Re-Add client="client" to restore command. Play a little with the

restoretree.ui file to get widgets a little more even.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5266 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/restore/restoretree.cpp b/bacula/src/qt-console/restore/restoretree.cpp
index b2e5b7b3f8d2b3f3589bdfeb37d8ed8be279b10b..17b1e8f8e40dfbb008412ed9208c64e87e12913f 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.cpp
+++ b/bacula/src/qt-console/restore/restoretree.cpp
@@ -224,9 +224,8 @@ void restoreTree::populateDirectoryTree()
          m_jobQuery += " LIMIT " + limit;
       }
 
-      if (mainWin->m_sqlDebug) {
-         Pmsg1(000, "Query cmd : %s\n", m_jobQuery.toUtf8().data());
-      }
+      if (mainWin->m_rtPopDirDebug)
+         Pmsg1(000, "m_jobQuery : %s\n", m_jobQuery.toUtf8().data());
       prBar1->setValue(ontask++);
       prLabel1->setText("Task " + QString("%1").arg(ontask)+ " of " + QString("%1").arg(taskcount));
       prBar2->setValue(0);
@@ -691,9 +690,8 @@ void restoreTree::populateJobTable()
       limit.setNum(limitSpinBox->value());
       jobQuery += " LIMIT " + limit;
    }
-   if (mainWin->m_sqlDebug) {
+   if (mainWin->m_sqlDebug)
       Pmsg1(000, "Query cmd : %s\n", jobQuery.toUtf8().data());
-   }
 
    QStringList results;
    if (m_console->sql_cmd(jobQuery, results)) {
@@ -1588,6 +1586,7 @@ void restoreTree::restoreButtonPushed()
       jobOption += "\"";
       QString cmd = QString("restore");
       cmd += jobOption +
+             " client=\"" + m_prevClientCombo + "\"" +
              " file=\"?" + tempTable + "\" done";
       if (mainWin->m_commandDebug)
          Pmsg1(000, "preRestore command \'%s\'\n", cmd.toUtf8().data());

diff --git a/bacula/src/qt-console/restore/restoretree.ui b/bacula/src/qt-console/restore/restoretree.ui
index 9cb45a7706f4130331d0ba5c2bc21c76d2ec88f5..eb25ce2e5076927159bde311d2d68deb4f8a9715 100644 (file)
--- a/bacula/src/qt-console/restore/restoretree.ui
+++ b/bacula/src/qt-console/restore/restoretree.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>817</width>
+    <width>711</width>
     <height>524</height>
    </rect>
   </property>
@@ -155,39 +155,39 @@
    <property name="geometry" >
     <rect>
      <x>20</x>
-     <y>23</y>
-     <width>661</width>
-     <height>79</height>
+     <y>59</y>
+     <width>669</width>
+     <height>95</height>
     </rect>
    </property>
    <property name="maximumSize" >
     <size>
      <width>900</width>
-     <height>79</height>
+     <height>95</height>
     </size>
    </property>
    <layout class="QGridLayout" >
     <property name="margin" >
-     <number>6</number>
+     <number>3</number>
     </property>
     <property name="spacing" >
-     <number>0</number>
+     <number>2</number>
     </property>
     <item row="1" column="0" >
      <layout class="QHBoxLayout" >
       <property name="margin" >
-       <number>0</number>
+       <number>2</number>
       </property>
       <property name="spacing" >
-       <number>6</number>
+       <number>4</number>
       </property>
       <item>
        <layout class="QGridLayout" >
         <property name="margin" >
-         <number>0</number>
+         <number>2</number>
         </property>
         <property name="spacing" >
-         <number>6</number>
+         <number>3</number>
         </property>
         <item row="0" column="0" >
          <widget class="QPushButton" name="refreshButton" >
@@ -221,10 +221,10 @@
       <item>
        <layout class="QVBoxLayout" >
         <property name="margin" >
-         <number>3</number>
+         <number>2</number>
         </property>
         <property name="spacing" >
-         <number>9</number>
+         <number>3</number>
         </property>
         <item>
          <widget class="QLabel" name="jobLabel" >
@@ -256,10 +256,10 @@
       <item>
        <layout class="QVBoxLayout" >
         <property name="margin" >
-         <number>3</number>
+         <number>2</number>
         </property>
         <property name="spacing" >
-         <number>0</number>
+         <number>3</number>
         </property>
         <item>
          <widget class="QLabel" name="clientLabel" >
@@ -291,10 +291,10 @@
       <item>
        <layout class="QVBoxLayout" >
         <property name="margin" >
-         <number>3</number>
+         <number>2</number>
         </property>
         <property name="spacing" >
-         <number>0</number>
+         <number>3</number>
         </property>
         <item>
          <widget class="QLabel" name="fileSetLabel" >
@@ -326,10 +326,10 @@
       <item>
        <layout class="QVBoxLayout" >
         <property name="margin" >
-         <number>3</number>
+         <number>2</number>
         </property>
         <property name="spacing" >
-         <number>0</number>
+         <number>3</number>
         </property>
         <item>
          <widget class="QCheckBox" name="limitCheckBox" >
@@ -356,10 +356,10 @@
       <item>
        <layout class="QVBoxLayout" >
         <property name="margin" >
-         <number>3</number>
+         <number>2</number>
         </property>
         <property name="spacing" >
-         <number>0</number>
+         <number>3</number>
         </property>
         <item>
          <widget class="QCheckBox" name="daysCheckBox" >