From 3118193980a10b5a41b4df193ad720fb5cfd5f81 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Tue, 22 Aug 2006 17:20:42 +0000 Subject: [PATCH] ebl add see all versions git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3330 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/brestore/brestore.glade | 129 +++++++++++++++++++++++++++++++++--- gui/brestore/brestore.pl | 15 ++++- 2 files changed, 130 insertions(+), 14 deletions(-) diff --git a/gui/brestore/brestore.glade b/gui/brestore/brestore.glade index c524748458..fcc94afaae 100644 --- a/gui/brestore/brestore.glade +++ b/gui/brestore/brestore.glade @@ -683,6 +683,81 @@ This year + + + True + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-zoom-in + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Estimate + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + True @@ -1325,17 +1400,49 @@ Example : DBI:Pg:database=bacula;host=127.0.0.1;port=5432 0 - + True - JobStatus is set to 'T' - True - Use only good ended backup - True - GTK_RELIEF_NORMAL - True - False - False - True + False + 0 + + + + True + JobStatus is set to 'T' + True + Use only good ended backup + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + See all file versions + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + @@ -1344,7 +1451,7 @@ Example : DBI:Pg:database=bacula;host=127.0.0.1;port=5432 True - <b>Job selection</b> + <b>Selections</b> False True GTK_JUSTIFY_LEFT diff --git a/gui/brestore/brestore.pl b/gui/brestore/brestore.pl index 4325e1f2af..80fac3dd58 100755 --- 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}; -- 2.39.5