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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-baseapps/KDE/4=2E6=5D_dolphin/src/panels=3A_Pro?=
From:       Peter Penz <peter.penz19 () gmail ! com>
Date:       2011-02-02 16:38:19
Message-ID: 20110202163819.AC3CCA609B () git ! kde ! org
[Download RAW message or body]

Git commit e687304d6a8e411d6245db08a2ca25e27eb54395 by Peter Penz.
Committed on 02/02/11 at 17:37.
Pushed by ppenz into branch 'KDE/4.6'.

Provide a default size-hint for all panels

This fixes the issue that the initial size of the Filter Panel is too small.

M  +0    -5    dolphin/src/panels/folders/folderspanel.cpp     
M  +0    -3    dolphin/src/panels/folders/folderspanel.h     
M  +0    -7    dolphin/src/panels/information/informationpanel.cpp     
M  +0    -3    dolphin/src/panels/information/informationpanel.h     
M  +10   -0    dolphin/src/panels/panel.cpp     
M  +3    -0    dolphin/src/panels/panel.h     
M  +0    -7    dolphin/src/panels/terminal/terminalpanel.cpp     
M  +0    -3    dolphin/src/panels/terminal/terminalpanel.h     

http://commits.kde.org/kde-baseapps/e687304d6a8e411d6245db08a2ca25e27eb54395

diff --git a/dolphin/src/panels/folders/folderspanel.cpp \
b/dolphin/src/panels/folders/folderspanel.cpp index 5cfce59..43d7b64 100644
--- a/dolphin/src/panels/folders/folderspanel.cpp
+++ b/dolphin/src/panels/folders/folderspanel.cpp
@@ -70,11 +70,6 @@ FoldersPanel::~FoldersPanel()
     m_dirLister = 0; // deleted by m_dolphinModel
 }
 
-QSize FoldersPanel::sizeHint() const
-{
-    return QSize(200, 400);
-}
-
 void FoldersPanel::setShowHiddenFiles(bool show)
 {
     FoldersPanelSettings::setShowHiddenFiles(show);
diff --git a/dolphin/src/panels/folders/folderspanel.h \
b/dolphin/src/panels/folders/folderspanel.h index 2aa94d1..43ae7bd 100644
--- a/dolphin/src/panels/folders/folderspanel.h
+++ b/dolphin/src/panels/folders/folderspanel.h
@@ -45,9 +45,6 @@ public:
     FoldersPanel(QWidget* parent = 0);
     virtual ~FoldersPanel();
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
-
     void setShowHiddenFiles(bool show);
     bool showHiddenFiles() const;
 
diff --git a/dolphin/src/panels/information/informationpanel.cpp \
b/dolphin/src/panels/information/informationpanel.cpp index 0fd67b2..7ce85ee 100644
--- a/dolphin/src/panels/information/informationpanel.cpp
+++ b/dolphin/src/panels/information/informationpanel.cpp
@@ -46,13 +46,6 @@ InformationPanel::~InformationPanel()
 {
 }
 
-QSize InformationPanel::sizeHint() const
-{
-    QSize size = Panel::sizeHint();
-    size.setWidth(minimumSizeHint().width());
-    return size;
-}
-
 void InformationPanel::setSelection(const KFileItemList& selection)
 {
     if (!isVisible()) {
diff --git a/dolphin/src/panels/information/informationpanel.h \
b/dolphin/src/panels/information/informationpanel.h index 58265f4..17f8003 100644
--- a/dolphin/src/panels/information/informationpanel.h
+++ b/dolphin/src/panels/information/informationpanel.h
@@ -35,9 +35,6 @@ public:
     explicit InformationPanel(QWidget* parent = 0);
     virtual ~InformationPanel();
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
-
 signals:
     void urlActivated(const KUrl& url);
 
diff --git a/dolphin/src/panels/panel.cpp b/dolphin/src/panels/panel.cpp
index 6d11422..3af29bf 100644
--- a/dolphin/src/panels/panel.cpp
+++ b/dolphin/src/panels/panel.cpp
@@ -36,6 +36,16 @@ KUrl Panel::url() const
     return m_url;
 }
 
+QSize Panel::sizeHint() const
+{
+    // The size hint will be requested already when starting Dolphin even
+    // if the panel is invisible. For performance reasons most panels delay
+    // the creation and initialization of widgets until a showEvent() is called.
+    // Because of this the size-hint of the embedded widgets cannot be used
+    // and a default size is provided:
+    return QSize(180, 180);
+}
+
 void Panel::setUrl(const KUrl& url)
 {
     if (url.equals(m_url, KUrl::CompareWithoutTrailingSlash)) {
diff --git a/dolphin/src/panels/panel.h b/dolphin/src/panels/panel.h
index 11558e2..2c91870 100644
--- a/dolphin/src/panels/panel.h
+++ b/dolphin/src/panels/panel.h
@@ -39,6 +39,9 @@ public:
     /** Returns the current set URL of the active Dolphin view. */
     KUrl url() const;
 
+    /** @see QWidget::sizeHint() */
+    virtual QSize sizeHint() const;
+
 public slots:
     /**
      * This is invoked every time the folder being displayed in the
diff --git a/dolphin/src/panels/terminal/terminalpanel.cpp \
b/dolphin/src/panels/terminal/terminalpanel.cpp index fc17683..3c9c5bd 100644
--- a/dolphin/src/panels/terminal/terminalpanel.cpp
+++ b/dolphin/src/panels/terminal/terminalpanel.cpp
@@ -46,13 +46,6 @@ TerminalPanel::~TerminalPanel()
 {
 }
 
-QSize TerminalPanel::sizeHint() const
-{
-    QSize size = Panel::sizeHint();
-    size.setHeight(200);
-    return size;
-}
-
 void TerminalPanel::terminalExited()
 {
     emit hideTerminalPanel();
diff --git a/dolphin/src/panels/terminal/terminalpanel.h \
b/dolphin/src/panels/terminal/terminalpanel.h index b950827..831c97f 100644
--- a/dolphin/src/panels/terminal/terminalpanel.h
+++ b/dolphin/src/panels/terminal/terminalpanel.h
@@ -42,9 +42,6 @@ public:
     TerminalPanel(QWidget* parent = 0);
     virtual ~TerminalPanel();
 
-    /** @see QWidget::sizeHint() */
-    virtual QSize sizeHint() const;
-
 public slots:
     void terminalExited();
 


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