From 389c909affddb127b2e7af35422c21e55c0485b9 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 6 Sep 2015 16:48:55 +0200 Subject: [PATCH 1/5] Remove the dummy widget, which assured that the dialog layout was not stretched vertically (vbox align top does the same), to make the uncheckable "Open archives as folder" checkbox checkable again. BUG: 349148 FIXED-IN: 15.08.1 REVIEW: 125077 --- src/settings/navigation/navigationsettingspage.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index f9c7a4dfcd..e37a35d8eb 100644 --- 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(); From 4143a69c05be6da8a91c8ba0db505a47b22ddc75 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 6 Sep 2015 16:34:41 +0200 Subject: [PATCH 2/5] Rename dialog: Set focus to input text box on dialog show event. BUG: 351708 FIXED-IN: 15.08.1 REVIEW: 125078 --- src/views/renamedialog.cpp | 8 +++++++- src/views/renamedialog.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index be9e34c4a1..60b7b16c1f 100644 --- 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 a1953e8b35..3964c0a5c4 100644 --- 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); From 23bbec8ad922da14738d9a27e4a4fb3ea6b0a0e7 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 10 Sep 2015 00:42:40 +0200 Subject: [PATCH 3/5] GIT_SILENT Upgrade KDE Applications version to 15.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1db40d13bb..d98f261217 100644 --- 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") From 51f75371c43b5c740703a80aa584a9bd88af16c8 Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Thu, 10 Sep 2015 20:59:00 +0200 Subject: [PATCH 4/5] Change Dolphin Preferences Sidebar Icons --- src/settings/dolphinsettingsdialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 820fc0e681..4f9a20de44 100644 --- 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); From 6e218c4c146c08626c6bf4c87e9849a9de7462c4 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Sat, 26 Sep 2015 05:34:26 +1000 Subject: [PATCH 5/5] Fix KF5Activities being optional. If found via find_package(KF5 COMPONENTS Activities) instead, it will inherit REQUIRED from the previous call. REVIEW: 125360 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d98f261217..d926e9f0ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 )