X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmain.ui;h=1e9a4113aa367557c86b229ab13230419ef9e073;hb=ff963fce22ab64308beeaae594c3c872a40bf31f;hp=f9fa3e542fd1c7dcf73c714f9ab9ef9197ef6205;hpb=921529be96cb0a092a158a719a44c6c341e63482;p=bacula%2Fbacula

diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index f9fa3e542f..1e9a4113aa 100644
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -14,7 +14,7 @@
    <string>bat - Bacula Admin Tool</string>
   </property>
   <property name="windowIcon" >
-   <iconset>:images/bat.png</iconset>
+   <iconset resource="main.qrc" >:/images/bat.png</iconset>
   </property>
   <property name="toolTip" >
    <string/>
@@ -74,25 +74,27 @@
      <height>28</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuHelp" >
+   <widget class="QMenu" name="menuEdit" >
     <property name="title" >
-     <string>&amp;Help</string>
+     <string>&amp;Edit</string>
     </property>
-    <addaction name="actionAbout_bat" />
+    <addaction name="actionCopy" />
+    <addaction name="actionCut" />
+    <addaction name="actionPaste" />
    </widget>
    <widget class="QMenu" name="menuSettings" >
     <property name="title" >
      <string>Settings</string>
     </property>
+    <addaction name="actionPreferences" />
     <addaction name="actionSelectFont" />
    </widget>
-   <widget class="QMenu" name="menuEdit" >
+   <widget class="QMenu" name="menuHelp" >
     <property name="title" >
-     <string>&amp;Edit</string>
+     <string>&amp;Help</string>
     </property>
-    <addaction name="actionCopy" />
-    <addaction name="actionCut" />
-    <addaction name="actionPaste" />
+    <addaction name="actionBat_Help" />
+    <addaction name="actionAbout_bat" />
    </widget>
    <widget class="QMenu" name="menuFile" >
     <property name="title" >
@@ -133,10 +135,14 @@
    </attribute>
    <addaction name="actionConnect" />
    <addaction name="actionStatusDir" />
+   <addaction name="actionStatusDirPage" />
    <addaction name="actionMessages" />
    <addaction name="actionLabel" />
    <addaction name="actionRestore" />
    <addaction name="actionRun" />
+   <addaction name="actionEstimate" />
+   <addaction name="actionBrowse" />
+   <addaction name="actionJobPlot" />
    <addaction name="actionUndock" />
   </widget>
   <widget class="QDockWidget" name="dockWidget" >
@@ -304,7 +310,7 @@
   </action>
   <action name="actionAbout_bat" >
    <property name="icon" >
-    <iconset>:images/bat.png</iconset>
+    <iconset resource="main.qrc" >:/images/bat.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;About bat</string>
@@ -312,7 +318,7 @@
   </action>
   <action name="actionCopy" >
    <property name="icon" >
-    <iconset>:images/copy.png</iconset>
+    <iconset resource="main.qrc" >:/images/copy.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Copy</string>
@@ -320,7 +326,7 @@
   </action>
   <action name="actionCut" >
    <property name="icon" >
-    <iconset>:images/cut.png</iconset>
+    <iconset resource="main.qrc" >:/images/cut.png</iconset>
    </property>
    <property name="text" >
     <string>Cu&amp;t</string>
@@ -328,7 +334,7 @@
   </action>
   <action name="actionNew" >
    <property name="icon" >
-    <iconset>:images/new.png</iconset>
+    <iconset resource="main.qrc" >:/images/new.png</iconset>
    </property>
    <property name="text" >
     <string>new</string>
@@ -336,7 +342,7 @@
   </action>
   <action name="actionOpen" >
    <property name="icon" >
-    <iconset>:images/open.png</iconset>
+    <iconset resource="main.qrc" >:/images/open.png</iconset>
    </property>
    <property name="text" >
     <string>open</string>
@@ -344,7 +350,7 @@
   </action>
   <action name="actionPaste" >
    <property name="icon" >
-    <iconset>:images/paste.png</iconset>
+    <iconset resource="main.qrc" >:/images/paste.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Paste</string>
@@ -352,7 +358,7 @@
   </action>
   <action name="actionPrint" >
    <property name="icon" >
-    <iconset>:images/print.png</iconset>
+    <iconset resource="main.qrc" >:/images/print.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Print</string>
@@ -363,7 +369,7 @@
   </action>
   <action name="actionSave" >
    <property name="icon" >
-    <iconset>:images/save.png</iconset>
+    <iconset resource="main.qrc" >:/images/save.png</iconset>
    </property>
    <property name="text" >
     <string>&amp;Save</string>
@@ -374,7 +380,7 @@
   </action>
   <action name="actionConnect" >
    <property name="icon" >
-    <iconset>:images/disconnected.png</iconset>
+    <iconset resource="main.qrc" >:/images/disconnected.png</iconset>
    </property>
    <property name="text" >
     <string>Connect</string>
@@ -385,7 +391,7 @@
   </action>
   <action name="actionLabel" >
    <property name="icon" >
