X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmain.ui;h=eab378e541789e50fa9d70494e790785f404b003;hb=8ec628bc2c18b136d3496203ebd9fa1a0cdc50d5;hp=4c1704ec7082102eab6d228decbb5c059d5a4022;hpb=aaca3d0300c30d6dfed2fb5d7b661191fb1633af;p=bacula%2Fbacula

diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 4c1704ec70..eab378e541 100644
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -6,15 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>882</width>
-    <height>689</height>
+    <width>785</width>
+    <height>660</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <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/>
@@ -34,30 +35,7 @@
      <number>6</number>
     </property>
     <item row="0" column="0" >
-     <widget class="QStackedWidget" name="stackedWidget" >
-      <property name="sizePolicy" >
-       <sizepolicy>
-        <hsizetype>7</hsizetype>
-        <vsizetype>7</vsizetype>
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="sizeIncrement" >
-       <size>
-        <width>1</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="focusPolicy" >
-       <enum>Qt::StrongFocus</enum>
-      </property>
-      <property name="toolTip" >
-       <string/>
-      </property>
-      <property name="statusTip" >
-       <string/>
-      </property>
+     <widget class="QTabWidget" name="tabWidget" >
       <property name="currentIndex" >
        <number>-1</number>
       </property>
@@ -70,18 +48,10 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>882</width>
-     <height>26</height>
+     <width>785</width>
+     <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>
@@ -100,12 +70,12 @@
     <property name="title" >
      <string>&amp;File</string>
     </property>
-    <addaction name="actionPrint" />
-    <addaction name="actionSave" />
+    <addaction name="actionRepopLists" />
+    <addaction name="actionReloadRepop" />
+    <addaction name="separator" />
     <addaction name="actionQuit" />
    </widget>
    <addaction name="menuFile" />
-   <addaction name="menuEdit" />
    <addaction name="menuSettings" />
    <addaction name="menuHelp" />
   </widget>
@@ -131,36 +101,42 @@
     <enum>Qt::Horizontal</enum>
    </property>
    <attribute name="toolBarArea" >
-    <number>4</number>
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <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="separator" />
+   <addaction name="actionEstimate" />
    <addaction name="actionRun" />
+   <addaction name="actionRestore" />
+   <addaction name="actionBrowse" />
+   <addaction name="separator" />
    <addaction name="actionUndock" />
-   <addaction name="actionEstimate" />
   </widget>
   <widget class="QDockWidget" name="dockWidget" >
    <property name="sizePolicy" >
-    <sizepolicy>
-     <hsizetype>5</hsizetype>
-     <vsizetype>7</vsizetype>
+    <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
      <horstretch>0</horstretch>
      <verstretch>1</verstretch>
     </sizepolicy>
    </property>
    <property name="minimumSize" >
     <size>
-     <width>50</width>
-     <height>100</height>
+     <width>97</width>
+     <height>157</height>
     </size>
    </property>
    <property name="maximumSize" >
     <size>
-     <width>16777215</width>
-     <height>16777215</height>
+     <width>524287</width>
+     <height>524287</height>
     </size>
    </property>
    <property name="focusPolicy" >
@@ -176,31 +152,23 @@
     <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>
    </property>
    <property name="windowTitle" >
-    <string>Page Selector</string>
+    <string></string>
    </property>
    <attribute name="dockWidgetArea" >
     <number>1</number>
    </attribute>
    <widget class="QWidget" name="dockWidgetContents" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>9</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="0" column="0" >
+    <layout class="QVBoxLayout" name="verticalLayout" >
+     <item>
       <widget class="QTreeWidget" name="treeWidget" >
        <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>7</vsizetype>
+        <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
          <horstretch>1</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
@@ -235,64 +203,26 @@
        <property name="autoFillBackground" >
         <bool>true</bool>
        </property>
+       <column>
+        <property name="text" >
+         <string>1</string>
+        </property>
+       </column>
       </widget>
      </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QDockWidget" name="dockWidget_2" >
