Simplify the main screen, removing the status dir console icon and the

"go back" one

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@9042 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 9f8315045e5a1e19e15b97c4826f2ca6847f4da1..b692c9dc920a6196dabc4d196e54950cd26f72e7 100644 (file)
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -14,7 +14,8 @@
    <string>bat - Bacula Admin Tool</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="main.qrc" >:/images/bat.png</iconset>
+   <iconset resource="main.qrc" >
+    <normaloff>:/images/bat.png</normaloff>:/images/bat.png</iconset>
   </property>
   <property name="toolTip" >
    <string/>
@@ -27,22 +28,10 @@
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" >
-    <property name="leftMargin" >
+    <property name="margin" >
      <number>9</number>
     </property>
-    <property name="topMargin" >
-     <number>9</number>
-    </property>
-    <property name="rightMargin" >
-     <number>9</number>
-    </property>
-    <property name="bottomMargin" >
-     <number>9</number>
-    </property>
-    <property name="horizontalSpacing" >
-     <number>6</number>
-    </property>
-    <property name="verticalSpacing" >
+    <property name="spacing" >
      <number>6</number>
     </property>
     <item row="0" column="0" >
@@ -81,17 +70,9 @@
      <x>0</x>
      <y>0</y>
      <width>882</width>
-     <height>22</height>
+     <height>24</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuEdit" >
-    <property name="title" >
-     <string>&amp;Edit</string>
-    </property>
-    <addaction name="actionCopy" />
-    <addaction name="actionCut" />
-    <addaction name="actionPaste" />
-   </widget>
    <widget class="QMenu" name="menuSettings" >
     <property name="title" >
      <string>Settings</string>
@@ -117,7 +98,6 @@
     <addaction name="actionReloadRepop" />
    </widget>
    <addaction name="menuFile" />
-   <addaction name="menuEdit" />
    <addaction name="menuSettings" />
    <addaction name="menuHelp" />
   </widget>
@@ -149,17 +129,18 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionConnect" />
-   <addaction name="actionStatusDir" />
    <addaction name="actionStatusDirPage" />
+   <addaction name="actionJobPlot" />
    <addaction name="actionMessages" />
+   <addaction name="separator" />
    <addaction name="actionLabel" />
-   <addaction name="actionRestore" />
-   <addaction name="actionRun" />
+   <addaction name="separator" />
    <addaction name="actionEstimate" />
+   <addaction name="actionRun" />
+   <addaction name="actionRestore" />
    <addaction name="actionBrowse" />
-   <addaction name="actionJobPlot" />
+   <addaction name="separator" />
    <addaction name="actionUndock" />
-   <addaction name="actionBack" />
   </widget>
   <widget class="QDockWidget" name="dockWidget" >
    <property name="sizePolicy" >
@@ -170,14 +151,14 @@
    </property>
    <property name="minimumSize" >
     <size>
-     <width>50</width>
-     <height>100</height>
+     <width>79</width>
+     <height>101</height>
     </size>
    </property>
    <property name="maximumSize" >
     <size>
-     <width>16777215</width>
-     <height>16777215</height>
+     <width>524287</width>
+     <height>524287</height>
     </size>
    </property>
    <property name="focusPolicy" >
@@ -193,7 +174,7 @@
     <bool>false</bool>
    </property>
    <property name="features" >
-    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
    </property>
    <property name="allowedAreas" >
     <set>Qt::AllDockWidgetAreas</set>
@@ -206,22 +187,10 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents" >
     <layout class="QGridLayout" >
-     <property name="leftMargin" >
+     <property name="margin" >
       <number>9</number>
      </property>
-     <property name="topMargin" >
-      <number>9</number>
-     </property>
-     <property name="rightMargin" >
-      <number>9</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>9</number>
-     </property>
-     <property name="horizontalSpacing" >
-      <number>6</number>
-     </property>
-     <property name="verticalSpacing" >
+     <property name="spacing" >
       <number>6</number>
      </property>
      <item row="0" column="0" >
@@ -283,10 +252,10 @@
     <string>Console Command entry Dock Widget</string>
    </property>
    <property name="features" >
-    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
+    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
    </property>
    <property name="allowedAreas" >
