Partially fill run dialog in gnome-console

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 830d745d090b15455562b88b3cf3dea690b5240c..0168026ba1513aeae862a2c139a5e1dbed7e3575 100644 (file)
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -23,6 +23,7 @@ For 1.30 release:
 - Figure out how to use ssh or stunnel to protect Bacula communications.
 
 After 1.30:
+- Check if Job/File retentions apply to multivolume jobs.
 - Change M_INFO to M_RESTORED for all restored files.
 - Remove subsysdir from conf files (used only in autostart scripts).
 - Implement console @echo command.

diff --git a/bacula/src/console.glade b/bacula/src/console.glade
index a22744b24a7ce91a62ffce4d2a73b7e806cd9a8e..40675b9f669f2ac22a3ee0412559acb8192a66bb 100644 (file)
--- a/bacula/src/console.glade
+++ b/bacula/src/console.glade
@@ -305,6 +305,19 @@
          <label>Msgs</label>
          <stock_pixmap>GNOME_STOCK_PIXMAP_SEARCH</stock_pixmap>
        </widget>
+
+       <widget>
+         <class>GtkButton</class>
+         <child_name>Toolbar:button</child_name>
+         <name>restore_button</name>
+         <signal>
+           <name>clicked</name>
+           <handler>on_restore_button_clicked</handler>
+           <last_modification_time>Tue, 29 Apr 2003 15:25:57 GMT</last_modification_time>
+         </signal>
+         <label>Restore</label>
+         <stock_pixmap>GNOME_STOCK_PIXMAP_REVERT</stock_pixmap>
+       </widget>
       </widget>
     </widget>
 
@@ -835,10 +848,10 @@
   <name>RunDialog</name>
   <title>Run a Job</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
+  <position>GTK_WIN_POS_CENTER</position>
   <modal>False</modal>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>False</allow_grow>
   <auto_shrink>False</auto_shrink>
 
   <widget>
@@ -988,7 +1001,7 @@
 
            <widget>
              <class>GtkCombo</class>
-             <name>combo21</name>
+             <name>combo_job</name>
              <value_in_list>False</value_in_list>
              <ok_if_empty>True</ok_if_empty>
              <case_sensitive>False</case_sensitive>
@@ -1004,9 +1017,9 @@
              <widget>
                <class>GtkEntry</class>
                <child_name>GtkCombo:entry</child_name>
-               <name>entry14</name>
+               <name>entry_job</name>
                <can_focus>True</can_focus>
-               <editable>True</editable>
+               <editable>False</editable>
                <text_visible>True</text_visible>
                <text_max_length>0</text_max_length>
                <text></text>
@@ -1032,14 +1045,23 @@
 
            <widget>
              <class>GtkCombo</class>
-             <name>combo22</name>
+             <name>type_combo</name>
              <width>131</width>
-             <value_in_list>False</value_in_list>
+             <signal>
+               <name>selection_received</name>
+               <handler>on_type_combo_selection_received</handler>
+               <last_modification_time>Tue, 29 Apr 2003 15:01:06 GMT</last_modification_time>
+             </signal>
+             <value_in_list>True</value_in_list>
              <ok_if_empty>True</ok_if_empty>
              <case_sensitive>False</case_sensitive>
              <use_arrows>True</use_arrows>
              <use_arrows_always>False</use_arrows_always>
-             <items></items>
+             <items>Backup
+Restore
+Admin
+Verify
+</items>
              <child>
                <padding>6</padding>
                <expand>False</expand>
@@ -1049,13 +1071,13 @@
              <widget>
                <class>GtkEntry</class>
                <child_name>GtkCombo:entry</child_name>
-               <name>entry15</name>
+               <name>entry_type</name>
                <width>127</width>
                <can_focus>True</can_focus>
-               <editable>True</editable>
+               <editable>False</editable>
                <text_visible>True</text_visible>
                <text_max_length>0</text_max_length>
-               <text></text>
+               <text>Backup</text>
              </widget>
            </widget>
          </widget>
@@ -1109,7 +1131,7 @@
 
          <widget>
            <class>GtkCombo</class>
-           <name>combo23</name>
+           <name>combo_client</name>
            <width>236</width>
            <value_in_list>False</value_in_list>
            <ok_if_empty>True</ok_if_empty>
@@ -1126,9 +1148,9 @@
            <widget>
              <class>GtkEntry</class>
              <child_name>GtkCombo:entry</child_name>
-             <name>entry16</name>
+             <name>entry_client</name>
              <can_focus>True</can_focus>
-             <editable>True</editable>
+             <editable>False</editable>
              <text_visible>True</text_visible>
              <text_max_length>0</text_max_length>
              <text></text>
@@ -1184,7 +1206,7 @@
 
          <widget>
            <class>GtkCombo</class>
