Have the title of undocked window describe the type of window it is like the

page selector and the director that it represents.
Also add bat.pro to svn property svn:ignore to make more svn friendly.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4593 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/qt-console/TODO b/bacula/src/qt-console/TODO
index bb27bb083171daa2fec3e5ffe9f9c73028ae2696..5aa5cb6399cc26df60a4b0e0cfd9ba3f3c6024fd 100644 (file)
--- a/bacula/src/qt-console/TODO
+++ b/bacula/src/qt-console/TODO
@@ -22,7 +22,7 @@ to surf the filestructure on the job.
 
 LOW priority items:
 
-Get rid of "Warning: name layoutWidget is already used" when make uic's resture.ui
+Get rid of "Warning: name layoutWidget is already used" when make uic's restore.ui
 
 move behavior of:
   MainWin::setContextMenuDockText
@@ -51,6 +51,8 @@ global one defined in the mainWin class (if I remember right).
 ============================================================
 DONE:
 ============================================================
+Set Window titles to reflect what director it is.
+
 Must:: get page selector to follow undocked windows.  Otherwise
 current console won't be current.
 

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 290d8d2319ebfc127e2a86c938f25e02e21ee3f7..c4089d57c4541fdf56ff4522841e9fa2430d6f03 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -43,12 +43,14 @@
 Clients::Clients()
 {
    setupUi(this);
+   m_name = "Clients";
    pgInitialize();
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_client.h */
    m_populated = false;
    m_checkcurwidget = true;
    m_closeable = false;
+   setTitle();
 }
 
 Clients::~Clients()
@@ -222,12 +224,3 @@ void Clients::currentStackItem()
       m_populated=true;
    }
 }
-
-/*
- * Virtual Function to return the name for the medialist tree widget
- */
-void Clients::treeWidgetName(QString &name)
-{
-   name = "Clients";
-}
-

diff --git a/bacula/src/qt-console/clients/clients.h b/bacula/src/qt-console/clients/clients.h
index 2c1ea4d66e5f9f9c0a4e0cdd15c3beb405efd08f..3b2021ee5ce64f67b675bb294518ff20ce45c6d2 100644 (file)
--- a/bacula/src/qt-console/clients/clients.h
+++ b/bacula/src/qt-console/clients/clients.h
@@ -48,7 +48,6 @@ public:
    ~Clients();
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
-   virtual void treeWidgetName(QString &);
 
 public slots:
    void treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);

diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp
index 128e4765d9825d33ef2d5f4cc3c3b1cf310b9d75..2b4e649c71d8cecf42bd66478193222a39acf8da 100644 (file)
--- a/bacula/src/qt-console/console/console.cpp
+++ b/bacula/src/qt-console/console/console.cpp
@@ -622,3 +622,11 @@ void Console::setDirRes(DIRRES *dir)
 { 
    m_dir = dir;
 }
+
+/*
+ * To have the ability to get the name of the director resource.
+ */
+void Console::getDirResName(QString &name_returned)
+{
+   name_returned = m_dir->name();
+}

diff --git a/bacula/src/qt-console/console/console.h b/bacula/src/qt-console/console/console.h
index b6a0638df65be50382ab669dec1cd18015cdc5d0..6a38782dfe9b4aa5a42c5bab26a8342d6f7f0a17 100644 (file)
--- a/bacula/src/qt-console/console/console.h
+++ b/bacula/src/qt-console/console/console.h
@@ -97,7 +97,7 @@ public:
    void setDirectorTreeItem(QTreeWidgetItem *);
    void setDirRes(DIRRES *dir);
    QTreeWidgetItem *directorTreeItem() { return m_directorTreeItem; };
-   DIRRES *getDirRes() { return m_dir; };
+   void getDirResName(QString &);
 
    QStringList job_list;
    QStringList client_list;

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index da232bfc55a3e528bb033799528fc72fd4b9c025..eb2337ed42fb475ba170841d5ded0ba77045a2b6 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -43,12 +43,14 @@
 FileSet::FileSet()
 {
    setupUi(this);
+   m_name = "FileSets";
    pgInitialize();
 
    /* mp_treeWidget, FileSet Tree Tree Widget inherited from ui_fileset.h */
    m_populated = false;
    m_checkcurwidget = true;
    m_closeable = false;
+   setTitle();
 }
 
 FileSet::~FileSet()
