bat: cleanup job and mediainfo panel

diff --git a/bacula/src/qt-console/job/job.cpp b/bacula/src/qt-console/job/job.cpp
index d9ef451ead8fa57d21c5b5e48ccb4b6dcc39f482..ec9ef8d122499a7cda4525cc6d80fec69e2657b4 100644 (file)
--- a/bacula/src/qt-console/job/job.cpp
+++ b/bacula/src/qt-console/job/job.cpp
@@ -197,52 +197,6 @@ void Job::populateText()
   
 }
 
-// Need to use the fmtwidgetitem helper instead
-static QString convertBytesSI(qint64 qfld)
-{
-   static const qint64 KB = Q_INT64_C(1000);
-   static const qint64 MB = (KB * KB);
-   static const qint64 GB = (MB * KB);
-   static const qint64 TB = (GB * KB);
-   static const qint64 PB = (TB * KB);
-   static const qint64 EB = (PB * KB);
-
-   /* note: division is integer, so to have some decimals we divide for a
-      smaller unit (e.g. GB for a TB number and so on) */
-   char suffix;
-   if (qfld >= EB) {
-      qfld /= PB; 
-      suffix = 'E';
-   }
-   else if (qfld >= PB) {
-      qfld /= TB; 
-      suffix = 'P';
-   }
-   else if (qfld >= TB) {
-      qfld /= GB; 
-      suffix = 'T';
-   }
-   else if (qfld >= GB) {
-      qfld /= MB;
-      suffix = 'G';
-   }
-   else if (qfld >= MB) {
-      qfld /= KB;
-      suffix = 'M';
-   }
-   else if (qfld >= KB) {
-      suffix = 'k'; /* SI uses lowercase k */
-   }
-   else  {
-      /* plain bytes, no need to reformat */
-      return QString("%1 B").arg(qfld); 
-   }
-
-   /* having divided for a smaller unit, now we can safely convert to double and
-      use the extra room for decimals */
-   return QString("%1 %2B").arg(qfld / 1000.0, 0, 'f', 2).arg(suffix);
-}
-
 /*
  * Populate the text in the window
  */

diff --git a/bacula/src/qt-console/mediainfo/mediainfo.cpp b/bacula/src/qt-console/mediainfo/mediainfo.cpp
index ce2be03a15ee6310d04e4657e075155122e6a3f8..f66a9b8366e47fee695c891fba0ead365ca5c800 100644 (file)
--- a/bacula/src/qt-console/mediainfo/mediainfo.cpp
+++ b/bacula/src/qt-console/mediainfo/mediainfo.cpp
@@ -31,6 +31,7 @@
 #include <QTableWidgetItem>
 #include <QMessageBox>
 #include "mediainfo.h"
+#include "util/fmtwidgetitem.h"
 
 /*
  * A constructor 
@@ -48,52 +49,6 @@ MediaInfo::MediaInfo(QTreeWidgetItem *parentWidget, QString &mediaName)
    populateForm();
 }
 
-// Need to use the fmtwidgetitem helper instead
-static QString convertBytesSI(qint64 qfld)
-{
-   static const qint64 KB = Q_INT64_C(1000);
-   static const qint64 MB = (KB * KB);
-   static const qint64 GB = (MB * KB);
-   static const qint64 TB = (GB * KB);
-   static const qint64 PB = (TB * KB);
-   static const qint64 EB = (PB * KB);
-
-   /* note: division is integer, so to have some decimals we divide for a
-      smaller unit (e.g. GB for a TB number and so on) */
-   char suffix;
-   if (qfld >= EB) {
-      qfld /= PB; 
-      suffix = 'E';
-   }
-   else if (qfld >= PB) {
-      qfld /= TB; 
-      suffix = 'P';
-   }
-   else if (qfld >= TB) {
-      qfld /= GB; 
-      suffix = 'T';
-   }
-   else if (qfld >= GB) {
-      qfld /= MB;
-      suffix = 'G';
-   }
-   else if (qfld >= MB) {
-      qfld /= KB;
-      suffix = 'M';
-   }
-   else if (qfld >= KB) {
-      suffix = 'k'; /* SI uses lowercase k */
-   }
-   else  {
-      /* plain bytes, no need to reformat */
-      return QString("%1 B").arg(qfld); 
-   }
-
-   /* having divided for a smaller unit, now we can safely convert to double and
-      use the extra room for decimals */
-   return QString("%1 %2B").arg(qfld / 1000.0, 0, 'f', 2).arg(suffix);
-}
-
 /*
  * Populate the text in the window
  */

diff --git a/bacula/src/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp
index f149d81cd9c1c797340cd8d45f0bc0e3ebcfc589..7871e8a9c4b40b0a9b8c18e627380a61abd20ef8 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.cpp
+++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp
@@ -88,7 +88,7 @@ Freeze::~Freeze()
 
 ItemFormatterBase::BYTES_CONVERSION ItemFormatterBase::cnvFlag(BYTES_CONVERSION_IEC);
 
-QString ItemFormatterBase::convertBytesIEC(qint64 qfld)
+QString convertBytesIEC(qint64 qfld)
 {
    static const qint64 KB = Q_INT64_C(1024);
    static const qint64 MB = (KB * KB);
@@ -133,7 +133,7 @@ QString ItemFormatterBase::convertBytesIEC(qint64 qfld)
    return QString("%1 %2iB").arg(qfld / 1000.0, 0, 'f', 2).arg(suffix);
 }
 
-QString ItemFormatterBase::convertBytesSI(qint64 qfld)
+QString convertBytesSI(qint64 qfld)
 {
    static const qint64 KB = Q_INT64_C(1000);
    static const qint64 MB = (KB * KB);

diff --git a/bacula/src/qt-console/util/fmtwidgetitem.h b/bacula/src/qt-console/util/fmtwidgetitem.h
index af44c23100edec62e2992f69c72bc07f9392b9c4..896a0d32e28814410db8c35d6835317bcd8b7ce1 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.h
+++ b/bacula/src/qt-console/util/fmtwidgetitem.h
@@ -47,6 +47,12 @@ class QBrush;
  */
 QString convertJobStatus(const QString &sts);
 
+/* bytes formatted as power-of-two with IEC suffixes (KiB, MiB, and so on) */
+QString convertBytesIEC(qint64 fld);
+
+/* bytes formatted as power-of-ten with SI suffixes (kB, MB, and so on) */
+QString convertBytesSI(qint64 fld);
+
 /*
  * disable widget updating
  */
@@ -128,14 +134,6 @@ protected:
    /* sets the *optional* value used for sorting */
    virtual void setSortValue(int index, const QVariant &value) = 0;
 
-private:
-
-   /* bytes formatted as power-of-two with IEC suffixes (KiB, MiB, and so on) */
-   static QString convertBytesIEC(qint64 fld);
-
-   /* bytes formatted as power-of-ten with SI suffixes (kB, MB, and so on) */
-   static QString convertBytesSI(qint64 fld);
-
 private:
    static BYTES_CONVERSION cnvFlag;
 };

diff --git a/bacula/technotes b/bacula/technotes
index 769f961a08988b134feca5a3ba85c2be6e78bb14..c9bb4020df7029e4c97a4c2712a32439ef35718f 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -4,6 +4,7 @@ General:
 
 04Aug09
 ebl  bat: Go to the media info panel when double-click on job page or media list
+ebl  bat: cleanup job and mediainfo panel
 03Aug09
 ebl  Add new media info panel to bat
 02Aug09