I could not get a few files to compile until I opened and saved these

[bacula/bacula] / bacula / src / qt-console / clients / clients.cpp

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index 3e7b5889115905172c9d22ec79ae6f92d75f751e..96f2d2eac067a1d92f4f77c394106ad1c3833f9c 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -1,14 +1,14 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2007-2008 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,7 +27,7 @@
 */
  
 /*
- *   Version $Id: client.cpp 4230 2007-02-21 20:07:37Z kerns $
+ *   Version $Id$
  *
  *  Clients Class
  *
@@ -39,11 +39,12 @@
 #include <QMenu>
 #include "bat.h"
 #include "clients/clients.h"
+#include "run/run.h"
 
 Clients::Clients()
 {
    setupUi(this);
-   m_name = "Clients";
+   m_name = tr("Clients");
    pgInitialize();
    QTreeWidgetItem* thisitem = mainWin->getFromHash(this);
    thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/network-server.png")));
@@ -52,6 +53,11 @@ Clients::Clients()
    m_populated = false;
    m_checkcurwidget = true;
    m_closeable = false;
+   /* add context sensitive menu items specific to this classto the page
+    * selector tree. m_contextActions is QList of QActions */
+   m_contextActions.append(actionRefreshClients);
+   createContextMenu();
+   dockPage();
 }
 
 Clients::~Clients()
@@ -72,11 +78,11 @@ void Clients::populateTree()
    mp_treeWidget->clear();
    m_checkcurwidget = true;
 
-   QStringList headerlist = (QStringList() << "Client Name" << "File Retention"
-       << "Job Retention" << "AutoPrune" << "ClientId" << "Uname" );
+   QStringList headerlist = (QStringList() << tr("Client Name") << tr("File Retention")
+       << tr("Job Retention") << tr("AutoPrune") << tr("ClientId") << tr("Uname") );
 
    topItem = new QTreeWidgetItem(mp_treeWidget);
-   topItem->setText(0, "Clients");
+   topItem->setText(0, tr("Clients"));
    topItem->setData(0, Qt::UserRole, 0);
    topItem->setExpanded(true);
 
@@ -139,7 +145,6 @@ void Clients::PgSeltreeWidgetClicked()
 {
    if(!m_populated) {
       populateTree();
-      createContextMenu();
       m_populated=true;
    }
 }
@@ -159,6 +164,7 @@ void Clients::treeItemChanged(QTreeWidgetItem *currentwidgetitem, QTreeWidgetIte
             mp_treeWidget->removeAction(actionListJobsofClient);
             mp_treeWidget->removeAction(actionStatusClientInConsole);
             mp_treeWidget->removeAction(actionPurgeJobs);
+            mp_treeWidget->removeAction(actionPrune);
          }
       }
 
@@ -170,6 +176,7 @@ void Clients::treeItemChanged(QTreeWidgetItem *currentwidgetitem, QTreeWidgetIte
          mp_treeWidget->addAction(actionListJobsofClient);
          mp_treeWidget->addAction(actionStatusClientInConsole);
          mp_treeWidget->addAction(actionPurgeJobs);
+         mp_treeWidget->addAction(actionPrune);
       }
    }
 }
@@ -195,6 +202,8 @@ void Clients::createContextMenu()
                 SLOT(consoleStatusClient()));
    connect(actionPurgeJobs, SIGNAL(triggered()), this,
                 SLOT(consolePurgeJobs()));
+   connect(actionPrune, SIGNAL(triggered()), this,
+                SLOT(prune()));
 }
 
 /*
@@ -203,9 +212,8 @@ void Clients::createContextMenu()
  */
 void Clients::showJobs()
 {
-   QString emptymedia("");
    QTreeWidgetItem *parentItem = mainWin->getFromHash(this);
-   mainWin->createPageJobList(emptymedia, m_currentlyselected, parentItem);
+   mainWin->createPageJobList("", m_currentlyselected, "", "", parentItem);
 }
 
 /*
@@ -226,12 +234,7 @@ void Clients::currentStackItem()
 {
    if(!m_populated) {
       populateTree();
-      /* add context sensitive menu items specific to this classto the page
-       * selector tree. m_contextActions is QList of QActions, so this is 
-       * only done once with the first population. */
-      m_contextActions.append(actionRefreshClients);
       /* Create the context menu for the client tree */
-      createContextMenu();
       m_populated=true;
    }
 }
@@ -241,7 +244,7 @@ void Clients::currentStackItem()
  */
 void Clients::consolePurgeJobs()
 {
-   if (QMessageBox::warning(this, tr("Bat"),
+   if (QMessageBox::warning(this, "Bat",
       tr("Are you sure you want to purge ??  !!!.\n"
 "The Purge command will delete associated Catalog database records from Jobs and"
 " Volumes without considering the retention period. Purge  works only on the"
@@ -249,7 +252,7 @@ void Clients::consolePurgeJobs()
 " be dangerous because you can delete catalog records associated with current"
 " backups of files, and we recommend that you do not use it unless you know what"
 " you are doing.\n\n"
-" Is there any way I can get you to Click cancel here.  You really don't want to do"
+" Is there any way I can get you to click Cancel here?  You really don't want to do"
 " this\n\n"
       "Press OK to proceed with the purge operation?"),
       QMessageBox::Ok | QMessageBox::Cancel)
@@ -260,3 +263,10 @@ void Clients::consolePurgeJobs()
    consoleCommand(cmd);
 }
 
+/*
+ * Function responding to actionPrune
+ */
+void Clients::prune()
+{
+   new prunePage("", m_currentlyselected);
+}