GUI: Remove security-category.

The security-category was removed from core in commits 03f3ee62a0 and 11bc5195b8.
This commit is contained in:
Kimmo Varis 2009-07-13 16:47:38 +03:00
parent f7cb7da560
commit 635acfa2ab
5 changed files with 1 additions and 28 deletions

View File

@ -27,7 +27,6 @@ typedef enum
{ {
SHOW_ALL = 0, SHOW_ALL = 0,
SHOW_STYLE, SHOW_STYLE,
SHOW_SECURITY,
SHOW_ERRORS, SHOW_ERRORS,
SHOW_NONE SHOW_NONE
} }
@ -40,7 +39,6 @@ ShowTypes;
#define SETTINGS_WINDOW_WIDTH "Window width" #define SETTINGS_WINDOW_WIDTH "Window width"
#define SETTINGS_WINDOW_HEIGHT "Window height" #define SETTINGS_WINDOW_HEIGHT "Window height"
#define SETTINGS_SHOW_ALL "Show all" #define SETTINGS_SHOW_ALL "Show all"
#define SETTINGS_SHOW_SECURITY "Show security"
#define SETTINGS_SHOW_STYLE "Show style" #define SETTINGS_SHOW_STYLE "Show style"
#define SETTINGS_SHOW_ERRORS "Show errors" #define SETTINGS_SHOW_ERRORS "Show errors"
#define SETTINGS_CHECK_PATH "Check path" #define SETTINGS_CHECK_PATH "Check path"

View File

@ -69,7 +69,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>640</width> <width>640</width>
<height>24</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="mMenuFile"> <widget class="QMenu" name="mMenuFile">
@ -84,7 +84,6 @@
<string>&amp;View</string> <string>&amp;View</string>
</property> </property>
<addaction name="mActionShowAll"/> <addaction name="mActionShowAll"/>
<addaction name="mActionShowSecurity"/>
<addaction name="mActionShowStyle"/> <addaction name="mActionShowStyle"/>
<addaction name="mActionShowErrors"/> <addaction name="mActionShowErrors"/>
<addaction name="mActionCheckAll"/> <addaction name="mActionCheckAll"/>

View File