-   <property name="toolTip" >
-    <string>Console Entry</string>
-   </property>
-   <property name="statusTip" >
-    <string>Enter a bacula command</string>
-   </property>
-   <property name="whatsThis" >
-    <string>Console Command entry Dock Widget</string>
-   </property>
-   <property name="features" >
-    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
-   </property>
-   <property name="allowedAreas" >
-    <set>Qt::BottomDockWidgetArea|Qt::NoDockWidgetArea|Qt::TopDockWidgetArea</set>
-   </property>
-   <property name="windowTitle" >
-    <string>Console Command Line Entry</string>
-   </property>
-   <attribute name="dockWidgetArea" >
-    <number>8</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_2" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>9</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="0" column="0" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Command:</string>
        </property>
-       <property name="spacing" >
-        <number>6</number>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit" >
+       <property name="statusTip" >
+        <string>Click here to enter command</string>
        </property>
-       <item>
-        <widget class="QLabel" name="label" >
-         <property name="text" >
-          <string>Command:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="lineEdit" >
-         <property name="statusTip" >
-          <string>Click here to enter command</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      </widget>
      </item>
     </layout>
    </widget>
@@ -307,7 +237,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>
@@ -315,7 +246,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>
@@ -323,7 +255,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>
@@ -331,7 +264,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>
@@ -339,7 +273,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>
@@ -347,7 +282,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>
@@ -355,7 +291,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>
@@ -366,7 +303,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>
@@ -377,7 +315,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>
@@ -388,7 +327,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>
@@ -402,7 +342,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>
@@ -416,7 +357,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>
@@ -436,7 +378,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/estimate-job.svg</iconset>
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/estimate-job.png</normaloff>:/images/estimate-job.png</iconset>
    </property>
    <property name="text" >
     <string>Estimate Job</string>
@@ -453,7 +396,8 @@
   </action>
   <action name="actionStatusDir" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/status.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>
@@ -462,10 +406,10 @@
     <string>Status Dir</string>
    </property>
    <property name="toolTip" >
-    <string>Query status of director</string>
+    <string>Query status of director in console</string>
    </property>
    <property name="statusTip" >
-    <string>Query status of director</string>
+    <string>Query status of director in console</string>
    </property>
    <property name="autoRepeat" >
     <bool>true</bool>
@@ -478,7 +422,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>
@@ -489,7 +434,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>
@@ -503,7 +449,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>
@@ -514,7 +461,8 @@
   </action>
   <action name="actionMessages" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/mail-message-new.svg</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>
@@ -539,12 +487,88 @@
   </action>
   <action name="actionBat_Help" >
    <property name="icon" >
-    <iconset resource="main.qrc" >:/images/help-browser.svg</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>
    </property>
   </action>
+  <action name="actionBrowse" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/browse.png</normaloff>:/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" >
+     <normaloff>:/images/applications-graphics.png</normaloff>:/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" >
+     <normaloff>:/images/status.png</normaloff>:/images/status.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Status Dir Page</string>
+   </property>
+   <property name="toolTip" >
+    <string>Director Status Page</string>
+   </property>
+  </action>
+  <action name="actionRepopLists" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/mark.png</normaloff>:/images/mark.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Repop Lists</string>
+   </property>
+  </action>
+  <action name="actionReloadRepop" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/mark.png</normaloff>:/images/mark.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Reload and Repop</string>
+   </property>
+  </action>
+  <action name="actionBack" >
+   <property name="icon" >
+    <iconset resource="main.qrc" >
+     <normaloff>:/images/go-jump.png</normaloff>:/images/go-jump.png</iconset>
+   </property>
+   <property name="text" >
+    <string>back</string>
+   </property>
+   <property name="toolTip" >
+    <string>Previous Page</string>
+   </property>
+   <property name="statusTip" >
+    <string>Previous Page</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="main.qrc" />