adapt Dolphin to kdelibs coding style (http://techbase.kde.org/Policies/Kdelibs_Codin...

[dolphin.git] / src / viewpropsprogressinfo.cpp

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index 2d0b1a8f8c79f682820dfbda444a18a7fe72eb78..e0037a6f94a417a0cd21daa36f6200f4b32b9607 100644 (file)
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include "viewpropsprogressinfo.h"
@@ -33,25 +33,25 @@
 #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)
 {
-    setCaption(i18n("Applying view properties"));
+    const QSize minSize = minimumSize();
+    setMinimumSize(QSize(320, minSize.height()));
+
+    setCaption(i18n("Applying View Properties"));
     setButtons(KDialog::Cancel);
 
     m_viewProps = new ViewProperties(dir);
-    m_viewProps->setViewMode(viewProps.viewMode());
-    m_viewProps->setShowHiddenFiles(viewProps.showHiddenFiles());
-    m_viewProps->setSorting(viewProps.sorting());
-    m_viewProps->setSortOrder(viewProps.sortOrder());
+    m_viewProps->setDirProperties(viewProps);
 
     // the view properties are stored by the ViewPropsApplierJob, so prevent
     // that the view properties are saved twice: