[Eliot-dev] eliot/qt main_window.cpp prefs_dialog.cpp prefs...

[Olivier Teulière]

CVSROOT:        /cvsroot/eliot
Module name:    eliot
Changes by:     Olivier Teulière <ipkiss>      08/12/08 21:38:12

Modified files:
        qt             : main_window.cpp prefs_dialog.cpp prefs_dialog.h 

Log message:
        Save the toolbar visibility from one session to the next

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/main_window.cpp?cvsroot=eliot&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/prefs_dialog.cpp?cvsroot=eliot&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/prefs_dialog.h?cvsroot=eliot&r1=1.3&r2=1.4

Patches:
Index: main_window.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/main_window.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- main_window.cpp     8 Dec 2008 21:37:02 -0000       1.23
+++ main_window.cpp     8 Dec 2008 21:38:12 -0000       1.24
@@ -337,6 +337,11 @@
 
 void MainWindow::createMenu()
 {
+    // Decide whether to show the toolbar
+    QSettings qs(ORGANIZATION, PACKAGE_NAME);
+    bool showToolBar = qs.value(PrefsDialog::kINTF_SHOW_TOOLBAR, 
true).toBool();
+    m_ui.toolBar->setVisible(showToolBar);
+
     QMenu *menuFile = new QMenu(m_ui.menubar);
     m_ui.menubar->addAction(menuFile->menuAction());
     menuFile->setTitle(_q("&Game"));
@@ -393,7 +398,7 @@
     menuWindows->setTitle(_q("&Windows"));
     m_actionWindowsToolbar = addMenuAction(menuWindows, _q("&Toolbar"), 
_q("Ctrl+T"),
                   _q("Show/hide the toolbar"), SLOT(onWindowsToolbar()), true);
-    m_actionWindowsToolbar->setChecked(true);
+    m_actionWindowsToolbar->setChecked(showToolBar);
     m_actionWindowsBag = addMenuAction(menuWindows, _q("&Bag"), _q("Ctrl+B"),
                   _q("Show/hide the remaining tiles in the bag"), 
SLOT(onWindowsBag()), true);
     m_actionWindowsBoard = addMenuAction(menuWindows, _q("&External board"), 
_q("Ctrl+E"),
@@ -676,7 +681,6 @@
 
             // Save the location of the dictionary in the preferences
             QSettings qs(ORGANIZATION, PACKAGE_NAME);
-            QString dicPath = qs.value(PrefsDialog::kINTF_DIC_PATH, 
"").toString();
             qs.setValue(PrefsDialog::kINTF_DIC_PATH, fileName);
         }
         catch (std::exception &e)
@@ -693,6 +697,8 @@
         m_ui.toolBar->hide();
     else
         m_ui.toolBar->show();
+    QSettings qs(ORGANIZATION, PACKAGE_NAME);
+    qs.setValue(PrefsDialog::kINTF_SHOW_TOOLBAR, m_ui.toolBar->isVisible());
 }
 
 
@@ -844,8 +850,8 @@
         return;
 
     QSettings settings(ORGANIZATION, PACKAGE_NAME);
-    QVariant warn = settings.value(PrefsDialog::kINTF_WARN_REPLAY_TURN);
-    if (warn.isNull() || warn.toBool()) {
+    bool warn = settings.value(PrefsDialog::kINTF_WARN_REPLAY_TURN, 
true).toBool();
+    if (warn) {
         // Ask for a confirmation, because this may lead to data loss
         QString msg = _q("Replaying this turn will modify the game history "
                          "by deleting the turns after the displayed one (i.e. "

Index: prefs_dialog.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/prefs_dialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- prefs_dialog.cpp    8 Dec 2008 21:37:02 -0000       1.6
+++ prefs_dialog.cpp    8 Dec 2008 21:38:12 -0000       1.7
@@ -32,6 +32,7 @@
 const QString PrefsDialog::kINTF_ALIGN_HISTORY = "Interface/AlignHistory";
 const QString PrefsDialog::kINTF_DIC_PATH = "Interface/DicPath";
 const QString PrefsDialog::kINTF_WARN_REPLAY_TURN = "Interface/WarnReplayTurn";
+const QString PrefsDialog::kINTF_SHOW_TOOLBAR = "Interface/ShowToolBar";
 
 
 PrefsDialog::PrefsDialog(QWidget *iParent)
@@ -45,8 +46,8 @@
         QSettings qs(ORGANIZATION, PACKAGE_NAME);
         lineEditIntfDicPath->setText(qs.value(kINTF_DIC_PATH, "").toString());
         
checkBoxIntfAlignHistory->setChecked(qs.value(kINTF_ALIGN_HISTORY).toBool());
-        QVariant warnReplayTurn = qs.value(kINTF_WARN_REPLAY_TURN);
-        checkBoxIntfWarnReplayTurn->setChecked(warnReplayTurn.isNull() || 
warnReplayTurn.toBool());
+        bool warnReplayTurn = qs.value(kINTF_WARN_REPLAY_TURN, true).toBool();
+        checkBoxIntfWarnReplayTurn->setChecked(warnReplayTurn);
 
         // Duplicate settings
         
checkBoxDuplRefuseInvalid->setChecked(Settings::Instance().getBool("duplicate.reject-invalid"));

Index: prefs_dialog.h
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/prefs_dialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- prefs_dialog.h      8 Dec 2008 21:37:02 -0000       1.3
+++ prefs_dialog.h      8 Dec 2008 21:38:12 -0000       1.4
@@ -37,6 +37,7 @@
     static const QString kINTF_ALIGN_HISTORY;
     static const QString kINTF_DIC_PATH;
     static const QString kINTF_WARN_REPLAY_TURN;
+    static const QString kINTF_SHOW_TOOLBAR;
 
 public slots:
     /// Update the settings when the user selects "OK"