Some minor polishing: use a grid for the icons view, give the toggle button of the...

svn path=/trunk/KDE/kdebase/apps/; revision=634601

diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 3f9df031665c207e4e0437725de97a09bc86fab4..0f619ff301836192131a205543e91b904bb35065 100644 (file)
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -37,7 +37,7 @@ DolphinIconsView::DolphinIconsView(QWidget* parent, DolphinController* controlle
 
     // TODO: read out settings
     setViewMode(QListView::IconMode);
-    setSpacing(32);
+    setGridSize(QSize(128, 96));
 
     connect(this, SIGNAL(clicked(const QModelIndex&)),
             controller, SLOT(triggerItem(const QModelIndex&)));

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index aeb10e715371500c137dc87d1ea68f6b035228cc..4ce0fc00937da06f75ad606ce723972c502fba17 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -30,6 +30,7 @@
 #include <assert.h>
 
 #include <kfileitem.h>
+#include <kicon.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
 #include <kurlcombobox.h>
@@ -37,12 +38,12 @@
 
 #include <QApplication>
 #include <QClipboard>
-#include <QCheckBox>
 #include <QDir>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMouseEvent>
+#include <QPushButton>
 
 UrlNavigator::HistoryElem::HistoryElem() :
     m_url(),
@@ -82,9 +83,14 @@ UrlNavigator::UrlNavigator(const KUrl& url,
     m_history.prepend(HistoryElem(url));
 
     QFontMetrics fontMetrics(font());
-    setMinimumHeight(fontMetrics.height() + 8);
-
-    m_toggleButton = new QCheckBox();
+    setMinimumHeight(fontMetrics.height() + 10);
+
+    // intialize toggle button which switches between the breadcrumb view
+    // and the traditional view
+    m_toggleButton = new QPushButton();
+    m_toggleButton->setCheckable(true);
+    m_toggleButton->setFlat(true);
+    m_toggleButton->setIcon(KIcon("locationbar_erase")); // TODO: is just a placeholder icon
     m_toggleButton->setFocusPolicy(Qt::NoFocus);
     m_toggleButton->setMinimumHeight(minimumHeight());
     connect(m_toggleButton, SIGNAL(clicked()),
@@ -93,10 +99,12 @@ UrlNavigator::UrlNavigator(const KUrl& url,
         m_toggleButton->toggle();
     }
 
+    // initialize the bookmark selector
     m_bookmarkSelector = new BookmarkSelector(this);
     connect(m_bookmarkSelector, SIGNAL(bookmarkActivated(const KUrl&)),
             this, SLOT(setUrl(const KUrl&)));
 
+    // initialize the path box of the traditional view
     m_pathBox = new KUrlComboBox(KUrlComboBox::Directories, true, this);
 
     KUrlCompletion* kurlCompletion = new KUrlCompletion(KUrlCompletion::DirCompletion);

diff --git a/src/urlnavigator.h b/src/urlnavigator.h
index 4b571b98dc65503a9fa84b3a8204717195437779..9482619d62a91fcbc83d007ddd58198681e5762b 100644 (file)
--- a/src/urlnavigator.h
+++ b/src/urlnavigator.h
@@ -26,11 +26,11 @@
 #include <QWidget>
 #include <QLinkedList>
 
-class QCheckBox;
 class QHBoxLayout;
 class QLabel;
 class QLineEdit;
 class QMouseEvent;
+class QPushButton;
 
 class KUrl;
 class KFileItem;
@@ -294,7 +294,7 @@ private:
     QHBoxLayout* m_layout;
 
     QLinkedList<HistoryElem> m_history;
-    QCheckBox* m_toggleButton;
+    QPushButton* m_toggleButton;
     BookmarkSelector* m_bookmarkSelector;
     KUrlComboBox* m_pathBox;
     ProtocolCombo* m_protocols;