The order is important, also is important to accept the event on the move event....

[dolphin.git] / src / viewpropsprogressinfo.cpp

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index e0037a6f94a417a0cd21daa36f6200f4b32b9607..c841a13311ae51944ec53c8be7e43ef1d1660888 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -22,32 +22,31 @@
 #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>
-#include <kurl.h>
 #include <kio/jobclasses.h>
 
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
-        const KUrl& dir,
-        const ViewProperties& viewProps) :
-        KDialog(parent),
-        m_dir(dir),
-        m_viewProps(0),
-        m_label(0),
-        m_progressBar(0),
-        m_dirSizeJob(0),
-        m_applyViewPropsJob(0),
-        m_timer(0)
+                                             const KUrl& dir,
+                                             const ViewProperties& viewProps) :
+    KDialog(parent),
+    m_dir(dir),
+    m_viewProps(0),
+    m_label(0),
+    m_progressBar(0),
+    m_dirSizeJob(0),
+    m_applyViewPropsJob(0),
+    m_timer(0)
 {
     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);
@@ -60,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);
@@ -107,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) {
@@ -123,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;
@@ -136,11 +135,11 @@ void ViewPropsProgressInfo::applyViewProperties()
 void ViewPropsProgressInfo::cancelApplying()
 {
     if (m_dirSizeJob != 0) {
-        m_dirSizeJob->doKill();
+        m_dirSizeJob->kill();
     }
 
     if (m_applyViewPropsJob != 0) {
-        m_applyViewPropsJob->doKill();
+        m_applyViewPropsJob->kill();
     }
 }