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"
/// @} /// @}

726
gui/main.ui
View File

@ -1,363 +1,363 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>640</width> <width>640</width>
<height>480</height> <height>480</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>640</width> <width>640</width>
<height>480</height> <height>480</height>
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Cppcheck</string> <string>Cppcheck</string>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
<width>22</width> <width>22</width>
<height>22</height> <height>22</height>
</size> </size>
</property> </property>
<widget class="QWidget" name="mCentral"> <widget class="QWidget" name="mCentral">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="ResultsView" name="mResults" native="true"/> <widget class="ResultsView" name="mResults" native="true"/>
</item> </item>
</layout> </layout>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="mMenuBar"> <widget class="QMenuBar" name="mMenuBar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>640</width> <width>640</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="mMenuFile"> <widget class="QMenu" name="mMenuFile">
<property name="title"> <property name="title">
<string>&amp;File</string> <string>&amp;File</string>
</property> </property>
<addaction name="mActionSave"/> <addaction name="mActionSave"/>
<addaction name="mActionQuit"/> <addaction name="mActionQuit"/>
</widget> </widget>
<widget class="QMenu" name="mMenuView"> <widget class="QMenu" name="mMenuView">
<property name="title"> <property name="title">
<string>&amp;View</string> <string>&amp;View</string>
</property> </property>
<widget class="QMenu" name="mMenuToolbars"> <widget class="QMenu" name="mMenuToolbars">
<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"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="mActionShowStyle"/> <addaction name="mActionShowStyle"/>
<addaction name="mActionShowErrors"/> <addaction name="mActionShowErrors"/>
<addaction name="mActionCheckAll"/> <addaction name="mActionCheckAll"/>
<addaction name="mActionUncheckAll"/> <addaction name="mActionUncheckAll"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="mActionCollapseAll"/> <addaction name="mActionCollapseAll"/>
<addaction name="mActionExpandAll"/> <addaction name="mActionExpandAll"/>
<addaction name="separator"/> <addaction name="separator"/>
</widget> </widget>
<widget class="QMenu" name="mMenuLanguage"> <widget class="QMenu" name="mMenuLanguage">
<property name="title"> <property name="title">
<string>&amp;Language</string> <string>&amp;Language</string>
</property> </property>
</widget> </widget>
<widget class="QMenu" name="mMenuHelp"> <widget class="QMenu" name="mMenuHelp">
<property name="title"> <property name="title">
<string>&amp;Help</string> <string>&amp;Help</string>
</property> </property>
<addaction name="mActionHelpContents"/> <addaction name="mActionHelpContents"/>
<addaction name="mActionLicense"/> <addaction name="mActionLicense"/>
<addaction name="mActionAuthors"/> <addaction name="mActionAuthors"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="mActionAbout"/> <addaction name="mActionAbout"/>
</widget> </widget>
<widget class="QMenu" name="mMenuCheck"> <widget class="QMenu" name="mMenuCheck">
<property name="title"> <property name="title">
<string>&amp;Check</string> <string>&amp;Check</string>
</property> </property>
<addaction name="mActionCheckFiles"/> <addaction name="mActionCheckFiles"/>
<addaction name="mActionCheckDirectory"/> <addaction name="mActionCheckDirectory"/>
<addaction name="mActionRecheck"/> <addaction name="mActionRecheck"/>
<addaction name="mActionStop"/> <addaction name="mActionStop"/>
</widget> </widget>
<widget class="QMenu" name="mMenuEdit"> <widget class="QMenu" name="mMenuEdit">
<property name="title"> <property name="title">
<string>&amp;Edit</string> <string>&amp;Edit</string>
</property> </property>
<addaction name="mActionClearResults"/> <addaction name="mActionClearResults"/>
<addaction name="mActionSettings"/> <addaction name="mActionSettings"/>
</widget> </widget>
<addaction name="mMenuFile"/> <addaction name="mMenuFile"/>
<addaction name="mMenuEdit"/> <addaction name="mMenuEdit"/>
<addaction name="mMenuView"/> <addaction name="mMenuView"/>
<addaction name="mMenuCheck"/> <addaction name="mMenuCheck"/>
<addaction name="mMenuLanguage"/> <addaction name="mMenuLanguage"/>
<addaction name="mMenuHelp"/> <addaction name="mMenuHelp"/>
</widget> </widget>
<widget class="QToolBar" name="mToolBarMain"> <widget class="QToolBar" name="mToolBarMain">
<property name="windowTitle"> <property name="windowTitle">
<string>Standard</string> <string>Standard</string>
</property> </property>
<attribute name="toolBarArea"> <attribute name="toolBarArea">
<enum>TopToolBarArea</enum> <enum>TopToolBarArea</enum>
</attribute> </attribute>
<attribute name="toolBarBreak"> <attribute name="toolBarBreak">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="mActionCheckDirectory"/> <addaction name="mActionCheckDirectory"/>
<addaction name="mActionSave"/> <addaction name="mActionSave"/>
<addaction name="mActionRecheck"/> <addaction name="mActionRecheck"/>
<addaction name="mActionStop"/> <addaction name="mActionStop"/>
<addaction name="mActionClearResults"/> <addaction name="mActionClearResults"/>
<addaction name="mActionSettings"/> <addaction name="mActionSettings"/>
<addaction name="mActionAbout"/> <addaction name="mActionAbout"/>
</widget> </widget>
<widget class="QToolBar" name="mToolBarView"> <widget class="QToolBar" name="mToolBarView">
<property name="windowTitle"> <property name="windowTitle">
<string>Categories</string> <string>Categories</string>
</property> </property>
<attribute name="toolBarArea"> <attribute name="toolBarArea">
<enum>TopToolBarArea</enum> <enum>TopToolBarArea</enum>
</attribute> </attribute>
<attribute name="toolBarBreak"> <attribute name="toolBarBreak">
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="mActionShowErrors"/> <addaction name="mActionShowErrors"/>
<addaction name="mActionShowStyle"/> <addaction name="mActionShowStyle"/>
</widget> </widget>
<action name="mActionLicense"> <action name="mActionLicense">
<property name="text"> <property name="text">
<string>&amp;License...</string> <string>&amp;License...</string>
</property> </property>
</action> </action>
<action name="mActionAuthors"> <action name="mActionAuthors">
<property name="text"> <property name="text">
<string>A&amp;uthors...</string> <string>A&amp;uthors...</string>
</property> </property>
</action> </action>
<action name="mActionAbout"> <action name="mActionAbout">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/help-browser.png</normaloff>:/images/help-browser.png</iconset> <normaloff>:/images/help-browser.png</normaloff>:/images/help-browser.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;About...</string> <string>&amp;About...</string>
</property> </property>
</action> </action>
<action name="mActionCheckFiles"> <action name="mActionCheckFiles">
<property name="text"> <property name="text">
<string>&amp;Files...</string> <string>&amp;Files...</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+F</string> <string>Ctrl+F</string>
</property> </property>
</action> </action>
<action name="mActionCheckDirectory"> <action name="mActionCheckDirectory">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/icon.png</normaloff>:/icon.png</iconset> <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Directory...</string> <string>&amp;Directory...</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+D</string> <string>Ctrl+D</string>
</property> </property>
</action> </action>
<action name="mActionRecheck"> <action name="mActionRecheck">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/view-refresh.png</normaloff>:/images/view-refresh.png</iconset> <normaloff>:/images/view-refresh.png</normaloff>:/images/view-refresh.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Recheck files</string> <string>&amp;Recheck files</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+R</string> <string>Ctrl+R</string>
</property> </property>
</action> </action>
<action name="mActionStop"> <action name="mActionStop">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/process-stop.png</normaloff>:/images/process-stop.png</iconset> <normaloff>:/images/process-stop.png</normaloff>:/images/process-stop.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Stop</string> <string>&amp;Stop</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Esc</string> <string>Esc</string>
</property> </property>
</action> </action>
<action name="mActionSave"> <action name="mActionSave">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/media-floppy.png</normaloff>:/images/media-floppy.png</iconset> <normaloff>:/images/media-floppy.png</normaloff>:/images/media-floppy.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Save results to file...</string> <string>&amp;Save results to file...</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+S</string> <string>Ctrl+S</string>
</property> </property>
</action> </action>
<action name="mActionQuit"> <action name="mActionQuit">
<property name="text"> <property name="text">
<string>&amp;Quit</string> <string>&amp;Quit</string>
</property> </property>
</action> </action>
<action name="mActionClearResults"> <action name="mActionClearResults">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/edit-clear.png</normaloff>:/images/edit-clear.png</iconset> <normaloff>:/images/edit-clear.png</normaloff>:/images/edit-clear.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Clear results</string> <string>&amp;Clear results</string>
</property> </property>
</action> </action>
<action name="mActionSettings"> <action name="mActionSettings">
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/preferences-system.png</normaloff>:/images/preferences-system.png</iconset> <normaloff>:/images/preferences-system.png</normaloff>:/images/preferences-system.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Preferences</string> <string>&amp;Preferences</string>
</property> </property>
</action> </action>
<action name="mActionShowStyle"> <action name="mActionShowStyle">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/showstylewarnings.png</normaloff>:/images/showstylewarnings.png</iconset> <normaloff>:/images/showstylewarnings.png</normaloff>:/images/showstylewarnings.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Show style errors</string> <string>Show style errors</string>
</property> </property>
</action> </action>
<action name="mActionShowErrors"> <action name="mActionShowErrors">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="gui.qrc"> <iconset resource="gui.qrc">
<normaloff>:/images/showerrors.png</normaloff>:/images/showerrors.png</iconset> <normaloff>:/images/showerrors.png</normaloff>:/images/showerrors.png</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Show common errors</string> <string>Show common errors</string>
</property> </property>
</action> </action>
<action name="mActionCheckAll"> <action name="mActionCheckAll">
<property name="text"> <property name="text">
<string>&amp;Check all</string> <string>&amp;Check all</string>
</property> </property>
</action> </action>
<action name="mActionUncheckAll"> <action name="mActionUncheckAll">
<property name="text"> <property name="text">
<string>&amp;Uncheck all</string> <string>&amp;Uncheck all</string>
</property> </property>
</action> </action>
<action name="mActionCollapseAll"> <action name="mActionCollapseAll">
<property name="text"> <property name="text">
<string>Collapse &amp;all</string> <string>Collapse &amp;all</string>
</property> </property>
</action> </action>
<action name="mActionExpandAll"> <action name="mActionExpandAll">
<property name="text"> <property name="text">
<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>
<property name="text"> <property name="text">
<string>&amp;Standard</string> <string>&amp;Standard</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Standard items</string> <string>Standard items</string>
</property> </property>
</action> </action>
<action name="mActionHelpContents"> <action name="mActionHelpContents">
<property name="text"> <property name="text">
<string>&amp;Contents</string> <string>&amp;Contents</string>
</property> </property>
<property name="statusTip"> <property name="statusTip">
<string>Open the help contents</string> <string>Open the help contents</string>
</property> </property>
<property name="shortcut"> <property name="shortcut">
<string>F1</string> <string>F1</string>
</property> </property>
</action> </action>
<action name="actionToolbar"> <action name="actionToolbar">
<property name="text"> <property name="text">
<string>Toolbar</string> <string>Toolbar</string>
</property> </property>
</action> </action>
<action name="mActionToolBarView"> <action name="mActionToolBarView">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Categories</string> <string>&amp;Categories</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Error categories</string> <string>Error categories</string>
</property> </property>
</action> </action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>ResultsView</class> <class>ResultsView</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>resultsview.h</header> <header>resultsview.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="gui.qrc"/> <include location="gui.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

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