From 77a34643e2e091dd140fe0b3a8cc10b33cb0e020 Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Sat, 3 Jul 2010 20:03:53 +0300 Subject: [PATCH] GUI: Refactoring toolbar member names to be more consistent. --- gui/common.h | 2 +- gui/main.ui | 726 ++++++++++++++++++++++----------------------- gui/mainwindow.cpp | 14 +- gui/mainwindow.h | 2 +- 4 files changed, 372 insertions(+), 372 deletions(-) diff --git a/gui/common.h b/gui/common.h index 8157cf9f3..d0226db95 100644 --- a/gui/common.h +++ b/gui/common.h @@ -56,7 +56,7 @@ ShowTypes; #define SETTINGS_APPLICATION_PATHS "Application paths" #define SETTINGS_RESULT_COLUMN_WIDTH "Result column %1 width" #define SETTINGS_LANGUAGE "Application language" -#define SETTINGS_TOOLBARS_SHOW "Toolbars/ShowStandard" +#define SETTINGS_TOOLBARS_MAIN_SHOW "Toolbars/ShowStandard" #define SETTINGS_TOOLBARS_VIEW_SHOW "Toolbars/ShowView" /// @} diff --git a/gui/main.ui b/gui/main.ui index 296a877c0..c0818eea0 100644 --- a/gui/main.ui +++ b/gui/main.ui @@ -1,363 +1,363 @@ - - - MainWindow - - - - 0 - 0 - 640 - 480 - - - - - 0 - 0 - - - - - 640 - 480 - - - - Cppcheck - - - - 22 - 22 - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - - - - - - - - - - 0 - 0 - 640 - 21 - - - - - &File - - - - - - - &View - - - - &Toolbars - - - - - - - - - - - - - - - - - - &Language - - - - - &Help - - - - - - - - - - &Check - - - - - - - - - &Edit - - - - - - - - - - - - - - Standard - - - TopToolBarArea - - - false - - - - - - - - - - - - Categories - - - TopToolBarArea - - - false - - - - - - - &License... - - - - - A&uthors... - - - - - - :/images/help-browser.png:/images/help-browser.png - - - &About... - - - - - &Files... - - - Ctrl+F - - - - - - :/icon.png:/icon.png - - - &Directory... - - - Ctrl+D - - - - - - :/images/view-refresh.png:/images/view-refresh.png - - - &Recheck files - - - Ctrl+R - - - - - - :/images/process-stop.png:/images/process-stop.png - - - &Stop - - - Esc - - - - - - :/images/media-floppy.png:/images/media-floppy.png - - - &Save results to file... - - - Ctrl+S - - - - - &Quit - - - - - - :/images/edit-clear.png:/images/edit-clear.png - - - &Clear results - - - - - - :/images/preferences-system.png:/images/preferences-system.png - - - &Preferences - - - - - true - - - - :/images/showstylewarnings.png:/images/showstylewarnings.png - - - Show style errors - - - - - true - - - - :/images/showerrors.png:/images/showerrors.png - - - Show common errors - - - - - &Check all - - - - - &Uncheck all - - - - - Collapse &all - - - - - &Expand all - - - - - true - - - &Standard - - - Standard items - - - - - &Contents - - - Open the help contents - - - F1 - - - - - Toolbar - - - - - true - - - &Categories - - - Error categories - - - - - - ResultsView - QWidget -
resultsview.h
- 1 - - - - - - - + + + MainWindow + + + + 0 + 0 + 640 + 480 + + + + + 0 + 0 + + + + + 640 + 480 + + + + Cppcheck + + + + 22 + 22 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + + + + + + + + 0 + 0 + 640 + 21 + + + + + &File + + + + + + + &View + + + + &Toolbars + + + + + + + + + + + + + + + + + + &Language + + + + + &Help + + + + + + + + + + &Check + + + + + + + + + &Edit + + + + + + + + + + + + + + Standard + + + TopToolBarArea + + + false + + + + + + + + + + + + Categories + + + TopToolBarArea + + + false + + + + + + + &License... + + + + + A&uthors... + + + + + + :/images/help-browser.png:/images/help-browser.png + + + &About... + + + + + &Files... + + + Ctrl+F + + + + + + :/icon.png:/icon.png + + + &Directory... + + + Ctrl+D + + + + + + :/images/view-refresh.png:/images/view-refresh.png + + + &Recheck files + + + Ctrl+R + + + + + + :/images/process-stop.png:/images/process-stop.png + + + &Stop + + + Esc + + + + + + :/images/media-floppy.png:/images/media-floppy.png + + + &Save results to file... + + + Ctrl+S + + + + + &Quit + + + + + + :/images/edit-clear.png:/images/edit-clear.png + + + &Clear results + + + + + + :/images/preferences-system.png:/images/preferences-system.png + + + &Preferences + + + + + true + + + + :/images/showstylewarnings.png:/images/showstylewarnings.png + + + Show style errors + + + + + true + + + + :/images/showerrors.png:/images/showerrors.png + + + Show common errors + + + + + &Check all + + + + + &Uncheck all + + + + + Collapse &all + + + + + &Expand all + + + + + true + + + &Standard + + + Standard items + + + + + &Contents + + + Open the help contents + + + F1 + + + + + Toolbar + + + + + true + + + &Categories + + + Error categories + + + + + + ResultsView + QWidget +
resultsview.h
+ 1 + + + + + + + diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 7315e47ae..1a0c14542 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -71,7 +71,7 @@ MainWindow::MainWindow() : connect(mUI.mActionAbout, SIGNAL(triggered()), this, SLOT(About())); connect(mUI.mActionLicense, SIGNAL(triggered()), this, SLOT(ShowLicense())); - connect(mUI.mActionToolbar, SIGNAL(toggled(bool)), this, SLOT(ToggleToolbar())); + connect(mUI.mActionToolBarMain, SIGNAL(toggled(bool)), this, SLOT(ToggleMainToolBar())); connect(mUI.mActionToolBarView, SIGNAL(toggled(bool)), this, SLOT(ToggleViewToolBar())); connect(mUI.mActionAuthors, SIGNAL(triggered()), this, SLOT(ShowAuthors())); @@ -162,8 +162,8 @@ void MainWindow::LoadSettings() mUI.mResults->ShowResults(SHOW_ERRORS, mUI.mActionShowErrors->isChecked()); mUI.mResults->ShowResults(SHOW_STYLE, mUI.mActionShowStyle->isChecked()); - mUI.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool()); - mUI.mToolBarMain->setVisible(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool()); + mUI.mActionToolBarMain->setChecked(mSettings->value(SETTINGS_TOOLBARS_MAIN_SHOW, true).toBool()); + mUI.mToolBarMain->setVisible(mSettings->value(SETTINGS_TOOLBARS_MAIN_SHOW, true).toBool()); mUI.mToolBarView->setVisible(mSettings->value(SETTINGS_TOOLBARS_VIEW_SHOW, true).toBool()); mApplications->LoadSettings(mSettings); @@ -182,7 +182,7 @@ void MainWindow::SaveSettings() mSettings->setValue(SETTINGS_SHOW_STYLE, mUI.mActionShowStyle->isChecked()); mSettings->setValue(SETTINGS_SHOW_ERRORS, mUI.mActionShowErrors->isChecked()); - mSettings->setValue(SETTINGS_TOOLBARS_SHOW, mUI.mToolBarMain->isVisible()); + mSettings->setValue(SETTINGS_TOOLBARS_MAIN_SHOW, mUI.mToolBarMain->isVisible()); mSettings->setValue(SETTINGS_TOOLBARS_VIEW_SHOW, mUI.mToolBarView->isVisible()); mApplications->SaveSettings(mSettings); @@ -566,9 +566,9 @@ void MainWindow::ResultsAdded() { } -void MainWindow::ToggleToolbar() +void MainWindow::ToggleMainToolBar() { - mUI.mToolBarMain->setVisible(mUI.mActionToolbar->isChecked()); + mUI.mToolBarMain->setVisible(mUI.mActionToolBarMain->isChecked()); } void MainWindow::ToggleViewToolBar() @@ -638,7 +638,7 @@ void MainWindow::MapLanguage(QAction *action) void MainWindow::AboutToShowViewMenu() { - mUI.mActionToolbar->setChecked(mUI.mToolBarMain->isVisible()); + mUI.mActionToolBarMain->setChecked(mUI.mToolBarMain->isVisible()); mUI.mActionToolBarView->setChecked(mUI.mToolBarView->isVisible()); } diff --git a/gui/mainwindow.h b/gui/mainwindow.h index e5bc37758..0fa17db2d 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -148,7 +148,7 @@ protected slots: /** * @brief Slot for showing/hiding standard toolbar */ - void ToggleToolbar(); + void ToggleMainToolBar(); /** * @brief Slot for showing/hiding Categories toolbar