alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use the new KDEPackageAppTemplates ECM module

Browse Source 
REVIEW:126557
Change-Id: Ie32644a0641d1f0d5299ba9d1b0053e3f37d2635
This commit is contained in:
Marco Martin 2015-12-29 10:47:17 +01:00
parent ab135f4e8e
commit 3f56e63e70
5 changed files with 9 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -8,8 +8,7 @@ find_package(ECM 5.17.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(GenerateExportHeader)
include(ECMGenerateHeaders)
@ -19,11 +18,11 @@ include(KDECompilerSettings)
include(ECMPackageConfigHelpers)
include(ECMSetupVersion)
include(KDEFrameworkCompilerSettings)
include(KDETemplateMacro)
include(ECMQtDeclareLoggingCategory)
include(KDEPackageAppTemplates)
set(KF5_VERSION "5.18.0") # handled by release scripts
set(KF5_DEP_VERSION "5.17.0") # handled by release scripts
set(KF5_DEP_VERSION "5.18.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION}
VARIABLE_PREFIX PLASMA

49
cmake/KDETemplateMacro.cmake
View File

@ -1,49 +0,0 @@
macro(kdetemplate_add_app_templates _templateNames)
foreach(_templateName ${ARGV})
get_filename_component(_tmp_file ${_templateName} ABSOLUTE)
get_filename_component(_baseName ${_tmp_file} NAME_WE)
if(WIN32)
set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.zip)
else(WIN32)
set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.tar.bz2)
endif()
file(GLOB _files "${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}/*")
set(_deps)
foreach(_file ${_files})
get_filename_component(_fileName ${_file} NAME)
string(COMPARE NOTEQUAL ${_fileName} .kdev_ignore _v1)
string(REGEX MATCH "\\.svn" _v2 ${_fileName})
if(WIN32)
string(REGEX MATCH "_svn" _v3 ${_fileName})
else(WIN32)
set(_v3 FALSE)
endif()
if (_v1 AND NOT _v2 AND NOT _v3)
set(_deps ${_deps} ${_file})
endif ()
endforeach()
add_custom_target(${_baseName} ALL DEPENDS ${_template})
if(WIN32)
add_custom_command(OUTPUT ${_template}
COMMAND 7za ARGS a -r -tzip ${_template} ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}/*
DEPENDS ${_deps}
)
else(WIN32)
add_custom_command(OUTPUT ${_template}
COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}
--exclude .kdev_ignore --exclude .svn
-j -f ${_template} .
DEPENDS ${_deps}
)
endif()
install(FILES ${_template} DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates)
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_template}")
endforeach()
endmacro()

5
src/declarativeimports/core/iconitem.cpp
View File

@ -133,7 +133,7 @@ void IconItem::setSource(const QVariant &source)
if (iconTheme) {
iconTheme->iconPath(source.toString() + QLatin1String(".svg"), qMin(width(), height()), KIconLoader::MatchBest);
if (iconPath.isEmpty()) {
iconPath = iconTheme->iconPath(source.toString() + QLatin1String(".svgz"), qMin(width(), height()), KIconLoader::MatchBest);
iconPath = iconTheme->iconPath(source.toString() + QLatin1String(".svg"), qMin(width(), height()), KIconLoader::MatchBest);
}
} else {
qWarning() << "KIconLoader has no theme set";
@ -198,6 +198,7 @@ void IconItem::setColorGroup(Plasma::Theme::ColorGroup group)
if (m_svgIcon) {
m_svgIcon->setColorGroup(group);
loadPixmap();
}
emit colorGroupChanged();
@ -351,7 +352,7 @@ void IconItem::loadPixmap()
if (iconTheme) {
QString iconPath = iconTheme->iconPath(source().toString() + QLatin1String(".svg"), qMin(width(), height()), KIconLoader::MatchBest);
if (iconPath.isEmpty()) {
iconPath = iconTheme->iconPath(source().toString() + QLatin1String(".svgz"), qMin(width(), height()), KIconLoader::MatchBest);
iconPath = iconTheme->iconPath(source().toString() + QLatin1String(".svg"), qMin(width(), height()), KIconLoader::MatchBest);
}
} else {
qWarning() << "KIconLoader has no theme set";

4
src/declarativeimports/plasmastyle/ToolButtonStyle.qml
View File

@ -79,7 +79,7 @@ QtQuickControlStyle.ButtonStyle {
Layout.minimumHeight: Layout.minimumWidth
Layout.maximumHeight: Layout.minimumWidth
active: style.controlHovered
colorGroup: style.controlHovered || !style.flat ? PlasmaCore.Theme.ButtonColorGroup : PlasmaCore.Theme.NormalColorGroup
colorGroup: controlHovered || !flat ? PlasmaCore.Theme.ButtonColorGroup : PlasmaCore.ColorScope.colorGroup
}
PlasmaComponents.Label {
@ -90,7 +90,7 @@ QtQuickControlStyle.ButtonStyle {
visible: control.text != ""
Layout.fillWidth: true
height: parent.height
color: style.controlHovered || !style.flat ? theme.buttonTextColor : PlasmaCore.ColorScope.textColor
color: controlHovered || !flat ? theme.buttonTextColor : PlasmaCore.ColorScope.textColor
horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight

2
templates/CMakeLists.txt
View File

@ -2,4 +2,4 @@ set(apptemplate_DIRS
qml-plasmoid
cpp-plasmoid)
kdetemplate_add_app_templates(${apptemplate_DIRS})
kde_package_app_templates(TEMPLATES ${apptemplate_DIRS} INSTALL_DIR ${KDE_INSTALL_KTEMPLATESDIR})