Skip to content

Commit

Permalink
Revert Edit to Process menu change
Browse files Browse the repository at this point in the history
It invalidates top level menu translations, most of which
we don't have the resources to update now and several
parts of the wiki for no relevant reasons.
I should not have merged this change, sorry.
  • Loading branch information
amtriathlon committed Dec 28, 2024
1 parent 31d2352 commit 5ef6080
Show file tree
Hide file tree
Showing 15 changed files with 3,149 additions and 3,189 deletions.
14 changes: 7 additions & 7 deletions src/Gui/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -600,11 +600,11 @@ MainWindow::MainWindow(const QDir &home)
optionsMenu->setWhatsThis(optionsMenuHelp->getWhatsThisText(HelpWhatsThis::MenuBar_Tools));


processMenu = menuBar()->addMenu(tr("&Process"));
connect(processMenu, SIGNAL(aboutToShow()), this, SLOT(onProcessMenuAboutToShow()));
editMenu = menuBar()->addMenu(tr("&Edit"));
connect(editMenu, SIGNAL(aboutToShow()), this, SLOT(onEditMenuAboutToShow()));

HelpWhatsThis *editMenuHelp = new HelpWhatsThis(processMenu);
processMenu->setWhatsThis(editMenuHelp->getWhatsThisText(HelpWhatsThis::MenuBar_Edit));
HelpWhatsThis *editMenuHelp = new HelpWhatsThis(editMenu);
editMenu->setWhatsThis(editMenuHelp->getWhatsThisText(HelpWhatsThis::MenuBar_Edit));

// VIEW MENU
QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
Expand Down Expand Up @@ -2613,9 +2613,9 @@ MainWindow::ridesAutoImport() {

}

void MainWindow::onProcessMenuAboutToShow()
void MainWindow::onEditMenuAboutToShow()
{
processMenu->clear();
editMenu->clear();
if (toolMapper != nullptr) {
delete toolMapper;
}
Expand All @@ -2630,7 +2630,7 @@ void MainWindow::onProcessMenuAboutToShow()
if (! (*iter)->isAutomatedOnly()) {
// The localized processor name is shown in menu
QAction *action = new QAction(QString("%1...").arg((*iter)->name()), this);
processMenu->addAction(action);
editMenu->addAction(action);
connect(action, SIGNAL(triggered()), toolMapper, SLOT(map()));
toolMapper->setMapping(action, (*iter)->id());
}
Expand Down
4 changes: 2 additions & 2 deletions src/Gui/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ class MainWindow : public QMainWindow
// autoload rides from athlete specific directory (preferences)
void ridesAutoImport();

void onProcessMenuAboutToShow();
void onEditMenuAboutToShow();

#ifdef GC_HAS_CLOUD_DB
// CloudDB actions
Expand Down Expand Up @@ -302,7 +302,7 @@ class MainWindow : public QMainWindow
QTFullScreen *fullScreen;
#endif

QMenu *processMenu;
QMenu *editMenu;

QComboBox *perspectiveSelector;
bool pactive; // when programmatically manipulating selector
Expand Down
486 changes: 241 additions & 245 deletions src/Resources/translations/gc_cs.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_de.ts

Large diffs are not rendered by default.

484 changes: 242 additions & 242 deletions src/Resources/translations/gc_es.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_fr.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_it.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_ja.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_nl.ts

Large diffs are not rendered by default.

488 changes: 244 additions & 244 deletions src/Resources/translations/gc_pt-br.ts

Large diffs are not rendered by default.

488 changes: 244 additions & 244 deletions src/Resources/translations/gc_pt.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_ru.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_sv.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_zh-cn.ts

Large diffs are not rendered by default.

486 changes: 241 additions & 245 deletions src/Resources/translations/gc_zh-tw.ts

Large diffs are not rendered by default.

0 comments on commit 5ef6080

Please sign in to comment.