From 171d545562e5da6b5999fc08c5baf69ed6d03a1f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 10 Oct 2014 23:36:11 +0400 Subject: [PATCH] add skel for #32 --- sources/3rdparty/tasks | 2 +- sources/CMakeLists.txt | 12 +++++++++- sources/awesome-widget/awesome-widget.cpp | 11 +++++++++ sources/awesome-widget/awesome-widget.h | 1 + sources/version.h.in | 29 +++++++++++++++++++++++ 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 sources/version.h.in diff --git a/sources/3rdparty/tasks b/sources/3rdparty/tasks index 230bdec..d4e154a 160000 --- a/sources/3rdparty/tasks +++ b/sources/3rdparty/tasks @@ -1 +1 @@ -Subproject commit 230bdecd2c18ee2ec5350d94778a51158565c119 +Subproject commit d4e154aa948b82cee2d41b145763ffd9d9ec3ca7 diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 4fc4b6c..89430f3 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -6,13 +6,20 @@ cmake_policy (SET CMP0011 NEW) cmake_policy (SET CMP0015 NEW) project (awesome-widgets) +set (PROJECT_AUTHOR "Evgeniy Alekseev") +set (PROJECT_CONTACT "esalexeev@gmail.com") +set (PROJECT_LICENSE "GPLv3") set (PROJECT_VERSION_MAJOR 2) set (PROJECT_VERSION_MINOR 0) set (PROJECT_VERSION_PATCH 5) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) -set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) +string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) +string (TIMESTAMP CURRENT_YEAR "%Y") + +message (STATUS "Project: ${PROJECT_NAME}") message (STATUS "Version: ${PROJECT_VERSION}") +message (STATUS "Build date: ${CURRENT_DATE}") # flags if (CMAKE_COMPILER_IS_GNUCXX) @@ -23,6 +30,9 @@ else () message (STATUS "Unknown compiler") endif () +configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) +set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) + add_subdirectory (awesome-widget) add_subdirectory (ext-sysmon) add_subdirectory (desktop-panel) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 90589aa..9408a2e 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -33,6 +33,7 @@ #include "customlabel.h" #include #include +#include "version.h" AwesomeWidget::AwesomeWidget(QObject *parent, const QVariantList &args) @@ -62,6 +63,16 @@ AwesomeWidget::~AwesomeWidget() } +bool AwesomeWidget::checkUpdates() +{ + if (debug) qDebug() << PDEBUG; + + bool needUpdate = false; + + return needUpdate; +} + + QList AwesomeWidget::contextualActions() { if (debug) qDebug() << PDEBUG; diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h index 50c6e1f..f82d610 100644 --- a/sources/awesome-widget/awesome-widget.h +++ b/sources/awesome-widget/awesome-widget.h @@ -70,6 +70,7 @@ public slots: void updateTooltip(); private slots: + bool checkUpdates(); void reinit(); // configuration interface void addNewCustomCommand(QTableWidgetItem *item); diff --git a/sources/version.h.in b/sources/version.h.in new file mode 100644 index 0000000..5886127 --- /dev/null +++ b/sources/version.h.in @@ -0,0 +1,29 @@ +#ifndef VERSION_H +#define VERSION_H + +// information +#define NAME "Awesome Widgets" +#define VERSION "@PROJECT_VERSION@" +#define AUTHOR "@PROJECT_AUTHOR@" +#define TRANSLATORS "Ernesto Avilés Vzqz (Spanish),Mermouy (French),underr (Brazillian Portuguese),Виктор Слободян (Ukrainian),Lemueler (Chinese)" +#define EMAIL "@PROJECT_CONTACT@" +#define LICENSE "@PROJECT_LICENSE@" +#define TRDPARTY_LICENSE "tasks,BSD,https://github.com/mhogomchungu/tasks" + +// links +#define HOMEPAGE "http://arcanis.name/projects/awesome-widgets/" +#define REPOSITORY "https://github.com/arcan1s/awesome-widgets" +#define VERSION_API "https://api.github.com/repos/arcan1s/awesome-widgets/releases" +#define BUGTRACKER "https://github.com/arcan1s/awesome-widgets/issues" +#define TRANSLATION "https://github.com/arcan1s/awesome-widgets/issues/14" +#define AUR_PACKAGES "https://aur.archlinux.org/packages/kdeplasma-applets-awesome-widgets/" + +// build information +#define BUILD_DATE "@CURRENT_DATE@" +#define DATE "2014-@CURRENT_YEAR@" + +// cmake properties +#define CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@" +#define CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" + +#endif /* VERSION_H */