This is committing most of the patch received from Eric.

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

diff --git a/bacula/src/qt-console/pages.h b/bacula/src/qt-console/pages.h
index 49d7ca7494ad70aef7f5d9fe268a97c0035d9ede..654dd2ad9509fe986415a60ee6622297e85a6b85 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -60,7 +60,7 @@ public:
    void togglePageDocking();
    bool isDocked();
    bool isCloseable();
-   QStackedWidget *m_parent;
+   QTabWidget *m_parent;
    QList<QAction*> m_contextActions;
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
@@ -70,7 +70,12 @@ public:
    void setContextMenuDockText();
    void setTreeWidgetItemDockColor();
    void consoleCommand(QString &);
-   void consoleInput(QString &);
+   void consoleCommand(QString &, int conn);
+   void consoleCommand(QString &, bool setCurrent);
+   void consoleCommand(QString &, int conn, bool setCurrent);
+   QString &name() { return m_name; };
+   void getVolumeList(QStringList &);
+   void getStatusList(QStringList &);
 
 public slots:
    /* closeEvent is a virtual function inherited from QWidget */
@@ -78,7 +83,8 @@ public slots:
 
 protected:
    void pgInitialize();
-   void pgInitialize(QTreeWidgetItem *);
+   void pgInitialize(const QString &);
+   void pgInitialize(const QString &, QTreeWidgetItem *);
    virtual void treeWidgetName(QString &);
    virtual void changeEvent(QEvent *event);
    void setConsoleCurrent();