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

GUI: Remove Language-menu. 

We now have language selection in Settings-dialog.
This commit is contained in:
Kimmo Varis 2011-01-10 00:50:32 +02:00
parent 29d6b443fa
commit 85a700b496
3 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/main.ui
View File

@ -113,11 +113,6 @@
<addaction name="mActionViewLog"/> <addaction name="mActionViewLog"/>
<addaction name="mActionViewStats"/> <addaction name="mActionViewStats"/>
</widget> </widget>
<widget class="QMenu" name="mMenuLanguage">
<property name="title">
<string>&amp;Language</string>
</property>
</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>
@ -148,7 +143,6 @@
<addaction name="mMenuEdit"/> <addaction name="mMenuEdit"/>
<addaction name="mMenuView"/> <addaction name="mMenuView"/>
<addaction name="mMenuCheck"/> <addaction name="mMenuCheck"/>
<addaction name="mMenuLanguage"/>
<addaction name="mMenuHelp"/> <addaction name="mMenuHelp"/>
</widget> </widget>
<widget class="QToolBar" name="mToolBarMain"> <widget class="QToolBar" name="mToolBarMain">

47
gui/mainwindow.cpp
View File

@ -98,7 +98,6 @@ MainWindow::MainWindow() :
connect(mUI.mActionHelpContents, SIGNAL(triggered()), this, SLOT(OpenHelpContents())); connect(mUI.mActionHelpContents, SIGNAL(triggered()), this, SLOT(OpenHelpContents()));
CreateLanguageMenuItems();
LoadSettings(); LoadSettings();
mThread->Initialize(mUI.mResults); mThread->Initialize(mUI.mResults);
@ -128,39 +127,6 @@ MainWindow::~MainWindow()
delete mProject; delete mProject;
} }
void MainWindow::CreateLanguageMenuItems()
{
QStringList languages = mTranslation->GetNames();
for (int i = 0; i < languages.size(); i++)
{
//Create an action for each language
//Language name is pre translated
QAction *temp = new QAction(languages[i], this);
temp->setCheckable(true);
//Add the action to menu
mUI.mMenuLanguage->addAction(temp);
//Add action to the group
mLanguages->addAction(temp);
//Check it if it's the value stored to settings
if (i == mSettings->value(SETTINGS_LANGUAGE, 0).toInt())
{
temp->setChecked(true);
}
else
{
temp->setChecked(false);
}
}
connect(mLanguages, SIGNAL(triggered(QAction *)),
this, SLOT(MapLanguage(QAction *)));
}
void MainWindow::LoadSettings() void MainWindow::LoadSettings()
{ {
if (mSettings->value(SETTINGS_WINDOW_MAXIMIZED, false).toBool()) if (mSettings->value(SETTINGS_WINDOW_MAXIMIZED, false).toBool())
@ -715,19 +681,6 @@ void MainWindow::SetLanguage(int index)
} }
} }
void MainWindow::MapLanguage(QAction *action)
{
//Find the action that has the language that user clicked
QList<QAction *> actions = mLanguages->actions();
for (int i = 0; i < actions.size(); i++)
{
if (actions[i] == action)
{
SetLanguage(i);
}
}
}
void MainWindow::AboutToShowViewMenu() void MainWindow::AboutToShowViewMenu()
{ {
mUI.mActionToolBarMain->setChecked(mUI.mToolBarMain->isVisible()); mUI.mActionToolBarMain->setChecked(mUI.mToolBarMain->isVisible());

12
gui/mainwindow.h
View File

@ -212,12 +212,6 @@ protected slots:
*/ */
void ResultsAdded(); void ResultsAdded();
/**
* @brief Slot for changing the program's language
*
*/
void MapLanguage(QAction *);
/** /**
* @brief Slot for showing/hiding standard toolbar * @brief Slot for showing/hiding standard toolbar
*/ */
@ -259,12 +253,6 @@ protected slots:
protected: protected:
/**
* @brief Create menu items to change language
*
*/
void CreateLanguageMenuItems();
/** /**
* @brief Set current language * @brief Set current language
* @param index Index of the language to set * @param index Index of the language to set