Move radio buttons to more intuitive location

[bacula/bacula] / bacula / src / qt-console / restore / restore.h

diff --git a/bacula/src/qt-console/restore/restore.h b/bacula/src/qt-console/restore/restore.h
index b07426cc9b69eda6b91d35fcfc1ab2e26add6734..7fe23641b3858768006a733753c4d5d86919854c 100644 (file)
--- a/bacula/src/qt-console/restore/restore.h
+++ b/bacula/src/qt-console/restore/restore.h
@@ -40,27 +40,40 @@
 #include "ui_restore.h"
 #include "ui_prerestore.h"
 
-class Console;
+enum {
+   R_NONE,
+   R_JOBIDLIST,
+   R_JOBDATETIME
+};
 
 /*
  * The pre-restore dialog selects the Job/Client to be restored
  * It really could use considerable enhancement.
  */
-class prerestoreDialog : public QDialog, public Ui::prerestoreForm
+class prerestorePage : public Pages, public Ui::prerestoreForm
 {
    Q_OBJECT 
 
 public:
-   prerestoreDialog(Console *parent);
+   prerestorePage();
+   prerestorePage(QString &data, unsigned int);
 
 private slots:
-   void accept();
-   void reject();
+   void okButtonPushed();
+   void cancelButtonPushed();
    void job_name_change(int index);
+   void recentChanged(int);
+   void jobRadioClicked(bool);
+   void jobidsRadioClicked(bool);
+   void jobIdEditFinished();
 
 private:
-   Console *m_console;
-
+   void jobdefsFromJob(QStringList &, QString);
+   void buildPage();
+   bool checkJobIdList();
+   QString m_dtformat;
+   QString m_dataIn;
+   unsigned int m_dataInType;
 };
 
 /*  
@@ -68,27 +81,30 @@ private:
  * restore tree routines.  It handles putting up a GUI tree
  * representation of the files to be restored.
  */
-class restoreDialog : public QDialog, public Ui::restoreForm
+class restorePage : public Pages, public Ui::restoreForm
 {
    Q_OBJECT 
 
 public:
-   restoreDialog(Console *parent);
+   restorePage();
    void fillDirectory();
    char *get_cwd();
    bool cwd(const char *);
 
 private slots:
-   void accept();
-   void reject();
+   void okButtonPushed();
+   void cancelButtonPushed();
    void fileDoubleClicked(QTreeWidgetItem *item, int column);
+   void directoryItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);
    void upButtonPushed();
    void unmarkButtonPushed();
    void markButtonPushed();
+   void addDirectory(QString &);
 
 private:
-   Console *m_console;
    QString m_cwd;
+   QHash<QString, QTreeWidgetItem *> m_dirPaths;
+   QHash<QTreeWidgetItem *,QString> m_dirTreeItems;
 };
 
 
@@ -99,7 +115,6 @@ class bRestore : public Pages, public Ui::bRestoreForm
 public:
    bRestore();
    ~bRestore();
-   virtual void treeWidgetName(QString &);
 
 public slots: