From: Kern Sibbald Date: Wed, 19 Oct 2011 10:53:15 +0000 (+0200) Subject: Remove Version browser from bat (broken) X-Git-Tag: Release-7.0.0~537 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bbe9a2ffcbe35e7f447824c32634cd1992fbc344;p=bacula%2Fbacula Remove Version browser from bat (broken) --- diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui index eab378e541..0cd7a870ba 100644 --- a/bacula/src/qt-console/main.ui +++ b/bacula/src/qt-console/main.ui @@ -1,8 +1,9 @@ - + + Kern Sibbald MainForm - - + + 0 0 @@ -10,216 +11,216 @@ 660 - + bat - Bacula Admin Tool - - + + :/images/bat.png:/images/bat.png - + - + Bacula Administration Tool - + It's a Dock widget to allow page selection - - - + + + 9 - + 6 - - - + + + -1 - - + + 0 0 785 - 24 + 25 - - + + Settings - - + + - - + + &Help - - + + - - + + &File - - - - + + + + - - - + + + - - + + Current Status - + Current Status - - + + 51 39 - + Tool Bar - + Qt::Horizontal - + TopToolBarArea - + false - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + 0 1 - + - 97 - 157 + 112 + 179 - + 524287 524287 - + Qt::StrongFocus - + - + - + false - + QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable - + Qt::AllDockWidgetAreas - - + + - + 1 - - + + - - - + + + 1 1 - + 0 0 - + 16777215 16777215 - + 0 0 - + Qt::StrongFocus - + Selects panel window - + Use items in this tree to select what window is in panel - + true - + 1 - - + + Command: - - + + Click here to enter command @@ -227,351 +228,354 @@ - - + + &Quit - + Ctrl+Q - - - + + + :/images/bat.png:/images/bat.png - + &About bat - - - + + + :/images/copy.png:/images/copy.png - + &Copy - - - + + + :/images/cut.png:/images/cut.png - + Cu&t - - - + + + :/images/new.png:/images/new.png - + new - - - + + + :/images/open.png:/images/open.png - + open - - - + + + :/images/paste.png:/images/paste.png - + &Paste - - - + + + :/images/print.png:/images/print.png - + &Print - + Print - - - + + + :/images/save.png:/images/save.png - + &Save - + Save (not implemented) - - - + + + :/images/disconnected.png:/images/disconnected.png - + Connect - + Connect/disconnect - - - + + + :/images/label.png:/images/label.png - + Label - + Label a Volume - + Label a Volume - - - + + + :/images/restore.png:/images/restore.png - + Restore - + Restore Files - - + + false - - + + :/images/run.png:/images/run.png - + Run Job - + Run Job - + Run Job - + Run a Job - - + + false - - + + :/images/estimate-job.png:/images/estimate-job.png - + Estimate Job - + Estimate Job - + Estimate Job - + Estimate a Job - - - + + + :/images/status-console.png:/images/status-console.png - - Status Dir + + Status Dir - + Status Dir - + Query status of director in console - + Query status of director in console - + true - - + + &Select Font ... - - - + + + :/images/up.png:/images/up.png - + Undock Window - + Undock Current Window - - - + + + :/images/up.png:/images/up.png - + ToggleDock - + Toggle Dock Status - + Toggle Dock Status - - - + + + :/images/unmark.png:/images/unmark.png - + Close Page - + Close The Current Page - - - + + + :/images/mail-message-new.png:/images/mail-message-new.png - + Messages - + Display any messages queued at the director - + false - - + + &Preferences ... - + Set Preferences - + Set Preferences - - - + + + :/images/help-browser.png:/images/help-browser.png - + bat &Help - - - + + + false + + + :/images/browse.png:/images/browse.png - + Browse - + Browse Cataloged Files - + Browse Cataloged Files - - - + + + :/images/applications-graphics.png:/images/applications-graphics.png - + JobPlot - + Plot Job Files and Bytes - + Plot Job Files and Bytes - - - + + + :/images/status.png:/images/status.png - + Status Dir Page - + Director Status Page - - - + + + :/images/mark.png:/images/mark.png - + Repop Lists - - - + + + :/images/mark.png:/images/mark.png - + Reload and Repop - - - + + + :/images/go-jump.png:/images/go-jump.png - + back - + Previous Page - + Previous Page - + diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp index bb753afea1..76b4b0bc13 100644 --- a/bacula/src/qt-console/mainwin.cpp +++ b/bacula/src/qt-console/mainwin.cpp @@ -186,9 +186,9 @@ void MainWin::createPages() new MediaList(); new MediaView(); new Storage(); - if (m_openBrowser) { - new restoreTree(); - } +// if (m_openBrowser) { +// new restoreTree(); +// } if (m_openDirStat) { new DirStat(); } @@ -573,7 +573,7 @@ void MainWin::estimateButtonClicked() void MainWin::browseButtonClicked() { - new restoreTree(); +// new restoreTree(); } void MainWin::statusPageButtonClicked() diff --git a/bacula/src/qt-console/restore/brestore.ui b/bacula/src/qt-console/restore/brestore.ui index be794c051c..9be39da575 100644 --- a/bacula/src/qt-console/restore/brestore.ui +++ b/bacula/src/qt-console/restore/brestore.ui @@ -75,11 +75,14 @@ + + true + Merge Jobs - true + false @@ -158,6 +161,9 @@ false + + false + Type @@ -498,6 +504,9 @@ p, li { white-space: pre-wrap; } false + + false + Type