From: Kern Sibbald Date: Wed, 18 Apr 2007 17:06:43 +0000 (+0000) Subject: kes The bgnome-console (gnome-console) and bwx-console (wx-console) are X-Git-Tag: Release-2.2.0~710 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0a693e64227d8f721e4303d2dd7d21a3cb99d432;p=bacula%2Fbacula kes The bgnome-console (gnome-console) and bwx-console (wx-console) are deprecated. No additional bugs will be fixed, and they will be dropped in a future release (probably 2.4.0). kes Change name of wx-console to bwx-console to make it more Bacula unique. kes Change the name of gnome-console to bgnome-console to make it more Bacula unique. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4567 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index 0527c694de..fbebd39b17 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -223,7 +223,7 @@ dnl# -------------------------------------------------------------------------- # gnome (default off) # ------------------------------------------- AC_ARG_ENABLE(gnome, - [ --enable-gnome enable build of gnome-console GUI [disabled]], + [ --enable-gnome enable build of bgnome-console GUI [disabled]], [if test x$enableval = xyes; then support_gnome=yes fi]) @@ -273,10 +273,10 @@ AC_SUBST(BAT_DIR) # ------------------------------------------- -# wx-console (default off) +# bwx-console (default off) # ------------------------------------------- -AC_ARG_ENABLE(wx-console, - [ --enable-wx-console enable build of wxWidgets console [disabled]], +AC_ARG_ENABLE(bwx-console, + [ --enable-bwx-console enable build of wxWidgets console [disabled]], [if test x$enableval = xyes; then support_wx_console=yes fi]) @@ -295,7 +295,7 @@ if test x$support_wx_console = xyes; then WX_DIR=src/wx-console else echo " " - echo "wx-config program not found. wx-console disabled." + echo "wx-config program not found. bwx-console disabled." echo " " support_wx_console=no fi @@ -418,8 +418,8 @@ STATIC_GNOME_CONS= STATIC_WX_CONS= if test x$support_static_cons = xyes; then STATIC_CONS="static-bconsole" - STATIC_GNOME_CONS="static-gnome-console" - STATIC_WX_CONS="static-wx-console" + STATIC_GNOME_CONS="static-bgnome-console" + STATIC_WX_CONS="static-bwx-console" fi AC_SUBST(STATIC_CONS) AC_SUBST(STATIC_GNOME_CONS) @@ -2027,7 +2027,7 @@ AC_OUTPUT([autoconf/Make.common \ scripts/bacula.desktop.gnome2.consolehelper \ scripts/bacula.desktop.gnome1.xsu \ scripts/bacula.desktop.gnome2.xsu \ - scripts/gnome-console.console_apps \ + scripts/bgnome-console.console_apps \ scripts/mtx-changer \ scripts/disk-changer \ scripts/dvd-handler \ @@ -2043,9 +2043,9 @@ AC_OUTPUT([autoconf/Make.common \ src/console/Makefile \ src/console/bconsole.conf \ src/gnome2-console/Makefile \ - src/gnome2-console/gnome-console.conf \ + src/gnome2-console/bgnome-console.conf \ src/wx-console/Makefile \ - src/wx-console/wx-console.conf \ + src/wx-console/bwx-console.conf \ src/tray-monitor/Makefile \ src/tray-monitor/tray-monitor.conf \ src/dird/Makefile \ @@ -2234,7 +2234,7 @@ Configuration on `date`: enable-smartalloc: ${support_smartalloc} enable-bat: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} - enable-wx-console: ${support_wx_console} ${wx_version} + enable-bwx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} build-dird: ${build_dird} diff --git a/bacula/configure b/bacula/configure index 3692440ba4..7c484bece7 100755 --- a/bacula/configure +++ b/bacula/configure @@ -1430,9 +1430,9 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths - --enable-gnome enable build of gnome-console GUI disabled + --enable-gnome enable build of bgnome-console GUI disabled --enable-bat enable build of bat Qt4 GUI disabled - --enable-wx-console enable build of wxWidgets console disabled + --enable-bwx-console enable build of wxWidgets console disabled --enable-tray-monitor enable build of Gnome tray monitor (compatible with KDE) disabled --enable-smartalloc enable smartalloc debugging support disabled --enable-static-tools enable static tape tools disabled @@ -14708,11 +14708,11 @@ fi # ------------------------------------------- -# wx-console (default off) +# bwx-console (default off) # ------------------------------------------- -# Check whether --enable-wx-console was given. -if test "${enable_wx_console+set}" = set; then - enableval=$enable_wx_console; if test x$enableval = xyes; then +# Check whether --enable-bwx-console was given. +if test "${enable_bwx_console+set}" = set; then + enableval=$enable_bwx_console; if test x$enableval = xyes; then support_wx_console=yes fi fi @@ -14732,7 +14732,7 @@ if test x$support_wx_console = xyes; then WX_DIR=src/wx-console else echo " " - echo "wx-config program not found. wx-console disabled." + echo "wx-config program not found. bwx-console disabled." echo " " support_wx_console=no fi @@ -14875,8 +14875,8 @@ STATIC_GNOME_CONS= STATIC_WX_CONS= if test x$support_static_cons = xyes; then STATIC_CONS="static-bconsole" - STATIC_GNOME_CONS="static-gnome-console" - STATIC_WX_CONS="static-wx-console" + STATIC_GNOME_CONS="static-bgnome-console" + STATIC_WX_CONS="static-bwx-console" fi @@ -33853,7 +33853,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi -ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES" +ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES" ac_config_commands="$ac_config_commands default" @@ -34437,7 +34437,7 @@ do "scripts/bacula.desktop.gnome2.consolehelper") CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.consolehelper" ;; "scripts/bacula.desktop.gnome1.xsu") CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome1.xsu" ;; "scripts/bacula.desktop.gnome2.xsu") CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.xsu" ;; - "scripts/gnome-console.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/gnome-console.console_apps" ;; + "scripts/bgnome-console.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/bgnome-console.console_apps" ;; "scripts/mtx-changer") CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;; "scripts/disk-changer") CONFIG_FILES="$CONFIG_FILES scripts/disk-changer" ;; "scripts/dvd-handler") CONFIG_FILES="$CONFIG_FILES scripts/dvd-handler" ;; @@ -34453,9 +34453,9 @@ do "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; "src/console/bconsole.conf") CONFIG_FILES="$CONFIG_FILES src/console/bconsole.conf" ;; "src/gnome2-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;; - "src/gnome2-console/gnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/gnome-console.conf" ;; + "src/gnome2-console/bgnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/bgnome-console.conf" ;; "src/wx-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/wx-console/Makefile" ;; - "src/wx-console/wx-console.conf") CONFIG_FILES="$CONFIG_FILES src/wx-console/wx-console.conf" ;; + "src/wx-console/bwx-console.conf") CONFIG_FILES="$CONFIG_FILES src/wx-console/bwx-console.conf" ;; "src/tray-monitor/Makefile") CONFIG_FILES="$CONFIG_FILES src/tray-monitor/Makefile" ;; "src/tray-monitor/tray-monitor.conf") CONFIG_FILES="$CONFIG_FILES src/tray-monitor/tray-monitor.conf" ;; "src/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;; @@ -35586,7 +35586,7 @@ Configuration on `date`: enable-smartalloc: ${support_smartalloc} enable-bat: ${support_bat} enable-gnome: ${support_gnome} ${gnome_version} - enable-wx-console: ${support_wx_console} ${wx_version} + enable-bwx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} build-dird: ${build_dird} diff --git a/bacula/kernstodo b/bacula/kernstodo index 389dd221a9..7426dc36a2 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -44,8 +44,6 @@ Document: Priority: - On restore add Restore Client, Original Client. -- Change gnome-console to bgnome-console. -- Change wx-console to bwx-console 01-Apr 00:42 rufus-dir: Start Backup JobId 55, Job=kernsave.2007-04-01_00.42.48 01-Apr 00:42 rufus-sd: Python SD JobStart: JobId=55 Client=Rufus 01-Apr 00:42 rufus-dir: Created new Volume "Full0001" in catalog. @@ -1788,3 +1786,5 @@ Block Position: 0 - Migration Volume span bug - Rescue release - Bug reports +- Change gnome-console to bgnome-console. +- Change wx-console to bwx-console diff --git a/bacula/scripts/Makefile.in b/bacula/scripts/Makefile.in index ce3c95de8f..9ad6d0be49 100755 --- a/bacula/scripts/Makefile.in +++ b/bacula/scripts/Makefile.in @@ -103,6 +103,7 @@ distclean: clean @$(RMF) bconsole gconsole logrotate bacula.desktop @$(RMF) bacula.desktop.gnome1 bacula.desktop.gnome2 mtx-changer dvd-handler @$(RMF) gnome-console.console_apps bacula.desktop.gnome2.xsu + @$(RMF) bgnome-console.console_apps @$(RMF) bacula.desktop.gnome2.consolehelper bacula.desktop.gnome1.xsu @$(RMF) bacula.desktop.gnome1.consolehelper diff --git a/bacula/scripts/bacula.desktop.gnome1.consolehelper.in b/bacula/scripts/bacula.desktop.gnome1.consolehelper.in index 4797f60f28..c2cddffc77 100644 --- a/bacula/scripts/bacula.desktop.gnome1.consolehelper.in +++ b/bacula/scripts/bacula.desktop.gnome1.consolehelper.in @@ -2,7 +2,7 @@ Name=Bacula Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/bacula.png -Exec=/usr/bin/gnome-console -c @sysconfdir@/gnome-console.conf +Exec=/usr/bin/bgnome-console -c @sysconfdir@/bgnome-console.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/bacula.desktop.gnome1.in b/bacula/scripts/bacula.desktop.gnome1.in index 8ae17bd2c3..0560a9e867 100644 --- a/bacula/scripts/bacula.desktop.gnome1.in +++ b/bacula/scripts/bacula.desktop.gnome1.in @@ -2,7 +2,7 @@ Name=Bacula Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/bacula.png -Exec=@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf +Exec=@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/bacula.desktop.gnome1.xsu.in b/bacula/scripts/bacula.desktop.gnome1.xsu.in index 366a7dfce1..477a3f832b 100644 --- a/bacula/scripts/bacula.desktop.gnome1.xsu.in +++ b/bacula/scripts/bacula.desktop.gnome1.xsu.in @@ -2,7 +2,7 @@ Name=Bacula Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/bacula.png -Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required." +Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required." Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/bacula.desktop.gnome2.consolehelper.in b/bacula/scripts/bacula.desktop.gnome2.consolehelper.in index 4797f60f28..c2cddffc77 100644 --- a/bacula/scripts/bacula.desktop.gnome2.consolehelper.in +++ b/bacula/scripts/bacula.desktop.gnome2.consolehelper.in @@ -2,7 +2,7 @@ Name=Bacula Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/bacula.png -Exec=/usr/bin/gnome-console -c @sysconfdir@/gnome-console.conf +Exec=/usr/bin/bgnome-console -c @sysconfdir@/bgnome-console.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/bacula.desktop.gnome2.in b/bacula/scripts/bacula.desktop.gnome2.in index 8ae17bd2c3..0560a9e867 100644 --- a/bacula/scripts/bacula.desktop.gnome2.in +++ b/bacula/scripts/bacula.desktop.gnome2.in @@ -2,7 +2,7 @@ Name=Bacula Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/bacula.png -Exec=@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf +Exec=@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/bacula.desktop.gnome2.xsu.in b/bacula/scripts/bacula.desktop.gnome2.xsu.in index 366a7dfce1..477a3f832b 100644 --- a/bacula/scripts/bacula.desktop.gnome2.xsu.in +++ b/bacula/scripts/bacula.desktop.gnome2.xsu.in @@ -2,7 +2,7 @@ Name=Bacula Console Comment=Bacula Director Console Icon=/usr/share/pixmaps/bacula.png -Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required." +Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required." Terminal=false Type=Application Encoding=UTF-8 diff --git a/bacula/scripts/bgnome-console.console_apps.in b/bacula/scripts/bgnome-console.console_apps.in new file mode 100644 index 0000000000..092df236e9 --- /dev/null +++ b/bacula/scripts/bgnome-console.console_apps.in @@ -0,0 +1,3 @@ +USER=root +PROGRAM=@sbindir@/bgnome-console +SESSION=true diff --git a/bacula/scripts/gconsole.in b/bacula/scripts/gconsole.in index ff0c0283bb..a8db17cab8 100755 --- a/bacula/scripts/gconsole.in +++ b/bacula/scripts/gconsole.in @@ -1,10 +1,10 @@ #!/bin/sh # -# Run gnome-console with test config file +# Run bgnome-console with test config file # if [ $# = 1 ] ; then - echo "doing gnome-console $1.conf" - @sbindir@/gnome-console -c $1.conf + echo "doing bgnome-console $1.conf" + @sbindir@/bgnome-console -c $1.conf else - @sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf + @sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf fi diff --git a/bacula/scripts/gnome-console.console_apps.in b/bacula/scripts/gnome-console.console_apps.in deleted file mode 100644 index 6be995e8ce..0000000000 --- a/bacula/scripts/gnome-console.console_apps.in +++ /dev/null @@ -1,3 +0,0 @@ -USER=root -PROGRAM=@sbindir@/gnome-console -SESSION=true diff --git a/bacula/src/gnome2-console/Makefile.in b/bacula/src/gnome2-console/Makefile.in index 7707a6ecb0..62ac0d29a4 100644 --- a/bacula/src/gnome2-console/Makefile.in +++ b/bacula/src/gnome2-console/Makefile.in @@ -52,8 +52,8 @@ CONS_LDFLAGS=$(GNOME_LIBDIR) $(GNOMEUI_LIBS) @echo "Compiling $<" $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- -all: Makefile gnome-console @STATIC_GNOME_CONS@ - @echo "==== Make of gnome-console is good ====" +all: Makefile bgnome-console @STATIC_GNOME_CONS@ + @echo "==== Make of bgnome-console is good ====" @echo " " support.o: support.c @@ -62,13 +62,13 @@ support.o: support.c sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< -gnome-console: $(CONSOBJS) ../lib/libbac.a +bgnome-console: $(CONSOBJS) ../lib/libbac.a $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \ $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lm -static-console: static-gnome-console +static-console: static-bgnome-console -static-gnome-console: $(CONSOBJS) ../lib/libbac.a +static-bgnome-console: $(CONSOBJS) ../lib/libbac.a $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \ $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lm strip $@ @@ -78,12 +78,12 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status clean: - @$(RMF) gnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3 - @$(RMF) static-gnome-console gmon.out Makefile.am + @$(RMF) bgnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3 + @$(RMF) static-bgnome-console gmon.out Makefile.am realclean: clean @$(RMF) tags - @$(RM) -rf .deps gnome-console.conf + @$(RM) -rf .deps bgnome-console.conf distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi @@ -94,8 +94,8 @@ devclean: realclean (cd $(srcdir); $(RMF) Makefile) install: all - $(INSTALL_PROGRAM) gnome-console $(DESTDIR)$(sbindir)/gnome-console - @srcconf=gnome-console.conf; \ + $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console + @srcconf=bgnome-console.conf; \ if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ @@ -104,16 +104,19 @@ install: all fi; \ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf - if test -f static-gnome-console; then \ - $(INSTALL_PROGRAM) static-gnome-console $(DESTDIR)$(sbindir)/static-gnome-console; \ + if test -f static-bgnome-console; then \ + $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \ fi uninstall: + (cd $(DESTDIR)$(sbindir); $(RMF) bgnome-console static-bgnome-console) + (cd $(DESTDIR)$(sysconfdir); $(RMF) bgnome-console.conf bgnome-console.conf.new) (cd $(DESTDIR)$(sbindir); $(RMF) gnome-console static-gnome-console) (cd $(DESTDIR)$(sysconfdir); $(RMF) gnome-console.conf gnome-console.conf.new) + # Semi-automatic generation of dependencies: # Use gcc -MM because X11 `makedepend' doesn't work on all systems # and it also includes system headers. diff --git a/bacula/src/gnome2-console/bgnome-console.conf.in b/bacula/src/gnome2-console/bgnome-console.conf.in new file mode 100644 index 0000000000..9c3731d433 --- /dev/null +++ b/bacula/src/gnome2-console/bgnome-console.conf.in @@ -0,0 +1,15 @@ +# +# Bacula User Agent (or Console) Configuration File +# + +Director { + Name = @hostname@-dir + DIRport = @dir_port@ + address = @hostname@ + Password = "@dir_password@" +} + +ConsoleFont { + Name = Default + Font = "LucidaTypewriter 9" +} diff --git a/bacula/src/gnome2-console/console.c b/bacula/src/gnome2-console/console.c index 063fce15a1..0b0d0424b1 100644 --- a/bacula/src/gnome2-console/console.c +++ b/bacula/src/gnome2-console/console.c @@ -1,15 +1,7 @@ -/* - * - * Bacula GNOME Console interface to the Director - * - * Kern Sibbald, March MMII - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2002-2006 Free Software Foundation Europe e.V. + Copyright (C) 2002-2007 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -33,6 +25,14 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * Bacula GNOME Console interface to the Director + * + * Kern Sibbald, March MMII + * + * Version $Id$ + */ #include "bacula.h" #include "console.h" @@ -93,14 +93,14 @@ static bool quit = false; static guint initial; static int numdir = 0; -#define CONFIG_FILE "./gnome-console.conf" /* default configuration file */ +#define CONFIG_FILE "./bgnome-console.conf" /* default configuration file */ static void usage() { fprintf(stderr, _( PROG_COPYRIGHT "\nVersion: %s (%s) %s %s %s\n\n" -"Usage: gnome-console [-s] [-c config_file] [-d debug_level] [config_file]\n" +"Usage: bgnome-console [-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" @@ -210,7 +210,7 @@ int main(int argc, char *argv[]) int no_signals = TRUE; int test_config = FALSE; int gargc = 1; - const char *gargv[2] = {"gnome-console", NULL}; + const char *gargv[2] = {"bgnome-console", NULL}; CONFONTRES *con_font; #ifdef ENABLE_NLS @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) #endif init_stack_dump(); - my_name_is(argc, argv, "gnome-console"); + my_name_is(argc, argv, "bgnome-console"); init_msg(NULL, NULL); working_directory = "/tmp"; diff --git a/bacula/src/gnome2-console/gnome-console.conf.in b/bacula/src/gnome2-console/gnome-console.conf.in deleted file mode 100644 index 9c3731d433..0000000000 --- a/bacula/src/gnome2-console/gnome-console.conf.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# Bacula User Agent (or Console) Configuration File -# - -Director { - Name = @hostname@-dir - DIRport = @dir_port@ - address = @hostname@ - Password = "@dir_password@" -} - -ConsoleFont { - Name = Default - Font = "LucidaTypewriter 9" -} diff --git a/bacula/src/gnome2-console/restore.c b/bacula/src/gnome2-console/restore.c old mode 100755 new mode 100644 diff --git a/bacula/src/wx-console/BUILD b/bacula/src/wx-console/BUILD index 993ba190b9..b8d0dd4308 100644 --- a/bacula/src/wx-console/BUILD +++ b/bacula/src/wx-console/BUILD @@ -7,8 +7,8 @@ GTK/Linux (and *nix) compiling notes: - Download www.wxwidgets.org wxWidgets code version 2.4.2 - Build and install the above using --disable-universal configure option. - - Use ./configure --enable-wx-console for the Bacula build + - Use ./configure --enable-bwx-console for the Bacula build It will then be built and installed automatically with the other programs. - - Edit the wx-console.conf in the current directory to have the + - Edit the bwx-console.conf in the current directory to have the correct values for your Director (name, IP address, password). diff --git a/bacula/src/wx-console/CHANGELOG b/bacula/src/wx-console/CHANGELOG index e9485d5794..9e0467acd4 100644 --- a/bacula/src/wx-console/CHANGELOG +++ b/bacula/src/wx-console/CHANGELOG @@ -15,12 +15,12 @@ - Fixes compile error with unicode-enabled wxWidgets. 25-04-2005 : - - Fixes to make wx-console compatible with wxWidgets 2.6.0. + - Fixes to make bwx-console compatible with wxWidgets 2.6.0. 24-03-2005 : - - wxbMainFrame : Fix a bug with GTK+-1.2 which caused wx-console to crash + - wxbMainFrame : Fix a bug with GTK+-1.2 which caused bwx-console to crash when starting. - - wxbRestorePanel : Fix a major bug which caused wx-console to enter in an + - wxbRestorePanel : Fix a major bug which caused bwx-console to enter in an infinite loop which allocate a lot of memory and could make the system crash. 10-03-2005 : @@ -175,7 +175,7 @@ when restoring 26-04-2004 : - - Corrected a bug in Windows which causes wx-console to crash when + - Corrected a bug in Windows which causes bwx-console to crash when typing quit before exiting the application. 25-04-2004 : @@ -194,7 +194,7 @@ console text control. 24-04-2004 : - - wxbMainFrame : When starting wx-console, the initial key + - wxbMainFrame : When starting bwx-console, the initial key input focus is set into the command window. - wxbMainFrame : the user is now prompted when an unexpected "question" is asked). @@ -228,7 +228,7 @@ - modified the way data is passed to panel (no Prints anymore, but wxbDataParsers) - win32 : Makefile.in corrected to use ressource file - - win32 : wx-console is now compatible with MinGW. + - win32 : bwx-console is now compatible with MinGW. - wxbPanel/wxbMainFrame : Added a locking function (for example, the user can't type something in the console when a restore is in progress) @@ -238,8 +238,8 @@ double-clicking on the check mark 15-04-2004 : - - project renamed in wx-console - - console_thread : Uses wx-console.conf instead of console.conf + - project renamed in bwx-console + - console_thread : Uses bwx-console.conf instead of console.conf - wxbRestorePanel : Change the marked state without redoing a dir 12-04-2004 : diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in index 0586861530..1084eaeec5 100644 --- a/bacula/src/wx-console/Makefile.in +++ b/bacula/src/wx-console/Makefile.in @@ -27,11 +27,11 @@ CONSOBJS = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o \ wxbconfigpanel.o wxbconfigfileeditor.o wxbhistorytextctrl.o -win32 = wx-console_private.res +win32 = bwx-console_private.res WIN32RES = $(@WIN32@) -macosx = wx-console.app +macosx = bwx-console.app MACOSXAPP = $(@MACOSX@) @@ -66,35 +66,35 @@ OPENSSL_LIBS = @OPENSSL_LIBS@ #------------------------------------------------------------------------- -all: Makefile wx-console $(MACOSXAPP) +all: Makefile bwx-console $(MACOSXAPP) @echo "==== Make of wx-console is good ====" @echo " " # Mac OS X application bundle # See http://216.239.59.104/search?q=cache:a61SGKgoHSQJ:wiki.wxwidgets.org/wiki.pl%3FWxMac_Issues+wxmac+%22application+bundle%22&hl=fr -wx-console.app: wx-console - -mkdir wx-console.app - -mkdir wx-console.app/Contents - -mkdir wx-console.app/Contents/MacOS - -mkdir wx-console.app/Contents/Resources - -mkdir wx-console.app/Contents/Resources/English.lproj - echo -n 'APPL????' > wx-console.app/Contents/PkgInfo - mv wx-console wx-console.app/Contents/MacOS/wx-console - cp wx-console.conf /Library/Preferences/org.bacula.wxconsole.conf - -wx-console: $(CONSOBJS) @WIN32@ ../lib/libbac.a +bwx-console.app: bwx-console + -mkdir bwx-console.app + -mkdir bwx-console.app/Contents + -mkdir bwx-console.app/Contents/MacOS + -mkdir bwx-console.app/Contents/Resources + -mkdir bwx-console.app/Contents/Resources/English.lproj + echo -n 'APPL????' > bwx-console.app/Contents/PkgInfo + mv bwx-console bwx-console.app/Contents/MacOS/bwx-console + cp bwx-console.conf /Library/Preferences/org.bacula.wxconsole.conf + +bwx-console: $(CONSOBJS) @WIN32@ ../lib/libbac.a $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \ -lbac $(OPENSSL_LIBS) -win32: wx-console_private.res +win32: bwx-console_private.res -wx-console_private.res: wx-console_private.rc - windres.exe -i wx-console_private.rc -I rc -o wx-console_private.res -O coff +bwx-console_private.res: bwx-console_private.rc + windres.exe -i bwx-console_private.rc -I rc -o bwx-console_private.res -O coff clean: - @$(RMF) $(CONSOBJS) wx-console $(WIN32RES) + @$(RMF) $(CONSOBJS) bwx-console $(WIN32RES) distclean: clean $(RMF) Makefile @@ -104,8 +104,8 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status install: all - $(INSTALL_PROGRAM) wx-console $(DESTDIR)$(sbindir)/wx-console - @srcconf=wx-console.conf; \ + $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console + @srcconf=bwx-console.conf; \ if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ @@ -116,8 +116,8 @@ install: all ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf uninstall: - (cd $(DESTDIR)$(sbindir); $(RMF) wx-console) - (cd $(DESTDIR)$(sysconfdir); $(RMF) wx-console.conf wx-console.conf.new) + (cd $(DESTDIR)$(sbindir); $(RMF) bwx-console) + (cd $(DESTDIR)$(sysconfdir); $(RMF) bwx-console.conf bwx-console.conf.new) # Semi-automatic generation of dependencies: # Use gcc -MM because X11 `makedepend' doesn't work on all systems diff --git a/bacula/src/wx-console/bwx-console.conf.in b/bacula/src/wx-console/bwx-console.conf.in new file mode 100644 index 0000000000..010797b8c0 --- /dev/null +++ b/bacula/src/wx-console/bwx-console.conf.in @@ -0,0 +1,10 @@ +# +# Bacula User Agent (or Console) Configuration File +# + +Director { + Name = @hostname@-dir + DIRport = @dir_port@ + address = @hostname@ + Password = "@dir_password@" +} diff --git a/bacula/src/wx-console/bwx-console.ico b/bacula/src/wx-console/bwx-console.ico new file mode 100644 index 0000000000..2310c5d275 Binary files /dev/null and b/bacula/src/wx-console/bwx-console.ico differ diff --git a/bacula/src/wx-console/console_thread.cpp b/bacula/src/wx-console/console_thread.cpp index 975abe05c2..ef5c59f9ea 100644 --- a/bacula/src/wx-console/console_thread.cpp +++ b/bacula/src/wx-console/console_thread.cpp @@ -172,7 +172,7 @@ void console_thread::InitLib() } init_stack_dump(); - my_name_is(0, NULL, "wx-console"); + my_name_is(0, NULL, "bwx-console"); working_directory = (const char*) console_thread::working_dir.GetData(); inited = true; @@ -253,7 +253,7 @@ wxString console_thread::LoadConfig(wxString configfile) } term_msg(); - wxRemoveFile(console_thread::working_dir + wxT("/wx-console.conmsg")); + wxRemoveFile(console_thread::working_dir + wxT("/bwx-console.conmsg")); init_msg(NULL, NULL); configloaded = true; @@ -282,7 +282,7 @@ console_thread::~console_thread() { void* console_thread::Entry() { #ifndef HAVE_WIN32 /* It seems we must redefine the locale on each thread on wxGTK. - * On Win32 it makes wx-console crash. */ + * On Win32 it makes bwx-console crash. */ wxLocale m_locale; m_locale.Init(); m_locale.AddCatalog(wxT("bacula")); @@ -454,7 +454,7 @@ void* console_thread::Entry() { int stat; int last_is_eod = 0; /* Last packet received is BNET_EOD */ - int do_not_forward_eod = 0; /* Last packet received/sent is .messages, so don't forward EOD. (so wx-console don't show the prompt again) */ + int do_not_forward_eod = 0; /* Last packet received/sent is .messages, so don't forward EOD. (so bwx-console don't show the prompt again) */ /* main loop */ while(!TestDestroy()) { /* Tests if thread has been ended */ diff --git a/bacula/src/wx-console/main.cpp b/bacula/src/wx-console/main.cpp index 69f3cbd7d7..fe93804ee0 100644 --- a/bacula/src/wx-console/main.cpp +++ b/bacula/src/wx-console/main.cpp @@ -1,15 +1,7 @@ -/* - * - * Bacula wx-console application - * - * Nicolas Boichat, April 2004 - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2004-2006 Free Software Foundation Europe e.V. + Copyright (C) 2004-20076 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -33,6 +25,15 @@ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * Bacula bwx-console application + * + * Nicolas Boichat, April 2004 + * + * Version $Id$ + */ + // ============================================================================ // declarations @@ -115,12 +116,12 @@ bool MyApp::OnInit() } } - wxbMainFrame *frame = wxbMainFrame::CreateInstance(_("Bacula wx-console"), + wxbMainFrame *frame = wxbMainFrame::CreateInstance(_("Bacula bwx-console"), wxPoint(posx, posy), wxSize(sizex, sizey)); frame->Show(TRUE); - frame->Print(wxString::Format(_("Welcome to bacula wx-console %s (%s)!\n"), wxT(VERSION), wxT(BDATE)), CS_DEBUG); + frame->Print(wxString::Format(_("Welcome to bacula bwx-console %s (%s)!\n"), wxT(VERSION), wxT(BDATE)), CS_DEBUG); frame->StartConsoleThread(wxT("")); diff --git a/bacula/src/wx-console/wx-console.conf.in b/bacula/src/wx-console/wx-console.conf.in deleted file mode 100644 index 010797b8c0..0000000000 --- a/bacula/src/wx-console/wx-console.conf.in +++ /dev/null @@ -1,10 +0,0 @@ -# -# Bacula User Agent (or Console) Configuration File -# - -Director { - Name = @hostname@-dir - DIRport = @dir_port@ - address = @hostname@ - Password = "@dir_password@" -} diff --git a/bacula/src/wx-console/wx-console.ico b/bacula/src/wx-console/wx-console.ico deleted file mode 100644 index 2310c5d275..0000000000 Binary files a/bacula/src/wx-console/wx-console.ico and /dev/null differ diff --git a/bacula/src/wx-console/wx-console_private.rc b/bacula/src/wx-console/wx-console_private.rc index 5672be173a..ca0cd0bf52 100644 --- a/bacula/src/wx-console/wx-console_private.rc +++ b/bacula/src/wx-console/wx-console_private.rc @@ -1,8 +1,8 @@ -A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "wx-console.ico" +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "bwx-console.ico" ///////////////////////////////////////////////////////////////////////////// // // RT_MANIFEST // -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "wx-console.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "bwx-console.manifest" diff --git a/bacula/src/wx-console/wxbconfigfileeditor.cpp b/bacula/src/wx-console/wxbconfigfileeditor.cpp index ec83cb5215..8be5e915dd 100644 --- a/bacula/src/wx-console/wxbconfigfileeditor.cpp +++ b/bacula/src/wx-console/wxbconfigfileeditor.cpp @@ -72,7 +72,7 @@ wxbConfigFileEditor::wxbConfigFileEditor(wxWindow* parent, wxString filename): if (!filen.FileExists()) { strbuf << wxT("#\n"); - strbuf << _("# Bacula wx-console Configuration File\n"); + strbuf << _("# Bacula bwx-console Configuration File\n"); strbuf << wxT("#\n"); strbuf << wxT("\n"); strbuf << wxT("Director {\n"); diff --git a/bacula/src/wx-console/wxbmainframe.cpp b/bacula/src/wx-console/wxbmainframe.cpp index 8f17462dc4..0c775445c5 100644 --- a/bacula/src/wx-console/wxbmainframe.cpp +++ b/bacula/src/wx-console/wxbmainframe.cpp @@ -264,7 +264,7 @@ wxbMainFrame::wxbMainFrame(const wxString& title, const wxPoint& pos, const wxSi CreateStatusBar(1); - SetStatusText(wxString::Format(_("Welcome to bacula wx-console %s (%s)!\n"), wxT(VERSION), wxT(BDATE))); + SetStatusText(wxString::Format(_("Welcome to bacula bwx-console %s (%s)!\n"), wxT(VERSION), wxT(BDATE))); wxPanel* global = new wxPanel(this, -1); @@ -284,7 +284,7 @@ wxbMainFrame::wxbMainFrame(const wxString& title, const wxPoint& pos, const wxSi #else consoleCtrl->SetDefaultStyle(wxTextAttr(*wxBLACK, wxNullColour, font)); #if (wxUSE_UNICODE == 0) && __WXGTK20__ - Print(_("Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode support when handling non-ASCII filenames: Every non-ASCII character in such filenames will be replaced by an interrogation mark.\nIf this behaviour disturbs you, please build wx-console against a Unicode version of wxWidgets for GTK+ 2.0.\n---\n"), CS_DEBUG); + Print(_("Warning : There is a problem with wxWidgets for GTK+ 2.0 without Unicode support when handling non-ASCII filenames: Every non-ASCII character in such filenames will be replaced by an interrogation mark.\nIf this behaviour disturbs you, please build bwx-console against a Unicode version of wxWidgets for GTK+ 2.0.\n---\n"), CS_DEBUG); #endif #endif @@ -373,7 +373,7 @@ void wxbMainFrame::StartConsoleThread(const wxString& config) { if (((wxTheApp->argc % 2) != 1)) { Print(_("Error while parsing command line arguments, using defaults.\n"), CS_DEBUG); - Print(_("Usage: wx-console [-c configfile] [-w tmp]\n"), CS_DEBUG); + Print(_("Usage: bwx-console [-c configfile] [-w tmp]\n"), CS_DEBUG); } else { for (int c = 1; c < wxTheApp->argc; c += 2) { @@ -385,14 +385,14 @@ void wxbMainFrame::StartConsoleThread(const wxString& config) { } if (wxTheApp->argv[c][0] != '-') { Print(_("Error while parsing command line arguments, using defaults.\n"), CS_DEBUG); - Print(_("Usage: wx-console [-c configfile] [-w tmp]\n"), CS_DEBUG); + Print(_("Usage: bwx-console [-c configfile] [-w tmp]\n"), CS_DEBUG); break; } } } if (configfile == wxT("")) { - wxConfig::Set(new wxConfig(wxT("wx-console"), wxT("bacula"))); + wxConfig::Set(new wxConfig(wxT("bwx-console"), wxT("bacula"))); if (!wxConfig::Get()->Read(wxT("/ConfigFile"), &configfile)) { #ifdef HAVE_MACOSX wxFileName filename(::wxGetHomeDir()); @@ -403,7 +403,7 @@ void wxbMainFrame::StartConsoleThread(const wxString& config) { } configfile += L"Library/Preferences/org.bacula.wxconsole.conf"; #else - wxFileName filename(::wxGetCwd(), wxT("wx-console.conf")); + wxFileName filename(::wxGetCwd(), wxT("bwx-console.conf")); filename.MakeAbsolute(); configfile = filename.GetLongPath(); #ifdef HAVE_WIN32 @@ -414,7 +414,7 @@ void wxbMainFrame::StartConsoleThread(const wxString& config) { int answer = wxMessageBox( wxString::Format(_( - "It seems that it is the first time you run wx-console.\nThis file (%s) has been choosen as default configuration file.\nDo you want to edit it? (if you click No you will have to select another file)"), + "It seems that it is the first time you run bwx-console.\nThis file (%s) has been choosen as default configuration file.\nDo you want to edit it? (if you click No you will have to select another file)"), configfile.c_str()), _("First run"), wxYES_NO | wxICON_QUESTION, this); @@ -514,11 +514,11 @@ void wxbMainFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void wxbMainFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { wxString msg; - msg.Printf(_("Welcome to Bacula wx-console.\n" + msg.Printf(_("Welcome to Bacula bwx-console.\n" "Written by Nicolas Boichat \n" "Copyright (C), 2005-2007 Free Software Foundation Europe, e.V.\n")); - wxMessageBox(msg, _("About Bacula wx-console"), wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, _("About Bacula bwx-console"), wxOK | wxICON_INFORMATION, this); } void wxbMainFrame::OnChangeConfig(wxCommandEvent& event) { @@ -705,7 +705,7 @@ void wxbMainFrame::Print(wxString str, int status) } int res = ::wxGetSingleChoiceIndex(message, - _("wx-console: unexpected director's question."), n, choices, this); + _("bwx-console: unexpected director's question."), n, choices, this); if (res == -1) { //Cancel pressed Send(wxT(".\n")); } @@ -722,7 +722,7 @@ void wxbMainFrame::Print(wxString str, int status) } else { Send(::wxGetTextFromUser(message, - _("wx-console: unexpected director's question."), + _("bwx-console: unexpected director's question."), wxT(""), this) + wxT("\n")); } } diff --git a/bacula/src/wx-console/wxbrestorepanel.cpp b/bacula/src/wx-console/wxbrestorepanel.cpp index 6984bc4e2e..87d50ffffd 100644 --- a/bacula/src/wx-console/wxbrestorepanel.cpp +++ b/bacula/src/wx-console/wxbrestorepanel.cpp @@ -728,7 +728,7 @@ void wxbRestorePanel::CmdStart() } int res = ::wxGetSingleChoiceIndex(message, - _("wx-console: unexpected restore question."), n, choices, this); + _("bwx-console: unexpected restore question."), n, choices, this); if (res == -1) { delete promptparser; promptparser = wxbUtils::WaitForPrompt(wxT(".\n"), true); @@ -750,7 +750,7 @@ void wxbRestorePanel::CmdStart() delete promptparser; promptparser = wxbUtils::WaitForPrompt(::wxGetTextFromUser(message, - _("wx-console: unexpected restore question."), + _("bwx-console: unexpected restore question."), wxT(""), this) + wxT("\n")); } } @@ -848,8 +848,8 @@ void wxbRestorePanel::CmdStart() } if (scheduledtime.Subtract(currenttime).IsLongerThan(wxTimeSpan::Seconds(150))) { - wxbMainFrame::GetInstance()->Print(_("Restore is scheduled in more than two minutes, wx-console will not wait for its completion.\n"), CS_DEBUG); - wxbMainFrame::GetInstance()->SetStatusText(_("Restore is scheduled in more than two minutes, wx-console will not wait for its completion.")); + wxbMainFrame::GetInstance()->Print(_("Restore is scheduled in more than two minutes, bwx-console will not wait for its completion.\n"), CS_DEBUG); + wxbMainFrame::GetInstance()->SetStatusText(_("Restore is scheduled in more than two minutes, bwx-console will not wait for its completion.")); SetStatus(finished); return; } @@ -988,8 +988,8 @@ void wxbRestorePanel::CmdStart() } if ((!waitforever) && (sw.Time() > 60000)) { - wxbMainFrame::GetInstance()->Print(_("The restore job has not been started within one minute, wx-console will not wait for its completion anymore.\n"), CS_DEBUG); - wxbMainFrame::GetInstance()->SetStatusText(_("The restore job has not been started within one minute, wx-console will not wait for its completion anymore.")); + wxbMainFrame::GetInstance()->Print(_("The restore job has not been started within one minute, bwx-console will not wait for its completion anymore.\n"), CS_DEBUG); + wxbMainFrame::GetInstance()->SetStatusText(_("The restore job has not been started within one minute, bwx-console will not wait for its completion anymore.")); break; } } diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1 index 429ecfc13c..e26acae711 100644 --- a/bacula/technotes-2.1 +++ b/bacula/technotes-2.1 @@ -1,6 +1,14 @@ Technical notes on version 2.1 General: +18Apr07 +kes The bgnome-console (gnome-console) and bwx-console (wx-console) are + deprecated. No additional bugs will be fixed, and they will be dropped + in a future release (probably 2.4.0). +kes Change name of wx-console to bwx-console to make it more Bacula + unique. +kes Change the name of gnome-console to bgnome-console to make it + more Bacula unique. 14Apr07 kes Some time in March, a Feature Request with patch from Jorj Bauer was committed by Landon (with my approval).