Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Discover
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma
Discover
Commits
8519fd22
Commit
8519fd22
authored
Dec 28, 2017
by
Aleix Pol Gonzalez
🐧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve KNS error message
BUG: 388101
parent
d070a0bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
libdiscover/backends/KNSBackend/KNSBackend.cpp
libdiscover/backends/KNSBackend/KNSBackend.cpp
+8
-6
libdiscover/backends/KNSBackend/KNSBackend.h
libdiscover/backends/KNSBackend/KNSBackend.h
+1
-0
No files found.
libdiscover/backends/KNSBackend/KNSBackend.cpp
View file @
8519fd22
...
...
@@ -113,9 +113,11 @@ KNSBackend::KNSBackend(QObject* parent, const QString& iconName, const QString &
m_engine
->
setPageSize
(
100
);
#endif
// Setting setFetching to false when we get an error ensures we don't end up in an eternally-fetching state
connect
(
m_engine
,
&
KNSCore
::
Engine
::
signalError
,
this
,
[
this
](
const
QString
&
error
)
{
connect
(
m_engine
,
&
KNSCore
::
Engine
::
signalError
,
this
,
[
this
](
const
QString
&
_error
)
{
QString
error
=
_error
;
if
(
error
==
QLatin1Literal
(
"All categories are missing"
))
{
markInvalid
(
error
);
error
=
i18n
(
"Invalid %1 backend, contact your distributor."
,
m_displayName
);
}
m_responsePending
=
false
;
Q_EMIT
searchFinished
();
...
...
@@ -131,10 +133,10 @@ KNSBackend::KNSBackend(QObject* parent, const QString& iconName, const QString &
const
QVector
<
QPair
<
FilterType
,
QString
>>
filters
=
{
{
CategoryFilter
,
fileName
}
};
const
QSet
<
QString
>
backendName
=
{
name
()
};
QString
displayName
=
group
.
readEntry
(
"Name"
,
QString
());
if
(
displayName
.
isEmpty
())
{
displayName
=
fileName
.
mid
(
0
,
fileName
.
indexOf
(
QLatin1Char
(
'.'
)));
displayName
[
0
]
=
displayName
[
0
].
toUpper
();
m_
displayName
=
group
.
readEntry
(
"Name"
,
QString
());
if
(
m_
displayName
.
isEmpty
())
{
m_
displayName
=
fileName
.
mid
(
0
,
fileName
.
indexOf
(
QLatin1Char
(
'.'
)));
m_displayName
[
0
]
=
m_
displayName
[
0
].
toUpper
();
}
static
const
QSet
<
QString
>
knsrcPlasma
=
{
...
...
@@ -144,7 +146,7 @@ KNSBackend::KNSBackend(QObject* parent, const QString& iconName, const QString &
QStringLiteral
(
"cgcgtk3.knsrc"
),
QStringLiteral
(
"cgcicon.knsrc"
),
QStringLiteral
(
"cgctheme.knsrc"
),
//GTK integration
QStringLiteral
(
"kwinswitcher.knsrc"
),
QStringLiteral
(
"kwineffect.knsrc"
),
QStringLiteral
(
"kwinscripts.knsrc"
)
//KWin
};
auto
actualCategory
=
new
Category
(
displayName
,
QStringLiteral
(
"plasma"
),
filters
,
backendName
,
{},
QUrl
(),
true
);
auto
actualCategory
=
new
Category
(
m_
displayName
,
QStringLiteral
(
"plasma"
),
filters
,
backendName
,
{},
QUrl
(),
true
);
const
auto
topLevelName
=
knsrcPlasma
.
contains
(
fileName
)
?
i18n
(
"Plasma Addons"
)
:
i18n
(
"Application Addons"
);
const
QUrl
decoration
(
knsrcPlasma
.
contains
(
fileName
)
?
QStringLiteral
(
"https://c2.staticflickr.com/4/3148/3042248532_20bd2e38f4_b.jpg"
)
:
QStringLiteral
(
"https://c2.staticflickr.com/8/7067/6847903539_d9324dcd19_o.jpg"
));
...
...
libdiscover/backends/KNSBackend/KNSBackend.h
View file @
8519fd22
...
...
@@ -96,6 +96,7 @@ private:
QStringList
m_extends
;
QStringList
m_categories
;
QVector
<
Category
*>
m_rootCategories
;
QString
m_displayName
;
};
#endif // KNSBACKEND_H
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment