From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 14 Nov 2011 19:52:21 +0000 (+0100)
Subject: tweak bat to remove unused control
X-Git-Tag: Release-7.0.0~457
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7a5174861eb0cfe944c28d70e749472b3313143;p=bacula%2Fbacula

tweak bat to remove unused control
---

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index 95a7df9c2f..ae058c7751 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -57,7 +57,7 @@ Closed Bugs since 5.0.3:
 Note on bug 1612 where Bacula does not save a checksum for hard links during
 full backup, but expects one during accurate differential backups. You need
 a Full backup with the 5.2.x code to have these checksums in the Catalog.
-Doing Incr/Diff over a 5.0.x Full backup will still display lots of errors.
+Doing Incr/Diff over a 5.0.x Full backup will still display lot of errors.
 
 
 
diff --git a/bacula/src/qt-console/job/job.cpp b/bacula/src/qt-console/job/job.cpp
index f8906760a4..bec19daa95 100644
--- a/bacula/src/qt-console/job/job.cpp
+++ b/bacula/src/qt-console/job/job.cpp
@@ -40,7 +40,6 @@ Job::Job(QString &jobId, QTreeWidgetItem *parentTreeWidgetItem) : Pages()
    thisitem->setIcon(0,QIcon(QString::fromUtf8(":images/joblog.png")));
    m_cursor = new QTextCursor(textJobLog->document());
 
-   m_bwlimit = 0;
    m_jobId = jobId;
    m_timer = NULL;
    getFont();
@@ -50,7 +49,6 @@ Job::Job(QString &jobId, QTreeWidgetItem *parentTreeWidgetItem) : Pages()
    connect(pbCancel, SIGNAL(clicked()), this, SLOT(cancelJob()));
    connect(pbRun, SIGNAL(clicked()), this, SLOT(rerun()));
    connect(list_Volume, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(showInfoVolume(QListWidgetItem *)));
-   connect(spin_Bwlimit, SIGNAL(valueChanged(int)), this, SLOT(storeBwLimit(int)));
 
    populateAll();
    dockPage();
@@ -225,10 +223,6 @@ void Job::populateText()
   
 }
 
-void Job::storeBwLimit(int val)
-{
-   m_bwlimit = val;
-}
 
 void Job::updateRunInfo()
 {
@@ -238,14 +232,6 @@ void Job::updateRunInfo()
    bool parseit=false;
    QChar equal = '=';
 
-   if (m_bwlimit >= 100) {
-      cmd = QString("setbandwidth limit=" + QString::number(m_bwlimit) 
-                    + " jobid=" + m_jobId);
-      m_console->dir_cmd(cmd, results);
-      results.clear();
-      m_bwlimit = 0;
-   }
-
    cmd = QString(".status client=\"" + m_client + "\" running");
 /*
  *  JobId 5 Job backup.2010-12-21_09.28.17_03 is running.
@@ -325,19 +311,7 @@ void Job::updateRunInfo()
 //         } else if (lst[0] == "JobStarted") {
 //            Started->setText(lst[1]);
 
-            if (lst[0] == "Bwlimit") {
-               int val = lst[1].toInt();
-               if (val > 0) {
-                  chk_Bwlimit->setChecked(true);
-                  spin_Bwlimit->setEnabled(true);
-                  spin_Bwlimit->setValue(lst[1].toInt()/1024);
-               } else {
-                  chk_Bwlimit->setEnabled(false);
-                  spin_Bwlimit->setEnabled(false);
-                  spin_Bwlimit->setValue(0);
-               }
-               
-            } else if (lst[0] == "Errors") {
+            if (lst[0] == "Errors") {
                label_JobErrors->setText(lst[1]);
                
             } else if (lst[0] == "Bytes/sec") {
diff --git a/bacula/src/qt-console/job/job.h b/bacula/src/qt-console/job/job.h
index 263b7a40d7..8d7f0cbf88 100644
--- a/bacula/src/qt-console/job/job.h
+++ b/bacula/src/qt-console/job/job.h
@@ -45,7 +45,6 @@ public slots:
    void cancelJob();
    void showInfoVolume(QListWidgetItem *);
    void rerun();
-   void storeBwLimit(int val);
 
 private slots:
 
@@ -59,7 +58,6 @@ private:
    QString m_jobId;
    QString m_client;
    QTimer *m_timer;
-   int m_bwlimit;
 };
 
 #endif /* _JOB_H_ */
diff --git a/bacula/src/qt-console/job/job.ui b/bacula/src/qt-console/job/job.ui
index a189c2671c..f112a2c513 100644
--- a/bacula/src/qt-console/job/job.ui
+++ b/bacula/src/qt-console/job/job.ui
@@ -692,35 +692,6 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
-         <widget class="QSpinBox" name="spin_Bwlimit">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="suffix">
-           <string> kB/s</string>
-          </property>
-          <property name="minimum">
-           <number>100</number>
-          </property>
-          <property name="maximum">
-           <number>200000</number>
-          </property>
-          <property name="singleStep">
-           <number>100</number>
-          </property>
-          <property name="value">
-           <number>200000</number>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QCheckBox" name="chk_Bwlimit">
-          <property name="text">
-           <string>Bandwidth Limit:</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </item>