X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Fmain.cpp;h=9c315903edc061edf55f2339058afaa05a6f1075;hb=afd4ac31e0f65357c5264c04b804e86b2095a304;hp=8aa2b39f3905007b136dd42f623a101f2fdad39b;hpb=04b0f420de94bf142a6511103be1c0c998a2a463;p=bacula%2Fbacula

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 8aa2b39f39..9c315903ed 100644
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2007-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2009 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.
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -35,8 +35,9 @@
  */ 
 
 
-#include <QApplication>
 #include "bat.h"
+#include <QApplication>
+#include <QTranslator>
 
 MainWin *mainWin;
 QApplication *app;
@@ -46,9 +47,12 @@ void terminate_console(int sig);
 static void usage();
 static int check_resources();
 
+extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code);
+
 #define CONFIG_FILE "./bat.conf"   /* default configuration file */
 
 /* Static variables */
+static CONFIG *config;
 static char *configfile = NULL;
 
 int main(int argc, char *argv[])
@@ -61,9 +65,18 @@ int main(int argc, char *argv[])
    app = new QApplication(argc, argv);        
    app->setQuitOnLastWindowClosed(true);
    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+     
+   QTranslator qtTranslator;
+   qtTranslator.load(QString("qt_") + QLocale::system().name());
+   app->installTranslator(&qtTranslator);
+
+   QTranslator batTranslator;
+   batTranslator.load(QString("bat_") + QLocale::system().name());
+   app->installTranslator(&batTranslator);
 
 
-#ifdef ENABLE_NLS
+
+#ifdef xENABLE_NLS
    setlocale(LC_ALL, "");
    bindtextdomain("bacula", LOCALEDIR);
    textdomain("bacula");
@@ -122,11 +135,17 @@ int main(int argc, char *argv[])
       usage();
    }
 
+   OSDependentInit();
+#ifdef HAVE_WIN32
+   WSA_Init();                        /* Initialize Windows sockets */
+#endif
+
    if (configfile == NULL) {
       configfile = bstrdup(CONFIG_FILE);
    }
 
-   parse_config(configfile);
+   config = new_config_parser();
+   parse_bat_config(config, configfile, M_ERROR_TERM);
 
    if (init_crypto() != 0) {
       Emsg0(M_ERROR_TERM, 0, _("Cryptography library initialization failed.\n"));
@@ -142,9 +161,9 @@ int main(int argc, char *argv[])
    return app->exec();
 }
 
-void terminate_console(int sig)
+void terminate_console(int /*sig*/)
 {
-   (void)sig;                         /* avoid compiler complaints */
+// WSA_Cleanup();                  /* TODO: check when we have to call it */
    exit(0);
 }
 
@@ -164,28 +183,6 @@ PROG_COPYRIGHT
    exit(1);
 }
 
-#ifdef xxx
-/*
- * Call-back for reading a passphrase for an encrypted PEM file
- * This function uses getpass(), which uses a static buffer and is NOT thread-safe.
- */
-static int tls_pem_callback(char *buf, int size, const void *userdata)
-{
-#ifdef HAVE_TLS
-   const char *prompt = (const char *) userdata;
-   char *passwd;
-
-   passwd = getpass(prompt);
-   bstrncpy(buf, passwd, size);
-   return (strlen(buf));
-#else
-   buf[0] = 0;
-   return 0;
-#endif
-}
-#endif
-
-
 /*
  * Make a quick check to see that we have all the
  * resources needed.