-           <name>combo24</name>
+           <name>combo_fileset</name>
            <value_in_list>False</value_in_list>
            <ok_if_empty>True</ok_if_empty>
            <case_sensitive>False</case_sensitive>
@@ -1200,9 +1222,9 @@
            <widget>
              <class>GtkEntry</class>
              <child_name>GtkCombo:entry</child_name>
-             <name>entry17</name>
+             <name>entry_fileset</name>
              <can_focus>True</can_focus>
-             <editable>True</editable>
+             <editable>False</editable>
              <text_visible>True</text_visible>
              <text_max_length>0</text_max_length>
              <text></text>
@@ -1211,9 +1233,14 @@
 
          <widget>
            <class>GtkButton</class>
-           <name>button24</name>
+           <name>view_fileset_button</name>
            <height>12</height>
            <can_focus>True</can_focus>
+           <signal>
+             <name>clicked</name>
+             <handler>on_view_fileset_clicked</handler>
+             <last_modification_time>Tue, 29 Apr 2003 14:57:25 GMT</last_modification_time>
+           </signal>
            <label>  View FileSet  </label>
            <relief>GTK_RELIEF_NORMAL</relief>
            <child>
@@ -1272,7 +1299,7 @@
 
          <widget>
            <class>GtkCombo</class>
-           <name>combo25</name>
+           <name>combo_level</name>
            <value_in_list>False</value_in_list>
            <ok_if_empty>True</ok_if_empty>
            <case_sensitive>False</case_sensitive>
@@ -1288,9 +1315,9 @@
            <widget>
              <class>GtkEntry</class>
              <child_name>GtkCombo:entry</child_name>
-             <name>entry18</name>
+             <name>entry_level</name>
              <can_focus>True</can_focus>
-             <editable>True</editable>
+             <editable>False</editable>
              <text_visible>True</text_visible>
              <text_max_length>0</text_max_length>
              <text></text>
@@ -1330,7 +1357,7 @@
            <class>GtkLabel</class>
            <name>label72</name>
            <width>70</width>
-           <label>Messages: </label>
+           <label>Pool:</label>
            <justify>GTK_JUSTIFY_CENTER</justify>
            <wrap>False</wrap>
            <xalign>0.5</xalign>
@@ -1346,7 +1373,7 @@
 
          <widget>
            <class>GtkCombo</class>
-           <name>combo26</name>
+           <name>combo_pool</name>
            <value_in_list>False</value_in_list>
            <ok_if_empty>True</ok_if_empty>
            <case_sensitive>False</case_sensitive>
@@ -1362,12 +1389,12 @@
            <widget>
              <class>GtkEntry</class>
              <child_name>GtkCombo:entry</child_name>
-             <name>entry19</name>
+             <name>entry_pool</name>
              <can_focus>True</can_focus>
-             <editable>True</editable>
+             <editable>False</editable>
              <text_visible>True</text_visible>
              <text_max_length>0</text_max_length>
-             <text></text>
+             <text>Default</text>
            </widget>
          </widget>
 
@@ -1402,7 +1429,7 @@
 
          <widget>
            <class>GtkLabel</class>
-           <name>label74</name>
+           <name>label77</name>
            <width>70</width>
            <label>Where: </label>
            <justify>GTK_JUSTIFY_CENTER</justify>
@@ -1420,7 +1447,7 @@
 
          <widget>
            <class>GtkCombo</class>
-           <name>combo27</name>
+           <name>combo_where</name>
            <value_in_list>False</value_in_list>
            <ok_if_empty>True</ok_if_empty>
            <case_sensitive>False</case_sensitive>
@@ -1436,19 +1463,19 @@
            <widget>
              <class>GtkEntry</class>
              <child_name>GtkCombo:entry</child_name>
-             <name>entry20</name>
+             <name>entry_where</name>
              <can_focus>True</can_focus>
              <editable>True</editable>
              <text_visible>True</text_visible>
              <text_max_length>0</text_max_length>
-             <text></text>
+             <text>/tmp/bacula-restores</text>
            </widget>
          </widget>
 
          <widget>
            <class>GtkLabel</class>
-           <name>label75</name>
-           <label>      </label>
+           <name>label78</name>
+           <label>   </label>
            <justify>GTK_JUSTIFY_CENTER</justify>
            <wrap>False</wrap>
            <xalign>0.5</xalign>
@@ -1456,7 +1483,7 @@
            <xpad>0</xpad>
            <ypad>0</ypad>
            <child>
-             <padding>114</padding>
+             <padding>120</padding>
              <expand>False</expand>
              <fill>False</fill>
            </child>
@@ -1464,10 +1491,158 @@
        </widget>
       </widget>
 