@ -56,7 +56,6 @@ MainWindow::MainWindow() :
connect(mUI.mActionClearResults, SIGNAL(triggered()), this, SLOT(ClearResults())); connect(mUI.mActionClearResults, SIGNAL(triggered()), this, SLOT(ClearResults()));
connect(mUI.mActionShowAll, SIGNAL(toggled(bool)), this, SLOT(ShowAll(bool))); connect(mUI.mActionShowAll, SIGNAL(toggled(bool)), this, SLOT(ShowAll(bool)));
connect(mUI.mActionShowSecurity, SIGNAL(toggled(bool)), this, SLOT(ShowSecurity(bool)));
connect(mUI.mActionShowStyle, SIGNAL(toggled(bool)), this, SLOT(ShowStyle(bool))); connect(mUI.mActionShowStyle, SIGNAL(toggled(bool)), this, SLOT(ShowStyle(bool)));
connect(mUI.mActionShowErrors, SIGNAL(toggled(bool)), this, SLOT(ShowErrors(bool))); connect(mUI.mActionShowErrors, SIGNAL(toggled(bool)), this, SLOT(ShowErrors(bool)));
connect(mUI.mActionCheckAll, SIGNAL(triggered()), this, SLOT(CheckAll())); connect(mUI.mActionCheckAll, SIGNAL(triggered()), this, SLOT(CheckAll()));
@ -149,14 +148,12 @@ void MainWindow::LoadSettings()
mUI.mActionShowAll->setChecked(mSettings->value(SETTINGS_SHOW_ALL, true).toBool()); mUI.mActionShowAll->setChecked(mSettings->value(SETTINGS_SHOW_ALL, true).toBool());
mUI.mActionShowSecurity->setChecked(mSettings->value(SETTINGS_SHOW_SECURITY, true).toBool());
mUI.mActionShowStyle->setChecked(mSettings->value(SETTINGS_SHOW_STYLE, true).toBool()); mUI.mActionShowStyle->setChecked(mSettings->value(SETTINGS_SHOW_STYLE, true).toBool());
mUI.mActionShowErrors->setChecked(mSettings->value(SETTINGS_SHOW_ERRORS, true).toBool()); mUI.mActionShowErrors->setChecked(mSettings->value(SETTINGS_SHOW_ERRORS, true).toBool());
mUI.mResults->ShowResults(SHOW_ALL, mUI.mActionShowAll->isChecked()); mUI.mResults->ShowResults(SHOW_ALL, mUI.mActionShowAll->isChecked());
mUI.mResults->ShowResults(SHOW_ERRORS, mUI.mActionShowErrors->isChecked()); mUI.mResults->ShowResults(SHOW_ERRORS, mUI.mActionShowErrors->isChecked());
mUI.mResults->ShowResults(SHOW_SECURITY, mUI.mActionShowSecurity->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.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
@ -178,7 +175,6 @@ void MainWindow::SaveSettings()
mSettings->setValue(SETTINGS_SHOW_ALL, mUI.mActionShowAll->isChecked()); mSettings->setValue(SETTINGS_SHOW_ALL, mUI.mActionShowAll->isChecked());
mSettings->setValue(SETTINGS_SHOW_SECURITY, mUI.mActionShowSecurity->isChecked());
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.mToolBar->isVisible()); mSettings->setValue(SETTINGS_TOOLBARS_SHOW, mUI.mToolBar->isVisible());
@ -415,11 +411,6 @@ void MainWindow::ShowAll(bool checked)
mUI.mResults->ShowResults(SHOW_ALL, checked); mUI.mResults->ShowResults(SHOW_ALL, checked);
} }
void MainWindow::ShowSecurity(bool checked)
{
mUI.mResults->ShowResults(SHOW_SECURITY, checked);
}
void MainWindow::ShowStyle(bool checked) void MainWindow::ShowStyle(bool checked)
{ {
mUI.mResults->ShowResults(SHOW_STYLE, checked); mUI.mResults->ShowResults(SHOW_STYLE, checked);
@ -471,9 +462,6 @@ void MainWindow::ToggleAllChecked(bool checked)
mUI.mActionShowAll->setChecked(checked); mUI.mActionShowAll->setChecked(checked);
ShowAll(checked); ShowAll(checked);
mUI.mActionShowSecurity->setChecked(checked);
ShowSecurity(checked);
mUI.mActionShowStyle->setChecked(checked); mUI.mActionShowStyle->setChecked(checked);
ShowStyle(checked); ShowStyle(checked);

View File

@ -73,12 +73,6 @@ public slots:
*/ */
void ShowAll(bool checked); void ShowAll(bool checked);
/**
* @brief Show errors with type "security"
* @param checked Should errors be shown (true) or hidden (false)
*/
void ShowSecurity(bool checked);
/** /**
* @brief Show errors with type "style" * @brief Show errors with type "style"
* @param checked Should errors be shown (true) or hidden (false) * @param checked Should errors be shown (true) or hidden (false)

View File

@ -189,8 +189,6 @@ ShowTypes ResultsTree::SeverityToShowType(const QString & severity)
return SHOW_ERRORS; return SHOW_ERRORS;
if (severity == "style") if (severity == "style")
return SHOW_STYLE; return SHOW_STYLE;
if (severity == "security")
return SHOW_SECURITY;
return SHOW_NONE; return SHOW_NONE;
} }
@ -617,10 +615,6 @@ QString ResultsTree::ShowTypeToString(ShowTypes type)
return tr("style"); return tr("style");
break; break;
case SHOW_SECURITY:
return tr("security");
break;
case SHOW_ERRORS: case SHOW_ERRORS:
return tr("error"); return tr("error");
break; break;