From fa5b81ed2355a81b15d90fe752dae600dd213bd0 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 9 Feb 2007 22:22:54 +0000 Subject: [PATCH] First cut run dialog git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4156 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/Makefile | 74 +++++- bacula/src/qt-console/bat.pro | 7 +- bacula/src/qt-console/label/label.cpp | 2 + bacula/src/qt-console/label/label.h | 2 +- bacula/src/qt-console/label/label.ui | 8 +- bacula/src/qt-console/mainwin.cpp | 6 + bacula/src/qt-console/mainwin.h | 2 + bacula/src/qt-console/run/run.cpp | 79 ++++++ bacula/src/qt-console/run/run.h | 24 ++ bacula/src/qt-console/run/run.ui | 345 ++++++++++++++++++++++++++ 10 files changed, 532 insertions(+), 17 deletions(-) create mode 100644 bacula/src/qt-console/run/run.cpp create mode 100644 bacula/src/qt-console/run/run.h create mode 100644 bacula/src/qt-console/run/run.ui diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile index e25c2fcbb0..dd1c6bf11d 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: Fri Feb 9 18:42:06 2007 +# Generated by qmake (2.01a) (Qt 4.2.1) on: Fri Feb 9 23:20:13 2007 # Project: bat.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile bat.pro @@ -52,10 +52,12 @@ SOURCES = main.cpp \ console/authenticate.cpp \ console/console.cpp \ restore/brestore.cpp \ - label/label.cpp moc_mainwin.cpp \ + label/label.cpp \ + run/run.cpp moc_mainwin.cpp \ moc_console.cpp \ moc_restore.cpp \ moc_label.cpp \ + moc_run.cpp \ qrc_main.cpp OBJECTS = main.o \ bat_conf.o \ @@ -65,10 +67,12 @@ OBJECTS = main.o \ console.o \ brestore.o \ label.o \ + run.o \ moc_mainwin.o \ moc_console.o \ moc_restore.o \ moc_label.o \ + moc_run.o \ qrc_main.o DIST = /usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/g++.conf \ @@ -115,7 +119,7 @@ first: all all: Makefile $(TARGET) -$(TARGET): ui_main.h ui_label.h ui_console.h ui_brestore.h $(OBJECTS) +$(TARGET): ui_main.h ui_label.h ui_console.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 \ @@ -160,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 .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 .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui label/label.ui console/console.ui restore/brestore.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 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: @@ -184,10 +188,14 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: moc_mainwin.cpp moc_console.cpp moc_restore.cpp moc_label.cpp +compiler_moc_header_make_all: moc_mainwin.cpp moc_console.cpp moc_restore.cpp moc_label.cpp moc_run.cpp compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwin.cpp moc_console.cpp moc_restore.cpp moc_label.cpp + -$(DEL_FILE) moc_mainwin.cpp moc_console.cpp moc_restore.cpp moc_label.cpp moc_run.cpp moc_mainwin.cpp: ui_main.h \ + label/label.h \ + ui_label.h \ + run/run.h \ + ui_run.h \ mainwin.h \ /usr/bin/moc /usr/bin/moc $(DEFINES) $(INCPATH) mainwin.h -o moc_mainwin.cpp @@ -207,6 +215,11 @@ moc_label.cpp: ui_label.h \ /usr/bin/moc /usr/bin/moc $(DEFINES) $(INCPATH) label/label.h -o moc_label.cpp +moc_run.cpp: ui_run.h \ + run/run.h \ + /usr/bin/moc + /usr/bin/moc $(DEFINES) $(INCPATH) run/run.h -o moc_run.cpp + compiler_rcc_make_all: qrc_main.cpp compiler_rcc_clean: -$(DEL_FILE) qrc_main.cpp @@ -233,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 +compiler_uic_make_all: ui_main.h ui_label.h ui_console.h ui_brestore.h ui_run.h compiler_uic_clean: - -$(DEL_FILE) ui_main.h ui_label.h ui_console.h ui_brestore.h + -$(DEL_FILE) ui_main.h ui_label.h ui_console.h ui_brestore.h ui_run.h ui_main.h: main.ui /usr/bin/uic main.ui -o ui_main.h @@ -248,6 +261,9 @@ ui_console.h: console/console.ui 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 + compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean ####### Compile @@ -255,6 +271,10 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_coll main.o: main.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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp @@ -265,6 +285,10 @@ bat_conf.o: bat_conf.cpp bat_conf.h mainwin.o: mainwin.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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwin.o mainwin.cpp @@ -275,6 +299,10 @@ qstd.o: qstd.cpp qstd.h authenticate.o: console/authenticate.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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o authenticate.o console/authenticate.cpp @@ -282,6 +310,10 @@ authenticate.o: console/authenticate.cpp bat.h \ console.o: console/console.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 \ console/console.h \ @@ -291,6 +323,10 @@ console.o: console/console.cpp bat.h \ brestore.o: restore/brestore.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 \ @@ -300,12 +336,25 @@ brestore.o: restore/brestore.cpp bat.h \ label.o: label/label.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h \ - qstd.h \ label/label.h \ - ui_label.h + ui_label.h \ + run/run.h \ + ui_run.h \ + bat_conf.h \ + qstd.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o label.o label/label.cpp +run.o: run/run.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 + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o run.o run/run.cpp + moc_mainwin.o: moc_mainwin.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwin.o moc_mainwin.cpp @@ -318,6 +367,9 @@ moc_restore.o: moc_restore.cpp moc_label.o: moc_label.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_label.o moc_label.cpp +moc_run.o: moc_run.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_run.o moc_run.cpp + qrc_main.o: qrc_main.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_main.o qrc_main.cpp diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro index 280b37ad7a..a222cb6cff 100644 --- a/bacula/src/qt-console/bat.pro +++ b/bacula/src/qt-console/bat.pro @@ -14,10 +14,10 @@ RESOURCES = main.qrc # Main window FORMS += main.ui -# Label dialog FORMS += label/label.ui FORMS += console/console.ui FORMS += restore/brestore.ui +FORMS += run/run.ui HEADERS += mainwin.h bat.h bat_conf.h qstd.h @@ -34,3 +34,8 @@ SOURCES += restore/brestore.cpp # Label dialog HEADERS += label/label.h SOURCES += label/label.cpp + +# Run dialog +HEADERS += run/run.h +SOURCES += run/run.cpp + diff --git a/bacula/src/qt-console/label/label.cpp b/bacula/src/qt-console/label/label.cpp index ace4ce982f..4fdd3f1ea5 100644 --- a/bacula/src/qt-console/label/label.cpp +++ b/bacula/src/qt-console/label/label.cpp @@ -51,6 +51,7 @@ void labelDialog::accept() storageCombo->currentText().toUtf8().data(), poolCombo->currentText().toUtf8().data()); this->hide(); + delete this; #ifdef xxx volume = get_entry_text(label_dialog, "label_entry_volume"); @@ -74,4 +75,5 @@ void labelDialog::reject() { printf("Rejected\n"); this->hide(); + delete this; } diff --git a/bacula/src/qt-console/label/label.h b/bacula/src/qt-console/label/label.h index 7d463c5cfb..d06cf40aa3 100644 --- a/bacula/src/qt-console/label/label.h +++ b/bacula/src/qt-console/label/label.h @@ -6,7 +6,7 @@ #include "ui_label.h" #include "console.h" -class labelDialog : public QDialog, public Ui::labelVolume +class labelDialog : public QDialog, public Ui::labelForm { Q_OBJECT diff --git a/bacula/src/qt-console/label/label.ui b/bacula/src/qt-console/label/label.ui index 94363cad14..99ed73599e 100644 --- a/bacula/src/qt-console/label/label.ui +++ b/bacula/src/qt-console/label/label.ui @@ -1,6 +1,6 @@ - labelVolume - + labelForm + 0 @@ -193,7 +193,7 @@ p, li { white-space: pre-wrap; } buttonBox accepted() - labelVolume + labelForm accept() @@ -209,7 +209,7 @@ p, li { white-space: pre-wrap; } buttonBox rejected() - labelVolume + labelForm reject() diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index 5fb85d4551..54627a5ae1 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -75,6 +75,7 @@ void MainWin::createConnections() connect(actionStatusDir, SIGNAL(triggered()), m_console, SLOT(status_dir())); connect(actionSelectFont, SIGNAL(triggered()), m_console, SLOT(set_font())); connect(actionLabel, SIGNAL(triggered()), this, SLOT(labelDialogClicked())); + connect(actionRun, SIGNAL(triggered()), this, SLOT(runDialogClicked())); } /* @@ -134,6 +135,11 @@ void MainWin::labelDialogClicked() new labelDialog(m_console); } +void MainWin::runDialogClicked() +{ + new runDialog(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 3c4b6c9fb7..e2f2ac3a16 100644 --- a/bacula/src/qt-console/mainwin.h +++ b/bacula/src/qt-console/mainwin.h @@ -38,6 +38,7 @@ #include #include "ui_main.h" #include "label/label.h" +#include "run/run.h" class Console; @@ -59,6 +60,7 @@ public slots: void treeItemClicked(QTreeWidgetItem *item, int column); void treeItemDoubleClicked(QTreeWidgetItem *item, int column); void labelDialogClicked(); + void runDialogClicked(); protected: void closeEvent(QCloseEvent *event); diff --git a/bacula/src/qt-console/run/run.cpp b/bacula/src/qt-console/run/run.cpp new file mode 100644 index 0000000000..a733dc3879 --- /dev/null +++ b/bacula/src/qt-console/run/run.cpp @@ -0,0 +1,79 @@ +/* + 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. +*/ + +/* + * Run Dialog class + * + * Kern Sibbald, February MMVI + * + */ + +#include "bat.h" +#include "run.h" + +runDialog::runDialog(Console *console) +{ + setupUi(this); + storageCombo->addItems(console->storage_list); + poolCombo->addItems(console->pool_list); + this->show(); +} + +void runDialog::accept() +{ + printf("Storage=%s\n" + "Pool=%s\n", + storageCombo->currentText().toUtf8().data(), + poolCombo->currentText().toUtf8().data()); + this->hide(); + delete this; + +#ifdef xxx + volume = get_entry_text(label_dialog, "label_entry_volume"); + + slot = get_spin_text(label_dialog, "label_slot"); + + if (!pool || !storage || !volume || !(*volume)) { + set_status_ready(); + return; + } + + bsnprintf(cmd, sizeof(cmd), + "label volume=\"%s\" pool=\"%s\" storage=\"%s\" slot=%s\n", + volume, pool, storage, slot); + write_director(cmd); + set_text(cmd, strlen(cmd)); +#endif +} + +void runDialog::reject() +{ + printf("Rejected\n"); + this->hide(); + delete this; +} diff --git a/bacula/src/qt-console/run/run.h b/bacula/src/qt-console/run/run.h new file mode 100644 index 0000000000..3d33268931 --- /dev/null +++ b/bacula/src/qt-console/run/run.h @@ -0,0 +1,24 @@ + +#ifndef _RUN_H_ +#define _RUN_H_ + +#include +#include "ui_run.h" +#include "console.h" + +class runDialog : public QDialog, public Ui::runForm +{ + Q_OBJECT + +public: + runDialog(Console *console); + +public slots: + void accept(); + void reject(); + +private: + +}; + +#endif /* _RUN_H_ */ diff --git a/bacula/src/qt-console/run/run.ui b/bacula/src/qt-console/run/run.ui new file mode 100644 index 0000000000..8976c02903 --- /dev/null +++ b/bacula/src/qt-console/run/run.ui @@ -0,0 +1,345 @@ + + runForm + + + + 0 + 0 + 590 + 393 + + + + Run Dialog + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + + + + + 5 + 0 + 0 + 0 + + + + + 150 + 0 + + + + + + + + Bootstrap: + + + true + + + bootstrap + + + + + + + Client: + + + clientCombo + + + + + + + 10000 + + + + + + + Type: + + + typeCombo + + + + + + + Storage: + + + storageCombo + + + + + + + + + + + + + + + + Pool: + + + poolCombo + + + + + + + When: + + + dateTimeEdit + + + + + + + Level: + + + levelCombo + + + + + + + Qt::Vertical + + + + 20 + 171 + + + + + + + + FileSet: + + + filesetCombo + + + + + + + + + + + + + Priority: + + + prioritySpin + + + + + + + Messages: + + + messagesCombo + + + + + + + + 200 + 0 + + + + + + + + Job: + + + jobCombo + + + + + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Maximum + + + + 572 + 16 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + + + + + + Qt::Vertical + + + QSizePolicy::Maximum + + + + 572 + 16 + + + + + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 71 + 21 + + + + + + + + + 16777215 + 30 + + + + <h3>Run a Job</h3> + + + + + + + Qt::Horizontal + + + + 81 + 20 + + + + + + + + + + + + buttonBox + accepted() + runForm + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + runForm + reject() + + + 316 + 260 + + + 286 + 274 + + + + + -- 2.39.5