-    <iconset>:images/label.png</iconset>
+    <iconset resource="main.qrc" >:/images/label.png</iconset>
    </property>
    <property name="text" >
     <string>Label</string>
@@ -399,7 +405,7 @@
   </action>
   <action name="actionRestore" >
    <property name="icon" >
-    <iconset>:images/restore.png</iconset>
+    <iconset resource="main.qrc" >:/images/restore.png</iconset>
    </property>
    <property name="text" >
     <string>Restore</string>
@@ -413,7 +419,7 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset>:images/run.png</iconset>
+    <iconset resource="main.qrc" >:/images/run.png</iconset>
    </property>
    <property name="text" >
     <string>Run Job</string>
@@ -428,18 +434,44 @@
     <string>Run a Job</string>
    </property>
   </action>
+  <action name="actionEstimate" >
+   <property name="checked" >
+    <bool>false</bool>
+   </property>
+   <property name="icon" >
+    <iconset resource="main.qrc" >:/images/estimate-job.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Estimate Job</string>
+   </property>
+   <property name="iconText" >
+    <string>Estimate Job</string>
+   </property>
+   <property name="toolTip" >
+    <string>Estimate Job</string>
+   </property>
+   <property name="statusTip" >
+    <string>Estimate a Job</string>
+   </property>
+  </action>
   <action name="actionStatusDir" >
    <property name="icon" >
-    <iconset>:images/status.png</iconset>
+    <iconset resource="main.qrc" >:/images/status-console.png</iconset>
    </property>
    <property name="text" >
-    <string>StatusDir</string>
+    <string comment="Query status of director" >Status Dir</string>
+   </property>
+   <property name="iconText" >
+    <string>Status Dir</string>
    </property>
    <property name="toolTip" >
-    <string>status dir</string>
+    <string>Query status of director in console</string>
    </property>
    <property name="statusTip" >
-    <string>Status of Director</string>
+    <string>Query status of director in console</string>
+   </property>
+   <property name="autoRepeat" >
+    <bool>true</bool>
    </property>
   </action>
   <action name="actionSelectFont" >
@@ -449,23 +481,32 @@
   </action>
   <action name="actionUndock" >
    <property name="icon" >
-    <iconset>:images/up.png</iconset>
+    <iconset resource="main.qrc" >:/images/up.png</iconset>
    </property>
    <property name="text" >
     <string>Undock Window</string>
    </property>
+   <property name="statusTip" >
+    <string>Undock Current Window</string>
+   </property>
   </action>
   <action name="actionToggleDock" >
    <property name="icon" >
-    <iconset>:images/unmark.png</iconset>
+    <iconset resource="main.qrc" >:/images/up.png</iconset>
    </property>
    <property name="text" >
     <string>ToggleDock</string>
    </property>
+   <property name="toolTip" >
+    <string>Toggle Dock Status</string>
+   </property>
+   <property name="statusTip" >
+    <string>Toggle Dock Status</string>
+   </property>
   </action>
   <action name="actionClosePage" >
    <property name="icon" >
-    <iconset>:images/unmark.png</iconset>
+    <iconset resource="main.qrc" >:/images/unmark.png</iconset>
    </property>
    <property name="text" >
     <string>Close Page</string>
@@ -476,7 +517,7 @@
   </action>
   <action name="actionMessages" >
    <property name="icon" >
-    <iconset>:images/status.png</iconset>
+    <iconset resource="main.qrc" >:/images/mail-message-new.png</iconset>
    </property>
    <property name="text" >
     <string>Messages</string>
@@ -484,6 +525,67 @@
    <property name="statusTip" >
     <string>Display any messages queued at the director</string>
    </property>
+   <property name="autoRepeat" >
+    <bool>false</bool>
+   </property>
+  </action>
+  <action name="actionPreferences" >
+   <property name="text" >
+    <string>&amp;Preferences ...</string>
+   </property>
+   <property name="iconText" >
+    <string>Set Preferences</string>
+   </property>
+   <property name="toolTip" >
+    <string>Set Preferences</string>
+   </property>
+  </action>
+  <action name="actionBat_Help" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >:/images/help-browser.png</iconset>
+   </property>
+   <property name="text" >
+    <string>bat &amp;Help</string>
+   </property>
+  </action>
+  <action name="actionBrowse" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >:/images/browse.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Browse</string>
+   </property>
+   <property name="toolTip" >
+    <string>Browse Cataloged Files</string>
+   </property>
+   <property name="statusTip" >
+    <string>Browse Cataloged Files</string>
+   </property>
+  </action>
+  <action name="actionJobPlot" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >:/images/applications-graphics.png</iconset>
+   </property>
+   <property name="text" >
+    <string>JobPlot</string>
+   </property>
+   <property name="toolTip" >
+    <string>Plot Job Files and Bytes</string>
+   </property>
+   <property name="statusTip" >
+    <string>Plot Job Files and Bytes</string>
+   </property>
+  </action>
+  <action name="actionStatusDirPage" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >:/images/status.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Status Dir Page</string>
+   </property>
+   <property name="toolTip" >
+    <string>Director Status Page</string>
+   </property>
   </action>
  </widget>
  <resources>