Move radio buttons to more intuitive location

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

diff --git a/bacula/src/qt-console/restore/prerestore.cpp b/bacula/src/qt-console/restore/prerestore.cpp
index c16b07b14ce95e446dde4ca11fdbeec662f82e94..bca6c1e6c14f0d135696ff35d4ac188abcfc407d 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.cpp
+++ b/bacula/src/qt-console/restore/prerestore.cpp
@@ -79,24 +79,27 @@ void prerestorePage::buildPage()
    beforeDateTime->setEnabled(false);
    selectFilesRadio->setChecked(true);
    if (m_dataInType == R_NONE) {
-      selectJobsRadio->setChecked(true);
+      selectJobRadio->setChecked(true);
+      selectJobIdsRadio->setChecked(false);
       jobIdEdit->setText("Comma separted list of jobs id's");
       jobIdEdit->setEnabled(false);
    } else if (m_dataInType == R_JOBIDLIST) {
-      listJobsRadio->setChecked(true);
+      selectJobIdsRadio->setChecked(true);
+      selectJobRadio->setChecked(false);
       jobIdEdit->setText(m_dataIn);
-      jobsRadioClicked(false);
+      jobRadioClicked(false);
       QStringList fieldlist;
       jobdefsFromJob(fieldlist,m_dataIn);
       filesetCombo->setCurrentIndex(filesetCombo->findText(fieldlist[2], Qt::MatchExactly));
       clientCombo->setCurrentIndex(clientCombo->findText(fieldlist[1], Qt::MatchExactly));
       jobCombo->setCurrentIndex(jobCombo->findText(fieldlist[0], Qt::MatchExactly));
    } else if (m_dataInType == R_JOBDATETIME) {
-      selectJobsRadio->setChecked(true);
+      selectJobRadio->setChecked(true);
+      selectJobIdsRadio->setChecked(false);
       jobIdEdit->setText("Comma separted list of jobs id's");
       jobIdEdit->setEnabled(false);
       recentCheckBox->setCheckState(Qt::Unchecked);
-      jobsRadioClicked(true);
+      jobRadioClicked(true);
       QStringList fieldlist;
       jobdefsFromJob(fieldlist,m_dataIn);
       filesetCombo->setCurrentIndex(filesetCombo->findText(fieldlist[2], Qt::MatchExactly));
@@ -109,7 +112,8 @@ void prerestorePage::buildPage()
    connect(okButton, SIGNAL(pressed()), this, SLOT(okButtonPushed()));
    connect(cancelButton, SIGNAL(pressed()), this, SLOT(cancelButtonPushed()));
    connect(recentCheckBox, SIGNAL(stateChanged(int)), this, SLOT(recentChanged(int)));
-   connect(selectJobsRadio, SIGNAL(toggled(bool)), this, SLOT(jobsRadioClicked(bool)));
+   connect(selectJobRadio, SIGNAL(clicked(bool)), this, SLOT(jobRadioClicked(bool)));
+   connect(selectJobIdsRadio, SIGNAL(clicked(bool)), this, SLOT(jobidsRadioClicked(bool)));
    connect(jobIdEdit, SIGNAL(editingFinished()), this, SLOT(jobIdEditFinished()));
 
    dockPage();
@@ -124,7 +128,7 @@ void prerestorePage::buildPage()
  */
 void prerestorePage::okButtonPushed()
 {
-   if (!selectJobsRadio->isChecked()) {
+   if (!selectJobRadio->isChecked()) {
       if (!checkJobIdList())
          return;
    }
@@ -135,7 +139,7 @@ void prerestorePage::okButtonPushed()
    cmd = QString("restore");
    cmd += " fileset=\"" + filesetCombo->currentText() + "\"";
    cmd += " client=\"" + clientCombo->currentText() + "\"";
-   if (selectJobsRadio->isChecked()) {
+   if (selectJobRadio->isChecked()) {
       if (poolCombo->currentText() != "Any" ){
          cmd += " pool=\"" + poolCombo->currentText() + "\"";
       }
@@ -151,7 +155,7 @@ void prerestorePage::okButtonPushed()
       cmd += " jobid=\"" + jobIdEdit->text() + "\"";
    }
    if (selectFilesRadio->isChecked()) {
-      if (!listJobsRadio->isChecked())
+      if (!selectJobIdsRadio->isChecked())
          cmd += " select";
    } else {
       cmd += " all done";
@@ -208,41 +212,13 @@ void prerestorePage::job_name_change(int index)
  */
 void prerestorePage::recentChanged(int state)
 {
-   if ((state == Qt::Unchecked) && (selectJobsRadio->isChecked())) {
+   if ((state == Qt::Unchecked) && (selectJobRadio->isChecked())) {
       beforeDateTime->setEnabled(true);
    } else {
       beforeDateTime->setEnabled(false);
    }
 }
 
-/*
- * Handle the change of enabled of input widgets when the job radio buttons
- * are changed.
- */
-void prerestorePage::jobsRadioClicked(bool checked)
-{
-   if (checked) {
-      jobCombo->setEnabled(true);
-      filesetCombo->setEnabled(true);
-      clientCombo->setEnabled(true);
-      poolCombo->setEnabled(true);
-      storageCombo->setEnabled(true);
-      recentCheckBox->setEnabled(true);
-      if (!recentCheckBox->isChecked()) {
-         beforeDateTime->setEnabled(true);
-      }
-      jobIdEdit->setEnabled(false);
-   } else {
-      jobCombo->setEnabled(false);
-      filesetCombo->setEnabled(false);
-      clientCombo->setEnabled(false);
-      poolCombo->setEnabled(false);
-      storageCombo->setEnabled(false);
-      recentCheckBox->setEnabled(false);
-      beforeDateTime->setEnabled(false);
-      jobIdEdit->setEnabled(true);
-   }
-}
 
 /*
  * For when jobs list is to be used, return a list which is the needed items from
@@ -335,3 +311,69 @@ bool prerestorePage::checkJobIdList()
    }
    return true;
 }
+
+/*
+ * Handle the change of enabled of input widgets when the job radio buttons
+ * are changed.
+ */
+void prerestorePage::jobRadioClicked(bool checked)
+{
+   if (checked) {
+      jobCombo->setEnabled(true);
+      filesetCombo->setEnabled(true);
+      clientCombo->setEnabled(true);
+      poolCombo->setEnabled(true);
+      storageCombo->setEnabled(true);
+      recentCheckBox->setEnabled(true);
+      if (!recentCheckBox->isChecked()) {
+         beforeDateTime->setEnabled(true);
+      }
+      jobIdEdit->setEnabled(false);
+      selectJobRadio->setChecked(true);
+      selectJobIdsRadio->setChecked(false);
+   } else {
+      jobCombo->setEnabled(false);
+      filesetCombo->setEnabled(false);
+      clientCombo->setEnabled(false);
+      poolCombo->setEnabled(false);
+      storageCombo->setEnabled(false);
+      recentCheckBox->setEnabled(false);
+      beforeDateTime->setEnabled(false);
+      jobIdEdit->setEnabled(true);
+      selectJobRadio->setChecked(false);
+      selectJobIdsRadio->setChecked(true);
+   }
+   Dmsg2(200, "jobRadio=%d jobidsRadio=%d\n", selectJobRadio->isChecked(), 
+         selectJobIdsRadio->isChecked());
+}
+
+void prerestorePage::jobidsRadioClicked(bool checked)
+{
+   if (checked) {
+      jobCombo->setEnabled(false);
+      filesetCombo->setEnabled(false);
+      clientCombo->setEnabled(false);
+      poolCombo->setEnabled(false);
+      storageCombo->setEnabled(false);
+      recentCheckBox->setEnabled(false);
+      beforeDateTime->setEnabled(false);
+      jobIdEdit->setEnabled(true);
+      selectJobRadio->setChecked(false);
+      selectJobIdsRadio->setChecked(true);
+   } else {
+      jobCombo->setEnabled(true);
+      filesetCombo->setEnabled(true);
+      clientCombo->setEnabled(true);
+      poolCombo->setEnabled(true);
+      storageCombo->setEnabled(true);
+      recentCheckBox->setEnabled(true);
+      if (!recentCheckBox->isChecked()) {
+         beforeDateTime->setEnabled(true);
+      }
+      jobIdEdit->setEnabled(false);
+      selectJobRadio->setChecked(true);
+      selectJobIdsRadio->setChecked(false);
+   }
+   Dmsg2(200, "jobRadio=%d jobidsRadio=%d\n", selectJobRadio->isChecked(), 
+         selectJobIdsRadio->isChecked());
+}

diff --git a/bacula/src/qt-console/restore/prerestore.ui b/bacula/src/qt-console/restore/prerestore.ui
index 96876736f5b433e447c211af8fda5ddd185f426a..5f375b2ea0ce6b8e8d51878462868f05a7de933e 100644 (file)
--- a/bacula/src/qt-console/restore/prerestore.ui
+++ b/bacula/src/qt-console/restore/prerestore.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>589</width>
-    <height>458</height>
+    <height>897</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,59 +22,7 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="0" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>93</width>
-       <height>301</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" >
+   <item rowspan="2" row="2" column="1" >
     <layout class="QGridLayout" >
      <property name="margin" >
       <number>0</number>
@@ -82,57 +30,14 @@
      <property name="spacing" >
       <number>6</number>
      </property>
-     <item row="10" column="0" >
-      <widget class="QLabel" name="label_6" >
-       <property name="text" >
-        <string>Before:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>beforeDateTime</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1" colspan="2" >
-      <widget class="QComboBox" name="storageCombo" />
-     </item>
-     <item row="7" column="0" >
-      <widget class="QLabel" name="label_4" >
-       <property name="text" >
-        <string>Pool:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>poolCombo</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="10" column="1" colspan="2" >
-      <widget class="QDateTimeEdit" name="beforeDateTime" >
-       <property name="minimumDate" >
-        <date>
-         <year>2000</year>
-         <month>1</month>
-         <day>1</day>
-        </date>
-       </property>
-       <property name="displayFormat" >
-        <string>yyyy-mm-dd h:mm:ss</string>
-       </property>
-       <property name="calendarPopup" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0" colspan="3" >
-      <widget class="QFrame" name="frame_2" >
+     <item row="1" column="0" >
+      <widget class="QFrame" name="frame" >
        <property name="frameShape" >
         <enum>QFrame::NoFrame</enum>
        </property>
        <property name="frameShadow" >
         <enum>QFrame::Plain</enum>
        </property>
-       <property name="lineWidth" >
-        <number>0</number>
-       </property>
        <layout class="QGridLayout" >
         <property name="margin" >
          <number>0</number>
@@ -140,33 +45,20 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <item row="0" column="0" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QRadioButton" name="selectJobsRadio" >
+        <item row="0" column="2" >
+         <widget class="QRadioButton" name="allFilesRadio" >
           <property name="text" >
-           <string>Select Jobs</string>
+           <string>All Files</string>
           </property>
           <property name="checked" >
            <bool>false</bool>
           </property>
          </widget>
         </item>
-        <item row="0" column="2" >
-         <widget class="QRadioButton" name="listJobsRadio" >
+        <item row="0" column="1" >
+         <widget class="QRadioButton" name="selectFilesRadio" >
           <property name="text" >
-           <string>List Jobs</string>
+           <string>Select Files</string>
           </property>
           <property name="checked" >
            <bool>false</bool>
@@ -186,262 +78,333 @@
           </property>
          </spacer>
         </item>
+        <item row="0" column="0" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </widget>
      </item>
-     <item row="3" column="1" colspan="2" >
-      <widget class="QLineEdit" name="jobIdEdit" />
-     </item>
-     <item row="6" column="1" colspan="2" >
-      <widget class="QComboBox" name="filesetCombo" />
-     </item>
-     <item row="4" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Job:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>jobCombo</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1" colspan="2" >
-      <widget class="QComboBox" name="poolCombo" />
-     </item>
-     <item row="9" column="0" colspan="2" >
-      <widget class="QCheckBox" name="recentCheckBox" >
-       <property name="layoutDirection" >
-        <enum>Qt::RightToLeft</enum>
+     <item row="2" column="0" >
+      <layout class="QGridLayout" >
+       <property name="margin" >
+        <number>0</number>
        </property>
-       <property name="text" >
-        <string>Use Most Recent</string>
+       <property name="spacing" >
+        <number>6</number>
        </property>
-      </widget>
+       <item row="1" column="1" >
+        <widget class="QComboBox" name="jobCombo" >
+         <property name="sizePolicy" >
+          <sizepolicy>
+           <hsizetype>7</hsizetype>
+           <vsizetype>0</vsizetype>
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize" >
+          <size>
+           <width>600</width>
+           <height>600</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QRadioButton" name="selectJobRadio" >
+         <property name="text" >
+          <string>Job</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="jobIdEdit" />
+       </item>
+       <item row="0" column="0" >
+        <widget class="QRadioButton" name="selectJobIdsRadio" >
+         <property name="text" >
+          <string>JobIds</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
-     <item row="9" column="2" >
+     <item row="0" column="0" >
       <spacer>
        <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
        </property>
        <property name="sizeHint" >
         <size>
-         <width>221</width>
-         <height>20</height>
+         <width>20</width>
+         <height>21</height>
         </size>
        </property>
       </spacer>
      </item>
-     <item row="8" column="0" >
-      <widget class="QLabel" name="label_5" >
-       <property name="text" >
-        <string>Storage:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>storageCombo</cstring>
-       </property>
-      </widget>
-     </item>
      <item row="3" column="0" >
-      <widget class="QLabel" name="label_7" >
-       <property name="text" >
-        <string>JobIds:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>jobCombo</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>File Set:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>filesetCombo</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1" colspan="2" >
-      <widget class="QComboBox" name="jobCombo" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>7</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize" >
-        <size>
-         <width>600</width>
-         <height>600</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="11" column="0" colspan="3" >
-      <layout class="QHBoxLayout" >
+      <layout class="QGridLayout" >
        <property name="margin" >
         <number>0</number>
        </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+       <item row="5" column="1" colspan="2" >
+        <widget class="QDateTimeEdit" name="beforeDateTime" >
+         <property name="minimumDate" >
+          <date>
+           <year>2000</year>
+           <month>1</month>
+           <day>1</day>
+          </date>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>171</width>
-           <height>20</height>
-          </size>
+         <property name="displayFormat" >
+          <string>yyyy-mm-dd h:mm:ss</string>
          </property>
-        </spacer>
+         <property name="calendarPopup" >
+          <bool>true</bool>
+         </property>
+        </widget>
        </item>
-       <item>
-        <widget class="QPushButton" name="okButton" >
+       <item row="4" column="0" colspan="2" >
+        <widget class="QCheckBox" name="recentCheckBox" >
+         <property name="layoutDirection" >
+          <enum>Qt::LeftToRight</enum>
+         </property>
          <property name="text" >
-          <string>OK</string>
+          <string>Use Most Recent</string>
          </property>
         </widget>
        </item>
-       <item>
-        <widget class="QPushButton" name="cancelButton" >
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_3" >
          <property name="text" >
-          <string>Cancel</string>
+          <string>File Set:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>filesetCombo</cstring>
          </property>
         </widget>
        </item>
-      </layout>
-     </item>
-     <item row="5" column="1" colspan="2" >
-      <widget class="QComboBox" name="clientCombo" />
-     </item>
-     <item row="0" column="0" colspan="3" >
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_2" >
+         <property name="text" >
+          <string>Client:</string>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>71</width>
-           <height>21</height>
-          </size>
+         <property name="buddy" >
+          <cstring>clientCombo</cstring>
          </property>
-        </spacer>
+        </widget>
        </item>
-       <item>
-        <widget class="QLabel" name="run" >
-         <property name="maximumSize" >
-          <size>
-           <width>16777215</width>
-           <height>30</height>
-          </size>
+       <item row="0" column="1" colspan="2" >
+        <widget class="QComboBox" name="clientCombo" />
+       </item>
+       <item row="3" column="0" >
+        <widget class="QLabel" name="label_5" >
+         <property name="text" >
+          <string>Storage:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>storageCombo</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" colspan="2" >
+        <widget class="QComboBox" name="storageCombo" />
+       </item>
+       <item row="5" column="0" >
+        <widget class="QLabel" name="label_6" >
+         <property name="text" >
+          <string>Before:</string>
          </property>
+         <property name="buddy" >
+          <cstring>beforeDateTime</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" colspan="2" >
+        <widget class="QComboBox" name="filesetCombo" />
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_4" >
          <property name="text" >
-          <string>&lt;h3>Select Jobs&lt;/h3></string>
+          <string>Pool:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>poolCombo</cstring>
          </property>
         </widget>
        </item>
-       <item>
+       <item row="2" column="1" colspan="2" >
+        <widget class="QComboBox" name="poolCombo" />
+       </item>
+       <item row="4" column="2" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" >
           <size>
-           <width>81</width>
-           <height>20</height>
+           <width>262</width>
+           <height>21</height>
           </size>
          </property>
         </spacer>
        </item>
+       <item row="6" column="0" colspan="3" >
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>171</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="okButton" >
+           <property name="text" >
+            <string>OK</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cancelButton" >
+           <property name="text" >
+            <string>Cancel</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
       </layout>
      </item>
-     <item row="1" column="0" colspan="3" >
-      <widget class="QFrame" name="frame" >
-       <property name="frameShape" >
-        <enum>QFrame::NoFrame</enum>
+    </layout>
+   </item>
+   <item row="4" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>71</width>
+       <height>41</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>387</width>
+       <height>161</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>41</width>
+       <height>139</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>21</width>
+       <height>139</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="1" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="frameShadow" >
-        <enum>QFrame::Plain</enum>
+       <property name="sizeHint" >
+        <size>
+         <width>71</width>
+         <height>21</height>
+        </size>
        </property>
-       <layout class="QGridLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <item row="0" column="2" >
-         <widget class="QRadioButton" name="allFilesRadio" >
-          <property name="text" >
-           <string>All Files</string>
-          </property>
-          <property name="checked" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QRadioButton" name="selectFilesRadio" >
-          <property name="text" >
-           <string>Select Files</string>
-          </property>
-          <property name="checked" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="3" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="0" column="0" >
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
+      </spacer>
      </item>
-     <item row="5" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>Client:</string>
+     <item>
+      <widget class="QLabel" name="run" >
+       <property name="maximumSize" >
+        <size>
+         <width>16777215</width>
+         <height>30</height>
+        </size>
        </property>
-       <property name="buddy" >
-        <cstring>clientCombo</cstring>
+       <property name="text" >
+        <string>&lt;h3>Select Jobs&lt;/h3></string>
        </property>
       </widget>
      </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>81</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
   </layout>

diff --git a/bacula/src/qt-console/restore/restore.h b/bacula/src/qt-console/restore/restore.h
index 39150a3cc8348fdd12e38bae322bfc00e2e821a6..7fe23641b3858768006a733753c4d5d86919854c 100644 (file)
--- a/bacula/src/qt-console/restore/restore.h
+++ b/bacula/src/qt-console/restore/restore.h
@@ -63,7 +63,8 @@ private slots:
    void cancelButtonPushed();
    void job_name_change(int index);
    void recentChanged(int);
-   void jobsRadioClicked(bool);
+   void jobRadioClicked(bool);
+   void jobidsRadioClicked(bool);
    void jobIdEditFinished();
 
 private: