Rework bat so that Win32 version works better

diff --git a/bacula/src/qt-console/README.mingw32 b/bacula/src/qt-console/README.mingw32
index 5112954ff25c0600b99421528aa9fb1cb7970a33..0422c1ffca090961a7e114a947d60f5203fd5812 100644 (file)
--- a/bacula/src/qt-console/README.mingw32
+++ b/bacula/src/qt-console/README.mingw32
@@ -78,6 +78,8 @@ Compile bat
 -----------
 
 $ cd bacula/src/qt-console
+$ export DEPKGS="directory above cross-tools and depkgs"
+$ ./make-win32 clean
 $ ./make-win32
 
 Cleanup

diff --git a/bacula/src/qt-console/bcomm/dircomm.cpp b/bacula/src/qt-console/bcomm/dircomm.cpp
index 5a3658331310502a239a487a4e5aa6346b3599f1..52ca833c6b26d10c5c352058dcbf15263e81cb47 100644 (file)
--- a/bacula/src/qt-console/bcomm/dircomm.cpp
+++ b/bacula/src/qt-console/bcomm/dircomm.cpp
@@ -198,11 +198,12 @@ bool DirComm::connect_dir()
 
    mainWin->set_status(_("Initializing ..."));
 
-#ifndef HAVE_WIN32
-   /* Set up input notifier */
+   /* 
+    * Set up input notifier
+    */
    m_notifier = new QSocketNotifier(m_sock->m_fd, QSocketNotifier::Read, 0);
    QObject::connect(m_notifier, SIGNAL(activated(int)), this, SLOT(read_dir(int)));
-#endif
+   m_notifier->setEnabled(false);
 
    write(".api 1");
    m_api_set = true;
@@ -314,9 +315,7 @@ int DirComm::read()
          if (mainWin->m_commDebug) Pmsg1(000, "conn %i CMD OK\n", m_conn);
          m_at_prompt = false;
          m_at_main_prompt = false;
-//       Pmsg1(000, "before dec m_in_command=%d\n", m_in_command);
          if (--m_in_command < 0) {
-//          Pmsg0(000, "m_in_command < 0\n");
             m_in_command = 0;
          }
          mainWin->set_status(_("Command completed ..."));
@@ -326,7 +325,6 @@ int DirComm::read()
          m_at_prompt = false;
          m_at_main_prompt = false;
          m_in_command++;
-//       Pmsg1(000, "after inc m_in_command=%d\n", m_in_command);
          mainWin->set_status(_("Processing command ..."));
          continue;
       case BNET_MAIN_PROMPT:
@@ -340,12 +338,14 @@ int DirComm::read()
          m_at_prompt = true;
          m_at_main_prompt = false;
          mainWin->set_status(_("At prompt waiting for input ..."));
+         /***** FIXME *****/
          /* commented out until the prompt communication issue with the director is resolved 
-            This is where I call a new text input dialog class to prevent the connection issues
-            when a text input is requited.
-         if (! m_in_select) {
-            new textInputDialog(m_console, m_conn);
-         } */
+          * This is where I call a new text input dialog class to prevent the connection issues
+          * when a text input is requited.
+          *   if (!m_in_select) {
+          *      new textInputDialog(m_console, m_conn);
+          *   }
+          */
          break;
       case BNET_CMD_FAILED:
          if (mainWin->m_commDebug) Pmsg1(000, "CMD FAILED\n", m_conn);
@@ -419,7 +419,6 @@ int DirComm::read()
             m_notifier = NULL;
          }
          mainWin->set_status(_("Director disconnected."));
-//         QApplication::restoreOverrideCursor();
          stat = BNET_HARDEOF;
       }
       break;
@@ -430,10 +429,16 @@ int DirComm::read()
 /* Called by signal when the Director has output for us */
 void DirComm::read_dir(int /* fd */)
 {
-   if (mainWin->m_commDebug) Pmsg1(000, "conn %i read_dir\n", m_conn);
-   while (read() >= 0) {
-      m_console->display_text(msg());
+   int stat;
+   if (mainWin->m_commDebug) Pmsg1(000, "enter read_dir conn %i read_dir\n", m_conn);
+   stat = m_sock->wait_data(0, 5000);
+   if (stat > 0) {
+      if (mainWin->m_commDebug) Pmsg2(000, "read_dir conn %i stat=%d\n", m_conn, stat);
+      while (read() >= 0) {
+         m_console->display_text(msg());
+      }
    }
+   if (mainWin->m_commDebug) Pmsg2(000, "exit read_dir conn %i stat=%d\n", m_conn, stat);
 }
 
 /*
@@ -451,9 +456,7 @@ bool DirComm::notify(bool enable)
    bool prev_enabled = false;
    if (m_notifier) {
       prev_enabled = m_notifier->isEnabled();   
-      if (prev_enabled != enable) {
-         m_notifier->setEnabled(enable);
-      }
+      m_notifier->setEnabled(enable);
       if (mainWin->m_connDebug) {
          if (prev_enabled && !enable)
             Pmsg2(000, "m_notifier Disabling notifier: %i %s\n", m_conn, m_console->m_dir->name());
@@ -468,16 +471,9 @@ bool DirComm::notify(bool enable)
 bool DirComm::is_notify_enabled() const
 {
    bool enabled = false;
-   if (m_notifier)
+   if (m_notifier) {
       enabled = m_notifier->isEnabled();   
-
-/* TODO: Windows doesn't support notifier without some kludge
- * This cheat seems to work, waiting for a cleaner solution.
- */
-#ifdef HAVE_WIN32
-   enabled = true;
-#endif
-
+   }
    return enabled;
 }
 
@@ -491,7 +487,6 @@ static int tls_pem_callback(char *buf, int size, const void *userdata)
    (void)size;
    (void)userdata;
 #ifdef HAVE_TLS
-   const char *prompt = (const char *)userdata;
 # if defined(HAVE_WIN32)
    //sendit(prompt);
    if (win32_cgets(buf, size) == NULL) {
@@ -501,6 +496,7 @@ static int tls_pem_callback(char *buf, int size, const void *userdata)
       return strlen(buf);
    }
 # else
+   const char *prompt = (const char *)userdata;
    char *passwd;
 
    passwd = getpass(prompt);

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 7f56dd9aefee45e207496256e9d6c8fafce55e3f..f9972ddba51a0226fcbcd57bf295fb635c8d564b 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -139,19 +139,12 @@ void Console::connect_dir()
  * A function created to separate out the population of the lists
  * from the Console::connect_dir function
  */
-void Console::populateLists(bool forcenew)
+void Console::populateLists(bool /*forcenew*/)
 {
    int conn;
-   if (forcenew) {
-      if (!newDirComm(conn)) {
-         Pmsg1(000, "newDirComm Seems to Failed to create a connection for populateLists %s\n", m_dir->name());
-         return;
-      }
-   } else {
-      if (!availableDirComm(conn)) {
-         Pmsg1(000, "availableDirComm Seems to Failed to find a connection for populateListsi %s\n", m_dir->name());
-         return;
-      }
+   if (!availableDirComm(conn) && !newDirComm(conn)) {
+      Pmsg1(000, "newDirComm Seems to Failed to create a connection for populateLists %s\n", m_dir->name());
+      return;
    }
    populateLists(conn);
 }

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index 67d1a07a1b003ad4fd6a615dbb8e57a0e5ab7063..13640735fd845a6a3a21a1b664394917d91588a7 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -104,16 +104,17 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
       m_currentConsole->getDirResName(directoryResourceName);
       Pmsg1(100, "Setting initial window to %s\n", directoryResourceName.toUtf8().data());
    }
+   app->restoreOverrideCursor();
 }
 
 void MainWin::popLists()
 {
    foreach(Console *console, m_consoleHash)
       console->populateLists(true);
-   app->restoreOverrideCursor();
    m_doConnect = true;
    connectConsoleSignals();
    connectSignals();
+   app->restoreOverrideCursor();
    m_currentConsole->setCurrent();
 }
 
@@ -324,13 +325,13 @@ void MainWin::waitExit()
 {
    m_waitState = false;
    if (mainWin->m_connDebug) Pmsg0(000, "Exiting Wait State\n");
-   app->restoreOverrideCursor();
    if (m_waitTreeItem != treeWidget->currentItem())
       treeWidget->setCurrentItem(m_waitTreeItem);
    if (m_doConnect) {
       connectSignals();
       connectConsoleSignals();
    }
+   app->restoreOverrideCursor();
 }
 
 void MainWin::connectConsoleSignals()

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index 81e7d8817121409e886c5d126c9d77ad184e9b15..ef7baf588171e4b811a155d3f7e5d45be91ef9de 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -132,8 +132,9 @@ void prerestorePage::buildPage()
 void prerestorePage::okButtonPushed()
 {
    if (!selectJobRadio->isChecked()) {
-      if (!checkJobIdList())
+      if (!checkJobIdList()) {
          return;
+      }
    }
    QString cmd;
 

diff --git a/bacula/src/qt-console/restore/restore.cpp b/bacula/src/qt-console/restore/restore.cpp
index 8f30997c931071a7d8f524b33ebeefeef9fe45cb..b820f6b642740e011b66f1b558d8c4a2e8525294 100644 (file)
--- a/bacula/src/qt-console/restore/restore.cpp
+++ b/bacula/src/qt-console/restore/restore.cpp
@@ -292,7 +292,7 @@ void restorePage::directoryItemChanged(QTreeWidgetItem *currentitem,
 {
    QString fullpath = m_dirTreeItems.value(currentitem);
    statusLine->setText("");
-   if (fullpath != ""){
+   if (fullpath != "") {
       cwd(fullpath.toUtf8().data());
       fillDirectory();
    }

diff --git a/bacula/src/qt-console/run/estimate.cpp b/bacula/src/qt-console/run/estimate.cpp
index 413c4b5ac21598e2c93d2f689179b9695ddec018..417c9f1cd35919822233b34cbce9d00ca5c6ff96 100644 (file)
--- a/bacula/src/qt-console/run/estimate.cpp
+++ b/bacula/src/qt-console/run/estimate.cpp
@@ -55,7 +55,6 @@ estimatePage::estimatePage()
    levelCombo->addItems(m_console->level_list);
    clientCombo->addItems(m_console->client_list);
    job_name_change(0);
-   Pmsg1(100, "connecting estimate buttons : %i\n", m_conn);
    connect(jobCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(job_name_change(int)));
    connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
    connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));