[QTerm-cvs] SF.net SVN: qterm:[1265] trunk/qterm-qt4/src

[<hep...@us...>]

Revision: 1265
          http://qterm.svn.sourceforge.net/qterm/?rev=1265&view=rev
Author:   hephooey
Date:     2011-03-03 04:25:14 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
Fix the name of the toolbars

Modified Paths:
--------------
    trunk/qterm-qt4/src/qterm.cfg
    trunk/qterm-qt4/src/qtermconfig.cpp
    trunk/qterm-qt4/src/toolbardialog.cpp

Modified: trunk/qterm-qt4/src/qterm.cfg
===================================================================
--- trunk/qterm-qt4/src/qterm.cfg	2011-03-03 04:25:06 UTC (rev 1264)
+++ trunk/qterm-qt4/src/qterm.cfg	2011-03-03 04:25:14 UTC (rev 1265)
@@ -56,8 +56,8 @@
 actionPaste=Shift+Ins
 
 [ToolBars]
-mainToolBar=actionQuickConnect
-bbsOperationsToolBar=actionDisconnect, actionCopy, actionPaste, actionCurrentSession, actionCopyArticle, actionViewMessage
+terminalToolBar=actionQuickConnect
+mainToolBar=actionDisconnect, actionCopy, actionPaste, actionCurrentSession, actionCopyArticle, actionViewMessage
 mainToolBarShown=true
 customKeyToolBarShown=false
 bbsOperationsToolBarShown=true

Modified: trunk/qterm-qt4/src/qtermconfig.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermconfig.cpp	2011-03-03 04:25:06 UTC (rev 1264)
+++ trunk/qterm-qt4/src/qtermconfig.cpp	2011-03-03 04:25:14 UTC (rev 1265)
@@ -84,13 +84,13 @@
     m_settings->beginGroup("ToolBars");
     QStringList listActions;
     listActions << "actionQuickConnect";
-    m_settings->setValue("mainToolBar", listActions);
+    m_settings->setValue("terminalToolBar", listActions);
     listActions.clear();
     listActions << "actionDisconnect" << "Separator" << "actionCopy" << "actionPaste" << "actionRect" << "actionColorCopy" << "Separator" << "actionFont" << "actionColor" << "actionRefresh" << "Separator" << "actionCurrentSession" << "Separator" << "actionCopyArticle" << "actionAntiIdle" << "actionAutoReply" << "actionViewMessage" << "actionMouse" << "actionBeep" << "actionReconnect";
-    m_settings->setValue("bbsOperationsToolBar",listActions);
-    m_settings->setValue("mainToolBarShown", true);
-    m_settings->setValue("customKeyToolBarShown", true);
-    m_settings->setValue("bbsOperationsToolBarShown",true);
+    m_settings->setValue("mainToolBar",listActions);
+    m_settings->setValue("terminalToolBarShown", true);
+    m_settings->setValue("keyToolBarShown", true);
+    m_settings->setValue("mainToolBarShown",true);
     m_settings->endGroup();
 }
 

Modified: trunk/qterm-qt4/src/toolbardialog.cpp
===================================================================
--- trunk/qterm-qt4/src/toolbardialog.cpp	2011-03-03 04:25:06 UTC (rev 1264)
+++ trunk/qterm-qt4/src/toolbardialog.cpp	2011-03-03 04:25:14 UTC (rev 1265)
@@ -31,7 +31,7 @@
     int index = 0;
     foreach(toolbar, toolbars) {
         index = (int)(toolbar->iconSize().height()/10)-1;
-        if (toolbar->objectName() != "customKeyToolBar")
+        if (toolbar->objectName() != "keyToolBar")
             comboToolbars->addItem(toolbar->windowTitle(), QVariant::fromValue((QObject*)toolbar));
     }
     comboToolbarsCurrentIndexChanged(0);
@@ -216,11 +216,11 @@
 {
     QStringList listActions;
     listActions << "actionQuickConnect";
-    m_defaultToolBars.insert("mainToolBar", listActions);
+    m_defaultToolBars.insert("terminalToolBar", listActions);
 
     listActions.clear();
     listActions << "actionDisconnect" << "Separator" << "actionCopy" << "actionPaste" << "actionRect" << "actionColorCopy" << "Separator" << "actionAppearance" << "actionRefresh" << "Separator" << "actionCurrentSession" << "Separator" << "actionCopyArticle" << "actionAntiIdle" << "actionAutoReply" << "actionViewMessage" << "actionMouse" << "actionBeep" << "actionReconnect";
-    m_defaultToolBars.insert("bbsOperationsToolBar", listActions);
+    m_defaultToolBars.insert("mainToolBar", listActions);
 }
 
 void ToolbarDialog::restoreDefaultToolbars()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.