walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GUI: Refactoring toolbar member names to be more consistent.

This commit is contained in:
Kimmo Varis 2010-07-03 20:03:53 +03:00
parent 7ddb60dd5a
commit 77a34643e2
4 changed files with 372 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/common.h
View File

@ -56,7 +56,7 @@ ShowTypes;
#define SETTINGS_APPLICATION_PATHS "Application paths" #define SETTINGS_APPLICATION_PATHS "Application paths"
#define SETTINGS_RESULT_COLUMN_WIDTH "Result column %1 width" #define SETTINGS_RESULT_COLUMN_WIDTH "Result column %1 width"
#define SETTINGS_LANGUAGE "Application language" #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" #define SETTINGS_TOOLBARS_VIEW_SHOW "Toolbars/ShowView"
/// @} /// @}

4
gui/main.ui
View File

@ -84,7 +84,7 @@
<property name="title"> <property name="title">
<string>&amp;Toolbars</string> <string>&amp;Toolbars</string>
</property> </property>
<addaction name="mActionToolbar"/> <addaction name="mActionToolBarMain"/>
<addaction name="mActionToolBarView"/> <addaction name="mActionToolBarView"/>
</widget> </widget>
<addaction name="mMenuToolbars"/> <addaction name="mMenuToolbars"/>
@ -309,7 +309,7 @@
<string>&amp;Expand all</string> <string>&amp;Expand all</string>
</property> </property>
</action> </action>
<action name="mActionToolbar"> <action name="mActionToolBarMain">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>

14
gui/mainwindow.cpp
View File

@ -71,7 +71,7 @@ MainWindow::MainWindow() :
connect(mUI.mActionAbout, SIGNAL(triggered()), this, SLOT(About())); connect(mUI.mActionAbout, SIGNAL(triggered()), this, SLOT(About()));
connect(mUI.mActionLicense, SIGNAL(triggered()), this, SLOT(ShowLicense())); 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.mActionToolBarView, SIGNAL(toggled(bool)), this, SLOT(ToggleViewToolBar()));
connect(mUI.mActionAuthors, SIGNAL(triggered()), this, SLOT(ShowAuthors())); 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_ERRORS, mUI.mActionShowErrors->isChecked());
mUI.mResults->ShowResults(SHOW_STYLE, mUI.mActionShowStyle->isChecked()); mUI.mResults->ShowResults(SHOW_STYLE, mUI.mActionShowStyle->isChecked());
mUI.mActionToolbar->setChecked(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_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()); mUI.mToolBarView->setVisible(mSettings->value(SETTINGS_TOOLBARS_VIEW_SHOW, true).toBool());
mApplications->LoadSettings(mSettings); mApplications->LoadSettings(mSettings);
@ -182,7 +182,7 @@ void MainWindow::SaveSettings()
mSettings->setValue(SETTINGS_SHOW_STYLE, mUI.mActionShowStyle->isChecked()); mSettings->setValue(SETTINGS_SHOW_STYLE, mUI.mActionShowStyle->isChecked());
mSettings->setValue(SETTINGS_SHOW_ERRORS, mUI.mActionShowErrors->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()); mSettings->setValue(SETTINGS_TOOLBARS_VIEW_SHOW, mUI.mToolBarView->isVisible());
mApplications->SaveSettings(mSettings); 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() void MainWindow::ToggleViewToolBar()
@ -638,7 +638,7 @@ void MainWindow::MapLanguage(QAction *action)
void MainWindow::AboutToShowViewMenu() void MainWindow::AboutToShowViewMenu()
{ {
mUI.mActionToolbar->setChecked(mUI.mToolBarMain->isVisible()); mUI.mActionToolBarMain->setChecked(mUI.mToolBarMain->isVisible());
mUI.mActionToolBarView->setChecked(mUI.mToolBarView->isVisible()); mUI.mActionToolBarView->setChecked(mUI.mToolBarView->isVisible());
} }

2
gui/mainwindow.h
View File

@ -148,7 +148,7 @@ protected slots:
/** /**
* @brief Slot for showing/hiding standard toolbar * @brief Slot for showing/hiding standard toolbar
*/ */
void ToggleToolbar(); void ToggleMainToolBar();
/** /**
* @brief Slot for showing/hiding Categories toolbar * @brief Slot for showing/hiding Categories toolbar