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

726
gui/main.ui
View File

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

14
gui/mainwindow.cpp
View File

@ -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());
}

2
gui/mainwindow.h
View File

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