X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7fecd3b82b3ade1b7ef5a2394e9c8fa2f5852192..da795d20e2f2fa57ac9cafdffcfac4d092d8eaea:/src/viewpropsprogressinfo.cpp

diff --git a/src/viewpropsprogressinfo.cpp b/src/viewpropsprogressinfo.cpp
index 79ebb9a0b..8011dd301 100644
--- a/src/viewpropsprogressinfo.cpp
+++ b/src/viewpropsprogressinfo.cpp
@@ -15,21 +15,20 @@
  *   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"
 #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,
@@ -44,14 +43,14 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
     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->setShowHiddenFilesEnabled(viewProps.isShowHiddenFilesEnabled());
-    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: