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

UI Nits: LTMSidebar Splitter simplify to menu

Browse Source 
.. remove the + and - options.
This commit is contained in:
Mark Liversedge
2013-03-05 20:00:54 +00:00
parent 3bac8cd4fc
commit 0ae9e1f1ca
1 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/LTMSidebar.cpp
View File

@@ -47,13 +47,6 @@ LTMSidebar::LTMSidebar(MainWindow *parent, const QDir &home) : QWidget(parent),
setContentsMargins(0,0,0,0);
seasonsWidget = new GcSplitterItem(tr("Date Ranges"), iconFromPNG(":images/sidebar/calendar.png"), this);
QAction *addSeasonAct = new QAction(iconFromPNG(":images/sidebar/plus.png"), tr("Add Date Range"), this);
seasonsWidget->addAction(addSeasonAct);
connect(addSeasonAct, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
QAction *removeSeasonAct = new QAction(iconFromPNG(":images/sidebar/minus.png"), tr("Delete Date Range"), this);
seasonsWidget->addAction(removeSeasonAct);
connect(removeSeasonAct, SIGNAL(triggered(void)), this, SLOT(deleteRange(void)));
QAction *moreSeasonAct = new QAction(iconFromPNG(":images/sidebar/extra.png"), tr("Menu"), this);
seasonsWidget->addAction(moreSeasonAct);
connect(moreSeasonAct, SIGNAL(triggered(void)), this, SLOT(dateRangePopup(void)));
@@ -78,13 +71,6 @@ LTMSidebar::LTMSidebar(MainWindow *parent, const QDir &home) : QWidget(parent),
eventsWidget = new GcSplitterItem(tr("Events"), iconFromPNG(":images/sidebar/bookmark.png"), this);
QAction *addEventAct = new QAction(iconFromPNG(":images/sidebar/plus.png"), tr("Add Event"), this);
eventsWidget->addAction(addEventAct);
connect(addEventAct, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
QAction *removeEventAct = new QAction(iconFromPNG(":images/sidebar/minus.png"), tr("Delete Event"), this);
eventsWidget->addAction(removeEventAct);
connect(removeEventAct, SIGNAL(triggered(void)), this, SLOT(deleteEvent(void)));
QAction *moreEventAct = new QAction(iconFromPNG(":images/sidebar/extra.png"), tr("Menu"), this);
eventsWidget->addAction(moreEventAct);
connect(moreEventAct, SIGNAL(triggered(void)), this, SLOT(eventPopup(void)));
@@ -380,13 +366,24 @@ LTMSidebar::eventPopup(QPoint pos)
void
LTMSidebar::eventPopup()
{
// no current season selected
if (eventTree->selectedItems().isEmpty()) return;
// events are against a selected season
if (dateRangeTree->selectedItems().count() == 0) return; // need a season selected!
QTreeWidgetItem *item = eventTree->selectedItems().at(0);
// and the season must be user defined not temporary
int seasonindex = allDateRanges->indexOfChild(dateRangeTree->selectedItems().first());
if (seasons->seasons[seasonindex].getType() == Season::temporary) return;
// have we selected an event?
QTreeWidgetItem *item = NULL;
if (!eventTree->selectedItems().isEmpty()) item = eventTree->selectedItems().at(0);
// OK - we are working with a specific event..
QMenu menu(eventTree);
// we can always add, regardless of any event being selected...
QAction *addEvent = new QAction(tr("Add event"), eventTree);
menu.addAction(addEvent);
connect(addEvent, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
if (item != NULL && item->type() != ROOT_TYPE && allEvents->indexOfChild(item) != -1) {
QAction *edit = new QAction(tr("Edit details"), eventTree);
@@ -399,14 +396,8 @@ LTMSidebar::eventPopup()
connect(del, SIGNAL(triggered(void)), this, SLOT(deleteEvent(void)));
}
// we can always add, regardless of any event being selected...
QAction *addEvent = new QAction(tr("Add event"), eventTree);
menu.addAction(addEvent);
connect(addEvent, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
// execute the menu
menu.exec(splitter->mapToGlobal(QPoint(eventsWidget->pos().x()+eventsWidget->width()-20,
eventsWidget->pos().y())));
menu.exec(splitter->mapToGlobal(QPoint(eventsWidget->pos().x()+eventsWidget->width()-20, eventsWidget->pos().y())));
}
void