This is a first commit at attempting to prevent connecting to a director which

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

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index 1620f12662aa547ad7a6865f382bf1562cb0d0f6..98668318124cf1976c60ba9921a16bffc17a9977 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -34,10 +34,10 @@
  */
 
 #include <QtGui>
+#include "pages.h"
 #include "ui_console.h"
 #include "restore.h"
 #include "select.h"
-#include "batstack.h"
 
 #ifndef MAX_NAME_LENGTH
 #define MAX_NAME_LENGTH 128
@@ -65,19 +65,25 @@ class BSOCK;
 class JCR;
 class CONRES;
 
-class Console : public BatStack, public Ui::ConsoleForm
+class Console : public Pages, public Ui::ConsoleForm
 {
    Q_OBJECT 
 
 public:
    Console(QStackedWidget *parent);
+   ~Console();
    void display_text(const char *buf);
    void display_text(const QString buf);
    void display_textf(const char *fmt, ...);
    void update_cursor(void);
    void write_dir(const char *buf);
+   bool dir_cmd(const char *cmd, QStringList &results);
+   bool dir_cmd(QString &cmd, QStringList &results);
+   bool sql_cmd(const char *cmd, QStringList &results);
+   bool sql_cmd(QString &cmd, QStringList &results);
    bool authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
    bool is_connected() { return m_sock != NULL; };
+   bool is_connectedGui();
    const QFont get_font();
    void writeSettings();
    void readSettings();
@@ -89,9 +95,10 @@ public:
    void beginNewCommand();
    void displayToPrompt();
    void discardToPrompt();
-   void setTreeItem(QTreeWidgetItem *item);
+   void setDirectorTreeItem(QTreeWidgetItem *);
    void setDirRes(DIRRES *dir);
-   QStringList* dosql(QString* sqlcmd);
+   QTreeWidgetItem *directorTreeItem() { return m_directorTreeItem; };
+   void getDirResName(QString &);
 
    QStringList job_list;
    QStringList client_list;
@@ -120,6 +127,7 @@ private:
    bool m_at_prompt;
    QSocketNotifier *m_notifier;
    QTextCursor *m_cursor;
+   QTreeWidgetItem *m_directorTreeItem;
    bool m_api_set;
    bool m_messages_pending;
    QTimer *m_timer;