Skip to content

Commit 3707329

Browse files
tjaarttjaart
committed
add alpha channel to colors and create updated install and upgrade script
1 parent 3f8f203 commit 3707329

File tree

9 files changed

+43
-6
lines changed

9 files changed

+43
-6
lines changed

‎.directory

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Dolphin]
2-
Timestamp=2017,4,13,21,11,6
3-
Version=3
2+
Timestamp=2018,6,17,3,8,35
3+
Version=4
44

55
[Settings]
66
HiddenFilesShown=true

‎build/CMakeCache.txt

+23-2
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,23 @@ KDE_INSTALL_MIMEDIR:PATH=
264264
//Plugins (QTPLUGINDIR)
265265
KDE_INSTALL_PLUGINDIR:PATH=
266266

267+
//Installs /usr/local/prefix.sh that sets up the necessary environment
268+
// variables
269+
KDE_INSTALL_PREFIX_SCRIPT:BOOL=OFF
270+
271+
//documentation bundles in QCH format (DATAROOTDIR/doc/qch)
272+
KDE_INSTALL_QCHDIR:PATH=
273+
267274
//QtQuick2 imports (LIBDIR/qml)
268275
KDE_INSTALL_QMLDIR:PATH=
269276

270277
//Qt plugins (LIBDIR/plugins)
271278
KDE_INSTALL_QTPLUGINDIR:PATH=
272279

280+
//documentation bundles in QCH format for Qt-extending libraries
281+
// (DATAROOTDIR/doc/qch)
282+
KDE_INSTALL_QTQCHDIR:PATH=
283+
273284
//QtQuick1 imports (QTPLUGINDIR/imports)
274285
KDE_INSTALL_QTQUICKIMPORTSDIR:PATH=
275286

@@ -288,8 +299,8 @@ KDE_INSTALL_SYSCONFDIR:PATH=
288299
//templates (DATAROOTDIR/templates)
289300
KDE_INSTALL_TEMPLATEDIR:PATH=
290301

291-
//Install mkspecs files, Plugins and Imports to the Qt 5 install
292-
// dir
302+
//Install mkspecs files, QCH files for Qt-based libs, Plugins and
303+
// Imports to the Qt 5 install dir
293304
KDE_INSTALL_USE_QT_SYS_PATHS:BOOL=OFF
294305

295306
//desktop wallpaper images (DATAROOTDIR/wallpapers)
@@ -310,6 +321,9 @@ KF5Plasma_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/KF5Plasma
310321
//The directory containing a CMake configuration file for KF5Service.
311322
KF5Service_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/KF5Service
312323

324+
//The directory containing a CMake configuration file for KF5WindowSystem.
325+
KF5WindowSystem_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/KF5WindowSystem
326+
313327
//Value Computed by CMake
314328
Project_BINARY_DIR:STATIC=/home/tjaart/Projects/KdeDev/plasma-fancy-clock/build
315329

@@ -325,6 +339,9 @@ Qt5Core_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Core
325339
//The directory containing a CMake configuration file for Qt5Gui.
326340
Qt5Gui_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui
327341

342+
//The directory containing a CMake configuration file for Qt5Widgets.
343+
Qt5Widgets_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Widgets
344+
328345
//The directory containing a CMake configuration file for Qt5Xml.
329346
Qt5Xml_DIR:PATH=/usr/lib/x86_64-linux-gnu/cmake/Qt5Xml
330347

@@ -522,10 +539,14 @@ KDE_INSTALL_METAINFODIR-ADVANCED:INTERNAL=1
522539
KDE_INSTALL_MIMEDIR-ADVANCED:INTERNAL=1
523540
//ADVANCED property for variable: KDE_INSTALL_PLUGINDIR
524541
KDE_INSTALL_PLUGINDIR-ADVANCED:INTERNAL=1
542+
//ADVANCED property for variable: KDE_INSTALL_QCHDIR
543+
KDE_INSTALL_QCHDIR-ADVANCED:INTERNAL=1
525544
//ADVANCED property for variable: KDE_INSTALL_QMLDIR
526545
KDE_INSTALL_QMLDIR-ADVANCED:INTERNAL=1
527546
//ADVANCED property for variable: KDE_INSTALL_QTPLUGINDIR
528547
KDE_INSTALL_QTPLUGINDIR-ADVANCED:INTERNAL=1
548+
//ADVANCED property for variable: KDE_INSTALL_QTQCHDIR
549+
KDE_INSTALL_QTQCHDIR-ADVANCED:INTERNAL=1
529550
//ADVANCED property for variable: KDE_INSTALL_QTQUICKIMPORTSDIR
530551
KDE_INSTALL_QTQUICKIMPORTSDIR-ADVANCED:INTERNAL=1
531552
//ADVANCED property for variable: KDE_INSTALL_SBINDIR

