dhb A modified main.ui for review of look and feel

     make Makefile and bat.conf ignored
     copied bat.conf to bat.conf.example

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4386 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile
deleted file mode 100644 (file)
index 034592d..0000000
--- a/bacula/src/qt-console/Makefile
+++ /dev/null
@@ -1,651 +0,0 @@
-#############################################################################
-# Makefile for building: bat
-# Generated by qmake (2.01a) (Qt 4.2.1) on: Wed Mar 21 18:09:48 2007
-# Project:  bat.pro
-# Template: app
-# Command: /usr/bin/qmake -unix -o Makefile bat.pro
-#############################################################################
-
-####### Compiler, tools and options
-
-CC            = gcc
-CXX           = g++
-LEX           = flex
-YACC          = yacc
-DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -g -D_REENTRANT -Wall -W  $(DEFINES)
-CXXFLAGS      = -pipe -g -D_REENTRANT -Wall -W  $(DEFINES)
-LEXFLAGS      = 
-YACCFLAGS     = -d
-INCPATH       = -I/usr/share/qt4/mkspecs/default -I. -I/usr/include/QtCore -I/usr/include/QtCore -I/usr/include/QtGui -I/usr/include/QtGui -I/usr/include -I. -Iconsole -Irestore -Iselect -I.. -Imoc -Iui
-LINK          = g++
-LFLAGS        = 
-LIBS          = $(SUBLIBS)  -L/usr/lib -L../lib -lbac -lssl -lcrypto -lQtGui -L/usr/lib -L/usr/X11R6/lib -lpng -lSM -lICE -lXi -lXrender -lXrandr -lXfixes -lXcursor -lXinerama -lfreetype -lfontconfig -lXext -lX11 -lQtCore -lz -lm -ldl -lpthread
-AR            = ar cqs
-RANLIB        = 
-QMAKE         = /usr/bin/qmake
-TAR           = tar -cf
-COMPRESS      = gzip -9f
-COPY          = cp -f
-COPY_FILE     = $(COPY)
-COPY_DIR      = $(COPY) -r
-INSTALL_FILE  = install -m 644 -p
-INSTALL_DIR   = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
-DEL_FILE      = rm -f
-SYMLINK       = ln -sf
-DEL_DIR       = rmdir
-MOVE          = mv -f
-CHK_DIR_EXISTS= test -d
-MKDIR         = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR   = obj/
-
-####### Files
-
-SOURCES       = main.cpp \
-               bat_conf.cpp \
-               mainwin.cpp \
-               qstd.cpp \
-               console/authenticate.cpp \
-               console/console.cpp \
-               restore/prerestore.cpp \
-               restore/restore.cpp \
-               restore/brestore.cpp \
-               label/label.cpp \
-               run/run.cpp \
-               run/runcmd.cpp \
-               select/select.cpp \
-               medialist/medialist.cpp \
-               mediaedit/mediaedit.cpp \
-               joblist/joblist.cpp moc/moc_mainwin.cpp \
-               moc/moc_console.cpp \
-               moc/moc_restore.cpp \
-               moc/moc_label.cpp \
-               moc/moc_run.cpp \
-               moc/moc_select.cpp \
-               moc/moc_medialist.cpp \
-               moc/moc_mediaedit.cpp \
-               moc/moc_joblist.cpp \
-               qrc_main.cpp
-OBJECTS       = obj/main.o \
-               obj/bat_conf.o \
-               obj/mainwin.o \
-               obj/qstd.o \
-               obj/authenticate.o \
-               obj/console.o \
-               obj/prerestore.o \
-               obj/restore.o \
-               obj/brestore.o \
-               obj/label.o \
-               obj/run.o \
-               obj/runcmd.o \
-               obj/select.o \
-               obj/medialist.o \
-               obj/mediaedit.o \
-               obj/joblist.o \
-               obj/moc_mainwin.o \
-               obj/moc_console.o \
-               obj/moc_restore.o \
-               obj/moc_label.o \
-               obj/moc_run.o \
-               obj/moc_select.o \
-               obj/moc_medialist.o \
-               obj/moc_mediaedit.o \
-               obj/moc_joblist.o \
-               obj/qrc_main.o
-DIST          = /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 \
-               /usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /usr/share/qt4/mkspecs/features/qt_config.prf \
-               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /usr/share/qt4/mkspecs/features/default_pre.prf \
-               /usr/share/qt4/mkspecs/features/debug.prf \
-               /usr/share/qt4/mkspecs/features/default_post.prf \
-               /usr/share/qt4/mkspecs/features/qt.prf \
-               /usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /usr/share/qt4/mkspecs/features/moc.prf \
-               /usr/share/qt4/mkspecs/features/warn_on.prf \
-               /usr/share/qt4/mkspecs/features/resources.prf \
-               /usr/share/qt4/mkspecs/features/uic.prf \
-               bat.pro
-QMAKE_TARGET  = bat
-DESTDIR       = 
-TARGET        = bat
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
-       $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET): ui/ui_main.h ui/ui_label.h ui/ui_console.h ui/ui_restore.h ui/ui_prerestore.h ui/ui_brestore.h ui/ui_run.h ui/ui_runcmd.h ui/ui_select.h ui/ui_medialist.h ui/ui_mediaedit.h ui/ui_joblist.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 \
-               /usr/share/qt4/mkspecs/common/g++.conf \
-               /usr/share/qt4/mkspecs/common/linux.conf \
-               /usr/share/qt4/mkspecs/qconfig.pri \
-               /usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /usr/share/qt4/mkspecs/features/qt_config.prf \
-               /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /usr/share/qt4/mkspecs/features/default_pre.prf \
-               /usr/share/qt4/mkspecs/features/debug.prf \
-               /usr/share/qt4/mkspecs/features/default_post.prf \
-               /usr/share/qt4/mkspecs/features/qt.prf \
-               /usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /usr/share/qt4/mkspecs/features/moc.prf \
-               /usr/share/qt4/mkspecs/features/warn_on.prf \
-               /usr/share/qt4/mkspecs/features/resources.prf \
-               /usr/share/qt4/mkspecs/features/uic.prf \
-               /usr/lib/libQtGui.prl \
-               /usr/lib/libQtCore.prl
-       $(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:
-/usr/share/qt4/mkspecs/qconfig.pri:
-/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/usr/share/qt4/mkspecs/features/qt_config.prf:
-/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/debug.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/usr/lib/libQtGui.prl:
-/usr/lib/libQtCore.prl:
-qmake:  FORCE
-       @$(QMAKE) -unix -o Makefile bat.pro
-
-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 select/select.h medialist/medialist.h mediaedit/mediaedit.h joblist/joblist.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/prerestore.cpp restore/restore.cpp restore/brestore.cpp label/label.cpp run/run.cpp run/runcmd.cpp select/select.cpp medialist/medialist.cpp mediaedit/mediaedit.cpp joblist/joblist.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 run/runcmd.ui select/select.ui medialist/medialist.ui mediaedit/mediaedit.ui joblist/joblist.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:
-lexclean:
-clean:compiler_clean 
-       -$(DEL_FILE) $(OBJECTS)
-       -$(DEL_FILE) *~ core *.core
-
-
-####### Sub-libraries
-
-distclean: clean
-       -$(DEL_FILE) $(TARGET) 
-       -$(DEL_FILE) Makefile
-
-
-/usr/bin/moc:
-       (cd $(QTDIR)/src/tools/moc && $(MAKE))
-
-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/moc_mainwin.cpp moc/moc_console.cpp moc/moc_restore.cpp moc/moc_label.cpp moc/moc_run.cpp moc/moc_select.cpp moc/moc_medialist.cpp moc/moc_mediaedit.cpp moc/moc_joblist.cpp
-compiler_moc_header_clean:
-       -$(DEL_FILE) moc/moc_mainwin.cpp moc/moc_console.cpp moc/moc_restore.cpp moc/moc_label.cpp moc/moc_run.cpp moc/moc_select.cpp moc/moc_medialist.cpp moc/moc_mediaedit.cpp moc/moc_joblist.cpp
-moc/moc_mainwin.cpp: ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               mainwin.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) mainwin.h -o moc/moc_mainwin.cpp
-
-moc/moc_console.cpp: ui/ui_console.h \
-               console/console.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) console/console.h -o moc/moc_console.cpp
-
-moc/moc_restore.cpp: ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               restore/restore.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) restore/restore.h -o moc/moc_restore.cpp
-
-moc/moc_label.cpp: ui/ui_label.h \
-               label/label.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) label/label.h -o moc/moc_label.cpp
-
-moc/moc_run.cpp: ui/ui_run.h \
-               ui/ui_runcmd.h \
-               run/run.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) run/run.h -o moc/moc_run.cpp
-
-moc/moc_select.cpp: ui/ui_select.h \
-               select/select.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) select/select.h -o moc/moc_select.cpp
-
-moc/moc_medialist.cpp: ui/ui_medialist.h \
-               medialist/medialist.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) medialist/medialist.h -o moc/moc_medialist.cpp
-
-moc/moc_mediaedit.cpp: ui/ui_mediaedit.h \
-               mediaedit/mediaedit.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) mediaedit/mediaedit.h -o moc/moc_mediaedit.cpp
-
-moc/moc_joblist.cpp: ui/ui_joblist.h \
-               joblist/joblist.h \
-               /usr/bin/moc
-       /usr/bin/moc $(DEFINES) $(INCPATH) joblist/joblist.h -o moc/moc_joblist.cpp
-
-compiler_rcc_make_all: qrc_main.cpp
-compiler_rcc_clean:
-       -$(DEL_FILE) qrc_main.cpp
-qrc_main.cpp: main.qrc \
-               /usr/bin/rcc \
-               images/new.png \
-               images/disconnected.png \
-               images/label.png \
-               images/server.png \
-               images/restore.png \
-               images/copy.png \
-               images/cut.png \
-               images/connected.png \
-               images/big-server.png \
-               images/save.png \
-               images/bat.png \
-               images/paste.png \
-               images/run.png \
-               images/open.png
-       /usr/bin/rcc -name main main.qrc -o qrc_main.cpp
-
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
-       -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all: ui/ui_main.h ui/ui_label.h ui/ui_console.h ui/ui_restore.h ui/ui_prerestore.h ui/ui_brestore.h ui/ui_run.h ui/ui_runcmd.h ui/ui_select.h ui/ui_medialist.h ui/ui_mediaedit.h ui/ui_joblist.h
-compiler_uic_clean:
-       -$(DEL_FILE) ui/ui_main.h ui/ui_label.h ui/ui_console.h ui/ui_restore.h ui/ui_prerestore.h ui/ui_brestore.h ui/ui_run.h ui/ui_runcmd.h ui/ui_select.h ui/ui_medialist.h ui/ui_mediaedit.h ui/ui_joblist.h
-ui/ui_main.h: main.ui
-       /usr/bin/uic main.ui -o ui/ui_main.h
-
-ui/ui_label.h: label/label.ui
-       /usr/bin/uic label/label.ui -o ui/ui_label.h
-
-ui/ui_console.h: console/console.ui
-       /usr/bin/uic console/console.ui -o ui/ui_console.h
-
-ui/ui_restore.h: restore/restore.ui
-       /usr/bin/uic restore/restore.ui -o ui/ui_restore.h
-
-ui/ui_prerestore.h: restore/prerestore.ui
-       /usr/bin/uic restore/prerestore.ui -o ui/ui_prerestore.h
-
-ui/ui_brestore.h: restore/brestore.ui
-       /usr/bin/uic restore/brestore.ui -o ui/ui_brestore.h
-
-ui/ui_run.h: run/run.ui
-       /usr/bin/uic run/run.ui -o ui/ui_run.h
-
-ui/ui_runcmd.h: run/runcmd.ui
-       /usr/bin/uic run/runcmd.ui -o ui/ui_runcmd.h
-
-ui/ui_select.h: select/select.ui
-       /usr/bin/uic select/select.ui -o ui/ui_select.h
-
-ui/ui_medialist.h: medialist/medialist.ui
-       /usr/bin/uic medialist/medialist.ui -o ui/ui_medialist.h
-
-ui/ui_mediaedit.h: mediaedit/mediaedit.ui
-       /usr/bin/uic mediaedit/mediaedit.ui -o ui/ui_mediaedit.h
-
-ui/ui_joblist.h: joblist/joblist.ui
-       /usr/bin/uic joblist/joblist.ui -o ui/ui_joblist.h
-
-compiler_clean: compiler_moc_header_clean compiler_rcc_clean compiler_image_collection_clean compiler_moc_source_clean compiler_uic_clean 
-
-####### Compile
-
-obj/main.o: main.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/main.o main.cpp
-
-obj/bat_conf.o: bat_conf.cpp bat_conf.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/bat_conf.o bat_conf.cpp
-
-obj/mainwin.o: mainwin.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/mainwin.o mainwin.cpp
-
-obj/qstd.o: qstd.cpp qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qstd.o qstd.cpp
-
-obj/authenticate.o: console/authenticate.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/authenticate.o console/authenticate.cpp
-
-obj/console.o: console/console.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h \
-               console/console.h \
-               ui/ui_console.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/console.o console/console.cpp
-
-obj/prerestore.o: restore/prerestore.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/prerestore.o restore/prerestore.cpp
-
-obj/restore.o: restore/restore.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/restore.o restore/restore.cpp
-
-obj/brestore.o: restore/brestore.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/brestore.o restore/brestore.cpp
-
-obj/label.o: label/label.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/label.o label/label.cpp
-
-obj/run.o: run/run.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/run.o run/run.cpp
-
-obj/runcmd.o: run/runcmd.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/runcmd.o run/runcmd.cpp
-
-obj/select.o: select/select.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h \
-               select/select.h \
-               ui/ui_select.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/select.o select/select.cpp
-
-obj/medialist.o: medialist/medialist.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h \
-               mediaedit/mediaedit.h \
-               ui/ui_mediaedit.h \
-               joblist/joblist.h \
-               ui/ui_joblist.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/medialist.o medialist/medialist.cpp
-
-obj/mediaedit.o: mediaedit/mediaedit.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h \
-               mediaedit/mediaedit.h \
-               ui/ui_mediaedit.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/mediaedit.o mediaedit/mediaedit.cpp
-
-obj/joblist.o: joblist/joblist.cpp bat.h \
-               mainwin.h \
-               ui/ui_main.h \
-               label/label.h \
-               ui/ui_label.h \
-               run/run.h \
-               ui/ui_run.h \
-               ui/ui_runcmd.h \
-               restore/restore.h \
-               ui/ui_brestore.h \
-               ui/ui_restore.h \
-               ui/ui_prerestore.h \
-               medialist/medialist.h \
-               ui/ui_medialist.h \
-               bat_conf.h \
-               qstd.h \
-               joblist/joblist.h \
-               ui/ui_joblist.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/joblist.o joblist/joblist.cpp
-
-obj/moc_mainwin.o: moc/moc_mainwin.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_mainwin.o moc/moc_mainwin.cpp
-
-obj/moc_console.o: moc/moc_console.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_console.o moc/moc_console.cpp
-
-obj/moc_restore.o: moc/moc_restore.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_restore.o moc/moc_restore.cpp
-
-obj/moc_label.o: moc/moc_label.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_label.o moc/moc_label.cpp
-
-obj/moc_run.o: moc/moc_run.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_run.o moc/moc_run.cpp
-
-obj/moc_select.o: moc/moc_select.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_select.o moc/moc_select.cpp
-
-obj/moc_medialist.o: moc/moc_medialist.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_medialist.o moc/moc_medialist.cpp
-
-obj/moc_mediaedit.o: moc/moc_mediaedit.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_mediaedit.o moc/moc_mediaedit.cpp
-
-obj/moc_joblist.o: moc/moc_joblist.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_joblist.o moc/moc_joblist.cpp
-
-obj/qrc_main.o: qrc_main.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qrc_main.o qrc_main.cpp
-
-####### Install
-
-install:   FORCE
-
-uninstall:   FORCE
-
-FORCE:
-

