Index: src/filewidgets/kdiroperator.cpp
===================================================================
--- src/filewidgets/kdiroperator.cpp
+++ src/filewidgets/kdiroperator.cpp
@@ -1883,22 +1883,23 @@
connect(action, SIGNAL(triggered(bool)), this, SLOT(deleteSelected()));
// the sort menu actions
- KActionMenu *sortMenu = new KActionMenu(i18n("Sorting"), this);
+ KActionMenu *sortMenu = new KActionMenu(i18n("Sort by"), this);
d->actionCollection->addAction(QStringLiteral("sorting menu"), sortMenu);
+ sortMenu->setIcon(QIcon::fromTheme(QStringLiteral("itemize")));
- KToggleAction *byNameAction = new KToggleAction(i18n("By Name"), this);
+ KToggleAction *byNameAction = new KToggleAction(i18n("Name"), this);
d->actionCollection->addAction(QStringLiteral("by name"), byNameAction);
connect(byNameAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortByName()));
- KToggleAction *bySizeAction = new KToggleAction(i18n("By Size"), this);
+ KToggleAction *bySizeAction = new KToggleAction(i18n("Size"), this);
d->actionCollection->addAction(QStringLiteral("by size"), bySizeAction);
connect(bySizeAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortBySize()));
- KToggleAction *byDateAction = new KToggleAction(i18n("By Date"), this);
+ KToggleAction *byDateAction = new KToggleAction(i18n("Date"), this);
d->actionCollection->addAction(QStringLiteral("by date"), byDateAction);
connect(byDateAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortByDate()));
- KToggleAction *byTypeAction = new KToggleAction(i18n("By Type"), this);
+ KToggleAction *byTypeAction = new KToggleAction(i18n("Type"), this);
d->actionCollection->addAction(QStringLiteral("by type"), byTypeAction);
connect(byTypeAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotSortByType()));
Index: src/filewidgets/kfilewidget.cpp
===================================================================
--- src/filewidgets/kfilewidget.cpp
+++ src/filewidgets/kfilewidget.cpp
@@ -484,7 +484,6 @@
"
the Places navigation panel"
"file previews"
"separating folders from files"));
- menu->addAction(coll->action(QStringLiteral("sorting menu")));
menu->addAction(coll->action(QStringLiteral("view menu")));
menu->addSeparator();
menu->addAction(coll->action(QStringLiteral("decoration menu")));
@@ -519,8 +518,11 @@
QAction *closerAction = new QAction(QIcon::fromTheme(QStringLiteral("file-zoom-in")), i18n("Zoom in"), this);
connect(closerAction, SIGNAL(triggered()), SLOT(_k_zoomInIconsSize()));
- QWidget *midSpacer = new QWidget(this);
- midSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ QWidget *midSpacer1 = new QWidget(this);
+ midSpacer1->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+ QWidget *midSpacer2 = new QWidget(this);
+ midSpacer2->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QAction *separator = new QAction(this);
separator->setSeparator(true);
@@ -540,7 +542,9 @@
d->toolbar->addAction(coll->action(QStringLiteral("detailed tree view")));
d->toolbar->addAction(separator2);
d->toolbar->addAction(coll->action(QStringLiteral("inline preview")));
- d->toolbar->addWidget(midSpacer);
+ d->toolbar->addWidget(midSpacer1);
+ d->toolbar->addAction(coll->action(QStringLiteral("sorting menu")));
+ d->toolbar->addWidget(midSpacer2);
d->toolbar->addAction(furtherAction);
d->toolbar->addWidget(d->iconSizeSlider);
d->toolbar->addAction(closerAction);
@@ -551,6 +555,14 @@
d->toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
d->toolbar->setMovable(false);
+ // Make any dropdown menu buttons open their menus without requiring a long press
+ foreach(QToolButton* button, d->toolbar->findChildren()) {
+ if (button->defaultAction() == coll->action(QStringLiteral("sorting menu"))) {
+ button->setPopupMode(QToolButton::InstantPopup);
+ button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ }
+ }
+
KUrlCompletion *pathCompletionObj = new KUrlCompletion(KUrlCompletion::DirCompletion);
pathCombo->setCompletionObject(pathCompletionObj);
pathCombo->setAutoDeleteCompletionObject(true);