[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/kde3/graphics/digikam/utilities/cameragui
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2007-08-31 20:42:30
Message-ID: 1188592950.129091.27328.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 707041 by cgilles:

always follow Album Libray Path if setup is changed during Camera Gui session


 M  +1 -2      cameraui.cpp  
 M  +7 -18     freespacewidget.cpp  
 M  +1 -8      freespacewidget.h  


--- branches/extragear/kde3/graphics/digikam/utilities/cameragui/cameraui.cpp #707040:707041
@@ -384,8 +384,7 @@
     layout->addWidget( pixmapLogo );
     layout->addWidget( d->anim );
 
-    d->freeSpaceWidget = new FreeSpaceWidget(plainPage(), 100,
-                         KURL(AlbumSettings::instance()->getAlbumLibraryPath()));
+    d->freeSpaceWidget = new FreeSpaceWidget(plainPage(), 100);
 
     viewBoxLayout->addMultiCellWidget(widget, 0, 0, 0, 7);
     viewBoxLayout->addMultiCellWidget(d->cancelBtn, 2, 2, 0, 0);
--- branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.cpp #707040:707041
@@ -35,12 +35,14 @@
 
 // KDE includes.
 
+#include <kurl.h>
 #include <klocale.h>
 #include <kdiskfreesp.h>
 #include <kio/global.h>
 
 // Local includes.
 
+#include "albumsettings.h"
 #include "freespacewidget.h"
 #include "freespacewidget.moc"
 
@@ -76,15 +78,12 @@
     QTimer        *timer;
     
     QPixmap        pix;
-
-    KURL           url;
 };
 
-FreeSpaceWidget::FreeSpaceWidget(QWidget* parent, int width, const KURL& url)
+FreeSpaceWidget::FreeSpaceWidget(QWidget* parent, int width)
                : QWidget(parent, 0, WResizeNoErase|WRepaintNoErase)
 {
     d = new FreeSpaceWidgetPriv;
-    d->url = url;
     setBackgroundMode(Qt::NoBackground);
     setFixedWidth(width);
     setMaximumHeight(fontMetrics().height()+4);
@@ -105,16 +104,6 @@
     delete d;
 }
 
-void FreeSpaceWidget::setUrl(const KURL& url)
-{
-    d->url = url;
-}
-
-KURL FreeSpaceWidget::url()
-{
-    return d->url;
-}
-
 void FreeSpaceWidget::setEstimatedDSizeKb(unsigned long dSize)
 {
     d->dSizeKb = dSize;
@@ -163,15 +152,15 @@
     d->pix.fill(colorGroup().background());
     
     QPainter p(&d->pix);
-    p.setPen(colorGroup().dark());
+    p.setPen(colorGroup().foreground());
     p.drawRect(0, 0, d->pix.width(), d->pix.height());
 
     if (isValid())
     {
         // We will compute the estimated % of space size used to download and process.
         unsigned long eUsedKb = d->dSizeKb + d->kBUsed;
-        int peUsed = (int)(100.0*((double)eUsedKb/(double)d->kBSize));
-        int pClamp = peUsed > 100 ? 100 : peUsed;
+        int peUsed            = (int)(100.0*((double)eUsedKb/(double)d->kBSize));
+        int pClamp            = peUsed > 100 ? 100 : peUsed;
         p.setBrush(peUsed > 95 ? Qt::red : Qt::darkGreen);
         p.setPen(Qt::white);
         QRect gRect(1, 1, (int)(((double)d->pix.width()-2.0)*(pClamp/100.0)), d->pix.height()-2);
@@ -204,7 +193,7 @@
 
 void FreeSpaceWidget::slotTimeout()
 {
-    QString mountPoint = KIO::findPathMountPoint(d->url.path());
+    QString mountPoint = KIO::findPathMountPoint(AlbumSettings::instance()->getAlbumLibraryPath());
     KDiskFreeSp *job   = new KDiskFreeSp;
     connect(job, SIGNAL(foundMountPoint(const unsigned long&, const unsigned long&,
                                         const unsigned long&, const QString&)),
--- branches/extragear/kde3/graphics/digikam/utilities/cameragui/freespacewidget.h #707040:707041
@@ -29,10 +29,6 @@
 #include <qstring.h>
 #include <qwidget.h>
 
-// KDE includes.
-
-#include <kurl.h>
-
 namespace Digikam
 {
 
@@ -44,12 +40,9 @@
     
 public:
 
-    FreeSpaceWidget(QWidget* parent, int width, const KURL& url);
+    FreeSpaceWidget(QWidget* parent, int width);
     ~FreeSpaceWidget();
 
-    void setUrl(const KURL& url);
-    KURL url();
-
     void          setEstimatedDSizeKb(unsigned long dSize);
     unsigned long estimatedDSizeKb();
     
[prev in list] [next in list] [prev in thread] [next in thread]