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

Updated Time Range context menu (#4808)

Browse Source 
* Centralized the menu creation
* Grouping of actions
* Showing that a phase is always directly assigned to a season
* Harmonized case
* Added ellipsis to all actions opening new dialogs
* Keeping ellipsis out of translatable string to keep as many
  current translations as possible
This commit is contained in:
Joachim Kohlhammer
2026-01-18 15:46:25 +01:00
committed by GitHub
parent 3c3927df1b
commit 1a4dd1d10f
2 changed files with 68 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
src/Gui/LTMSidebar.cpp
View File

@@ -538,173 +538,79 @@ void
LTMSidebar::dateRangePopup(QPoint pos)
{
QTreeWidgetItem *item = dateRangeTree->itemAt(pos);
if (item != NULL) {
// out of bounds or not user defined
int seasonIdx = -1;
int phaseIdx = -1;
if (item->type() >= Season::season && item->type() < Phase::phase) {
seasonIdx = allDateRanges->indexOfChild(item);
} else if (item->type() >= Phase::phase) {
seasonIdx = allDateRanges->indexOfChild(item->parent());
phaseIdx = item->parent()->indexOfChild(item);
}
if (phaseIdx == -1 &&
(seasonIdx == -1 || seasonIdx >= seasons->seasons.count() ||
seasons->seasons[seasonIdx].getType() == Season::temporary)) {
// on system date we just offer to add a Season, since its
// the only way of doing it when no seasons are defined!!
// create context menu
QMenu menu(dateRangeTree);
QAction *add = new QAction(tr("Add season"), dateRangeTree);
menu.addAction(add);
// connect menu to functions
connect(add, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
// execute the menu
QMenu menu;
buildDateRangeMenu(menu, item, false);
menu.exec(dateRangeTree->mapToGlobal(pos));
} else if (phaseIdx > -1) {
// create context menu
QMenu menu(dateRangeTree);
QAction *edit = new QAction(tr("Edit phase"), dateRangeTree);
QAction *del = new QAction(tr("Delete phase"), dateRangeTree);
QAction *season = new QAction(tr("Add season"), dateRangeTree);
QAction *event = new QAction(tr("Add Event"), dateRangeTree);
QAction *phase = new QAction(tr("Add Phase"), dateRangeTree);
menu.addAction(edit);
menu.addAction(del);
menu.addSeparator();
menu.addAction(season);
menu.addAction(event);
menu.addAction(phase);
// connect menu to functions
connect(edit, SIGNAL(triggered(void)), this, SLOT(editRange(void)));
connect(del, SIGNAL(triggered(void)), this, SLOT(deleteRange(void)));
connect(season, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
connect(event, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
connect(phase, SIGNAL(triggered(void)), this, SLOT(addPhase(void)));
// execute the menu
menu.exec(dateRangeTree->mapToGlobal(pos));
} else {
// create context menu
QMenu menu(dateRangeTree);
QAction *edit = new QAction(tr("Edit season"), dateRangeTree);
QAction *del = new QAction(tr("Delete season"), dateRangeTree);
QAction *season = new QAction(tr("Add season"), dateRangeTree);
QAction *event = new QAction(tr("Add Event"), dateRangeTree);
QAction *phase = new QAction(tr("Add Phase"), dateRangeTree);
if (! seasons->seasons[seasonIdx].isAbsolute()) {
event->setEnabled(false);
phase->setEnabled(false);
}
menu.addAction(edit);
menu.addAction(del);
menu.addSeparator();
menu.addAction(season);
menu.addAction(event);
menu.addAction(phase);
// connect menu to functions
connect(edit, SIGNAL(triggered(void)), this, SLOT(editRange(void)));
connect(del, SIGNAL(triggered(void)), this, SLOT(deleteRange(void)));
connect(season, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
connect(event, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
connect(phase, SIGNAL(triggered(void)), this, SLOT(addPhase(void)));
// execute the menu
menu.exec(dateRangeTree->mapToGlobal(pos));
}
}
}
void
LTMSidebar::dateRangePopup()
{
// no current season selected
if (dateRangeTree->selectedItems().isEmpty()) return;
QTreeWidgetItem *item = nullptr;
if (! dateRangeTree->selectedItems().isEmpty()) {
item = dateRangeTree->selectedItems().at(0);
}
QMenu menu;
buildDateRangeMenu(menu, item, true);
menu.exec(splitter->mapToGlobal(QPoint(seasonsWidget->pos().x() + seasonsWidget->width() - 20, seasonsWidget->pos().y())));
}
QTreeWidgetItem *item = dateRangeTree->selectedItems().at(0);
int seasonIdx = -1;
int phaseIdx = -1;
void
LTMSidebar::buildDateRangeMenu
(QMenu &menu, QTreeWidgetItem *item, bool asGlobal) const
{
bool isAbsUserSeason = false;
bool isRelUserSeason = false;
bool isSystemSeason = false;
bool isPhase = false;
bool isNone = true;
Season *season = nullptr;
Season *phase = nullptr;
if (item != nullptr) {
if (item->type() >= Season::season && item->type() < Phase::phase) {
seasonIdx = allDateRanges->indexOfChild(item);
season = &seasons->seasons[allDateRanges->indexOfChild(item)];
if (season != nullptr) {
isSystemSeason = (season->getType() == Season::temporary);
isAbsUserSeason = season->isAbsolute() && ! isSystemSeason;
isRelUserSeason = ! season->isAbsolute() && ! isSystemSeason;
isNone = false;
}
} else if (item->type() >= Phase::phase) {
seasonIdx = allDateRanges->indexOfChild(item->parent());
phaseIdx = item->parent()->indexOfChild(item);
season = &seasons->seasons[allDateRanges->indexOfChild(item->parent())];
phase = &seasons->seasons[item->parent()->indexOfChild(item)];
if (season != nullptr && phase != nullptr) {
isPhase = true;
isNone = false;
}
// OK - we are working with a specific event..
QMenu menu(dateRangeTree);
if (phaseIdx == -1 &&
(seasonIdx == -1 || seasonIdx >= seasons->seasons.count() ||
seasons->seasons[seasonIdx].getType() == Season::temporary)) {
QAction *season = new QAction(tr("Add season"), dateRangeTree);
menu.addAction(season);
// connect menu to functions
connect(season, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
} else if (phaseIdx > -1) {
QAction *edit = new QAction(tr("Edit phase"), dateRangeTree);
QAction *del = new QAction(tr("Delete phase"), dateRangeTree);
QAction *season = new QAction(tr("Add season"), dateRangeTree);
QAction *event = new QAction(tr("Add Event"), dateRangeTree);
QAction *phase = new QAction(tr("Add Phase"), dateRangeTree);
menu.addAction(edit);
menu.addAction(del);
}
}
const QString ellipsis = QStringLiteral("...");
if (isNone) {
menu.addAction(tr("Add season") % ellipsis, this, &LTMSidebar::addRange);
} else if (isPhase) {
QString seasonName = season->getName();
const int maxLength = 30;
menu.addAction(tr("Edit phase") % ellipsis, this, &LTMSidebar::editRange);
menu.addAction(tr("Delete phase"), this, &LTMSidebar::deleteRange);
menu.addSeparator();
menu.addAction(season);
menu.addAction(event);
menu.addAction(phase);
// connect menu to functions
connect(edit, SIGNAL(triggered(void)), this, SLOT(editRange(void)));
connect(del, SIGNAL(triggered(void)), this, SLOT(deleteRange(void)));
connect(season, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
connect(event, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
connect(phase, SIGNAL(triggered(void)), this, SLOT(addPhase(void)));
menu.addAction(tr(R"(Add phase to "%1")").arg(season->getName()) % ellipsis, this, &LTMSidebar::addPhase);
menu.addAction(tr(R"(Add event to "%1")").arg(season->getName()) % ellipsis, this, &LTMSidebar::addEvent);
if (asGlobal) {
menu.addSeparator();
menu.addAction(tr("Add season") % ellipsis, this, &LTMSidebar::addRange);
}
} else {
QAction *edit = new QAction(tr("Edit season"), dateRangeTree);
QAction *del = new QAction(tr("Delete season"), dateRangeTree);
QAction *season = new QAction(tr("Add season"), dateRangeTree);
QAction *event = new QAction(tr("Add Event"), dateRangeTree);
QAction *phase = new QAction(tr("Add Phase"), dateRangeTree);
menu.addAction(edit);
menu.addAction(del);
menu.addAction(tr("Edit season") % ellipsis, this, &LTMSidebar::editRange)->setEnabled(isAbsUserSeason || isRelUserSeason);
menu.addAction(tr("Delete season"), this, &LTMSidebar::deleteRange)->setEnabled(isAbsUserSeason || isRelUserSeason);
menu.addSeparator();
menu.addAction(season);
menu.addAction(event);
menu.addAction(phase);
menu.addAction(tr("Add phase") % ellipsis, this, &LTMSidebar::addPhase)->setEnabled(isAbsUserSeason);
menu.addAction(tr("Add event") % ellipsis, this, &LTMSidebar::addEvent)->setEnabled(isAbsUserSeason);
menu.addSeparator();
menu.addAction(tr("Add season") % ellipsis, this, &LTMSidebar::addRange);
}
}
// connect menu to functions
connect(edit, SIGNAL(triggered(void)), this, SLOT(editRange(void)));
connect(del, SIGNAL(triggered(void)), this, SLOT(deleteRange(void)));
connect(season, SIGNAL(triggered(void)), this, SLOT(addRange(void)));
connect(event, SIGNAL(triggered(void)), this, SLOT(addEvent(void)));
connect(phase, SIGNAL(triggered(void)), this, SLOT(addPhase(void)));
}
// execute the menu
menu.exec(splitter->mapToGlobal(QPoint(seasonsWidget->pos().x()+seasonsWidget->width()-20,
seasonsWidget->pos().y())));
}
void
LTMSidebar::eventPopup(QPoint pos)

2
src/Gui/LTMSidebar.h
View File

@@ -142,6 +142,8 @@ class LTMSidebar : public QWidget
bool isqueryfilter, isautofilter;
QStringList autoFilterFiles, queryFilterFiles;
void buildDateRangeMenu(QMenu &menu, QTreeWidgetItem *item, bool asGlobal) const;
};
#endif // _GC_LTMSidebar_h