From c5a3b306e49cc95376284590ad788962aa2f758d Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Sat, 3 Jul 2010 13:11:38 +0300
Subject: [PATCH] GUI: Rename main toolbar in code.

---
 gui/main.ui        | 2 +-
 gui/mainwindow.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gui/main.ui b/gui/main.ui
index 29c3d11ff..7b9e951fe 100644
--- a/gui/main.ui
+++ b/gui/main.ui
@@ -128,7 +128,7 @@
    <addaction name="mMenuLanguage"/>
    <addaction name="mMenuHelp"/>
   </widget>
-  <widget class="QToolBar" name="mToolBar">
+  <widget class="QToolBar" name="mToolBarMain">
    <property name="windowTitle">
     <string>Standard</string>
    </property>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 03b6a5170..a8be786f1 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -162,7 +162,7 @@ void MainWindow::LoadSettings()
     mUI.mResults->ShowResults(SHOW_STYLE, mUI.mActionShowStyle->isChecked());
 
     mUI.mActionToolbar->setChecked(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
-    mUI.mToolBar->setVisible(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
+    mUI.mToolBarMain->setVisible(mSettings->value(SETTINGS_TOOLBARS_SHOW, true).toBool());
 
     mApplications->LoadSettings(mSettings);
 
@@ -180,7 +180,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.mToolBar->isVisible());
+    mSettings->setValue(SETTINGS_TOOLBARS_SHOW, mUI.mToolBarMain->isVisible());
 
     mApplications->SaveSettings(mSettings);
 
@@ -565,7 +565,7 @@ void MainWindow::ResultsAdded()
 
 void MainWindow::ToggleToolbar()
 {
-    mUI.mToolBar->setVisible(mUI.mActionToolbar->isChecked());
+    mUI.mToolBarMain->setVisible(mUI.mActionToolbar->isChecked());
 }
 
 void MainWindow::FormatAndSetTitle(const QString &text)
@@ -630,7 +630,7 @@ void MainWindow::MapLanguage(QAction *action)
 
 void MainWindow::AboutToShowViewMenu()
 {
-    mUI.mActionToolbar->setChecked(mUI.mToolBar->isVisible());
+    mUI.mActionToolbar->setChecked(mUI.mToolBarMain->isVisible());
 }
 
 void MainWindow::StopChecking()