+      <widget>
+       <class>GtkHBox</class>
+       <name>hbox35</name>
+       <homogeneous>False</homogeneous>
+       <spacing>0</spacing>
+       <child>
+         <padding>5</padding>
+         <expand>False</expand>
+         <fill>False</fill>
+       </child>
+
+       <widget>
+         <class>GtkLabel</class>
+         <name>label80</name>
+         <width>70</width>
+         <label>When:</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+         <child>
+           <padding>0</padding>
+           <expand>False</expand>
+           <fill>False</fill>
+         </child>
+       </widget>
+
+       <widget>
+         <class>GtkCombo</class>
+         <name>combo30</name>
+         <value_in_list>False</value_in_list>
+         <ok_if_empty>True</ok_if_empty>
+         <case_sensitive>False</case_sensitive>
+         <use_arrows>True</use_arrows>
+         <use_arrows_always>False</use_arrows_always>
+         <items></items>
+         <child>
+           <padding>0</padding>
+           <expand>True</expand>
+           <fill>True</fill>
+         </child>
+
+         <widget>
+           <class>GtkEntry</class>
+           <child_name>GtkCombo:entry</child_name>
+           <name>entry_when</name>
+           <can_focus>True</can_focus>
+           <editable>True</editable>
+           <text_visible>True</text_visible>
+           <text_max_length>0</text_max_length>
+           <text></text>
+         </widget>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <name>label81</name>
+         <label>   </label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+         <child>
+           <padding>120</padding>
+           <expand>False</expand>
+           <fill>False</fill>
+         </child>
+       </widget>
+      </widget>
+
+      <widget>
+       <class>GtkHBox</class>
+       <name>hbox36</name>
+       <homogeneous>False</homogeneous>
+       <spacing>0</spacing>
+       <child>
+         <padding>0</padding>
+         <expand>True</expand>
+         <fill>True</fill>
+       </child>
+
+       <widget>
+         <class>GtkLabel</class>
+         <name>label82</name>
+         <width>70</width>
+         <label>Messages:</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+         <child>
+           <padding>0</padding>
+           <expand>False</expand>
+           <fill>False</fill>
+         </child>
+       </widget>
+
+       <widget>
+         <class>GtkCombo</class>
+         <name>combo_messages</name>
+         <value_in_list>False</value_in_list>
+         <ok_if_empty>True</ok_if_empty>
+         <case_sensitive>False</case_sensitive>
+         <use_arrows>True</use_arrows>
+         <use_arrows_always>False</use_arrows_always>
+         <items></items>
+         <child>
+           <padding>0</padding>
+           <expand>True</expand>
+           <fill>True</fill>
+         </child>
+
+         <widget>
+           <class>GtkEntry</class>
+           <child_name>GtkCombo:entry</child_name>
+           <name>entry_messages</name>
+           <can_focus>True</can_focus>
+           <editable>False</editable>
+           <text_visible>True</text_visible>
+           <text_max_length>0</text_max_length>
+           <text>Standard</text>
+         </widget>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <name>label83</name>
+         <label>   </label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+         <child>
+           <padding>120</padding>
+           <expand>False</expand>
+           <fill>False</fill>
+         </child>
+       </widget>
+      </widget>
+
       <widget>
        <class>GtkLabel</class>
-       <name>label76</name>
-       <label></label>
+       <name>label84</name>
+       <label>   </label>
        <justify>GTK_JUSTIFY_CENTER</justify>
        <wrap>False</wrap>
        <xalign>0.5</xalign>
@@ -1475,7 +1650,7 @@
        <xpad>0</xpad>
        <ypad>0</ypad>
        <child>
-         <padding>5</padding>
+         <padding>0</padding>
          <expand>False</expand>
          <fill>False</fill>
        </child>
@@ -1484,4 +1659,197 @@
   </widget>
 </widget>
 
