nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-16 01:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI Polish: Move train view controls to scope bar

Browse Source 
Now we have a scope bar we can move the train view controls
out of the sidebar.
This commit is contained in:
Mark Liversedge
2012-11-20 17:21:22 +00:00
parent a16eb563f9
commit e68afff2c7
4 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/MainWindow.cpp
View File

@@ -221,12 +221,6 @@ MainWindow::MainWindow(const QDir &home) :
connect(searchBox, SIGNAL(textChanged(QString)), this, SLOT(searchTextChanged(QString)));
#endif
scopebar = new GcScopeBar(this);
connect(scopebar, SIGNAL(selectDiary()), this, SLOT(selectDiary()));
connect(scopebar, SIGNAL(selectHome()), this, SLOT(selectHome()));
connect(scopebar, SIGNAL(selectAnal()), this, SLOT(selectAnalysis()));
connect(scopebar, SIGNAL(selectTrain()), this, SLOT(selectTrain()));
#endif // MAC NATIVE TOOLBAR AND SCOPEBAR
// COMMON GUI SETUP
@@ -382,8 +376,16 @@ MainWindow::MainWindow(const QDir &home) :
trainTool = new TrainTool(this, home);
trainTool->hide();
trainTool->getToolbarButtons()->hide(); // no show yet
#ifndef Q_OS_MAC
toolbar->addWidget(trainTool->getToolbarButtons());
#else
scopebar = new GcScopeBar(this, trainTool->getToolbarButtons());
connect(scopebar, SIGNAL(selectDiary()), this, SLOT(selectDiary()));
connect(scopebar, SIGNAL(selectHome()), this, SLOT(selectHome()));
connect(scopebar, SIGNAL(selectAnal()), this, SLOT(selectAnalysis()));
connect(scopebar, SIGNAL(selectTrain()), this, SLOT(selectTrain()));
#endif
// Analysis view buttons too.
@@ -1358,9 +1360,9 @@ MainWindow::selectAnalysis()
views->setCurrentIndex(0);
analWindow->selected(); // tell it!
currentWindow = analWindow;
trainTool->getToolbarButtons()->hide();
#ifndef Q_OS_MAC
analButtons->show();
trainTool->getToolbarButtons()->hide();
#else
scopebar->selected(2);
#endif
@@ -1375,9 +1377,9 @@ MainWindow::selectTrain()
views->setCurrentIndex(1);
trainWindow->selected(); // tell it!
currentWindow = trainWindow;
trainTool->getToolbarButtons()->show();
#ifndef Q_OS_MAC
analButtons->hide();
trainTool->getToolbarButtons()->show();
#else
scopebar->selected(3);
#endif
@@ -1392,9 +1394,9 @@ MainWindow::selectDiary()
views->setCurrentIndex(2);
diaryWindow->selected(); // tell it!
currentWindow = diaryWindow;
trainTool->getToolbarButtons()->hide();
#ifndef Q_OS_MAC
analButtons->hide();
trainTool->getToolbarButtons()->hide();
#else
scopebar->selected(1);
#endif
@@ -1410,9 +1412,9 @@ MainWindow::selectHome()
views->setCurrentIndex(3);
homeWindow->selected(); // tell it!
currentWindow = homeWindow;
trainTool->getToolbarButtons()->hide();
#ifndef Q_OS_MAC
analButtons->hide();
trainTool->getToolbarButtons()->hide();
#else
scopebar->selected(0);
#endif