fixed layout issues

svn path=/trunk/playground/utils/dolphin/; revision=611357

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 6d7df45111d9185c4424889e8f33c3b5d4aaa206..a5e43432e404987cc69e61b2f087b1b7d6d4aad7 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -19,16 +19,17 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"

-#include <qprogressbar.h>
-#include <qlabel.h>
-#include <qtimer.h>
-#include <kiconloader.h>
-#include <kvbox.h>
-

 #include "dolphinview.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 
 #include "dolphinview.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 

+#include <QLabel>
+#include <QProgressBar>
+#include <QTimer>
+
+#include <kiconloader.h>
+#include <kvbox.h>
+

 DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     KHBox(parent),
     m_messageLabel(0),
 DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     KHBox(parent),
     m_messageLabel(0),


@@ -36,8 +37,10 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     m_progressBar(0),
     m_progress(100)
 {
     m_progressBar(0),
     m_progress(100)
 {

+    setSpacing(4);
+

     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel = new StatusBarMessageLabel(this);

-    m_messageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+    m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);

 
     m_spaceInfo = new StatusBarSpaceInfo(this);
     m_spaceInfo->setUrl(parent->url());
 
     m_spaceInfo = new StatusBarSpaceInfo(this);
     m_spaceInfo->setUrl(parent->url());


@@ -53,7 +56,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
             this, SLOT(slotProgressTimer()));
 
     const QSize size(m_progressBar->sizeHint());
             this, SLOT(slotProgressTimer()));
 
     const QSize size(m_progressBar->sizeHint());

-    m_progressBar->setMaximumWidth(size.width());
+    m_progressBar->setMaximumWidth(200);

     setMinimumHeight(size.height());
     m_messageLabel->setMinimumTextHeight(size.height());
 
     setMinimumHeight(size.height());
     m_messageLabel->setMinimumTextHeight(size.height());
 

diff --git a/src/dolphinstatusbar.h b/src/dolphinstatusbar.h
index cc0cfdd05c934696810cc94dbcc38f73559e318c..e7a29e95465ce856bdb42d79c00557204b041b69 100644 (file)
--- a/src/dolphinstatusbar.h
+++ b/src/dolphinstatusbar.h
@@ -38,8 +38,6 @@ class KUrl;
  *
  * The statusbar allows to show messages and progress
  * information.
  *
  * The statusbar allows to show messages and progress
  * information.

- *
- * @author Peter Penz

  */
 class DolphinStatusBar : public KHBox {
     Q_OBJECT
  */
 class DolphinStatusBar : public KHBox {
     Q_OBJECT