Differential D26797 Diff 74541 kcms/componentchooser/componentchooserbrowser.cpp

Changeset View

Standalone View

View Options

kcms/componentchooser/componentchooserbrowser.cpp

1/*************************************************************************** 1​/***************************************************************************
2 componentchooserbrowser.cpp 2​ componentchooserbrowser.cpp
3 ------------------- 3​ -------------------
4 copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org> 4​ copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
5 copyright : (C) 2020 by Méven Car <meven.car@enioka.com> 5​ copyright : (C) 2020 by Méven Car <meven.car@enioka.com>
6***************************************************************************/ 6​***************************************************************************/
7 7​
8/*************************************************************************** 8​/***************************************************************************
9 * * 9​ * *
10 * This program is free software; you can redistribute it and/or modify * 10​ * This program is free software; you can redistribute it and/or modify *
11 * it under the terms of the GNU General Public License version 2 as * 11​ * it under the terms of the GNU General Public License version 2 as *
12 * published by the Free Software Foundationi * 12​ * published by the Free Software Foundation *
13 * * 13​ * *
14 ***************************************************************************/ 14​ ***************************************************************************/
15 15​
16#include "componentchooserbrowser.h" 16​#include "componentchooserbrowser.h"
17#include <kopenwithdialog.h> 17​#include <kopenwithdialog.h>
18#include "browser_settings.h" 18​#include "browser_settings.h"
19 19​
20#include <KBuildSycocaProgressDialog> ​
21#include <KLocalizedString> 20​#include <KLocalizedString>
22#include <KServiceTypeTrader> 21​#include <KServiceTypeTrader>
23#include <KMimeTypeTrader> 22​#include <KMimeTypeTrader>
24 23​
25#include <QUrl> 24​#include <QUrl>
26#include <QDBusConnection> 25​#include <QDBusConnection>
27#include <QDBusMessage> 26​#include <QDBusMessage>
28 27​
29CfgBrowser::CfgBrowser(QWidget *parent) 28​CfgBrowser::CfgBrowser(QWidget *parent)
30 : QWidget(parent), Ui::BrowserConfig_UI(),CfgPlugin() 29​ : CfgPlugin(parent)
31{ 30​{
32 setupUi(this); 31​ connect(this, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated), this, &CfgBrowser::selectBrowser);
33 connect(browserCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated), this, &CfgBrowser::selectBrowser); ​
34 ​
35} 32​}
36 33​
37CfgBrowser::~CfgBrowser() { 34​CfgBrowser::~CfgBrowser() {
38} 35​}
39 36​
40void CfgBrowser::selectBrowser(int index) 37​void CfgBrowser::selectBrowser(int index)
41{ 38​{
42 if (index == browserCombo->count() -1) { 39​ if (index == count() -1) {
43 QList<QUrl> urlList; 40​ QList<QUrl> urlList;
44 KOpenWithDialog dlg(QStringLiteral("x-scheme-handler/http"), QString(), this); 41​ KOpenWithDialog dlg(QStringLiteral("x-scheme-handler/http"), QString(), this);
45 dlg.setSaveNewApplications(true); 42​ dlg.setSaveNewApplications(true);
46 if (dlg.exec() != QDialog::Accepted) { 43​ if (dlg.exec() != QDialog::Accepted) {
47 browserCombo->setCurrentIndex(m_currentIndex); 44​ setCurrentIndex(m_currentIndex);
48 return; 45​ return;
49 } 46​ }
50 47​
51 const auto service = dlg.service(); 48​ const auto service = dlg.service();
52 49​
53 // check if the selected service is already in the list 50​ // check if the selected service is already in the list
54 const auto matching = browserCombo->model()->match(browserCombo->model()->index(0,0), Qt::UserRole, service->storageId()); 51​ const auto matching = model()->match(model()->index(0,0), Qt::UserRole, service->storageId());
55 if (!matching.isEmpty()) { 52​ if (!matching.isEmpty()) {
56 const int index = matching.at(0).row(); 53​ const int index = matching.at(0).row();
57 browserCombo->setCurrentIndex(index); 54​ setCurrentIndex(index);
58 emit changed(index != m_currentIndex); 55​ emit changed(index != m_currentIndex);
59 } else { 56​ } else {
60 const QString icon = !service->icon().isEmpty() ? service->icon() : QStringLiteral("application-x-shellscript"); 57​ const QString icon = !service->icon().isEmpty() ? service->icon() : QStringLiteral("application-x-shellscript");
61 browserCombo->insertItem(browserCombo->count() -1, QIcon::fromTheme(icon), service->name(), service->storageId()); 58​ insertItem(count() -1, QIcon::fromTheme(icon), service->name(), service->storageId());
62 browserCombo->setCurrentIndex(browserCombo->count() - 2); 59​ setCurrentIndex(count() - 2);
63 60​
64 emit changed(true); 61​ emit changed(true);
65 } 62​ }
66 63​
67 } else { 64​ } else {
68 emit changed(index != m_currentIndex); 65​ emit changed(index != m_currentIndex);
69 } 66​ }
70} 67​}
71 68​
72void CfgBrowser::defaults() ​
73{ ​
74 if (m_falkonIndex != -1) { ​
75 browserCombo->setCurrentIndex(m_falkonIndex); ​
76 } ​
77} ​
78 ​
79bool CfgBrowser::isDefaults() const ​
80{ ​
81 return m_falkonIndex == -1 || m_falkonIndex == browserCombo->currentIndex(); ​
82} ​
83 ​
84void CfgBrowser::load(KConfig *) 69​void CfgBrowser::load(KConfig *)
85{ 70​{
86 const auto browser = KMimeTypeTrader::self()->preferredService("x-scheme-handler/http"); 71​ const auto browser = KMimeTypeTrader::self()->preferredService("x-scheme-handler/http");
87 72​
88 browserCombo->clear(); 73​ clear();
89 m_currentIndex = -1; 74​ m_currentIndex = -1;
90 m_falkonIndex = -1; 75​ m_defaultIndex = -1;
91 76​
92 const auto constraint = QStringLiteral("'WebBrowser' in Categories and" 77​ const auto constraint = QStringLiteral("'WebBrowser' in Categories and"
93 " ('x-scheme-handler/http' in ServiceTypes or 'x-scheme-handler/https' in ServiceTypes)"); 78​ " ('x-scheme-handler/http' in ServiceTypes or 'x-scheme-handler/https' in ServiceTypes)");
94 const auto browsers = KServiceTypeTrader::self()->query(QStringLiteral("Application"), constraint); 79​ const auto browsers = KServiceTypeTrader::self()->query(QStringLiteral("Application"), constraint);
95 for (const auto &service : browsers) { 80​ for (const auto &service : browsers) {
96 browserCombo->addItem(QIcon::fromTheme(service->icon()), service->name(), service->storageId()); 81​ addItem(QIcon::fromTheme(service->icon()), service->name(), service->storageId());
97 82​
98 if (browser->storageId() == service->storageId()) { 83​ if (browser->storageId() == service->storageId()) {
99 browserCombo->setCurrentIndex(browserCombo->count() - 1); 84​ setCurrentIndex(count() - 1);
100 m_currentIndex = browserCombo->count() - 1; 85​ m_currentIndex = count() - 1;
101 } 86​ }
102 if (service->storageId() == QStringLiteral("org.kde.falkon.desktop")) { 87​ if (service->storageId() == QStringLiteral("org.kde.falkon.desktop")) {
broulikUnsubmitted
Not Done

As a future step I would like those default components not hardcoded in the code

broulik: As a future step I would like those default components not hardcoded in the code
ervinUnsubmitted
Not Done

Yes, it screams for GUI / config separation (in another commit)

ervin: Yes, it screams for GUI / config separation (in another commit)
103 m_falkonIndex = browserCombo->count() - 1; 88​ m_defaultIndex = count() - 1;
104 } 89​ }
105 } 90​ }
106 91​
107 if (browser && m_currentIndex == -1) { 92​ if (browser && m_currentIndex == -1) {
108 // we have a browser specified by the user 93​ // we have a browser specified by the user
109 browserCombo->addItem(QIcon::fromTheme(QStringLiteral("application-x-shellscript")), browser->name(), browser->storageId()); 94​ addItem(QIcon::fromTheme(QStringLiteral("application-x-shellscript")), browser->name(), browser->storageId());
110 browserCombo->setCurrentIndex(browserCombo->count() - 1); 95​ setCurrentIndex(count() - 1);
111 m_currentIndex = browserCombo->count() - 1; 96​ m_currentIndex = count() - 1;
broulikUnsubmitted
Not Done

Something funky is going on with this one:

I configured a custom kdialog --sorry "%f" command line. It only shows up as "kdialog" so I can't tell what the actual command was and not edit it later.

More importantly, though, I then changed my browser to be Kate. While it initially showed "Kate" with proper icon, when I re-open the KCM, it shows "kdialog" again as custom command, while still opening Kate when I open http URLs.
Now it keeps showing "kdialog" no matter what default browser I use.

broulik: Something funky is going on with this one: I configured a custom `kdialog --sorry "%f"`…
112 } 97​ }
113 98​
114 // add a other option to add a new browser 99​ // add a other option to add a new browser
115 browserCombo->addItem(QIcon::fromTheme(QStringLiteral("application-x-shellscript")), i18n("Other..."), QStringLiteral()); 100​ addItem(QIcon::fromTheme(QStringLiteral("application-x-shellscript")), i18n("Other..."));
broulikUnsubmitted
Done

Don't use QStringLiteral(), use QString() for a null string.
But in this case you can just omit the last argument altogether.

broulik: Don't use `QStringLiteral()`, use `QString()` for a null string. But in this case you can just…
116 101​
117 emit changed(false); 102​ emit changed(false);
118} 103​}
119 104​
120void CfgBrowser::save(KConfig *) 105​void CfgBrowser::save(KConfig *)
121{ 106​{
122 const QString browserStorageId = browserCombo->currentData().toString(); 107​ const QString browserStorageId = currentData().toString();
123 108​
124 BrowserSettings settings; 109​ BrowserSettings settings;
125 settings.setBrowserApplication(browserStorageId); 110​ settings.setBrowserApplication(browserStorageId);
126 settings.save(); 111​ settings.save();
127 112​
128 // Save the default browser as scheme handler for http(s) in mimeapps.list 113​ // Save the default browser as scheme handler for http(s) in mimeapps.list
129 KSharedConfig::Ptr mimeAppList = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation); 114​ KSharedConfig::Ptr mimeAppList = KSharedConfig::openConfig(QStringLiteral("mimeapps.list"), KConfig::NoGlobals, QStandardPaths::GenericConfigLocation);
130 if (mimeAppList->isConfigWritable(true /*warn user if not writable*/)) { 115​ if (mimeAppList->isConfigWritable(true /*warn user if not writable*/)) {
131 KConfigGroup defaultApp(mimeAppList, "Default Applications"); 116​ KConfigGroup defaultApp(mimeAppList, "Default Applications");
132 defaultApp.writeXdgListEntry(QStringLiteral("x-scheme-handler/http"), QStringList(browserStorageId)); 117​ defaultApp.writeXdgListEntry(QStringLiteral("x-scheme-handler/http"), QStringList(browserStorageId));
133 defaultApp.writeXdgListEntry(QStringLiteral("x-scheme-handler/https"), QStringList(browserStorageId)); 118​ defaultApp.writeXdgListEntry(QStringLiteral("x-scheme-handler/https"), QStringList(browserStorageId));
134 mimeAppList->sync(); 119​ mimeAppList->sync();
135 120​
136 KBuildSycocaProgressDialog::rebuildKSycoca(this); ​
137 ​
138 QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"), 121​ QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"),
139 QStringLiteral("/KLauncher"), 122​ QStringLiteral("/KLauncher"),
140 QStringLiteral("org.kde.KLauncher"), 123​ QStringLiteral("org.kde.KLauncher"),
141 QStringLiteral("reparseConfiguration")); 124​ QStringLiteral("reparseConfiguration"));
142 QDBusConnection::sessionBus().send(message); 125​ QDBusConnection::sessionBus().send(message);
143 126​
144 m_currentIndex = browserCombo->currentIndex(); 127​ m_currentIndex = currentIndex();
145 128​
146 emit changed(false); 129​ emit changed(false);
147 } 130​ }
148} 131​}