Update description of PAGES and changes to TODO. Also removed spacers

between up, mark and unmark in restore interface.

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

diff --git a/bacula/src/qt-console/PAGES b/bacula/src/qt-console/PAGES
index 51286c774fa4ec6906619593bdd7b5d78af24d5b..a232cc929e3031b44e61f37faa467f0ac0c4ed4c 100644 (file)
--- a/bacula/src/qt-console/PAGES
+++ b/bacula/src/qt-console/PAGES
@@ -19,3 +19,20 @@ dockPage();
    item in the page selector */
 setCurrent();
 
+Watch out for console not being connected yet gotchya's.  The console is not yet
+connected when the first base set of widgets are created on the stack.  Use a
+function like populate() to place objects in the window.  Call populate from
+virtual function void ClassName::currentStackItem().  Embed inside condition
+similar to if(!m_populated) {} so as to populate only the first time the page
+comes to the front.
+
+The major features that the pages class provides:
+dockPage, undockPage and togglePageDocking for docking.
+closeEvent to redock an undocked page when it is closed.
+virtual functions PgSeltreeWidgetClicked() and currentStackItem() to give pages
+the opportunity to have behaviours on events
+closeStackPage() to delete both the page object and it's page selector widget.
+consoleCommand(QString &command) to execute a console command
+setTitle() for setting the title of a window that will display when undocked.
+setCurrent() for making the page and tree widget item of an object selected and
+in the front of the stack.

diff --git a/bacula/src/qt-console/TODO b/bacula/src/qt-console/TODO
index 07027166ef7b5cd9f8e13f2c8ea546b3df6be6f5..6d11dc8f0bed58b37c75e83835b03260e31d36f7 100644 (file)
--- a/bacula/src/qt-console/TODO
+++ b/bacula/src/qt-console/TODO
@@ -11,12 +11,9 @@ User preferences.  With log to stdout options.
 Have settings for defaults of limits on joblist
 
 Test restore and get anything not working, working.
+Add inteligence to prerestore.
   partially done.
 
-Get restore into stack.
-  Should the jobs dialog be turned into a page as well??
-Possilbe: Turn run and label into docked pages. (remove button bar buttons??)
-
 Update README  describe bat.conf.example to bat.conf
 
 Add numerous are you sure dialog boxes.  Like are you sure you want to
@@ -101,6 +98,10 @@ global one defined in the mainWin class (if I remember right).
 ============================================================
 DONE:
 ============================================================
+Get restore into stack.
+  Should the jobs dialog be turned into a page as well??
+Possilbe: Turn run and label into docked pages. (remove button bar buttons??)
+
 Where and bootstrap are confused in runjobs of restore.
    This was just the labels.
 

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index 592649e6322cafeffbe918d99ac15cca902f7ce1..76cebaec8b835237a8c642f92787f7bee6bf5f1f 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -234,7 +234,7 @@ void Pages::consoleCommand(QString &command)
 void Pages::changeEvent(QEvent *event)
 {
    if ((event->type() ==  QEvent::ActivationChange) && (isActiveWindow())) {
-                       setCurrent();
+      setCurrent();
    }
 }
 

diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui
index ed4af5bcbcdd67f1bb9966c451a59065348fdfb6..043ff8775fa4237c8fc22cdd3d9d4902db07472a 100644 (file)
--- a/bacula/src/qt-console/restore/restore.ui
+++ b/bacula/src/qt-console/restore/restore.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>689</width>
-    <height>504</height>
+    <width>796</width>
+    <height>582</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -239,26 +239,10 @@
         <string>Up</string>
        </property>
        <property name="icon" >
-        <iconset>:images/up.png</iconset>
+        <iconset>../../../../../../../:images/up.png</iconset>
        </property>
       </widget>
      </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>16</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="markButton" >
        <property name="sizePolicy" >
@@ -279,26 +263,10 @@
         <string>Mark</string>
        </property>
        <property name="icon" >
-        <iconset>:images/mark.png</iconset>
+        <iconset>../../../../../../../:images/mark.png</iconset>
        </property>
       </widget>
      </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>16</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="unmarkButton" >
        <property name="sizePolicy" >
@@ -319,7 +287,7 @@
         <string>Unmark</string>
        </property>
        <property name="icon" >
-        <iconset>:images/unmark.png</iconset>
+        <iconset>../../../../../../../:images/unmark.png</iconset>
        </property>
       </widget>
      </item>