-    <set>Qt::BottomDockWidgetArea|Qt::NoDockWidgetArea|Qt::TopDockWidgetArea</set>
+    <set>Qt::BottomDockWidgetArea|Qt::TopDockWidgetArea</set>
    </property>
    <property name="windowTitle" >
     <string>Console Command Line Entry</string>
@@ -296,22 +265,10 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_2" >
     <layout class="QGridLayout" >
-     <property name="leftMargin" >
+     <property name="margin" >
       <number>9</number>
      </property>
-     <property name="topMargin" >
-      <number>9</number>
-     </property>
-     <property name="rightMargin" >
-      <number>9</number>
-     </property>
-     <property name="bottomMargin" >
-      <number>9</number>
-     </property>
-     <property name="horizontalSpacing" >
-      <number>6</number>
-     </property>
-     <property name="verticalSpacing" >
+     <property name="spacing" >
       <number>6</number>
      </property>
      <item row="0" column="0" >
@@ -319,16 +276,7 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <property name="leftMargin" >
-        <number>0</number>
-       </property>
-       <property name="topMargin" >
-        <number>0</number>
-       </property>
-       <property name="rightMargin" >
-        <number>0</number>
-       </property>
-       <property name="bottomMargin" >
+       <property name="margin" >
         <number>0</number>
        </property>
        <item>
@@ -360,7 +308,8 @@
   </action>
   <action name="actionAbout_bat" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/bat.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/bat.png</normaloff>:/images/bat.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;About bat</string>
@@ -368,7 +317,8 @@
   </action>
   <action name="actionCopy" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/copy.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/copy.png</normaloff>:/images/copy.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Copy</string>
@@ -376,7 +326,8 @@
   </action>
   <action name="actionCut" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/cut.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/cut.png</normaloff>:/images/cut.png</iconset>
    </property>
    <property name="text" >
     <string>Cu&amp;t</string>
@@ -384,7 +335,8 @@
   </action>
   <action name="actionNew" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/new.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/new.png</normaloff>:/images/new.png</iconset>
    </property>
    <property name="text" >
     <string>new</string>
@@ -392,7 +344,8 @@
   </action>
   <action name="actionOpen" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/open.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/open.png</normaloff>:/images/open.png</iconset>
    </property>
    <property name="text" >
     <string>open</string>
@@ -400,7 +353,8 @@
   </action>
   <action name="actionPaste" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/paste.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/paste.png</normaloff>:/images/paste.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Paste</string>
@@ -408,7 +362,8 @@
   </action>
   <action name="actionPrint" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/print.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/print.png</normaloff>:/images/print.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Print</string>
@@ -419,7 +374,8 @@
   </action>
   <action name="actionSave" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/save.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/save.png</normaloff>:/images/save.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Save</string>
@@ -430,7 +386,8 @@
   </action>
   <action name="actionConnect" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/disconnected.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/disconnected.png</normaloff>:/images/disconnected.png</iconset>
    </property>
    <property name="text" >
     <string>Connect</string>
@@ -441,7 +398,8 @@
   </action>
   <action name="actionLabel" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/label.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/label.png</normaloff>:/images/label.png</iconset>
    </property>
    <property name="text" >
     <string>Label</string>
@@ -455,7 +413,8 @@
   </action>
   <action name="actionRestore" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/restore.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/restore.png</normaloff>:/images/restore.png</iconset>
    </property>
    <property name="text" >
     <string>Restore</string>
@@ -469,7 +428,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/run.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/run.png</normaloff>:/images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Run Job</string>
@@ -489,7 +449,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/estimate-job.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/estimate-job.png</normaloff>:/images/estimate-job.png</iconset>
    </property>
    <property name="text" >
     <string>Estimate Job</string>
@@ -506,7 +467,8 @@
   </action>
   <action name="actionStatusDir" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/status-console.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/status-console.png</normaloff>:/images/status-console.png</iconset>
    </property>
    <property name="text" >
     <string comment="Query status of director" >Status Dir</string>
@@ -531,7 +493,8 @@
   </action>
   <action name="actionUndock" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/up.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/up.png</normaloff>:/images/up.png</iconset>
    </property>
    <property name="text" >
     <string>Undock Window</string>
@@ -542,7 +505,8 @@
   </action>
   <action name="actionToggleDock" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/up.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/up.png</normaloff>:/images/up.png</iconset>
    </property>
    <property name="text" >
     <string>ToggleDock</string>
