Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
System
Dolphin
Commits
e8c45004
Commit
e8c45004
authored
Aug 26, 2020
by
Alexander Lohnau
💬
Committed by
Elvis Angelaccio
Aug 31, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not build KNS installer and KNS button on Windows
parent
8d7775b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/CMakeLists.txt
src/CMakeLists.txt
+4
-2
src/settings/services/servicessettingspage.cpp
src/settings/services/servicessettingspage.cpp
+4
-0
No files found.
src/CMakeLists.txt
View file @
e8c45004
...
...
@@ -391,7 +391,10 @@ install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install
(
TARGETS kcm_dolphinservices DESTINATION
${
KDE_INSTALL_PLUGINDIR
}
)
install
(
TARGETS kcm_dolphingeneral DESTINATION
${
KDE_INSTALL_PLUGINDIR
}
)
add_subdirectory
(
settings/services/servicemenuinstaller
)
if
(
NOT WIN32
)
add_subdirectory
(
settings/services/servicemenuinstaller
)
install
(
FILES settings/services/servicemenu.knsrc DESTINATION
${
KDE_INSTALL_KNSRCDIR
}
)
endif
()
########### install files ###############
...
...
@@ -415,7 +418,6 @@ install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTAL
install
(
FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION
${
KDE_INSTALL_KSERVICES5DIR
}
)
install
(
FILES settings/kcm/kcmdolphinservices.desktop DESTINATION
${
KDE_INSTALL_KSERVICES5DIR
}
)
install
(
FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION
${
KDE_INSTALL_KSERVICES5DIR
}
)
install
(
FILES settings/services/servicemenu.knsrc DESTINATION
${
KDE_INSTALL_KNSRCDIR
}
)
if
(
BUILD_TESTING
)
find_package
(
Qt5Test
${
QT_MIN_VERSION
}
CONFIG REQUIRED
)
...
...
src/settings/services/servicessettingspage.cpp
View file @
e8c45004
...
...
@@ -69,15 +69,19 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
m_listView
->
setVerticalScrollMode
(
QListView
::
ScrollPerPixel
);
connect
(
m_listView
,
&
QListView
::
clicked
,
this
,
&
ServicesSettingsPage
::
changed
);
#ifndef Q_OS_WIN
auto
*
downloadButton
=
new
KNS3
::
Button
(
i18nc
(
"@action:button"
,
"Download New Services..."
),
QStringLiteral
(
"servicemenu.knsrc"
),
this
);
connect
(
downloadButton
,
&
KNS3
::
Button
::
dialogFinished
,
this
,
&
ServicesSettingsPage
::
loadServices
);
#endif
topLayout
->
addWidget
(
label
);
topLayout
->
addWidget
(
m_searchLineEdit
);
topLayout
->
addWidget
(
m_listView
);
#ifndef Q_OS_WIN
topLayout
->
addWidget
(
downloadButton
);
#endif
m_enabledVcsPlugins
=
VersionControlSettings
::
enabledPlugins
();
std
::
sort
(
m_enabledVcsPlugins
.
begin
(),
m_enabledVcsPlugins
.
end
());
...
...
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