edit cmake files

edit font dialog

sources/CMakeLists.txt

@@ -1,17 +1,19 @@
 cmake_minimum_required(VERSION 2.8.12)
 
+# some fucking magic
 cmake_policy(SET CMP0003 OLD)
 cmake_policy(SET CMP0002 OLD)
 cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
+cmake_policy(SET CMP0063 OLD)
 
 project(awesomewidgets)
 set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
-set (PROJECT_LICENSE "GPLv3")
+set(PROJECT_LICENSE "GPL3")
 set(PROJECT_VERSION_MAJOR 2)
-set (PROJECT_VERSION_MINOR 3)
+set(PROJECT_VERSION_MINOR 4)
-set (PROJECT_VERSION_PATCH 4)
+set(PROJECT_VERSION_PATCH 0)
 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
 string(TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
@@ -21,6 +23,8 @@ message (STATUS "Project: ${PROJECT_NAME}")
 message(STATUS "Version: ${PROJECT_VERSION}")
 message(STATUS "Build date: ${CURRENT_DATE}")
 
+option(BUILD_PLASMOIDS "Build plasmoids" ON)
+
 # flags
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11")
@@ -37,7 +41,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
     set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
 else()
-  message (STATUS "Unknown compiler")
+    message(FATAL_ERROR "Unknown compiler")
 endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -50,8 +54,8 @@ include (libraries.cmake)
 
 add_subdirectory(awesomewidgets)
 add_subdirectory(extsysmon)
+if(BUILD_PLASMOIDS)
     add_subdirectory(awesome-widget)
     add_subdirectory(desktop-panel)
-
-# translations
     add_subdirectory(translations)
+endif()

sources/awesome-widget/CMakeLists.txt

@@ -1,8 +1,6 @@
-# set project name
 set(SUBPROJECT plasma_applet_awesome-widget)
 message(STATUS "Subproject ${SUBPROJECT}")
 
-# prepare
 configure_file(metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
 
 add_subdirectory(plugin)

sources/awesome-widget/package/contents/ui/appearance.qml

@@ -89,7 +89,10 @@ Item {
                 id: selectFont
                 width: parent.width * 2 / 3
                 text: plasmoid.configuration.fontFamily
-                onClicked: fontDialog.visible = true
+                onClicked: {
+                    fontDialog.setFont()
+                    fontDialog.visible = true
+                }
             }
         }
 
@@ -229,13 +232,22 @@ Item {
     QtDialogs.FontDialog {
         id: fontDialog
         title: i18n("Select a font")
-        font: Qt.font({ family: selectFont.text, pointSize: fontSize.value, weight: Font.Normal })
+        signal setFont
+
         onAccepted: {
             selectFont.text = fontDialog.font.family
             fontSize.value = fontDialog.font.pointSize
             fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
             fontWeight.currentIndex = weight[fontDialog.font.weight]
         }
+        onSetFont: {
+            fontDialog.font = Qt.font({
+                family: selectFont.text,
+                pointSize: fontSize.value > 0 ? fontSize.value : 12,
+                italic: fontStyle.currentIndex == 1,
+                weight: Font.Normal,
+            })
+        }
     }
 
     Component.onCompleted: {

sources/awesome-widget/package/metadata.desktop

@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=2.3.4
+X-KDE-PluginInfo-Version=2.4.0
 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=

sources/awesome-widget/plugin/CMakeLists.txt

@@ -1,16 +1,17 @@
 set(PLUGIN_NAME awplugin)
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
-include_directories (${CMAKE_SOURCE_DIR}
+include_directories(
+    ${CMAKE_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../
     ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
     ${PROJECT_TRDPARTY_DIR}
     ${Qt_INCLUDE}
-                     ${Kf5_INCLUDE})
+    ${Kf5_INCLUDE}
+)
 
-# task source is required by extscripts
 file(GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp)
 file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)

sources/awesomewidgets/CMakeLists.txt

@@ -1,15 +1,16 @@
-# set project name
 set(SUBPROJECT ${PROJECT_LIBRARY})
 message(STATUS "Subproject ${SUBPROJECT}")
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
-include_directories (${CMAKE_SOURCE_DIR}
+include_directories(
+    ${CMAKE_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../
     ${PROJECT_TRDPARTY_DIR}
     ${Qt_INCLUDE}
-                     ${Kf5_INCLUDE})
+    ${Kf5_INCLUDE}
+)
 
 file(GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp)
 file(GLOB SUBPROJECT_HEADER *.h ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.h)
@@ -20,7 +21,6 @@ set (SUBPROJECT_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/scripts)
 set(SUBPROJECT_UPGRADE ${CMAKE_CURRENT_SOURCE_DIR}/upgrade)
 set(SUBPROJECT_WEATHER ${CMAKE_CURRENT_SOURCE_DIR}/weather)
 
-# make
 qt5_wrap_cpp(SUBPROJECT_MOC_SOURCE ${SUBPROJECT_HEADER})
 qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_MOC_SOURCE}

sources/desktop-panel/CMakeLists.txt

@@ -1,8 +1,6 @@
-# set project name
 set(SUBPROJECT plasma_applet_desktop-panel)
 message(STATUS "Subproject ${SUBPROJECT}")
 
-# prepare
 configure_file(metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
 
 add_subdirectory(plugin)

sources/desktop-panel/package/contents/ui/activeapp.qml

@@ -68,7 +68,10 @@ Item {
                 id: selectFont
                 width: parent.width * 2 / 3
                 text: plasmoid.configuration.currentFontFamily
-                onClicked: fontDialog.visible = true
+                onClicked: {
+                    fontDialog.setFont()
+                    fontDialog.visible = true
+                }
             }
         }
 
@@ -208,13 +211,22 @@ Item {
     QtDialogs.FontDialog {
         id: fontDialog
         title: i18n("Select a font")
-        font: Qt.font({ family: selectFont.text, pointSize: fontSize.value, weight: Font.Normal })
+        signal setFont
+
         onAccepted: {
             selectFont.text = fontDialog.font.family
             fontSize.value = fontDialog.font.pointSize
             fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
             fontWeight.currentIndex = weight[fontDialog.font.weight]
         }
+        onSetFont: {
+            fontDialog.font = Qt.font({
+                family: selectFont.text,
+                pointSize: fontSize.value > 0 ? fontSize.value : 12,
+                italic: fontStyle.currentIndex == 1,
+                weight: Font.Normal,
+            })
+        }
     }
 
     Component.onCompleted: {

sources/desktop-panel/package/contents/ui/inactiveapp.qml

@@ -68,7 +68,10 @@ Item {
                 id: selectFont
                 width: parent.width * 2 / 3
                 text: plasmoid.configuration.fontFamily
-                onClicked: fontDialog.visible = true
+                onClicked: {
+                    fontDialog.setFont()
+                    fontDialog.visible = true
+                }
             }
         }
 
@@ -208,13 +211,22 @@ Item {
     QtDialogs.FontDialog {
         id: fontDialog
         title: i18n("Select a font")
-        font: Qt.font({ family: selectFont.text, pointSize: fontSize.value, weight: Font.Normal })
+        signal setFont
+
         onAccepted: {
             selectFont.text = fontDialog.font.family
             fontSize.value = fontDialog.font.pointSize
             fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
             fontWeight.currentIndex = weight[fontDialog.font.weight]
         }
+        onSetFont: {
+            fontDialog.font = Qt.font({
+                family: selectFont.text,
+                pointSize: fontSize.value > 0 ? fontSize.value : 12,
+                italic: fontStyle.currentIndex == 1,
+                weight: Font.Normal,
+            })
+        }
     }
 
     Component.onCompleted: {

sources/desktop-panel/package/metadata.desktop

@@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
-X-KDE-PluginInfo-Version=2.3.4
+X-KDE-PluginInfo-Version=2.4.0
 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=

sources/desktop-panel/plugin/CMakeLists.txt

@@ -1,13 +1,15 @@
 set(PLUGIN_NAME dpplugin)
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.desktoppanel\")
 
-include_directories (${CMAKE_SOURCE_DIR}
+include_directories(
+    ${CMAKE_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../
     ${PROJECT_TRDPARTY_DIR}
     ${Qt_INCLUDE}
-                     ${Kf5_INCLUDE})
+    ${Kf5_INCLUDE}
+)
 
 file(GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)

sources/extsysmon/CMakeLists.txt

@@ -1,17 +1,18 @@
-# set project name
 set(SUBPROJECT plasma_dataengine_extsysmon)
 set(PLUGIN_NAME ${SUBPROJECT})
 message(STATUS "Subproject ${SUBPROJECT}")
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
-include_directories (${CMAKE_SOURCE_DIR}
+include_directories(
+    ${CMAKE_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../
     ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/
     ${PROJECT_TRDPARTY_DIR}
     ${Qt_INCLUDE}
-                     ${Kf5_INCLUDE})
+    ${Kf5_INCLUDE}
+)
 
 file(GLOB SUBPROJECT_DESKTOP_IN *.desktop)
 file(RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN})

sources/libraries.cmake

@@ -1,3 +1,4 @@
+find_package(Gettext REQUIRED)
 find_package(Qt5 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -7,12 +8,18 @@ include (KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 
-add_definitions (${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
+add_definitions(
-                 ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
+    ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
-set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}
+    ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
-                ${Qt5Qml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
+)
+set(Qt_INCLUDE
+    ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}
+    ${Qt5Qml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}
+)
 set(Kf5_INCLUDE ${I18n_INCLUDE_DIR} ${Notifications_INCLUDE_DIR} ${Plasma_INCLUDE_DIR})
 
-set (Qt_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES}
+set(Qt_LIBRARIES
-                  ${Qt5Qml_LIBRARIES} ${Qt5Widgets_LIBRARIES})
+    ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES}
+    ${Qt5Qml_LIBRARIES} ${Qt5Widgets_LIBRARIES}
+)
 set(Kf5_LIBRARIES KF5::I18n KF5::Notifications KF5::Plasma KF5::WindowSystem)

sources/version.h.in

@@ -37,5 +37,6 @@
 // cmake properties
 #define CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 #define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define BUILD_PLASMOIDS "@BUILD_PLASMOIDS@"
 
 #endif /* VERSION_H */