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 14a409270cfaba55b9ecefde7a2006a4315c5660..654dd2ad9509fe986415a60ee6622297e85a6b85 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -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,9 @@ 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 &);