Provide functionality for auto-expanding folders (the whole patch has been provided...

[dolphin.git] / src / viewpropsprogressinfo.cpp

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index b01e2bc8468531d94ec129a5ec48a5a99c44a34d..c073d3d46885e74616413a360643a2d1dd8b899e 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -22,10 +22,10 @@
 #include "applyviewpropsjob.h"
 #include "viewproperties.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
-#include <QVBoxLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
+#include <QtGui/QBoxLayout>
 
 #include <assert.h>
 #include <klocale.h>
@@ -46,7 +46,7 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(320, minSize.height()));
 
-    setCaption(i18n("Applying View Properties"));
+    setCaption(i18nc("@title:window", "Applying View Properties"));
     setButtons(KDialog::Cancel);
 
     m_viewProps = new ViewProperties(dir);
@@ -59,7 +59,7 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
     QWidget* main = new QWidget();
     QVBoxLayout* topLayout = new QVBoxLayout();
 
-    m_label = new QLabel(i18n("Counting folders: %1", 0), main);
+    m_label = new QLabel(i18nc("@info:progress", "Counting folders: %1", 0), main);
     m_progressBar = new QProgressBar(main);
     m_progressBar->setMinimum(0);
     m_progressBar->setMaximum(0);
@@ -106,7 +106,7 @@ void ViewPropsProgressInfo::updateProgress()
 {
     if (m_dirSizeJob != 0) {
         const int subdirs = m_dirSizeJob->totalSubdirs();
-        m_label->setText(i18n("Counting folders: %1", subdirs));
+        m_label->setText(i18nc("@info:progress", "Counting folders: %1", subdirs));
     }
 
     if (m_applyViewPropsJob != 0) {
@@ -122,7 +122,7 @@ void ViewPropsProgressInfo::applyViewProperties()
     }
 
     const int subdirs = m_dirSizeJob->totalSubdirs();
-    m_label->setText(i18n("Folders: %1", subdirs));
+    m_label->setText(i18nc("@info:progress", "Folders: %1", subdirs));
     m_progressBar->setMaximum(subdirs);
 
     m_dirSizeJob = 0;
@@ -135,11 +135,13 @@ void ViewPropsProgressInfo::applyViewProperties()
 void ViewPropsProgressInfo::cancelApplying()
 {
     if (m_dirSizeJob != 0) {
-        m_dirSizeJob->doKill();
+        m_dirSizeJob->kill();
+        m_dirSizeJob = 0;
     }
 
     if (m_applyViewPropsJob != 0) {
-        m_applyViewPropsJob->doKill();
+        m_applyViewPropsJob->kill();
+        m_applyViewPropsJob = 0;
     }
 }