From b7dce33b370b404959e783d60e2219735cb04abc Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 12 Feb 2007 10:39:38 +0000 Subject: [PATCH] Create first cut prerestore and restore dialogs git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4168 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/Makefile | 43 +++- bacula/src/qt-console/bat.h | 34 ++- bacula/src/qt-console/bat.pro | 5 +- bacula/src/qt-console/bat_conf.cpp | 46 ++-- bacula/src/qt-console/console/console.cpp | 30 ++- bacula/src/qt-console/console/console.h | 1 + bacula/src/qt-console/console/console.ui | 3 + bacula/src/qt-console/main.cpp | 3 +- bacula/src/qt-console/mainwin.cpp | 13 +- bacula/src/qt-console/mainwin.h | 4 + bacula/src/qt-console/restore/brestore.cpp | 3 +- .../{restore-select.ui => prerestore.ui} | 203 +++++++++--------- bacula/src/qt-console/restore/restore.cpp | 51 +++++ bacula/src/qt-console/restore/restore.h | 67 +++++- bacula/src/qt-console/restore/restore.ui | 173 ++++++++++++--- 15 files changed, 501 insertions(+), 178 deletions(-) rename bacula/src/qt-console/restore/{restore-select.ui => prerestore.ui} (69%) create mode 100644 bacula/src/qt-console/restore/restore.cpp diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile index fa5deb368a..a36f765e48 100644 --- 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 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 @@ SOURCES = main.cpp \ 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 @@ OBJECTS = obj/main.o \ 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 @@ first: all 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 @@ qmake: FORCE 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 @@ moc/moc_console.cpp: ui_console.h \ /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 @@ 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_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,14 +262,14 @@ ui_label.h: label/label.ui 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 @@ obj/console.o: console/console.cpp bat.h \ 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 @@ obj/brestore.o: restore/brestore.cpp bat.h \ 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 \ diff --git a/bacula/src/qt-console/bat.h b/bacula/src/qt-console/bat.h index 06b4fdb578..e54064e040 100644 --- a/bacula/src/qt-console/bat.h +++ b/bacula/src/qt-console/bat.h @@ -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:ftf@fsfeurope.org. +*/ +/* + * Version $Id$ + * + * Kern Sibbald, January 2007 + */ + #include "mainwin.h" #include "config.h" #include "bacula.h" diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro index b23aab5a3e..7959015474 100644 --- a/bacula/src/qt-console/bat.pro +++ b/bacula/src/qt-console/bat.pro @@ -18,8 +18,7 @@ OBJECTS_DIR = obj 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 @@ SOURCES += console/authenticate.cpp console/console.cpp # Restore HEADERS += restore/restore.h -SOURCES += restore/brestore.cpp +SOURCES += restore/restore.cpp restore/brestore.cpp # Label dialog HEADERS += label/label.h diff --git a/bacula/src/qt-console/bat_conf.cpp b/bacula/src/qt-console/bat_conf.cpp index c7537b7863..88457be53f 100644 --- a/bacula/src/qt-console/bat_conf.cpp +++ b/bacula/src/qt-console/bat_conf.cpp @@ -1,26 +1,3 @@ -/* - * 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 @@ -48,6 +25,29 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * 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" diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp index 9ff33183b9..b071f29a93 100644 --- a/bacula/src/qt-console/console/console.cpp +++ b/bacula/src/qt-console/console/console.cpp @@ -27,6 +27,8 @@ */ /* + * Version $Id$ + * * Console Class * * Kern Sibbald, January MMVI @@ -36,7 +38,6 @@ #include #include "bat.h" #include "console.h" -#include "restore.h" Console::Console(QStackedWidget *parent) { @@ -52,9 +53,9 @@ Console::Console(QStackedWidget *parent) 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 @@ Console::Console(QStackedWidget *parent) 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 @@ QStringList Console::get_list(char *cmd) return list; } - +/* + * Save user settings + */ void Console::writeSettings() { QFont font = get_font(); @@ -190,6 +193,9 @@ void Console::writeSettings() settings.endGroup(); } +/* + * Read and restore user settings + */ void Console::readSettings() { QFont font = get_font(); @@ -203,6 +209,9 @@ void Console::readSettings() m_textEdit->setFont(font); } +/* + * Set the console textEdit font + */ void Console::set_font() { bool ok; @@ -212,6 +221,9 @@ void Console::set_font() } } +/* + * Get the console text edit font + */ const QFont Console::get_font() { return m_textEdit->font(); @@ -223,6 +235,9 @@ void Console::status_dir() 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 @@ void Console::update_cursor() m_textEdit->ensureCursorVisible(); } +/* + * This should be moved into a bSocket class + */ char *Console::msg() { if (m_sock) { diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h index 652a89df8d..e31792c532 100644 --- a/bacula/src/qt-console/console/console.h +++ b/bacula/src/qt-console/console/console.h @@ -4,6 +4,7 @@ #include #include "ui_console.h" +#include "restore.h" class DIRRES; class BSOCK; diff --git a/bacula/src/qt-console/console/console.ui b/bacula/src/qt-console/console/console.ui index 2a0521e976..f491ac7406 100644 --- a/bacula/src/qt-console/console/console.ui +++ b/bacula/src/qt-console/console/console.ui @@ -25,6 +25,9 @@ Qt::AllDockWidgetAreas + + Qt::StrongFocus + 9 diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp index cc99377062..a2260c97fd 100644 --- a/bacula/src/qt-console/main.cpp +++ b/bacula/src/qt-console/main.cpp @@ -25,8 +25,9 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ - /* + * Version $Id$ + * * Main program for bat (qt-console) * * Kern Sibbald, January MMVI diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index 54627a5ae1..a75ec9b117 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -27,6 +27,8 @@ */ /* + * Version $Id$ + * * Main Window control for bat (qt-console) * * Kern Sibbald, January MMVI @@ -76,6 +78,7 @@ void MainWin::createConnections() 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 MainWin::treeItemClicked(QTreeWidgetItem *item, int column) { (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 MainWin::treeItemDoubleClicked(QTreeWidgetItem *item, int column) (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,6 +143,12 @@ void MainWin::runDialogClicked() new runDialog(m_console); } +void MainWin::restoreDialogClicked() +{ + new prerestoreDialog(m_console); +} + + /* * The user just finished typing a line in the command line edit box diff --git a/bacula/src/qt-console/mainwin.h b/bacula/src/qt-console/mainwin.h index e2f2ac3a16..f1936f7ef8 100644 --- a/bacula/src/qt-console/mainwin.h +++ b/bacula/src/qt-console/mainwin.h @@ -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 @@ public slots: void treeItemDoubleClicked(QTreeWidgetItem *item, int column); void labelDialogClicked(); void runDialogClicked(); + void restoreDialogClicked(); protected: void closeEvent(QCloseEvent *event); diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp index 3c43fbdf0d..d85cb132c2 100644 --- a/bacula/src/qt-console/restore/brestore.cpp +++ b/bacula/src/qt-console/restore/brestore.cpp @@ -27,13 +27,14 @@ */ /* + * Version $Id$ + * * bRestore Class (Eric's brestore) * * Kern Sibbald, January MMVI * */ -#include #include "bat.h" #include "restore.h" diff --git a/bacula/src/qt-console/restore/restore-select.ui b/bacula/src/qt-console/restore/prerestore.ui similarity index 69% rename from bacula/src/qt-console/restore/restore-select.ui rename to bacula/src/qt-console/restore/prerestore.ui index d9f3efabc9..57f81b04de 100644 --- a/bacula/src/qt-console/restore/restore-select.ui +++ b/bacula/src/qt-console/restore/prerestore.ui @@ -1,16 +1,25 @@ - restoreFileForm - + prerestoreForm + 0 0 - 400 - 300 + 366 + 299 + + + 500 + 500 + + + + Qt::StrongFocus + - Restore Files Dialog + Restore Files @@ -27,28 +36,13 @@ 6 - - + + - File Set: + Pool: - filesetCombo - - - - - - - - - - - 7 - 0 - 0 - 0 - + poolCombo @@ -62,44 +56,20 @@ - - - - Before: - - - dateTimeEdit - - + + - - - - Storage: - - - storageCombo - - + + - - - - Pool: - - - poolCombo - - - - - + + - + 2000 @@ -115,6 +85,16 @@ + + + + File Set: + + + filesetCombo + + + @@ -125,66 +105,91 @@ - - - - - - - - - 8 - - - 6 - - - - - Qt::Horizontal + + + + Storage: - - - 40 - 20 - + + storageCombo - + - - + + - Next + Before: + + + beforeDateTime - - - - Qt::Horizontal - - - QSizePolicy::Fixed + + + + + 7 + 0 + 0 + 0 + - + - 16 - 21 + 600 + 600 - - - - - - Cancel - + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + + - + + + buttonBox + accepted() + prerestoreForm + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + prerestoreForm + reject() + + + 316 + 260 + + + 286 + 274 + + + + diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp new file mode 100644 index 0000000000..58973fb6c1 --- /dev/null +++ b/bacula/src/qt-console/restore/restore.cpp @@ -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:ftf@fsfeurope.org. +*/ + +/* + * 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(); +} diff --git a/bacula/src/qt-console/restore/restore.h b/bacula/src/qt-console/restore/restore.h index 682e3e6259..b1b43f495d 100644 --- a/bacula/src/qt-console/restore/restore.h +++ b/bacula/src/qt-console/restore/restore.h @@ -1,9 +1,72 @@ - #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:ftf@fsfeurope.org. +*/ +/* + * Version $Id$ + * + * Kern Sibbald, February 2007 + */ + #include #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 { @@ -18,4 +81,6 @@ private: }; + + #endif /* _RESTORE_H_ */ diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui index 9b2dfe6425..4f1136525a 100644 --- a/bacula/src/qt-console/restore/restore.ui +++ b/bacula/src/qt-console/restore/restore.ui @@ -1,12 +1,12 @@ restoreForm - + 0 0 - 693 - 366 + 1047 + 764 @@ -24,8 +24,108 @@ Qt::Horizontal - - + + + + 5 + 7 + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + true + + + 1 + + + + 1 + + + + + + + 7 + 5 + 188 + 1 + + + + + 400 + 0 + + + + + 0 + 0 + + + + true + + + 7 + + + + 1 + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + 6 + + + @@ -71,39 +171,19 @@ - 60 + 30 20 - - - OK - - - - - + Qt::Horizontal - - QSizePolicy::Fixed - - - - 31 - 20 - - - - - - - - Cancel + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok @@ -112,5 +192,38 @@ - + + + buttonBox + accepted() + restoreForm + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + restoreForm + reject() + + + 316 + 260 + + + 286 + 274 + + + + -- 2.39.5