+<widget>
+  <class>GtkWindow</class>
+  <name>Restore_tree</name>
+  <title>Restore</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>True</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>False</auto_shrink>
+
+  <widget>
+    <class>GtkVBox</class>
+    <name>vbox13</name>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+
+    <widget>
+      <class>GtkScrolledWindow</class>
+      <name>scrolledwindow4</name>
+      <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
+      <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
+      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+      <child>
+       <padding>0</padding>
+       <expand>True</expand>
+       <fill>True</fill>
+      </child>
+
+      <widget>
+       <class>GtkCTree</class>
+       <name>ctree2</name>
+       <can_focus>True</can_focus>
+       <columns>7</columns>
+       <column_widths>55,246,67,80,80,80,80</column_widths>
+       <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+       <show_titles>True</show_titles>
+       <shadow_type>GTK_SHADOW_IN</shadow_type>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label89</name>
+         <label>Type</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label90</name>
+         <label>Filename</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label91</name>
+         <label>Permissions</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label92</name>
+         <label>User</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label93</name>
+         <label>Group</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label94</name>
+         <label>Size</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+
+       <widget>
+         <class>GtkLabel</class>
+         <child_name>CTree:title</child_name>
+         <name>label95</name>
+         <label>Date</label>
+         <justify>GTK_JUSTIFY_CENTER</justify>
+         <wrap>False</wrap>
+         <xalign>0.5</xalign>
+         <yalign>0.5</yalign>
+         <xpad>0</xpad>
+         <ypad>0</ypad>
+       </widget>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkHBox</class>
+      <name>hbox38</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
+      <child>
+       <padding>0</padding>
+       <expand>False</expand>
+       <fill>True</fill>
+      </child>
+
+      <widget>
+       <class>GtkLabel</class>
+       <name>label88</name>
+       <label> Command: </label>
+       <justify>GTK_JUSTIFY_CENTER</justify>
+       <wrap>False</wrap>
+       <xalign>0.5</xalign>
+       <yalign>0.5</yalign>
+       <xpad>0</xpad>
+       <ypad>0</ypad>
+       <child>
+         <padding>0</padding>
+         <expand>False</expand>
+         <fill>True</fill>
+       </child>
+      </widget>
+
+      <widget>
+       <class>GtkEntry</class>
+       <name>entry25</name>
+       <tooltip>Enter Commands Here</tooltip>
+       <can_default>True</can_default>
+       <has_default>True</has_default>
+       <can_focus>True</can_focus>
+       <has_focus>True</has_focus>
+       <signal>
+         <name>key_press_event</name>
+         <handler>on_entry1_key_press_event</handler>
+         <last_modification_time>Mon, 01 Apr 2002 07:32:11 GMT</last_modification_time>
+       </signal>
+       <signal>
+         <name>key_release_event</name>
+         <handler>on_entry1_key_release_event</handler>
+         <last_modification_time>Tue, 29 Apr 2003 08:15:13 GMT</last_modification_time>
+       </signal>
+       <editable>True</editable>
+       <text_visible>True</text_visible>
+       <text_max_length>0</text_max_length>
+       <text></text>
+       <child>
+         <padding>0</padding>
+         <expand>True</expand>
+         <fill>True</fill>
+       </child>
+      </widget>
+    </widget>
+  </widget>
+</widget>
+
 </GTK-Interface>

diff --git a/bacula/src/dird/ua_dotcmds.c b/bacula/src/dird/ua_dotcmds.c
index f03ea1eadc839d980237e6ffbba75b16ad3c2038..76489ac8175b6cf2f5ec01701c75bb8f99bef106 100644 (file)
--- a/bacula/src/dird/ua_dotcmds.c
+++ b/bacula/src/dird/ua_dotcmds.c
@@ -50,6 +50,7 @@ static int jobscmd(UAContext *ua, char *cmd);
 static int filesetscmd(UAContext *ua, char *cmd);
 static int clientscmd(UAContext *ua, char *cmd);
 static int msgscmd(UAContext *ua, char *cmd);
+static int poolscmd(UAContext *ua, char *cmd);
 
 struct cmdstruct { char *key; int (*func)(UAContext *ua, char *cmd); char *help; }; 
 static struct cmdstruct commands[] = {
@@ -58,6 +59,7 @@ static struct cmdstruct commands[] = {
  { N_(".filesets"),   filesetscmd,  NULL},
  { N_(".clients"),    clientscmd,   NULL},
  { N_(".msgs"),       msgscmd,      NULL},
+ { N_(".pools"),      poolscmd,     NULL},
  { N_(".messages"),   qmessagescmd, NULL},
  { N_(".quit"),       quitcmd,      NULL},
  { N_(".exit"),       quitcmd,      NULL} 
@@ -155,3 +157,15 @@ static int msgscmd(UAContext *ua, char *cmd)
    UnlockRes();
    return 1;
 }
+
+static int poolscmd(UAContext *ua, char *cmd)
+{
+   POOL *pool = NULL;
+   LockRes();
+   while ( (pool = (POOL *)GetNextRes(R_POOL, (RES *)pool)) ) {
+      bsendmsg(ua, "%s\n", pool->hdr.name);
+   }
+   UnlockRes();
+   return 1;
+}
+

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 17f450a791d928fedfca6355baf80eb195603130..135f9206c51ddd8e4de833c63028f06fe9706703 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
-#define VERSION "1.30"
+#define VERSION "1.31"
 #define VSTRING "1"
-#define BDATE   "28 April 2003"
-#define LSMDATE "28Apr03"
+#define BDATE   "29 April 2003"
+#define LSMDATE "29Apr03"
 
 /* Debug flags */
 #define DEBUG 1