From: <ke...@us...> - 2007-02-12 10:39:55
|
Revision: 4168 http://bacula.svn.sourceforge.net/bacula/?rev=4168&view=rev Author: kerns Date: 2007-02-12 02:39:38 -0800 (Mon, 12 Feb 2007) Log Message: ----------- Create first cut prerestore and restore dialogs Modified Paths: -------------- trunk/bacula/src/qt-console/Makefile trunk/bacula/src/qt-console/bat.h trunk/bacula/src/qt-console/bat.pro trunk/bacula/src/qt-console/bat_conf.cpp trunk/bacula/src/qt-console/console/console.cpp trunk/bacula/src/qt-console/console/console.h trunk/bacula/src/qt-console/console/console.ui trunk/bacula/src/qt-console/main.cpp trunk/bacula/src/qt-console/mainwin.cpp trunk/bacula/src/qt-console/mainwin.h trunk/bacula/src/qt-console/restore/brestore.cpp trunk/bacula/src/qt-console/restore/restore.h trunk/bacula/src/qt-console/restore/restore.ui Added Paths: ----------- trunk/bacula/src/qt-console/restore/prerestore.ui trunk/bacula/src/qt-console/restore/restore.cpp Removed Paths: ------------- trunk/bacula/src/qt-console/restore/restore-select.ui Property Changed: ---------------- trunk/bacula/src/qt-console/ trunk/bacula/src/qt-console/console/ Property changes on: trunk/bacula/src/qt-console ___________________________________________________________________ Name: svn:ignore - ui_*.h *.o bat about-func brestore.ui main.qrc mult-inheritance print-func qrc_main.cpp moc_*.cpp + ui_*.h *.o bat about-func brestore.ui main.qrc mult-inheritance print-func qrc_main.cpp moc_*.cpp v Modified: trunk/bacula/src/qt-console/Makefile =================================================================== --- trunk/bacula/src/qt-console/Makefile 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/Makefile 2007-02-12 10:39:38 UTC (rev 4168) @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bat -# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 21:06:09 2007 +# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 21:47:13 2007 # Project: bat.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile bat.pro @@ -51,6 +51,7 @@ qstd.cpp \ console/authenticate.cpp \ console/console.cpp \ + restore/restore.cpp \ restore/brestore.cpp \ label/label.cpp \ run/run.cpp moc/moc_mainwin.cpp \ @@ -65,6 +66,7 @@ obj/qstd.o \ obj/authenticate.o \ obj/console.o \ + obj/restore.o \ obj/brestore.o \ obj/label.o \ obj/run.o \ @@ -119,7 +121,7 @@ all: Makefile $(TARGET) -$(TARGET): ui_main.h ui_label.h ui_console.h ui_brestore.h ui_restore.h ui_restore-select.h ui_run.h $(OBJECTS) +$(TARGET): ui_main.h ui_label.h ui_console.h ui_restore.h ui_prerestore.h ui_brestore.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 +166,7 @@ dist: @$(CHK_DIR_EXISTS) obj/bat1.0.0 || $(MKDIR) obj/bat1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/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 obj/bat1.0.0/ && $(COPY_FILE) --parents main.qrc obj/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 obj/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 obj/bat1.0.0/ && (cd `dirname obj/bat1.0.0` && $(TAR) bat1.0.0.tar bat1.0.0 && $(COMPRESS) bat1.0.0.tar) && $(MOVE) `dirname obj/bat1.0.0`/bat1.0.0.tar.gz . && $(DEL_FILE) -r obj/bat1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/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 obj/bat1.0.0/ && $(COPY_FILE) --parents main.qrc obj/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp qstd.cpp console/authenticate.cpp console/console.cpp restore/restore.cpp restore/brestore.cpp label/label.cpp run/run.cpp obj/bat1.0.0/ && $(COPY_FILE) --parents main.ui label/label.ui console/console.ui restore/restore.ui restore/prerestore.ui restore/brestore.ui run/run.ui obj/bat1.0.0/ && (cd `dirname obj/bat1.0.0` && $(TAR) bat1.0.0.tar bat1.0.0 && $(COMPRESS) bat1.0.0.tar) && $(MOVE) `dirname obj/bat1.0.0`/bat1.0.0.tar.gz . && $(DEL_FILE) -r obj/bat1.0.0 yaccclean: @@ -206,6 +208,8 @@ /usr/bin/moc $(DEFINES) $(INCPATH) console/console.h -o moc/moc_console.cpp moc/moc_restore.cpp: ui_brestore.h \ + ui_restore.h \ + ui_prerestore.h \ restore/restore.h \ /usr/bin/moc /usr/bin/moc $(DEFINES) $(INCPATH) restore/restore.h -o moc/moc_restore.cpp @@ -246,9 +250,9 @@ -$(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_restore.h ui_restore-select.h ui_run.h +compiler_uic_make_all: ui_main.h ui_label.h ui_console.h ui_restore.h ui_prerestore.h ui_brestore.h ui_run.h compiler_uic_clean: - -$(DEL_FILE) ui_main.h ui_label.h ui_console.h ui_brestore.h ui_restore.h ui_restore-select.h ui_run.h + -$(DEL_FILE) ui_main.h ui_label.h ui_console.h ui_restore.h ui_prerestore.h ui_brestore.h ui_run.h ui_main.h: main.ui /usr/bin/uic main.ui -o ui_main.h @@ -258,15 +262,15 @@ ui_console.h: console/console.ui /usr/bin/uic console/console.ui -o ui_console.h -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_prerestore.h: restore/prerestore.ui + /usr/bin/uic restore/prerestore.ui -o ui_prerestore.h +ui_brestore.h: restore/brestore.ui + /usr/bin/uic restore/brestore.ui -o ui_brestore.h + ui_run.h: run/run.ui /usr/bin/uic run/run.ui -o ui_run.h @@ -326,6 +330,21 @@ ui_console.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/console.o console/console.cpp +obj/restore.o: restore/restore.cpp bat.h \ + mainwin.h \ + ui_main.h \ + label/label.h \ + ui_label.h \ + run/run.h \ + ui_run.h \ + bat_conf.h \ + qstd.h \ + restore/restore.h \ + ui_brestore.h \ + ui_restore.h \ + ui_prerestore.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/restore.o restore/restore.cpp + obj/brestore.o: restore/brestore.cpp bat.h \ mainwin.h \ ui_main.h \ @@ -336,7 +355,9 @@ bat_conf.h \ qstd.h \ restore/restore.h \ - ui_brestore.h + ui_brestore.h \ + ui_restore.h \ + ui_prerestore.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/brestore.o restore/brestore.cpp obj/label.o: label/label.cpp bat.h \ Modified: trunk/bacula/src/qt-console/bat.h =================================================================== --- trunk/bacula/src/qt-console/bat.h 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/bat.h 2007-02-12 10:39:38 UTC (rev 4168) @@ -1,7 +1,39 @@ - #ifndef _BAT_H_ #define _BAT_H_ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ft...@fs.... +*/ +/* + * Version $Id$ + * + * Kern Sibbald, January 2007 + */ + #include "mainwin.h" #include "config.h" #include "bacula.h" Modified: trunk/bacula/src/qt-console/bat.pro =================================================================== --- trunk/bacula/src/qt-console/bat.pro 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/bat.pro 2007-02-12 10:39:38 UTC (rev 4168) @@ -18,8 +18,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 += restore/restore.ui restore/prerestore.ui restore/brestore.ui FORMS += run/run.ui @@ -32,7 +31,7 @@ # Restore HEADERS += restore/restore.h -SOURCES += restore/brestore.cpp +SOURCES += restore/restore.cpp restore/brestore.cpp # Label dialog HEADERS += label/label.h Modified: trunk/bacula/src/qt-console/bat_conf.cpp =================================================================== --- trunk/bacula/src/qt-console/bat_conf.cpp 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/bat_conf.cpp 2007-02-12 10:39:38 UTC (rev 4168) @@ -1,27 +1,4 @@ /* - * Main configuration file parser for Bacula User Agent - * some parts may be split into separate files such as - * the schedule configuration (sch_config.c). - * - * Note, the configuration file parser consists of three parts - * - * 1. The generic lexical scanner in lib/lex.c and lib/lex.h - * - * 2. The generic config scanner in lib/parse_config.c and - * lib/parse_config.h. - * These files contain the parser code, some utility - * routines, and the common store routines (name, int, - * string). - * - * 3. The daemon specific file, which contains the Resource - * definitions as well as any specific store routines - * for the resource records. - * - * Kern Sibbald, January MM, September MM - * - * Version $Id$ - */ -/* Bacula® - The Network Backup Solution Copyright (C) 2000-2007 Free Software Foundation Europe e.V. @@ -48,6 +25,29 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ft...@fs.... */ +/* + * Main configuration file parser for Bacula User Agent + * some parts may be split into separate files such as + * the schedule configuration (sch_config.c). + * + * Note, the configuration file parser consists of three parts + * + * 1. The generic lexical scanner in lib/lex.c and lib/lex.h + * + * 2. The generic config scanner in lib/parse_config.c and + * lib/parse_config.h. + * These files contain the parser code, some utility + * routines, and the common store routines (name, int, + * string). + * + * 3. The daemon specific file, which contains the Resource + * definitions as well as any specific store routines + * for the resource records. + * + * Kern Sibbald, January MM, September MM + * + * Version $Id$ + */ #include "bacula.h" #include "bat_conf.h" Property changes on: trunk/bacula/src/qt-console/console ___________________________________________________________________ Name: svn:ignore + 1 Modified: trunk/bacula/src/qt-console/console/console.cpp =================================================================== --- trunk/bacula/src/qt-console/console/console.cpp 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/console/console.cpp 2007-02-12 10:39:38 UTC (rev 4168) @@ -27,6 +27,8 @@ */ /* + * Version $Id$ + * * Console Class * * Kern Sibbald, January MMVI @@ -36,7 +38,6 @@ #include <QAbstractEventDispatcher> #include "bat.h" #include "console.h" -#include "restore.h" Console::Console(QStackedWidget *parent) { @@ -52,9 +53,9 @@ m_cursor = new QTextCursor(m_textEdit->document()); mainWin->actionConnect->setIcon(QIcon(QString::fromUtf8("images/disconnected.png"))); - bRestore *restore = new bRestore(parent); - restore->setupUi(restore); - parent->addWidget(restore); + bRestore *brestore = new bRestore(parent); + brestore->setupUi(brestore); + parent->addWidget(brestore); /* Just take the first Director */ LockRes(); @@ -75,7 +76,7 @@ QBrush redBrush(Qt::red); item->setForeground(0, redBrush); item = new QTreeWidgetItem(topItem); - item->setText(0, "Restore"); + item->setText(0, "brestore"); item->setText(1, "1"); treeWidget->expandItem(topItem); @@ -177,7 +178,9 @@ return list; } - +/* + * Save user settings + */ void Console::writeSettings() { QFont font = get_font(); @@ -190,6 +193,9 @@ settings.endGroup(); } +/* + * Read and restore user settings + */ void Console::readSettings() { QFont font = get_font(); @@ -203,6 +209,9 @@ m_textEdit->setFont(font); } +/* + * Set the console textEdit font + */ void Console::set_font() { bool ok; @@ -212,6 +221,9 @@ } } +/* + * Get the console text edit font + */ const QFont Console::get_font() { return m_textEdit->font(); @@ -223,6 +235,9 @@ write_dir("status dir\n"); } +/* + * Put text into the console window + */ void Console::set_textf(const char *fmt, ...) { va_list arg_ptr; @@ -255,6 +270,9 @@ m_textEdit->ensureCursorVisible(); } +/* + * This should be moved into a bSocket class + */ char *Console::msg() { if (m_sock) { Modified: trunk/bacula/src/qt-console/console/console.h =================================================================== --- trunk/bacula/src/qt-console/console/console.h 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/console/console.h 2007-02-12 10:39:38 UTC (rev 4168) @@ -4,6 +4,7 @@ #include <QtGui> #include "ui_console.h" +#include "restore.h" class DIRRES; class BSOCK; Modified: trunk/bacula/src/qt-console/console/console.ui =================================================================== --- trunk/bacula/src/qt-console/console/console.ui 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/console/console.ui 2007-02-12 10:39:38 UTC (rev 4168) @@ -25,6 +25,9 @@ <set>Qt::AllDockWidgetAreas</set> </property> <widget class="QWidget" name="dockWidgetContents" > + <property name="focusPolicy" > + <enum>Qt::StrongFocus</enum> + </property> <layout class="QGridLayout" > <property name="margin" > <number>9</number> Modified: trunk/bacula/src/qt-console/main.cpp =================================================================== --- trunk/bacula/src/qt-console/main.cpp 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/main.cpp 2007-02-12 10:39:38 UTC (rev 4168) @@ -25,8 +25,9 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ft...@fs.... */ - /* + * Version $Id$ + * * Main program for bat (qt-console) * * Kern Sibbald, January MMVI Modified: trunk/bacula/src/qt-console/mainwin.cpp =================================================================== --- trunk/bacula/src/qt-console/mainwin.cpp 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/mainwin.cpp 2007-02-12 10:39:38 UTC (rev 4168) @@ -27,6 +27,8 @@ */ /* + * Version $Id$ + * * Main Window control for bat (qt-console) * * Kern Sibbald, January MMVI @@ -76,6 +78,7 @@ connect(actionSelectFont, SIGNAL(triggered()), m_console, SLOT(set_font())); connect(actionLabel, SIGNAL(triggered()), this, SLOT(labelDialogClicked())); connect(actionRun, SIGNAL(triggered()), this, SLOT(runDialogClicked())); + connect(actionRestore, SIGNAL(triggered()), this, SLOT(restoreDialogClicked())); } /* @@ -113,7 +116,7 @@ { (void)column; int index = item->text(1).toInt(); - if (index >= 0 && index < 2) { + if (index >= 0 && index < 4) { stackedWidget->setCurrentIndex(index); } } @@ -125,7 +128,7 @@ (void)column; int index = item->text(1).toInt(); /* ***FIXME**** make this automatic */ - if (index >= 0 && index < 2) { + if (index >= 0 && index < 4) { stackedWidget->setCurrentIndex(index); } } @@ -140,7 +143,13 @@ new runDialog(m_console); } +void MainWin::restoreDialogClicked() +{ + new prerestoreDialog(m_console); +} + + /* * The user just finished typing a line in the command line edit box */ Modified: trunk/bacula/src/qt-console/mainwin.h =================================================================== --- trunk/bacula/src/qt-console/mainwin.h 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/mainwin.h 2007-02-12 10:39:38 UTC (rev 4168) @@ -27,6 +27,8 @@ */ /* + * Version $Id$ + * * qt-console main window class definition. * * Written by Kern Sibbald, January MMVI @@ -39,6 +41,7 @@ #include "ui_main.h" #include "label/label.h" #include "run/run.h" +#include "restore/restore.h" class Console; @@ -61,6 +64,7 @@ void treeItemDoubleClicked(QTreeWidgetItem *item, int column); void labelDialogClicked(); void runDialogClicked(); + void restoreDialogClicked(); protected: void closeEvent(QCloseEvent *event); Modified: trunk/bacula/src/qt-console/restore/brestore.cpp =================================================================== --- trunk/bacula/src/qt-console/restore/brestore.cpp 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/restore/brestore.cpp 2007-02-12 10:39:38 UTC (rev 4168) @@ -27,13 +27,14 @@ */ /* + * Version $Id$ + * * bRestore Class (Eric's brestore) * * Kern Sibbald, January MMVI * */ -#include <QAbstractEventDispatcher> #include "bat.h" #include "restore.h" Added: trunk/bacula/src/qt-console/restore/prerestore.ui =================================================================== --- trunk/bacula/src/qt-console/restore/prerestore.ui (rev 0) +++ trunk/bacula/src/qt-console/restore/prerestore.ui 2007-02-12 10:39:38 UTC (rev 4168) @@ -0,0 +1,195 @@ +<ui version="4.0" > + <class>prerestoreForm</class> + <widget class="QDialog" name="prerestoreForm" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>366</width> + <height>299</height> + </rect> + </property> + <property name="maximumSize" > + <size> + <width>500</width> + <height>500</height> + </size> + </property> + <property name="focusPolicy" > + <enum>Qt::StrongFocus</enum> + </property> + <property name="windowTitle" > + <string>Restore Files</string> + </property> + <layout class="QVBoxLayout" > + <property name="margin" > + <number>9</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <layout class="QGridLayout" > + <property name="margin" > + <number>8</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item row="3" column="0" > + <widget class="QLabel" name="label_4" > + <property name="text" > + <string>Pool:</string> + </property> + <property name="buddy" > + <cstring>poolCombo</cstring> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="label_2" > + <property name="text" > + <string>Client:</string> + </property> + <property name="buddy" > + <cstring>clientCombo</cstring> + </property> + </widget> + </item> + <item row="2" column="1" > + <widget class="QComboBox" name="filesetCombo" /> + </item> + <item row="1" column="1" > + <widget class="QComboBox" name="clientCombo" /> + </item> + <item row="4" column="1" > + <widget class="QComboBox" name="storageCombo" /> + </item> + <item row="3" column="1" > + <widget class="QComboBox" name="poolCombo" /> + </item> + <item row="5" column="1" > + <widget class="QDateTimeEdit" name="beforeDateTime" > + <property name="minimumDate" > + <date> + <year>2000</year> + <month>1</month> + <day>1</day> + </date> + </property> + <property name="displayFormat" > + <string>yyyy-mm-dd h:mm:ss</string> + </property> + <property name="calendarPopup" > + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="0" > + <widget class="QLabel" name="label_3" > + <property name="text" > + <string>File Set:</string> + </property> + <property name="buddy" > + <cstring>filesetCombo</cstring> + </property> + </widget> + </item> + <item row="0" column="0" > + <widget class="QLabel" name="label" > + <property name="text" > + <string>Job:</string> + </property> + <property name="buddy" > + <cstring>jobCombo</cstring> + </property> + </widget> + </item> + <item row="4" column="0" > + <widget class="QLabel" name="label_5" > + <property name="text" > + <string>Storage:</string> + </property> + <property name="buddy" > + <cstring>storageCombo</cstring> + </property> + </widget> + </item> + <item row="5" column="0" > + <widget class="QLabel" name="label_6" > + <property name="text" > + <string>Before:</string> + </property> + <property name="buddy" > + <cstring>beforeDateTime</cstring> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QComboBox" name="jobCombo" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize" > + <size> + <width>600</width> + <height>600</height> + </size> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons" > + <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>prerestoreForm</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel" > + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel" > + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>prerestoreForm</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel" > + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel" > + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui> Deleted: trunk/bacula/src/qt-console/restore/restore-select.ui =================================================================== --- trunk/bacula/src/qt-console/restore/restore-select.ui 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/restore/restore-select.ui 2007-02-12 10:39:38 UTC (rev 4168) @@ -1,190 +0,0 @@ -<ui version="4.0" > - <class>restoreFileForm</class> - <widget class="QWidget" name="restoreFileForm" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle" > - <string>Restore Files Dialog</string> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <layout class="QGridLayout" > - <property name="margin" > - <number>8</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="2" column="0" > - <widget class="QLabel" name="label_3" > - <property name="text" > - <string>File Set:</string> - </property> - <property name="buddy" > - <cstring>filesetCombo</cstring> - </property> - </widget> - </item> - <item row="3" column="1" > - <widget class="QComboBox" name="poolCombo" /> - </item> - <item row="0" column="1" > - <widget class="QComboBox" name="jobCombo" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="label_2" > - <property name="text" > - <string>Client:</string> - </property> - <property name="buddy" > - <cstring>clientCombo</cstring> - </property> - </widget> - </item> - <item row="5" column="0" > - <widget class="QLabel" name="label_6" > - <property name="text" > - <string>Before:</string> - </property> - <property name="buddy" > - <cstring>dateTimeEdit</cstring> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QLabel" name="label_5" > - <property name="text" > - <string>Storage:</string> - </property> - <property name="buddy" > - <cstring>storageCombo</cstring> - </property> - </widget> - </item> - <item row="4" column="1" > - <widget class="QComboBox" name="storageCombo" /> - </item> - <item row="3" column="0" > - <widget class="QLabel" name="label_4" > - <property name="text" > - <string>Pool:</string> - </property> - <property name="buddy" > - <cstring>poolCombo</cstring> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QComboBox" name="clientCombo" /> - </item> - <item row="5" column="1" > - <widget class="QDateTimeEdit" name="dateTimeEdit" > - <property name="minimumDate" > - <date> - <year>2000</year> - <month>1</month> - <day>1</day> - </date> - </property> - <property name="displayFormat" > - <string>yyyy-mm-dd h:mm:ss</string> - </property> - <property name="calendarPopup" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string>Job:</string> - </property> - <property name="buddy" > - <cstring>jobCombo</cstring> - </property> - </widget> - </item> - <item row="2" column="1" > - <widget class="QComboBox" name="filesetCombo" /> - </item> - </layout> - </item> - <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>8</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" > - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="nextButton" > - <property name="text" > - <string>Next</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>16</width> - <height>21</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> Added: trunk/bacula/src/qt-console/restore/restore.cpp =================================================================== --- trunk/bacula/src/qt-console/restore/restore.cpp (rev 0) +++ trunk/bacula/src/qt-console/restore/restore.cpp 2007-02-12 10:39:38 UTC (rev 4168) @@ -0,0 +1,51 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ft...@fs.... +*/ + +/* + * Version $Id: $ + * + * Restore Class (Eric's brestore) + * + * Kern Sibbald, February MMVI + * + */ + +#include "bat.h" +#include "restore.h" + +restoreDialog::restoreDialog(Console *parent) +{ + setupUi(this); + this->show(); +} + +prerestoreDialog::prerestoreDialog(Console *parent) +{ + setupUi(this); + this->show(); +} Modified: trunk/bacula/src/qt-console/restore/restore.h =================================================================== --- trunk/bacula/src/qt-console/restore/restore.h 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/restore/restore.h 2007-02-12 10:39:38 UTC (rev 4168) @@ -1,10 +1,73 @@ - #ifndef _RESTORE_H_ #define _RESTORE_H_ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ft...@fs.... +*/ +/* + * Version $Id$ + * + * Kern Sibbald, February 2007 + */ + #include <QtGui> #include "ui_brestore.h" +#include "ui_restore.h" +#include "ui_prerestore.h" +class Console; + +class prerestoreDialog : public QDialog, public Ui::prerestoreForm +{ + Q_OBJECT + +public: + prerestoreDialog(Console *parent); + +public slots: + +private: + +}; + +class restoreDialog : public QDialog, public Ui::restoreForm +{ + Q_OBJECT + +public: + restoreDialog(Console *parent); + +public slots: + +private: + +}; + + class bRestore : public QWidget, public Ui::bRestoreForm { Q_OBJECT @@ -18,4 +81,6 @@ }; + + #endif /* _RESTORE_H_ */ Modified: trunk/bacula/src/qt-console/restore/restore.ui =================================================================== --- trunk/bacula/src/qt-console/restore/restore.ui 2007-02-12 07:58:57 UTC (rev 4167) +++ trunk/bacula/src/qt-console/restore/restore.ui 2007-02-12 10:39:38 UTC (rev 4168) @@ -1,12 +1,12 @@ <ui version="4.0" > <class>restoreForm</class> - <widget class="QWidget" name="restoreForm" > + <widget class="QDialog" name="restoreForm" > <property name="geometry" > <rect> <x>0</x> <y>0</y> - <width>693</width> - <height>366</height> + <width>1047</width> + <height>764</height> </rect> </property> <property name="windowTitle" > @@ -24,8 +24,108 @@ <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <widget class="QTreeWidget" name="treeWidget" /> - <widget class="QTreeWidget" name="fileWidget" /> + <widget class="QTreeWidget" name="treeWidget" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>7</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize" > + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="sizeIncrement" > + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="alternatingRowColors" > + <bool>true</bool> + </property> + <property name="columnCount" > + <number>1</number> + </property> + <column> + <property name="text" > + <string>1</string> + </property> + </column> + </widget> + <widget class="QTreeWidget" name="fileWidget" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>188</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>400</width> + <height>0</height> + </size> + </property> + <property name="sizeIncrement" > + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="alternatingRowColors" > + <bool>true</bool> + </property> + <property name="columnCount" > + <number>7</number> + </property> + <column> + <property name="text" > + <string>1</string> + </property> + </column> + <column> + <property name="text" > + <string>1</string> + </property> + </column> + <column> + <property name="text" > + <string>2</string> + </property> + </column> + <column> + <property name="text" > + <string>3</string> + </property> + </column> + <column> + <property name="text" > + <string>4</string> + </property> + </column> + <column> + <property name="text" > + <string>5</string> + </property> + </column> + <column> + <property name="text" > + <string>6</string> + </property> + </column> + </widget> </widget> </item> <item> @@ -71,40 +171,20 @@ </property> <property name="sizeHint" > <size> - <width>60</width> + <width>30</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> + <widget class="QDialogButtonBox" name="buttonBox" > <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > - <enum>QSizePolicy::Fixed</enum> + <property name="standardButtons" > + <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> </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> @@ -112,5 +192,38 @@ </layout> </widget> <resources/> - <connections/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>restoreForm</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel" > + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel" > + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>restoreForm</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel" > + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel" > + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> </ui> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |