mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-02-13 08:08:42 +00:00
Revert Edit to Process menu change
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.
This commit is contained in:
@@ -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"));
|
||||
@@ -2613,9 +2613,9 @@ MainWindow::ridesAutoImport() {
|
||||
|
||||
}
|
||||
|
||||
void MainWindow::onProcessMenuAboutToShow()
|
||||
void MainWindow::onEditMenuAboutToShow()
|
||||
{
|
||||
processMenu->clear();
|
||||
editMenu->clear();
|
||||
if (toolMapper != nullptr) {
|
||||
delete toolMapper;
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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
|
||||
@@ -302,7 +302,7 @@ class MainWindow : public QMainWindow
|
||||
QTFullScreen *fullScreen;
|
||||
#endif
|
||||
|
||||
QMenu *processMenu;
|
||||
QMenu *editMenu;
|
||||
|
||||
QComboBox *perspectiveSelector;
|
||||
bool pactive; // when programmatically manipulating selector
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user