diff --git a/bacula/src/qt-console/bat.conf b/bacula/src/qt-console/bat.conf
deleted file mode 100644 (file)
index fa5f9bc..0000000
--- a/bacula/src/qt-console/bat.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# 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.conf.example b/bacula/src/qt-console/bat.conf.example
new file mode 100644 (file)
index 0000000..fa5f9bc
--- /dev/null
+++ b/bacula/src/qt-console/bat.conf.example
@@ -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/main.ui b/bacula/src/qt-console/main.ui
index 1e04c09e50edf5efec63cc4152307b225fd472d8..ab91cc59553b0d27f489d3cadc44b354c5be20e9 100644 (file)
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1041</width>
+    <width>973</width>
     <height>801</height>
    </rect>
   </property>
@@ -25,139 +25,28 @@
      <number>6</number>
     </property>
     <item row="0" column="0" >
-     <widget class="QSplitter" name="splitter" >
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
+     <widget class="QStackedWidget" name="stackedWidget" >
+      <property name="sizePolicy" >
+       <sizepolicy>
+        <hsizetype>7</hsizetype>
+        <vsizetype>7</vsizetype>
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-      <widget class="QDockWidget" name="dockWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>5</hsizetype>
-         <vsizetype>7</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>1</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize" >
-        <size>
-         <width>50</width>
-         <height>100</height>
-        </size>
-       </property>
-       <property name="maximumSize" >
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="focusPolicy" >
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="floating" >
-        <bool>false</bool>
-       </property>
-       <property name="features" >
-        <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
-       </property>
-       <property name="allowedAreas" >
-        <set>Qt::NoDockWidgetArea</set>
-       </property>
-       <property name="windowTitle" >
-        <string>Page Selector</string>
-       </property>
-       <widget class="QWidget" name="dockWidgetContents" >
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>9</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="0" column="0" >
-          <widget class="QTreeWidget" name="treeWidget" >
-           <property name="sizePolicy" >
-            <sizepolicy>
-             <hsizetype>5</hsizetype>
-             <vsizetype>7</vsizetype>
-             <horstretch>1</horstretch>
-             <verstretch>1</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize" >
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize" >
-            <size>
-             <width>16777215</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="sizeIncrement" >
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="focusPolicy" >
-            <enum>Qt::StrongFocus</enum>
-           </property>
-           <property name="toolTip" >
-            <string>Selects right panel</string>
-           </property>
-           <property name="autoFillBackground" >
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </widget>
-      <widget class="QStackedWidget" name="stackedWidget" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>7</vsizetype>
-         <horstretch>1</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="sizeIncrement" >
-        <size>
-         <width>1</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="focusPolicy" >
-        <enum>Qt::StrongFocus</enum>
-       </property>
-       <property name="currentIndex" >
-        <number>-1</number>
-       </property>
-      </widget>
-     </widget>
-    </item>
-    <item row="1" column="0" >
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>0</number>
+      <property name="sizeIncrement" >
+       <size>
+        <width>1</width>
+        <height>0</height>
+       </size>
       </property>
