From e7c4e76cd2a1bed6abb348f7292e773f51f28991 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 1 Feb 2007 11:01:25 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4084 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/Makefile | 13 +- bacula/src/qt-console/bat.pro | 8 +- bacula/src/qt-console/label.ui | 226 +++++++++++++++++++++++++++++++++ bacula/src/qt-console/main.ui | 3 - 4 files changed, 241 insertions(+), 9 deletions(-) create mode 100644 bacula/src/qt-console/label.ui diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile index c42a72180c..f3ed7a0990 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: Mon Jan 29 12:01:29 2007 +# Generated by qmake (2.01a) (Qt 4.2.1) on: Thu Feb 1 11:50:08 2007 # Project: bat.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile bat.pro @@ -105,7 +105,7 @@ first: all all: Makefile $(TARGET) -$(TARGET): ui_main.h $(OBJECTS) +$(TARGET): ui_main.h ui_label.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 \ @@ -150,7 +150,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 console/console.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp console/authenticate.cpp console/console.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.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 console/console.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp bat_conf.cpp mainwin.cpp console/authenticate.cpp console/console.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui label.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: @@ -212,12 +212,15 @@ 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 +compiler_uic_make_all: ui_main.h ui_label.h compiler_uic_clean: - -$(DEL_FILE) ui_main.h + -$(DEL_FILE) ui_main.h ui_label.h ui_main.h: main.ui /usr/bin/uic main.ui -o ui_main.h +ui_label.h: label.ui + /usr/bin/uic label.ui -o ui_label.h + compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean ####### Compile diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro index 8cc59c89f3..a4daac1384 100644 --- a/bacula/src/qt-console/bat.pro +++ b/bacula/src/qt-console/bat.pro @@ -12,11 +12,17 @@ LIBS += -lbac LIBS += -lssl -lcrypto RESOURCES = main.qrc -# Main directory +# Main window FORMS += main.ui +# Label dialog +FORMS += label.ui + + HEADERS += mainwin.h bat.h bat_conf.h SOURCES += main.cpp bat_conf.cpp mainwin.cpp # Console HEADERS += console/console.h SOURCES += console/authenticate.cpp console/console.cpp + +# Label dialog diff --git a/bacula/src/qt-console/label.ui b/bacula/src/qt-console/label.ui new file mode 100644 index 0000000000..94363cad14 --- /dev/null +++ b/bacula/src/qt-console/label.ui @@ -0,0 +1,226 @@ + + labelVolume + + + + 0 + 0 + 400 + 300 + + + + Label + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 71 + 21 + + + + + + + + + 16777215 + 30 + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:12pt; font-weight:600;">Label a Volume</span></p></body></html> + + + + + + + Qt::Horizontal + + + + 81 + 20 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Maximum + + + + 20 + 10 + + + + + + + + 0 + + + 6 + + + + + 10000 + + + + + + + Pool: + + + poolCombo + + + + + + + Storage: + + + storageCombo + + + + + + + + 200 + 0 + + + + + + + + + + + Volume Name: + + + volumeName + + + + + + + + + + Slot: + + + slotSpin + + + + + + + + + Qt::Vertical + + + QSizePolicy::Maximum + + + + 21 + 16 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + labelVolume + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + labelVolume + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui index e84aced37b..7c4d50ac22 100644 --- a/bacula/src/qt-console/main.ui +++ b/bacula/src/qt-console/main.ui @@ -299,9 +299,6 @@ Ctrl+Q - - QAction::QuitRole - -- 2.39.5