From f896b1b6615bad4356134b0ab48a9d4097aff339 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Tue, 21 Jul 2015 11:52:22 +0200 Subject: [PATCH] remove unneeded files and make snore-send compile --- CMakeLists.txt | 5 +- src/CMakeLists.txt | 1 + src/snoresend/.gitignore | 21 ---- src/snoresend/CMakeLists.txt | 25 +---- src/snoresend/LICENSE | 165 ------------------------------- src/snoresend/README.md | 4 - src/snoresend/{src => }/main.cpp | 30 +++--- src/snoresend/src/CMakeLists.txt | 6 -- 8 files changed, 24 insertions(+), 233 deletions(-) delete mode 100644 src/snoresend/.gitignore delete mode 100644 src/snoresend/LICENSE delete mode 100644 src/snoresend/README.md rename src/snoresend/{src => }/main.cpp (64%) delete mode 100644 src/snoresend/src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index ad8d647..0ed2b9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,9 @@ include(ECMPackageConfigHelpers) include(ECMSetupVersion) ####################################################################### -option(WITH_FRONTENDS "Build frontends currently only useful if WITH_SNORE_DAEMON=ON" OFF) -option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications" OFF) +option(WITH_FRONTENDS "Build frontends currently only useful if WITH_SNORE_DAEMON=ON." OFF) +option(WITH_SNORE_DAEMON "Build the Snore daemon, which redirects notifications." OFF) +option(WITH_SNORE_SEND "Build snore-send, a cli for snore notifications." ON) ####################################################################### set(SNORE_VERSION_MAJOR 0) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ab17b7..6653e0a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(libsnore) add_subdirectory(daemon) add_subdirectory(settings) +add_subdirectory(snoresend) add_subdirectory(plugins) diff --git a/src/snoresend/.gitignore b/src/snoresend/.gitignore deleted file mode 100644 index 0def275..0000000 --- a/src/snoresend/.gitignore +++ /dev/null @@ -1,21 +0,0 @@ -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app diff --git a/src/snoresend/CMakeLists.txt b/src/snoresend/CMakeLists.txt index 9f3c89c..e5a914c 100644 --- a/src/snoresend/CMakeLists.txt +++ b/src/snoresend/CMakeLists.txt @@ -1,21 +1,6 @@ -project( snore-send ) -cmake_minimum_required( VERSION 2.8.12 ) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -include(GenerateExportHeader) - - - -find_package(ECM 0.0.9 NO_MODULE) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) -include(KDECompilerSettings) - -find_package(LibsnoreQt5 0.5.91 REQUIRED) - - - -add_subdirectory(src) - +if(WITH_SNORE_SEND) + add_executable( snore-send main.cpp) + target_link_libraries( snore-send Snore::Libsnore) + install(TARGETS snore-send ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +endif() diff --git a/src/snoresend/LICENSE b/src/snoresend/LICENSE deleted file mode 100644 index 6600f1c..0000000 --- a/src/snoresend/LICENSE +++ /dev/null @@ -1,165 +0,0 @@ -GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/src/snoresend/README.md b/src/snoresend/README.md deleted file mode 100644 index 5cd5fda..0000000 --- a/src/snoresend/README.md +++ /dev/null @@ -1,4 +0,0 @@ -snore-send -========== - -Acommand line interface for libsnore diff --git a/src/snoresend/src/main.cpp b/src/snoresend/main.cpp similarity index 64% rename from src/snoresend/src/main.cpp rename to src/snoresend/main.cpp index b67e40f..05af5c6 100644 --- a/src/snoresend/src/main.cpp +++ b/src/snoresend/main.cpp @@ -56,43 +56,43 @@ void bringToFront(QString pid) int main(int argc, char *argv[]) { QApplication app(argc, argv); - app.setApplicationName("snore-send"); - app.setOrganizationName("Snorenotify"); + app.setApplicationName(QLatin1String("snore-send")); + app.setOrganizationName(QLatin1String("Snorenotify")); app.setApplicationVersion(Snore::Version::version()); QCommandLineParser parser; - parser.setApplicationDescription("A command line interface for Snorenotify."); + parser.setApplicationDescription(QLatin1String("A command line interface for Snorenotify.")); parser.addHelpOption(); parser.addVersionOption(); - QCommandLineOption title(QStringList() << "t" << "title", "Set the notification title.", "title"); + QCommandLineOption title(QStringList() << QLatin1String("t") << QLatin1String("title"), QLatin1String("Set the notification title."), QLatin1String("title")); parser.addOption(title); - QCommandLineOption message(QStringList() << "m" << "message", "Set the notification body.", "message"); + QCommandLineOption message(QStringList() << QLatin1String("m") << QLatin1String("message"), QLatin1String("Set the notification body."), QLatin1String("message")); parser.addOption(message); - QCommandLineOption applicationName(QStringList() << "a" << "application", "Set the notification applicattion.", "application", app.applicationName()); + QCommandLineOption applicationName(QStringList() << QLatin1String("a") << QLatin1String("application"), QLatin1String("Set the notification applicattion."), QLatin1String("application"), app.applicationName()); parser.addOption(applicationName); - QCommandLineOption alertName(QStringList() << "c" << "alert", "Set the notification alert class.", "alert", "Default"); + QCommandLineOption alertName(QStringList() << QLatin1String("c") << QLatin1String("alert"), QLatin1String("Set the notification alert class."), QLatin1String("alert"), QLatin1String("Default")); parser.addOption(alertName); - QCommandLineOption iconPath(QStringList() << "i" << "icon", "Set the notification icon.", "icon", ":/root/snore.png"); + QCommandLineOption iconPath(QStringList() << QLatin1String("i") << QLatin1String("icon"), QLatin1String("Set the notification icon."), QLatin1String("icon"), QLatin1String(":/root/snore.png")); parser.addOption(iconPath); - QCommandLineOption priority(QStringList() << "p" << "priority", "Set the notification's' priority.", "[-2, 2]", "0"); + QCommandLineOption priority(QStringList() << QLatin1String("p") << QLatin1String("priority"), QLatin1String("Set the notification's' priority."), QLatin1String("[-2, 2]"), QLatin1String("0")); parser.addOption(priority); - QCommandLineOption markup(QStringList() << "markup", "Enable markup support.", "[0,1]", "0"); + QCommandLineOption markup(QStringList() << QLatin1String("markup"), QLatin1String("Enable markup support."), QLatin1String("[0,1]"), QLatin1String("0")); parser.addOption(markup); - QCommandLineOption silent(QStringList() << "silent", "Don't print to stdout."); + QCommandLineOption silent(QStringList() << QLatin1String("silent"), QLatin1String("Don't print to stdout.")); parser.addOption(silent); - QCommandLineOption _bringProcessToFront(QStringList() << "bring-process-to-front", "Bring process with pid to front if notification is clicked.", "pid"); + QCommandLineOption _bringProcessToFront(QStringList() << QLatin1String("bring-process-to-front"), QLatin1String("Bring process with pid to front if notification is clicked."), QLatin1String("pid")); parser.addOption(_bringProcessToFront); - QCommandLineOption _bringWindowToFront(QStringList() << "bring-window-to-front", "Bring window with wid to front if notification is clicked.", "wid"); + QCommandLineOption _bringWindowToFront(QStringList() << QLatin1String("bring-window-to-front"), QLatin1String("Bring window with wid to front if notification is clicked."), QLatin1String("wid")); parser.addOption(_bringWindowToFront); parser.process(app); @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if(parser.value(markup).toInt() == 1) { - application.hints().setValue("use-markup", QVariant::fromValue(true)); + application.hints().setValue("use-markup", true); } core.registerApplication(application); @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) } Notification n(application, alert, parser.value(title), parser.value(message), icon, Notification::defaultTimeout(), static_cast(prio)); if (parser.isSet(_bringProcessToFront) || parser.isSet(_bringWindowToFront)) { - n.addAction(Action(1, "Bring to Front")); + n.addAction(Action(1, qApp->translate("SnoreSend", "Bring to Front"))); } int returnCode = -1; diff --git a/src/snoresend/src/CMakeLists.txt b/src/snoresend/src/CMakeLists.txt deleted file mode 100644 index 19420a8..0000000 --- a/src/snoresend/src/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_executable( snore-send main.cpp) -target_link_libraries( snore-send Snore::Libsnore) - -install(TARGETS snore-send RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib)