Update bat

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

diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile
index be35e827d5ac14df5e3caca92cdad02b592cc573..990b89a130567d23eb06944d99fa09764823274f 100644 (file)
--- a/bacula/src/qt-console/Makefile
+++ b/bacula/src/qt-console/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bat
-# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 17:11:46 2007
+# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 19:50:38 2007
 # Project:  bat.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile bat.pro
@@ -119,7 +119,7 @@ first: all
 
 all: Makefile $(TARGET)
 
-$(TARGET): ui_main.h ui_label.h ui_console.h ui_brestore.h ui_run.h $(OBJECTS)  
+$(TARGET): ui_main.h ui_label.h ui_console.h ui_brestore.h ui_restore.h ui_restore-select.h ui_run.h $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
 Makefile: bat.pro  /usr/share/qt4/mkspecs/default/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \
@@ -164,7 +164,7 @@ qmake:  FORCE
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/bat1.0.0 || $(MKDIR) .tmp/bat1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/bat1.0.0/ && $(COPY_FILE) --parents mainwin.h bat.h bat_conf.h qstd.h console/console.h restore/restore.h label/label.h run/run.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp qstd.cpp console/authenticate.cpp console/console.cpp restore/brestore.cpp label/label.cpp run/run.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui label/label.ui console/console.ui restore/brestore.ui run/run.ui .tmp/bat1.0.0/ && (cd `dirname .tmp/bat1.0.0` && $(TAR) bat1.0.0.tar bat1.0.0 && $(COMPRESS) bat1.0.0.tar) && $(MOVE) `dirname .tmp/bat1.0.0`/bat1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/bat1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/bat1.0.0/ && $(COPY_FILE) --parents mainwin.h bat.h bat_conf.h qstd.h console/console.h restore/restore.h label/label.h run/run.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp qstd.cpp console/authenticate.cpp console/console.cpp restore/brestore.cpp label/label.cpp run/run.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui label/label.ui console/console.ui restore/brestore.ui restore/restore.ui restore/restore-select.ui run/run.ui .tmp/bat1.0.0/ && (cd `dirname .tmp/bat1.0.0` && $(TAR) bat1.0.0.tar bat1.0.0 && $(COMPRESS) bat1.0.0.tar) && $(MOVE) `dirname .tmp/bat1.0.0`/bat1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/bat1.0.0
 
 
 yaccclean:
@@ -246,9 +246,9 @@ compiler_image_collection_clean:
        -$(DEL_FILE) qmake_image_collection.cpp
 compiler_moc_source_make_all:
 compiler_moc_source_clean:
-compiler_uic_make_all: ui_main.h ui_label.h ui_console.h ui_brestore.h ui_run.h
+compiler_uic_make_all: ui_main.h ui_label.h ui_console.h ui_brestore.h ui_restore.h ui_restore-select.h ui_run.h
 compiler_uic_clean:
-       -$(DEL_FILE) ui_main.h ui_label.h ui_console.h ui_brestore.h ui_run.h
+       -$(DEL_FILE) ui_main.h ui_label.h ui_console.h ui_brestore.h ui_restore.h ui_restore-select.h ui_run.h
 ui_main.h: main.ui
        /usr/bin/uic main.ui -o ui_main.h
 
@@ -261,6 +261,12 @@ ui_console.h: console/console.ui
 ui_brestore.h: restore/brestore.ui
        /usr/bin/uic restore/brestore.ui -o ui_brestore.h
 
+ui_restore.h: restore/restore.ui
+       /usr/bin/uic restore/restore.ui -o ui_restore.h
+
+ui_restore-select.h: restore/restore-select.ui
+       /usr/bin/uic restore/restore-select.ui -o ui_restore-select.h
+
 ui_run.h: run/run.ui
        /usr/bin/uic run/run.ui -o ui_run.h
 

diff --git a/bacula/src/qt-console/README b/bacula/src/qt-console/README
index 84ced9ba22a408e9c3c5fd6538b212cc96c41016..2d943474797e5495626429b3eae0cf9faa5d51fe 100644 (file)
--- a/bacula/src/qt-console/README
+++ b/bacula/src/qt-console/README
@@ -8,7 +8,7 @@ default Qt or with the appropriate Qt Environment variables set.
 
 To build bat, you simply enter:
 
-  qmake 
+  qmake
   make
     
 then to execute it
@@ -22,7 +22,7 @@ Makefile, and there after, you simply use "make". In fact, providing
 you edit bat.pro, doing a "make" will automatically call qmake to
 rebuild the Makefile.
 
-Development status as of 29 Jan 07.
+Development status as of 11 Feb 07.
 
 Items implemented:
 - Reads a basic bat.conf (same as documented for the gnome-console 
@@ -30,19 +30,20 @@ Items implemented:
 - Basic main window structure
 - About dialog
 - Quit menu item
-- Connect button (initally shows disconnected) will connect to
-  the first Director defined in the conf file.
+- Connect button will connect to the first Director defined in the conf file.
 - The Director name will appear in the Selection tree followed
   by Console and Restore.  
 - Clicking on Console brings forward the console display screen
   (default at startup).
-- Clicking on Restore brings up a dummy two tab "restore" page.
+- Clicking on Restore brings up a brestore page that is not active.
 - The command line is implemented.
 - The status line (below the command line) is implemented.
+- Selection of Font is implemented.
+- The Font and the window size are saved on exit and restored on
+  execution of bat.
 
 Items not implemented:
 - None of the menu items except About, Quit.
-- None of the tool bar icons except the connect/disconnect.
 - Nothing on the restore page
      
 Design/implementation considerations:
@@ -51,26 +52,24 @@ Design/implementation considerations:
 - The Console class needs to be a list or be attached to the
   currently active Director.
 - Need icons in front of the Director.
-- Need indication if a director is connected or not.
 - The console page should be in a DockWidget so it can be removed
-  from the main window.
+  from the main window. It is currently in a dock window, but it
+  does not remove properly -- more research needed.
 - Need to figure out a good implementation of adding pages and even
   having plugins that load as pages.  Currently the page mechanism
   is a bit kludged.
-- Each page should in principle be a separate designer .ui file 
-  Currently the two pages console, restore are part of main.ui,
-  but they should be pulled out into their own .ui files.
 
 Design decisions:
-- If possible all windows will be created with designer and have
-  a name such as xxxForm i.e. the main window is MainForm and kept
-  in main.ui.  
 - If possible all code for a particular component will be kept in
   and appropriate subdirectory.
 - All private class variables are named "m_xxx" this makes it very
   clear if one is referencing a class variable or a local.
 - All signal/slots are connected by explict code (most all are
   done in the MainWin constructor), rather than using designer.      
+- Each page has a separate designer .ui file in a subdirectory.
+- All windows are created with designer and have
+  a name such as xxxForm i.e. the main window is MainForm and kept
+  in main.ui.  
 
 Major projects:
 - Implement a restore page that does a directory tree restore selection
@@ -84,4 +83,3 @@ Major projects:
 - Implement Qt plugins to add new functionality to bat
 - Implement a GUI configuration file editor (something like JBacula).
 ...
-

diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro
index a222cb6cff5ada2e3a5cd9b5688520bbd55299d2..48f0482b40f255908f857b5bc54272597fcdf39c 100644 (file)
--- a/bacula/src/qt-console/bat.pro
+++ b/bacula/src/qt-console/bat.pro
@@ -17,6 +17,7 @@ FORMS += main.ui
 FORMS += label/label.ui
 FORMS += console/console.ui
 FORMS += restore/brestore.ui
+FORMS += restore/restore.ui restore/restore-select.ui
 FORMS += run/run.ui
 
 
@@ -38,4 +39,3 @@ SOURCES += label/label.cpp
 # Run dialog
 HEADERS += run/run.h
 SOURCES += run/run.cpp
-

diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui
new file mode 100644 (file)
index 0000000..9b2dfe6
--- /dev/null
+++ b/bacula/src/qt-console/restore/restore.ui
@@ -0,0 +1,116 @@
+<ui version="4.0" >
+ <class>restoreForm</class>
+ <widget class="QWidget" name="restoreForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>693</width>
+    <height>366</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Restore File Selection</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QTreeWidget" name="treeWidget" />
+     <widget class="QTreeWidget" name="fileWidget" />
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>5</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Current Dir:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit" >
+       <property name="minimumSize" >
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>60</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>31</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>