@@ -211,12 +213,3 @@ void FileSet::currentStackItem()
       m_populated=true;
    }
 }
-
-/*
- * Virtual Function to return the name for the medialist tree widget
- */
-void FileSet::treeWidgetName(QString &name)
-{
-   name = "FileSet";
-}
-

diff --git a/bacula/src/qt-console/fileset/fileset.h b/bacula/src/qt-console/fileset/fileset.h
index 285b64579b9128183e653bc8f882da41d1f16619..f219b855faf72e14b7ec0df18d3074985bd5f59b 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.h
+++ b/bacula/src/qt-console/fileset/fileset.h
@@ -47,7 +47,6 @@ public:
    ~FileSet();
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
-   void treeWidgetName(QString &);
 
 public slots:
    void treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index a4598cec915c7d72bfb3a8a55067c9b712b6e00d..0cbebb654484c3dc8fc0fd9473963bd5cfc57812 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -44,6 +44,7 @@ JobList::JobList(QString &medianame, QString &clientname,
          QTreeWidgetItem *parentTreeWidgetItem)
 {
    setupUi(this);
+   m_name = "Clients";
    m_medianame = medianame;
    m_clientname = clientname;
    pgInitialize(parentTreeWidgetItem);
@@ -53,6 +54,7 @@ JobList::JobList(QString &medianame, QString &clientname,
    /* connect to the action specific to this pages class */
    connect(actionRefreshJobList, SIGNAL(triggered()), this,
                 SLOT(populateTable()));
+   setTitle();
 }
 
 /*

diff --git a/bacula/src/qt-console/mainwin.cpp b/bacula/src/qt-console/mainwin.cpp
index ba8b8fe7abc60dc36da88d90b4fe610d97c43af4..300510d90ca68268228a89054780db3baab1df0d 100644 (file)
--- a/bacula/src/qt-console/mainwin.cpp
+++ b/bacula/src/qt-console/mainwin.cpp
@@ -65,7 +65,7 @@ MainWin::MainWin(QWidget *parent) : QMainWindow(parent)
    }
    m_currentConsole = (Console*)getFromHash(m_firstItem);
    treeWidget->setCurrentItem(getFromHash(m_currentConsole));
-   /*
+   /*  FIXME
     *  I'd like to turn this into a debug item
     *  DIRRES* dirres = m_currentConsole->getDirRes();
     *  printf("Setting initial window to %s\n", dirres->name());

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index cd87bf8c54c2bb1117a788ab9c20d292698e932b..df7a7fdeb2cee6bf10e4c68c7318e8def745b3d0 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -45,12 +45,14 @@
 MediaList::MediaList()
 {
    setupUi(this);
+   m_name = "Media";
    pgInitialize();
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_medialist.h */
    m_populated = false;
    m_checkcurwidget = true;
    m_closeable = false;
+   setTitle();
 }
 
 MediaList::~MediaList()
@@ -220,11 +222,3 @@ void MediaList::currentStackItem()
       m_populated=true;
    }
 }
-
-/*
- * Virtual Function to return the name for the medialist tree widget
- */
-void MediaList::treeWidgetName(QString &name)
-{
-   name = "Media";
-}

diff --git a/bacula/src/qt-console/medialist/medialist.h b/bacula/src/qt-console/medialist/medialist.h
index fa436f346a0b047e71c08d66a1c48e7ac9c3431e..a86d22b55501d8b20ac502e7930cd7b18fa79dd9 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.h
+++ b/bacula/src/qt-console/medialist/medialist.h
@@ -47,7 +47,6 @@ public:
    ~MediaList();
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
-   virtual void treeWidgetName(QString &);
 
 public slots:
    void treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index ba27c228b89b1040451bcfd5db455f61c11118fa..907e551498a9d31fe8a9daad85740defdb4b4426 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -204,7 +204,7 @@ void Pages::pgInitialize(QTreeWidgetItem *parentTreeWidgetItem)
  */
 void Pages::treeWidgetName(QString &name)
 {
-   name = "Default Page Name";
+   name = m_name;
 }
 
 /*
@@ -222,7 +222,8 @@ void Pages::consoleCommand(QString &command)
 /*
  * Function for handling undocked windows becoming active.
  * Change the currently selected item in the page selector window to the now
- * active undocked window.
+ * active undocked window.  This will also make the console for the undocked
+ * window m_currentConsole.
  */
 void Pages::changeEvent(QEvent *event)
 {
@@ -230,3 +231,17 @@ void Pages::changeEvent(QEvent *event)
       mainWin->treeWidget->setCurrentItem(mainWin->getFromHash(this));
    }
 }