-      <property name="spacing" >
-       <number>6</number>
+      <property name="focusPolicy" >
+       <enum>Qt::StrongFocus</enum>
       </property>
-      <item>
-       <widget class="QLabel" name="label" >
-        <property name="text" >
-         <string>Command:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="lineEdit" />
-      </item>
-     </layout>
+      <property name="currentIndex" >
+       <number>-1</number>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -166,8 +55,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1041</width>
-     <height>33</height>
+     <width>973</width>
+     <height>28</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuHelp" >
@@ -233,6 +122,133 @@
    <addaction name="actionRestore" />
    <addaction name="actionRun" />
   </widget>
+  <widget class="QDockWidget" name="dockWidget" >
+   <property name="sizePolicy" >
+    <sizepolicy>
+     <hsizetype>5</hsizetype>
+     <vsizetype>7</vsizetype>
+     <horstretch>0</horstretch>
+     <verstretch>1</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize" >
+    <size>
+     <width>50</width>
+     <height>100</height>
+    </size>
+   </property>
+   <property name="maximumSize" >
+    <size>
+     <width>16777215</width>
+     <height>16777215</height>
+    </size>
+   </property>
+   <property name="focusPolicy" >
+    <enum>Qt::StrongFocus</enum>
+   </property>
+   <property name="floating" >
+    <bool>false</bool>
+   </property>
+   <property name="features" >
+    <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable|QDockWidget::NoDockWidgetFeatures</set>
+   </property>
+   <property name="allowedAreas" >
+    <set>Qt::AllDockWidgetAreas</set>
+   </property>
+   <property name="windowTitle" >
+    <string>Page Selector</string>
+   </property>
+   <attribute name="dockWidgetArea" >
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents" >
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>9</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="0" column="0" >
+      <widget class="QTreeWidget" name="treeWidget" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>5</hsizetype>
+         <vsizetype>7</vsizetype>
+         <horstretch>1</horstretch>
+         <verstretch>1</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize" >
+        <size>
+         <width>16777215</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="sizeIncrement" >
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="focusPolicy" >
+        <enum>Qt::StrongFocus</enum>
+       </property>
+       <property name="toolTip" >
+        <string>Selects right panel</string>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="dockWidget_2" >
+   <property name="allowedAreas" >
+    <set>Qt::BottomDockWidgetArea</set>
+   </property>
+   <attribute name="dockWidgetArea" >
+    <number>8</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents_2" >
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>9</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="0" column="0" >
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Command:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineEdit" />
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </widget>
+  </widget>
   <action name="actionQuit" >
    <property name="text" >
     <string>&amp;Quit</string>