ebl add see all versions

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

diff --git a/gui/brestore/brestore.glade b/gui/brestore/brestore.glade
index c52474845897e19c6d3d65e2fdf7ade223760fee..fcc94afaaee9db373f76d9ec91d8e10edbdba5e3 100644 (file)
--- a/gui/brestore/brestore.glade
+++ b/gui/brestore/brestore.glade
@@ -683,6 +683,81 @@ This year</property>
                        </widget>
                      </child>
 
+                     <child>
+                       <widget class="GtkButton" id="button6">
+                         <property name="visible">True</property>
+                         <property name="can_default">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <signal name="clicked" handler="on_estimate_clicked" last_modification_time="Tue, 22 Aug 2006 09:08:41 GMT"/>
+
+                         <child>
+                           <widget class="GtkAlignment" id="alignment19">
+                             <property name="visible">True</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xscale">0</property>
+                             <property name="yscale">0</property>
+                             <property name="top_padding">0</property>
+                             <property name="bottom_padding">0</property>
+                             <property name="left_padding">0</property>
+                             <property name="right_padding">0</property>
+
+                             <child>
+                               <widget class="GtkHBox" id="hbox15">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">2</property>
+
+                                 <child>
+                                   <widget class="GtkImage" id="image6">
+                                     <property name="visible">True</property>
+                                     <property name="stock">gtk-zoom-in</property>
+                                     <property name="icon_size">4</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label51">
+                                     <property name="visible">True</property>
+                                     <property name="label" translatable="yes">Estimate</property>
+                                     <property name="use_underline">True</property>
+                                     <property name="use_markup">False</property>
+                                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property name="selectable">False</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                             </child>
+                           </widget>
+                         </child>
+                       </widget>
+                     </child>
+
                      <child>
                        <widget class="GtkButton" id="button6">
                          <property name="visible">True</property>
@@ -1325,17 +1400,49 @@ Example : DBI:Pg:database=bacula;host=127.0.0.1;port=5432
                      <property name="right_padding">0</property>
 
                      <child>
-                       <widget class="GtkCheckButton" id="chkbp_use_ok_bkp_only">
+                       <widget class="GtkVBox" id="vbox17">
                          <property name="visible">True</property>
-                         <property name="tooltip" translatable="yes">JobStatus is set to 'T'</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">Use only good ended backup</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="chkbp_use_ok_bkp_only">
+                             <property name="visible">True</property>
+                             <property name="tooltip" translatable="yes">JobStatus is set to 'T'</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">Use only good ended backup</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+
+                         <child>
+                           <widget class="GtkCheckButton" id="chkbp_see_all_versions">
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="label" translatable="yes">See all file versions</property>
+                             <property name="use_underline">True</property>
+                             <property name="relief">GTK_RELIEF_NORMAL</property>
+                             <property name="focus_on_click">True</property>
+                             <property name="active">False</property>
+                             <property name="inconsistent">False</property>
+                             <property name="draw_indicator">True</property>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
                        </widget>
                      </child>
                    </widget>
@@ -1344,7 +1451,7 @@ Example : DBI:Pg:database=bacula;host=127.0.0.1;port=5432
                  <child>
                    <widget class="GtkLabel" id="label45">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">&lt;b&gt;Job selection&lt;/b&gt;</property>
+                     <property name="label" translatable="yes">&lt;b&gt;Selections&lt;/b&gt;</property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">True</property>
                      <property name="justify">GTK_JUSTIFY_LEFT</property>

diff --git a/gui/brestore/brestore.pl b/gui/brestore/brestore.pl
index 4325e1f2af3c2096c082f435610770f11b8b55a9..80fac3dd58c7ff6ef99d1882446bdd89c1acd40e 100755 (executable)
--- a/gui/brestore/brestore.pl
+++ b/gui/brestore/brestore.pl
@@ -120,7 +120,8 @@ sub new
     my @v = DlgResto::get_all_file_versions($dbh, 
                                            "$path/", 
                                            $file,
-                                           $client);
+                                           $client,
+                                           1);
     for my $ver (@v) {
        my (undef,$fn,$jobid,$fileindex,$mtime,$size,$inchanger,$md5,$volname)
            = @{$ver};
@@ -137,6 +138,12 @@ sub new
     
     return $self;
 }
+
+sub on_forward_keypress
+{
+    return 0;
+}
+
 1;
 ################################################################
 package DlgWarn;
@@ -464,12 +471,13 @@ sub new
        use_ok_bkp_only => 1,   # dont use bad backup
        bweb     => 'http://localhost/cgi-bin/bweb/bweb.pl', # bweb url
        glade_file => $glade_file,
+       see_all_versions => 0,  # display all file versions in FileInfo
        mozilla  => 'mozilla',  # mozilla bin
        default_restore_job => 'restore', # regular expression to select default
                                   # restore job
 
        # keywords that are used to fill DlgPref
-       chk_keyword =>  [ qw/use_ok_bkp_only debug/ ],
+       chk_keyword =>  [ qw/use_ok_bkp_only debug see_all_versions/ ],
         entry_keyword => [ qw/username password bweb mozilla
                          connection_string default_restore_job
                          bconsole bsr_dest glade_file/],
@@ -1422,7 +1430,8 @@ sub fill_infoview
     my @v = get_all_file_versions($self->{dbh}, 
                                  "$path/", 
                                  $file,
-                                 $self->current_client);
+                                 $self->current_client,
+                                 $self->{pref}->{see_all_versions});
     for my $ver (@v) {
        my (undef,$fn,$jobid,$fileindex,$mtime,$size,$inchanger,$md5,$volname)
            = @{$ver};