mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 16:18:42 +00:00
R Chart Initial Splitter Sizes
.. some users get confused, so make the splitter sit in the middle (ish) to help them .. need to still fixup save/restore splitter position to chart config.
This commit is contained in:
@@ -300,6 +300,7 @@ RChart::RChart(Context *context, bool ridesummary) : GcChartWindow(context), con
|
||||
|
||||
leftsplitter->addWidget(script);
|
||||
console = new RConsole(context, this);
|
||||
console->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
|
||||
leftsplitter->addWidget(console);
|
||||
|
||||
splitter = new QSplitter(Qt::Horizontal, this);
|
||||
@@ -313,6 +314,11 @@ RChart::RChart(Context *context, bool ridesummary) : GcChartWindow(context), con
|
||||
canvas->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
|
||||
splitter->addWidget(canvas);
|
||||
|
||||
// make splitter reasonable
|
||||
QList<int> sizes;
|
||||
sizes << 300 << 500;
|
||||
splitter->setSizes(sizes);
|
||||
|
||||
if (ridesummary) {
|
||||
connect(this, SIGNAL(rideItemChanged(RideItem*)), this, SLOT(runScript()));
|
||||
|
||||
@@ -332,6 +338,7 @@ RChart::RChart(Context *context, bool ridesummary) : GcChartWindow(context), con
|
||||
|
||||
// not starting
|
||||
script = NULL;
|
||||
splitter = NULL;
|
||||
console = NULL;
|
||||
canvas = NULL;
|
||||
}
|
||||
@@ -353,6 +360,21 @@ RChart::setScript(QString string)
|
||||
text = string;
|
||||
}
|
||||
|
||||
QString
|
||||
RChart::getState() const
|
||||
{
|
||||
//XXX FIXME
|
||||
//if (rtool && splitter) return QString(splitter->saveState());
|
||||
//else return "";
|
||||
}
|
||||
|
||||
void
|
||||
RChart::setState(QString b)
|
||||
{
|
||||
//XXX FIXME
|
||||
//if (rtool && splitter && b != "") splitter->restoreState(QByteArray(b.toLatin1()));
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
RChart::runScript()
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <QTextEdit>
|
||||
#include <QScrollBar>
|
||||
#include <QSplitter>
|
||||
#include <QByteArray>
|
||||
#include <string.h>
|
||||
|
||||
#include "GoldenCheetah.h"
|
||||
@@ -80,6 +81,7 @@ class RChart : public GcChartWindow {
|
||||
Q_OBJECT
|
||||
|
||||
Q_PROPERTY(QString script READ getScript WRITE setScript USER true)
|
||||
Q_PROPERTY(QString state READ getState WRITE setState USER true)
|
||||
|
||||
public:
|
||||
RChart(Context *context, bool ridesummary);
|
||||
@@ -92,6 +94,9 @@ class RChart : public GcChartWindow {
|
||||
QString getScript() const;
|
||||
void setScript(QString);
|
||||
|
||||
QString getState() const;
|
||||
void setState(QString);
|
||||
|
||||
public slots:
|
||||
void runScript();
|
||||
|
||||
|
||||
@@ -152,7 +152,6 @@ GcWindow *
|
||||
GcWindowRegistry::newGcWindow(GcWinID id, Context *context)
|
||||
{
|
||||
GcWindow *returning = NULL;
|
||||
int idx;
|
||||
|
||||
switch(id) {
|
||||
case GcWindowTypes::Aerolab: returning = new AerolabWindow(context); break;
|
||||
|
||||
Reference in New Issue
Block a user