@@ -556,7 +520,8 @@
   </action>
   <action name="actionClosePage" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/unmark.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/unmark.png</normaloff>:/images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Close Page</string>
@@ -567,7 +532,8 @@
   </action>
   <action name="actionMessages" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/mail-message-new.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/mail-message-new.png</normaloff>:/images/mail-message-new.png</iconset>
    </property>
    <property name="text" >
     <string>Messages</string>
@@ -592,7 +558,8 @@
   </action>
   <action name="actionBat_Help" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/help-browser.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/help-browser.png</normaloff>:/images/help-browser.png</iconset>
    </property>
    <property name="text" >
     <string>bat &amp;Help</string>
@@ -600,7 +567,8 @@
   </action>
   <action name="actionBrowse" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/browse.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/browse.png</normaloff>:/images/browse.png</iconset>
    </property>
    <property name="text" >
     <string>Browse</string>
@@ -614,7 +582,8 @@
   </action>
   <action name="actionJobPlot" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/applications-graphics.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/applications-graphics.png</normaloff>:/images/applications-graphics.png</iconset>
    </property>
    <property name="text" >
     <string>JobPlot</string>
@@ -628,7 +597,8 @@
   </action>
   <action name="actionStatusDirPage" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/status.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/status.png</normaloff>:/images/status.png</iconset>
    </property>
    <property name="text" >
     <string>Status Dir Page</string>
@@ -639,7 +609,8 @@
   </action>
   <action name="actionRepopLists" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/mark.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/mark.png</normaloff>:/images/mark.png</iconset>
    </property>
    <property name="text" >
     <string>Repop Lists</string>
@@ -647,7 +618,8 @@
   </action>
   <action name="actionReloadRepop" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/mark.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/mark.png</normaloff>:/images/mark.png</iconset>
    </property>
    <property name="text" >
     <string>Reload and Repop</string>
@@ -655,7 +627,8 @@
   </action>
   <action name="actionBack" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/go-jump.png</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/go-jump.png</normaloff>:/images/go-jump.png</iconset>
    </property>
    <property name="text" >
     <string>back</string>

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 083964da8e861c4a009c37d38c9c2107007bd792..ababdd3454e2bb30aa6033b48cb41f681af2654f 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -267,7 +267,6 @@ void MainWin::connectSignals()
    connect(actionPreferences, SIGNAL(triggered()), this,  SLOT(setPreferences()));
    connect(actionRepopLists, SIGNAL(triggered()), this,  SLOT(repopLists()));
    connect(actionReloadRepop, SIGNAL(triggered()), this,  SLOT(reloadRepopLists()));
-   connect(actionBack, SIGNAL(triggered()), this,  SLOT(goToPreviousPage()));
 }
 
 void MainWin::disconnectSignals()
@@ -295,7 +294,6 @@ void MainWin::disconnectSignals()
    disconnect(actionPreferences, SIGNAL(triggered()), this,  SLOT(setPreferences()));
    disconnect(actionRepopLists, SIGNAL(triggered()), this,  SLOT(repopLists()));
    disconnect(actionReloadRepop, SIGNAL(triggered()), this,  SLOT(reloadRepopLists()));
-   disconnect(actionBack, SIGNAL(triggered()), this,  SLOT(goToPreviousPage()));
 }
 
 /*
@@ -338,14 +336,12 @@ void MainWin::connectConsoleSignals()
 {
    connect(actionConnect, SIGNAL(triggered()), m_currentConsole, SLOT(connect_dir()));
    connect(actionSelectFont, SIGNAL(triggered()), m_currentConsole, SLOT(set_font()));
-   connect(actionStatusDir, SIGNAL(triggered()), m_currentConsole, SLOT(status_dir()));
    connect(actionMessages, SIGNAL(triggered()), m_currentConsole, SLOT(messages()));
 }
 
 void MainWin::disconnectConsoleSignals(Console *console)
 {
    disconnect(actionConnect, SIGNAL(triggered()), console, SLOT(connect_dir()));
-   disconnect(actionStatusDir, SIGNAL(triggered()), console, SLOT(status_dir()));
    disconnect(actionMessages, SIGNAL(triggered()), console, SLOT(messages()));
    disconnect(actionSelectFont, SIGNAL(triggered()), console, SLOT(set_font()));
 }