Merge branch 'Applications/15.08'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5580e9e01e0024eb36d5a049e6550ace6c52f14..8f1e2835d3c6577bb3428f9d38de981600ccfef1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(Dolphin)
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "15")
 set (KDE_APPLICATIONS_VERSION_MINOR "08")
-set (KDE_APPLICATIONS_VERSION_MICRO "0")
+set (KDE_APPLICATIONS_VERSION_MICRO "1")
 set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 set(QT_MIN_VERSION "5.4.0")
@@ -66,7 +66,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     WindowSystem
     Notifications
 )
-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS
+find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
     Activities
 )
 

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 820fc0e68106e3091f2f1c431b6a0194fab2986a..4f9a20de443cddfb6e0f7615c60e1b7bd3dafe68 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -74,28 +74,28 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
     KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
                                                        i18nc("@title:group", "Navigation"));
-    navigationSettingsFrame->setIcon(QIcon::fromTheme("input-mouse"));
+    navigationSettingsFrame->setIcon(QIcon::fromTheme("edit-select"));
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Services
     ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
     KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
                                                        i18nc("@title:group", "Services"));
-    servicesSettingsFrame->setIcon(QIcon::fromTheme("services"));
+    servicesSettingsFrame->setIcon(QIcon::fromTheme("flag"));
     connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
     TrashSettingsPage* trashSettingsPage = new TrashSettingsPage(this);
     KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
                                                    i18nc("@title:group", "Trash"));
-    trashSettingsFrame->setIcon(QIcon::fromTheme("user-trash"));
+    trashSettingsFrame->setIcon(QIcon::fromTheme("trash-empty"));
     connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // General
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
                                                     i18nc("@title:group General settings", "General"));
-    generalSettingsFrame->setIcon(QIcon::fromTheme("system-run"));
+    generalSettingsFrame->setIcon(QIcon::fromTheme("view-preview"));
     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     m_pages.append(startupSettingsPage);

diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp
index f9c7a4dfcd89546417b24715fe45363d333bb63f..e37a35d8eb9e6141319243338882e254c4f5518f 100644 (file)
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@@ -43,11 +43,6 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) :
     m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
     vBoxLayout->addWidget(m_autoExpandFolders);
 
-    // Add a dummy widget with no restriction regarding
-    // a vertical resizing. This assures that the dialog layout
-    // is not stretched vertically.
-    new QWidget(vBox);
-
     topLayout->addWidget(vBox);
 
     loadSettings();

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index be9e34c4a138ce2d8db31008f949b019df981bfb..60b7b16c1f2e8d18049fb3eb7f8691a4a9a05514 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -108,7 +108,6 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 
     m_lineEdit->setText(m_newName);
     m_lineEdit->setSelection(0, selectionLength);
-    m_lineEdit->setFocus();
 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);
@@ -197,6 +196,13 @@ void RenameDialog::slotTextChanged(const QString& newName)
     m_okButton->setEnabled(enable);
 }
 
+void RenameDialog::showEvent(QShowEvent* event)
+{
+    m_lineEdit->setFocus();
+
+    QDialog::showEvent(event);
+}
+
 void RenameDialog::renameItems()
 {
     // Iterate through all items and rename them...

diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index a1953e8b35e6afdb7379586493f76ea854b0a71a..3964c0a5c4fe05e14db941dedb22131f60189118 100644 (file)
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -45,6 +45,9 @@ private slots:
     void slotAccepted();
     void slotTextChanged(const QString& newName);
 
+protected:
+    void showEvent(QShowEvent* event) override;
+
 private:
     void renameItems();
     void renameItem(const KFileItem &item, const QString& newName);