From: Kern Sibbald Date: Sat, 27 Jan 2007 17:36:45 +0000 (+0000) Subject: Update name X-Git-Tag: Release-7.0.0~6997 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f0ff941167258cac169cab18e25875a76902568;p=bacula%2Fbacula Update name git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4059 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/qt-console/.cvsignore b/bacula/src/qt-console/.cvsignore index 5131277be3..ea9a48ab75 100644 --- a/bacula/src/qt-console/.cvsignore +++ b/bacula/src/qt-console/.cvsignore @@ -1,6 +1,6 @@ ui_main.h *.o -qt-console +bat about-func brestore.ui main.qrc diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile index 433da70a2e..ac0fee30ae 100644 --- a/bacula/src/qt-console/Makefile +++ b/bacula/src/qt-console/Makefile @@ -1,9 +1,9 @@ ############################################################################# -# Makefile for building: qt-console -# Generated by qmake (2.01a) (Qt 4.2.1) on: Fri Jan 26 20:53:56 2007 -# Project: qt-console.pro +# Makefile for building: bat +# Generated by qmake (2.01a) (Qt 4.2.1) on: Sat Jan 27 18:35:42 2007 +# Project: bat.pro # Template: app -# Command: /usr/bin/qmake -unix -o Makefile qt-console.pro +# Command: /usr/bin/qmake -unix -o Makefile bat.pro ############################################################################# ####### Compiler, tools and options @@ -72,10 +72,10 @@ DIST = /usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/features/moc.prf \ /usr/share/qt4/mkspecs/features/resources.prf \ /usr/share/qt4/mkspecs/features/uic.prf \ - qt-console.pro -QMAKE_TARGET = qt-console + bat.pro +QMAKE_TARGET = bat DESTDIR = -TARGET = qt-console +TARGET = bat first: all ####### Implicit rules @@ -104,7 +104,7 @@ all: Makefile $(TARGET) $(TARGET): ui_main.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) -Makefile: qt-console.pro /usr/share/qt4/mkspecs/default/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \ +Makefile: bat.pro /usr/share/qt4/mkspecs/default/qmake.conf /usr/share/qt4/mkspecs/common/unix.conf \ /usr/share/qt4/mkspecs/common/g++.conf \ /usr/share/qt4/mkspecs/common/linux.conf \ /usr/share/qt4/mkspecs/qconfig.pri \ @@ -122,7 +122,7 @@ Makefile: qt-console.pro /usr/share/qt4/mkspecs/default/qmake.conf /usr/share/q /usr/share/qt4/mkspecs/features/uic.prf \ /usr/lib/libQtGui.prl \ /usr/lib/libQtCore.prl - $(QMAKE) -unix -o Makefile qt-console.pro + $(QMAKE) -unix -o Makefile bat.pro /usr/share/qt4/mkspecs/common/unix.conf: /usr/share/qt4/mkspecs/common/g++.conf: /usr/share/qt4/mkspecs/common/linux.conf: @@ -142,11 +142,11 @@ Makefile: qt-console.pro /usr/share/qt4/mkspecs/default/qmake.conf /usr/share/q /usr/lib/libQtGui.prl: /usr/lib/libQtCore.prl: qmake: FORCE - @$(QMAKE) -unix -o Makefile qt-console.pro + @$(QMAKE) -unix -o Makefile bat.pro dist: - @$(CHK_DIR_EXISTS) .tmp/qt-console1.0.0 || $(MKDIR) .tmp/qt-console1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/qt-console1.0.0/ && $(COPY_FILE) --parents mainwindow.h console_conf.h .tmp/qt-console1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/qt-console1.0.0/ && $(COPY_FILE) --parents main.cpp authenticate.cpp console_conf.cpp mainwindow.cpp .tmp/qt-console1.0.0/ && $(COPY_FILE) --parents main.ui .tmp/qt-console1.0.0/ && (cd `dirname .tmp/qt-console1.0.0` && $(TAR) qt-console1.0.0.tar qt-console1.0.0 && $(COMPRESS) qt-console1.0.0.tar) && $(MOVE) `dirname .tmp/qt-console1.0.0`/qt-console1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/qt-console1.0.0 + @$(CHK_DIR_EXISTS) .tmp/bat1.0.0 || $(MKDIR) .tmp/bat1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/bat1.0.0/ && $(COPY_FILE) --parents mainwindow.h console_conf.h .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.qrc .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.cpp authenticate.cpp console_conf.cpp mainwindow.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 yaccclean: @@ -207,19 +207,24 @@ compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_coll ####### Compile -main.o: main.cpp mainwindow.h \ +main.o: main.cpp console.h \ + mainwindow.h \ ui_main.h \ console_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp -authenticate.o: authenticate.cpp console_conf.h +authenticate.o: authenticate.cpp mainwindow.h \ + ui_main.h \ + console_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o authenticate.o authenticate.cpp console_conf.o: console_conf.cpp console_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o console_conf.o console_conf.cpp -mainwindow.o: mainwindow.cpp mainwindow.h \ - ui_main.h +mainwindow.o: mainwindow.cpp console.h \ + mainwindow.h \ + ui_main.h \ + console_conf.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o mainwindow.cpp moc_mainwindow.o: moc_mainwindow.cpp diff --git a/bacula/src/qt-console/bat.conf b/bacula/src/qt-console/bat.conf new file mode 100644 index 0000000000..fa5f9bcd4e --- /dev/null +++ b/bacula/src/qt-console/bat.conf @@ -0,0 +1,10 @@ +# +# Bacula User Agent (or Console) Configuration File +# + +Director { + Name = rufus-dir + DIRport = 8101 + address = localhost + Password = UA_password +} diff --git a/bacula/src/qt-console/bat.pro b/bacula/src/qt-console/bat.pro new file mode 100644 index 0000000000..e31e6ba462 --- /dev/null +++ b/bacula/src/qt-console/bat.pro @@ -0,0 +1,19 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Thu Jan 18 09:40:56 2007 +###################################################################### + +TEMPLATE = app +TARGET = bat +DEPENDPATH += . +INCLUDEPATH += . +INCLUDEPATH += .. +LIBS += -L../lib +LIBS += -lbac +LIBS += -lssl -lcrypto +RESOURCES = main.qrc + +# Input +FORMS += main.ui +HEADERS += mainwindow.h console_conf.h +SOURCES += main.cpp authenticate.cpp console_conf.cpp +SOURCES += mainwindow.cpp diff --git a/bacula/src/qt-console/console.h b/bacula/src/qt-console/console.h new file mode 100644 index 0000000000..8715b5fe2d --- /dev/null +++ b/bacula/src/qt-console/console.h @@ -0,0 +1,7 @@ + +#include "mainwindow.h" +#include "config.h" +#include "bacula.h" +#include "console_conf.h" +#include "jcr.h" + diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp index 1933a0b949..bc54f0551d 100644 --- a/bacula/src/qt-console/main.cpp +++ b/bacula/src/qt-console/main.cpp @@ -26,12 +26,8 @@ Switzerland, email:ftf@fsfeurope.org. */ -#include "mainwindow.h" #include -#include "config.h" -#include "bacula.h" -#include "console_conf.h" -#include "jcr.h" +#include "console.h" /* Imported functions */ @@ -42,7 +38,7 @@ void terminate_console(int sig); static void usage(); static int check_resources(); -#define CONFIG_FILE "./qt-console.conf" /* default configuration file */ +#define CONFIG_FILE "./bat.conf" /* default configuration file */ /* Static variables */ static char *configfile = NULL; @@ -150,7 +146,7 @@ static void usage() fprintf(stderr, _( PROG_COPYRIGHT "\nVersion: %s (%s) %s %s %s\n\n" -"Usage: qt-console [-s] [-c config_file] [-d debug_level] [config_file]\n" +"Usage: bat [-s] [-c config_file] [-d debug_level] [config_file]\n" " -c set configuration file to file\n" " -dnn set debug level to nn\n" " -s no signals\n" diff --git a/bacula/src/qt-console/mainwindow.cpp b/bacula/src/qt-console/mainwindow.cpp index ae00cda623..7f87ec70f7 100644 --- a/bacula/src/qt-console/mainwindow.cpp +++ b/bacula/src/qt-console/mainwindow.cpp @@ -33,7 +33,7 @@ * */ -#include "mainwindow.h" +#include "console.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { @@ -91,10 +91,10 @@ void MainWindow::input_line() } void MainWindow::about() { - QMessageBox::about(this, tr("About qt-console"), - tr("

Qt_console 0.1

" - "

Copyright © 2007 Free Software Foundation Europe e.V." - "

The qt-console is an administrative" + QMessageBox::about(this, tr("About bat"), + tr("

bat 0.1

" + "

Copyright © " BYEAR " Free Software Foundation Europe e.V." + "

The bat is an administrative console" " interface to the Director.")); } diff --git a/bacula/src/qt-console/qt-console.pro b/bacula/src/qt-console/qt-console.pro deleted file mode 100644 index f93e8448c4..0000000000 --- a/bacula/src/qt-console/qt-console.pro +++ /dev/null @@ -1,19 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Thu Jan 18 09:40:56 2007 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . -INCLUDEPATH += .. -LIBS += -L../lib -LIBS += -lbac -LIBS += -lssl -lcrypto -RESOURCES = main.qrc - -# Input -FORMS += main.ui -HEADERS += mainwindow.h console_conf.h -SOURCES += main.cpp authenticate.cpp console_conf.cpp -SOURCES += mainwindow.cpp