+
+/*
+ * Function to simplify getting the name of the class and the director into
+ * the caption or title of the window
+ */
+void Pages::setTitle()
+{
+   QString title, director;
+   treeWidgetName(title);
+   m_console->getDirResName(director);
+   title += " of Director ";
+   title += director;
+   setWindowTitle(title);
+}

diff --git a/bacula/src/qt-console/pages.h b/bacula/src/qt-console/pages.h
index 943ada0efe3062631bffadf0f6c8b219515f7660..24e7d8e50915f43bd530b5f8a467c822ee2f3499 100644 (file)
--- a/bacula/src/qt-console/pages.h
+++ b/bacula/src/qt-console/pages.h
@@ -77,9 +77,11 @@ protected:
    void consoleCommand(QString &);
    virtual void treeWidgetName(QString &);
    virtual void changeEvent(QEvent *event);
+   void setTitle();
    bool m_closeable;
    bool m_docked;
    Console *m_console;
+   QString m_name;
 };
 
 #endif /* _PAGES_H_ */

diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index 5636df864cef264b6fc3f79b370382842eafcc5b..7e2766578465e5a5d117a17bbbdca386300e49fb 100644 (file)
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -40,6 +40,7 @@
 
 bRestore::bRestore()
 {
+   m_name = "bRestore";
    setupUi(this);
    pgInitialize();
    m_closeable = true;
@@ -48,11 +49,3 @@ bRestore::bRestore()
 bRestore::~bRestore()
 {
 }
-
-/*
- * Virtual Function to return the name for the medialist tree widget
- */
-void bRestore::treeWidgetName(QString &name)
-{
-   name = "bRestore";
-}

diff --git a/bacula/src/qt-console/restore/restore.h b/bacula/src/qt-console/restore/restore.h
index b07426cc9b69eda6b91d35fcfc1ab2e26add6734..bc825fc8eaf3564e1085ce9c3f41423d6d60ce16 100644 (file)
--- a/bacula/src/qt-console/restore/restore.h
+++ b/bacula/src/qt-console/restore/restore.h
@@ -99,7 +99,6 @@ class bRestore : public Pages, public Ui::bRestoreForm
 public:
    bRestore();
    ~bRestore();
-   virtual void treeWidgetName(QString &);
 
 public slots:
 

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 8efd845d785cfe9fcdcee5207bbc4312d2dce5e1..2001bcad08f57b1fc5e98d99a0db1b5dcce6d043 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -43,12 +43,14 @@
 Storage::Storage()
 {
    setupUi(this);
+   m_name = "Storage";
    pgInitialize();
 
    /* mp_treeWidget, Storage Tree Tree Widget inherited from ui_storage.h */
    m_populated = false;
    m_checkcurwidget = true;
    m_closeable = false;
+   setTitle();
 }
 
 Storage::~Storage()
@@ -211,12 +213,3 @@ void Storage::currentStackItem()
       m_populated=true;
    }
 }
-
-/*
- * Virtual Function to return the name for the medialist tree widget
- */
-void Storage::treeWidgetName(QString &name)
-{
-   name = "Storage";
-}
-

diff --git a/bacula/src/qt-console/storage/storage.h b/bacula/src/qt-console/storage/storage.h
index 49e6c6f124d51a8de45179c50e89c0f556d83105..5ba03d834e72f2fdb73cc325f73c152e4e431a8f 100644 (file)
--- a/bacula/src/qt-console/storage/storage.h
+++ b/bacula/src/qt-console/storage/storage.h
@@ -47,7 +47,6 @@ public:
    ~Storage();
    virtual void PgSeltreeWidgetClicked();
    virtual void currentStackItem();
-   virtual void treeWidgetName(QString &);
 
 public slots:
    void treeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);