nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI Nits: Simplify splitter to just one menu

Browse Source 
.. instead of + and - and menu.
This commit is contained in:
Mark Liversedge
2013-03-05 19:47:54 +00:00
parent b8b32a568f
commit 3bac8cd4fc
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MainWindow.cpp
View File

@@ -1302,6 +1302,8 @@ MainWindow::enableSaveButton()
void
MainWindow::analysisPopup()
{
// set the point for the menu and call below
showTreeContextMenuPopup(analSidebar->mapToGlobal(QPoint(analItem->pos().x()+analItem->width()-20, analItem->pos().y())));
}
void

30
src/TrainTool.cpp
View File

@@ -284,13 +284,11 @@ TrainTool::TrainTool(MainWindow *parent, const QDir &home) : GcWindow(parent), h
trainSplitter = new GcSplitter(Qt::Vertical);
trainSplitter->setContentsMargins(0,0,0,0);
deviceItem = new GcSplitterItem(tr("Devices"), iconFromPNG(":images/sidebar/power.png"), this);
// devices splitter actions
QAction *addDeviceAct = new QAction(iconFromPNG(":images/sidebar/plus.png"), tr("Add Device"), this);
deviceItem->addAction(addDeviceAct);
connect(addDeviceAct, SIGNAL(triggered(void)), main, SLOT(addDevice()));
QAction *removeDeviceAct = new QAction(iconFromPNG(":images/sidebar/minus.png"), tr("Delete Device"), this);
deviceItem->addAction(removeDeviceAct);
connect(removeDeviceAct, SIGNAL(triggered(void)), this, SLOT(deleteDevice(void)));
QAction *moreDeviceAct = new QAction(iconFromPNG(":images/sidebar/extra.png"), tr("Menu"), this);
deviceItem->addAction(moreDeviceAct);
connect(moreDeviceAct, SIGNAL(triggered(void)), this, SLOT(devicePopup(void)));
workoutItem = new GcSplitterItem(tr("Workouts"), iconFromPNG(":images/sidebar/folder.png"), this);
QAction *moreWorkoutAct = new QAction(iconFromPNG(":images/sidebar/extra.png"), tr("Menu"), this);
@@ -1521,6 +1519,26 @@ MultiDeviceDialog::cancelClicked()
reject();
}
void
TrainTool::devicePopup()
{
// OK - we are working with a specific event..
QMenu menu(deviceTree);
QAction *addDevice = new QAction(tr("Add Device"), deviceTree);
connect(addDevice, SIGNAL(triggered(void)), main, SLOT(addDevice()));
menu.addAction(addDevice);
if (deviceTree->selectedItems().size() == 1) {
QAction *delDevice = new QAction(tr("Delete Device"), deviceTree);
connect(delDevice, SIGNAL(triggered(void)), this, SLOT(deleteDevice()));
menu.addAction(delDevice);
}
// execute the menu
menu.exec(trainSplitter->mapToGlobal(QPoint(deviceItem->pos().x()+deviceItem->width()-20,
deviceItem->pos().y())));
}
void
TrainTool::deviceTreeMenuPopup(const QPoint &pos)
{

1
src/TrainTool.h
View File

@@ -123,6 +123,7 @@ class TrainTool : public GcWindow
void deviceTreeMenuPopup(const QPoint &);
void deleteDevice();
void devicePopup();
void workoutPopup();
void mediaPopup();