# 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])
# -------------------------------------------
-# 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])
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
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)
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 \
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 \
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}
--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
# -------------------------------------------
-# 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
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
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
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"
"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" ;;
"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" ;;
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}
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.
- Migration Volume span bug
- Rescue release
- Bug reports
+- Change gnome-console to bgnome-console.
+- Change wx-console to bwx-console
@$(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
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
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
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
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
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
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
--- /dev/null
+USER=root
+PROGRAM=@sbindir@/bgnome-console
+SESSION=true
#!/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
+++ /dev/null
-USER=root
-PROGRAM=@sbindir@/gnome-console
-SESSION=true
@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
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 $@
&& 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
(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"; \
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.
--- /dev/null
+#
+# 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"
+}
-/*
- *
- * 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.
(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"
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 <file> set configuration file to file\n"
" -dnn set debug level to nn\n"
" -s no signals\n"
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
#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";
+++ /dev/null
-#
-# 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"
-}
- 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).
- 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 :
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 :
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).
- 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)
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 :
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@)
#-------------------------------------------------------------------------
-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
&& 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"; \
${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
--- /dev/null
+#
+# Bacula User Agent (or Console) Configuration File
+#
+
+Director {
+ Name = @hostname@-dir
+ DIRport = @dir_port@
+ address = @hostname@
+ Password = "@dir_password@"
+}
}
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;
}
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;
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"));
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 */
-/*
- *
- * 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.
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ *
+ * Bacula bwx-console application
+ *
+ * Nicolas Boichat, April 2004
+ *
+ * Version $Id$
+ */
+
// ============================================================================
// declarations
}
}
- 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(""));
+++ /dev/null
-#
-# Bacula User Agent (or Console) Configuration File
-#
-
-Director {
- Name = @hostname@-dir
- DIRport = @dir_port@
- address = @hostname@
- Password = "@dir_password@"
-}
-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"
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");
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);
#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
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) {
}
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());
}
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
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);
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 <nicolas@boichat.ch>\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) {
}
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"));
}
}
else {
Send(::wxGetTextFromUser(message,
- _("wx-console: unexpected director's question."),
+ _("bwx-console: unexpected director's question."),
wxT(""), this) + wxT("\n"));
}
}
}
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);
delete promptparser;
promptparser = wxbUtils::WaitForPrompt(::wxGetTextFromUser(message,
- _("wx-console: unexpected restore question."),
+ _("bwx-console: unexpected restore question."),
wxT(""), this) + wxT("\n"));
}
}
}
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;
}
}
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;
}
}
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
<jorj@seas.upenn.edu> was committed by Landon (with my approval).
projects / bacula / bacula / commitdiff