Menu
▾
▴
[Bacula-commits] bacula/src/qt-console Makefile, 1.17, 1.18 bat.h, 1.3, 1.4 bat.pro, 1.8, 1.9 mainwin.cpp, 1.9, 1.10
|
From: Kern S. <ke...@us...> - 2007-02-04 16:29:55
|
Update of /cvsroot/bacula/bacula/src/qt-console In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19516 Modified Files: Makefile bat.h bat.pro mainwin.cpp Log Message: Implement command output lists Index: Makefile =================================================================== RCS file: /cvsroot/bacula/bacula/src/qt-console/Makefile,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Makefile 3 Feb 2007 13:01:19 -0000 1.17 +++ Makefile 4 Feb 2007 16:29:52 -0000 1.18 @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: bat -# Generated by qmake (2.01a) (Qt 4.2.1) on: Sat Feb 3 13:49:24 2007 +# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 4 16:56:30 2007 # Project: bat.pro # Template: app # Command: /usr/bin/qmake -unix -o Makefile bat.pro @@ -48,6 +48,7 @@ SOURCES = main.cpp \ bat_conf.cpp \ mainwin.cpp \ + qstd.cpp \ console/authenticate.cpp \ console/console.cpp \ restore/brestore.cpp moc_mainwin.cpp \ @@ -57,6 +58,7 @@ OBJECTS = main.o \ bat_conf.o \ mainwin.o \ + qstd.o \ authenticate.o \ console.o \ brestore.o \ @@ -154,7 +156,7 @@ 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 restore/restore.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 restore/brestore.cpp .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui 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 .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 .tmp/bat1.0.0/ && $(COPY_FILE) --parents main.ui 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 yaccclean: @@ -244,7 +246,8 @@ main.o: main.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h + bat_conf.h \ + qstd.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp bat_conf.o: bat_conf.cpp bat_conf.h @@ -253,19 +256,25 @@ mainwin.o: mainwin.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h + bat_conf.h \ + qstd.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwin.o mainwin.cpp +qstd.o: qstd.cpp qstd.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qstd.o qstd.cpp + authenticate.o: console/authenticate.cpp bat.h \ mainwin.h \ ui_main.h \ - bat_conf.h + bat_conf.h \ + qstd.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o authenticate.o console/authenticate.cpp console.o: console/console.cpp bat.h \ mainwin.h \ ui_main.h \ bat_conf.h \ + qstd.h \ console/console.h \ ui_console.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o console.o console/console.cpp @@ -274,6 +283,7 @@ mainwin.h \ ui_main.h \ bat_conf.h \ + qstd.h \ restore/restore.h \ ui_brestore.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o brestore.o restore/brestore.cpp Index: bat.h =================================================================== RCS file: /cvsroot/bacula/bacula/src/qt-console/bat.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bat.h 28 Jan 2007 13:05:40 -0000 1.3 +++ bat.h 4 Feb 2007 16:29:52 -0000 1.4 @@ -8,6 +8,9 @@ #include "bat_conf.h" #include "jcr.h" #include "console.h" +#include "qstd.h" + +using namespace qstd; extern MainWin *mainWin; extern QApplication *app; Index: mainwin.cpp =================================================================== RCS file: /cvsroot/bacula/bacula/src/qt-console/mainwin.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- mainwin.cpp 4 Feb 2007 09:41:26 -0000 1.9 +++ mainwin.cpp 4 Feb 2007 16:29:52 -0000 1.10 @@ -40,8 +40,6 @@ mainWin = this; setupUi(this); /* Setup UI defined by main.ui (designer) */ - statusBar()->showMessage("Director not connected. Click on connect button."); - m_console = new Console(stackedWidget); stackedWidget->setCurrentIndex(0); @@ -49,36 +47,13 @@ createConnections(); - readSettings(); -} - -#ifdef xxx - job_list = get_and_fill_combo(run_dialog, "combo_job", ".jobs"); - client_list = get_and_fill_combo(run_dialog, "combo_client", ".clients"); - fileset_list = get_and_fill_combo(run_dialog, "combo_fileset", ".filesets"); - messages_list = get_and_fill_combo(run_dialog, "combo_messages", ".msgs"); - pool_list = get_and_fill_combo(run_dialog, "combo_pool", ".pools"); - storage_list = get_and_fill_combo(run_dialog, "combo_storage", ".storage"); - type_list = get_and_fill_combo(run_dialog, "combo_type", ".types"); - level_list = get_and_fill_combo(run_dialog, "combo_level", ".levels"); - -static GList *get_list(char *cmd) -{ - GList *options; - char *msg; + this->show(); - options = NULL; - write_director(cmd); - while (bnet_recv(UA_sock) > 0) { - strip_trailing_junk(UA_sock->msg); - msg = (char *)malloc(strlen(UA_sock->msg) + 1); - strcpy(msg, UA_sock->msg); - options = g_list_append(options, msg); - } - return options; + readSettings(); + m_console->connect(); } -#endif + void MainWin::createConnections() { Index: bat.pro =================================================================== RCS file: /cvsroot/bacula/bacula/src/qt-console/bat.pro,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- bat.pro 3 Feb 2007 13:01:19 -0000 1.8 +++ bat.pro 4 Feb 2007 16:29:52 -0000 1.9 @@ -20,8 +20,8 @@ FORMS += restore/brestore.ui -HEADERS += mainwin.h bat.h bat_conf.h -SOURCES += main.cpp bat_conf.cpp mainwin.cpp +HEADERS += mainwin.h bat.h bat_conf.h qstd.h +SOURCES += main.cpp bat_conf.cpp mainwin.cpp qstd.cpp # Console HEADERS += console/console.h |