‎build/CMakeFiles/Makefile.cmake

+11
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ set(CMAKE_MAKEFILE_DEPENDS
4040
"/usr/lib/x86_64-linux-gnu/cmake/KF5Service/KF5ServiceMacros.cmake"
4141
"/usr/lib/x86_64-linux-gnu/cmake/KF5Service/KF5ServiceTargets-debian.cmake"
4242
"/usr/lib/x86_64-linux-gnu/cmake/KF5Service/KF5ServiceTargets.cmake"
43+
"/usr/lib/x86_64-linux-gnu/cmake/KF5WindowSystem/KF5WindowSystemConfig.cmake"
44+
"/usr/lib/x86_64-linux-gnu/cmake/KF5WindowSystem/KF5WindowSystemConfigVersion.cmake"
45+
"/usr/lib/x86_64-linux-gnu/cmake/KF5WindowSystem/KF5WindowSystemTargets-debian.cmake"
46+
"/usr/lib/x86_64-linux-gnu/cmake/KF5WindowSystem/KF5WindowSystemTargets.cmake"
4347
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfig.cmake"
4448
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"
4549
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake"
@@ -48,11 +52,16 @@ set(CMAKE_MAKEFILE_DEPENDS
4852
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5GuiConfig.cmake"
4953
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake"
5054
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake"
55+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake"
56+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake"
57+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake"
58+
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake"
5159
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Xml/Qt5XmlConfig.cmake"
5260
"/usr/lib/x86_64-linux-gnu/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake"
5361
"/usr/share/ECM/cmake/ECMConfig.cmake"
5462
"/usr/share/ECM/cmake/ECMConfigVersion.cmake"
5563
"/usr/share/ECM/kde-modules/KDEInstallDirs.cmake"
64+
"/usr/share/ECM/kde-modules/prefix.sh.cmake"
5665
"/usr/share/ECM/modules/ECMQueryQmake.cmake"
5766
"/usr/share/ECM/modules/ECMUseFindModules.cmake"
5867
"/usr/share/cmake-3.5/Modules/CMakeCInformation.cmake"
@@ -82,6 +91,8 @@ set(CMAKE_MAKEFILE_OUTPUTS
8291

8392
# Byproducts of CMake generate step:
8493
set(CMAKE_MAKEFILE_PRODUCTS
94+
"prefix.sh"
95+
"prefix.sh"
8596
"CMakeFiles/CMakeDirectoryInformation.cmake"
8697
)
8798

‎build/cmake_install.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspeci
3737
endif()
3838

3939
if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
40-
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo" TYPE FILE FILES "/home/tjaart/Projects/KdeDev/plasma-fancy-clock/build/org.kde.fancyclock.appdata.xml")
40+
file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo" TYPE FILE OPTIONAL FILES "/home/tjaart/Projects/KdeDev/plasma-fancy-clock/build/org.kde.fancyclock.appdata.xml")
4141
endif()
4242

4343
if(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")

‎build/org.kde.fancyclock.appdata.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<name>Fancy Clock</name>
55
<summary>A nice looking clock</summary>
66
<url type="homepage">plasma.kde.org</url>
7+
<url type="donation">https://www.kde.org/donate.php?app=org.kde.fancyclock</url>
78
<developer_name>Tjaart Blignaut &lt;[email protected]&gt;</developer_name>
89
<icon type="stock">clock</icon>
9-
<project_license>GPL</project_license>
10+
<project_license>GPL-2.0</project_license>
1011
<metadata_license>CC0-1.0</metadata_license>
1112
</component>

‎install_local.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
kpackagetool5 -t Plasma/Applet --install org.kde.fancyclock

‎org.kde.fancyclock/contents/ui/config/ColorPicker.qml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Item {
4646

4747
QtDialogs.ColorDialog {
4848
id: colorDialog
49+
showAlphaChannel: true
4950
}
5051
}
5152

‎org.kde.fancyclock/contents/ui/main.qml

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ Item {
106106
color: "#80000000"
107107
source: dateLabel
108108
}
109+
109110
}
110111

111112
}

‎upgrade.sh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
kpackagetool5 -t Plasma/Applet --upgrade org.kde.fancyclock

0 commit comments

Comments
 (0)