First cut of bat rerun a Job from Jobs Run

[bacula/bacula] / bacula / src / qt-console / bat.pro.mingw32.in

diff --git a/bacula/src/qt-console/bat.pro.mingw32.in b/bacula/src/qt-console/bat.pro.mingw32.in
index 74f7fdafbdba93e92581847e82282ee02511448a..26f5e010088afac8d72638661ce8d1553ca30835 100644 (file)
--- a/bacula/src/qt-console/bat.pro.mingw32.in
+++ b/bacula/src/qt-console/bat.pro.mingw32.in
@@ -7,7 +7,8 @@
 #
 #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #    
-CONFIG += qt debug cross-win32
+CONFIG += qt cross-win32
+# CONFIG += debug 
 
 bins.path = ./
 bins.files = ./bat
@@ -21,7 +22,7 @@ INCLUDEPATH += .. . ./console ./restore ./select
 
 cross-win32 {
 #  LIBS       +=  ../win32/dll/bacula.a
-  LIBS       +=  -mwindows -L../win32/release -lbacula
+  LIBS       +=  -mwindows -L../win32/release32 -lbacula
 }
 !cross-win32 {
   LIBS        += -L../lib -lbac @OPENSSL_LIBS@
@@ -33,31 +34,32 @@ qwt {
 }
 
 RESOURCES    = main.qrc
-MOC_DIR      = moc
-OBJECTS_DIR  = obj
-UI_DIR       = ui
+MOC_DIR      = moc32
+OBJECTS_DIR  = obj32
+UI_DIR       = ui32
 
 # Main window
 FORMS += main.ui 
 FORMS += prefs.ui
 FORMS += label/label.ui 
 FORMS += relabel/relabel.ui 
-FORMS += mount/mount.ui
-FORMS += console/console.ui
+FORMS += mount/mount.ui     
+FORMS += console/console.ui 
 FORMS += restore/restore.ui restore/prerestore.ui restore/brestore.ui
-FORMS += restore/restoretree.ui
-FORMS += run/run.ui run/runcmd.ui run/estimate.ui run/prune.ui
-FORMS += select/select.ui
+FORMS += restore/restoretree.ui                                      
+FORMS += run/run.ui run/runcmd.ui run/estimate.ui run/prune.ui       
+FORMS += select/select.ui select/textinput.ui                        
 FORMS += medialist/medialist.ui mediaedit/mediaedit.ui joblist/joblist.ui
-FORMS += clients/clients.ui storage/storage.ui fileset/fileset.ui
-FORMS += joblog/joblog.ui jobs/jobs.ui
-FORMS += help/help.ui
-FORMS += status/dirstat.ui
-FORMS += status/clientstat.ui
-FORMS += status/storstat.ui
-qwt {
-  FORMS += jobgraphs/jobplotcontrols.ui
-}
+FORMS += medialist/mediaview.ui                                          
+FORMS += clients/clients.ui storage/storage.ui fileset/fileset.ui        
+FORMS += joblog/joblog.ui jobs/jobs.ui job/job.ui                        
+FORMS += help/help.ui mediainfo/mediainfo.ui                             
+FORMS += status/dirstat.ui storage/content.ui                            
+FORMS += status/clientstat.ui                                            
+FORMS += status/storstat.ui                                              
+qwt {                                                                    
+  FORMS += jobgraphs/jobplotcontrols.ui                                  
+}                                                                        
 
 # Main directory
 HEADERS += mainwin.h bat.h bat_conf.h qstd.h pages.h
@@ -69,7 +71,7 @@ SOURCES += bcomm/dircomm.cpp bcomm/dircomm_auth.cpp
 
 # Console
 HEADERS += console/console.h
-SOURCES += console/authenticate.cpp console/console.cpp
+SOURCES += console/console.cpp
 
 # Restore
 HEADERS += restore/restore.h
@@ -92,13 +94,17 @@ HEADERS += run/run.h
 SOURCES += run/run.cpp run/runcmd.cpp run/estimate.cpp run/prune.cpp
 
 # Select dialog
-HEADERS += select/select.h
-SOURCES += select/select.cpp
+HEADERS += select/select.h select/textinput.h
+SOURCES += select/select.cpp select/textinput.cpp
 
 ## MediaList
 HEADERS += medialist/medialist.h
 SOURCES += medialist/medialist.cpp
 
+# MediaView
+HEADERS += medialist/mediaview.h
+SOURCES += medialist/mediaview.cpp
+
 ## MediaEdit
 HEADERS += mediaedit/mediaedit.h
 SOURCES += mediaedit/mediaedit.cpp
@@ -115,6 +121,10 @@ SOURCES += clients/clients.cpp
 HEADERS += storage/storage.h
 SOURCES += storage/storage.cpp
 
+## Storage content
+HEADERS += storage/content.h
+SOURCES += storage/content.cpp
+
 ## Fileset
 HEADERS += fileset/fileset.h
 SOURCES += fileset/fileset.cpp
@@ -123,6 +133,10 @@ SOURCES += fileset/fileset.cpp
 HEADERS += joblog/joblog.h
 SOURCES += joblog/joblog.cpp
 
+## Job
+HEADERS += job/job.h
+SOURCES += job/job.cpp
+
 ## Jobs
 HEADERS += jobs/jobs.h
 SOURCES += jobs/jobs.cpp
@@ -141,6 +155,10 @@ qwt {
 HEADERS += help/help.h
 SOURCES += help/help.cpp
 
+# Media info dialog
+HEADERS += mediainfo/mediainfo.h
+SOURCES += mediainfo/mediainfo.cpp
+
 ## Status Dir
 HEADERS += status/dirstat.h
 SOURCES += status/dirstat.cpp