From 4782baa27121e571a897f79b8adaa49ba1e335e7 Mon Sep 17 00:00:00 2001 From: Paulo Lieuthier Date: Tue, 10 Mar 2015 12:06:23 -0300 Subject: [PATCH] Added Status Notifier Plugin, from equim/lxqt-panel-plugin-snw Thanks @equim for the initial work! https://github.com/equeim/lxqt-panel-plugin-snw --- CMakeLists.txt | 10 + panel/plugin.cpp | 15 +- plugin-statusnotifier/CMakeLists.txt | 47 ++ plugin-statusnotifier/LICENSE | 675 ++++++++++++++++++ plugin-statusnotifier/dbustypes.cpp | 47 ++ plugin-statusnotifier/dbustypes.h | 30 + .../org.kde.StatusNotifierItem.xml | 69 ++ .../resources/statusnotifier.desktop.in | 5 + plugin-statusnotifier/statusnotifier.cpp | 13 + plugin-statusnotifier/statusnotifier.h | 34 + .../statusnotifierbutton.cpp | 141 ++++ plugin-statusnotifier/statusnotifierbutton.h | 55 ++ .../statusnotifieriteminterface.cpp | 26 + .../statusnotifieriteminterface.h | 146 ++++ .../statusnotifierwatcher.cpp | 55 ++ plugin-statusnotifier/statusnotifierwatcher.h | 46 ++ .../statusnotifierwidget.cpp | 58 ++ plugin-statusnotifier/statusnotifierwidget.h | 32 + 18 files changed, 1497 insertions(+), 7 deletions(-) create mode 100644 plugin-statusnotifier/CMakeLists.txt create mode 100644 plugin-statusnotifier/LICENSE create mode 100644 plugin-statusnotifier/dbustypes.cpp create mode 100644 plugin-statusnotifier/dbustypes.h create mode 100644 plugin-statusnotifier/org.kde.StatusNotifierItem.xml create mode 100644 plugin-statusnotifier/resources/statusnotifier.desktop.in create mode 100644 plugin-statusnotifier/statusnotifier.cpp create mode 100644 plugin-statusnotifier/statusnotifier.h create mode 100644 plugin-statusnotifier/statusnotifierbutton.cpp create mode 100644 plugin-statusnotifier/statusnotifierbutton.h create mode 100644 plugin-statusnotifier/statusnotifieriteminterface.cpp create mode 100644 plugin-statusnotifier/statusnotifieriteminterface.h create mode 100644 plugin-statusnotifier/statusnotifierwatcher.cpp create mode 100644 plugin-statusnotifier/statusnotifierwatcher.h create mode 100644 plugin-statusnotifier/statusnotifierwidget.cpp create mode 100644 plugin-statusnotifier/statusnotifierwidget.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e0176b9d..bc053c9fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,11 +38,13 @@ find_package(Qt5LinguistTools REQUIRED) find_package(Qt5Xml REQUIRED) find_package(Qt5X11Extras REQUIRED) find_package(KF5WindowSystem REQUIRED) +find_package(PkgConfig REQUIRED) find_package(lxqt REQUIRED) find_package(Qt5Xdg REQUIRED QUIET) find_package(lxqt-globalkeys REQUIRED) find_package(lxqt-globalkeys-ui REQUIRED) +pkg_check_modules(dbusmenu-qt5 REQUIRED dbusmenu-qt5) include(${LXQT_USE_FILE}) include(${QTXDG_USE_FILE}) @@ -55,6 +57,7 @@ include_directories( ${LXQT_INCLUDE_DIRS} ${QTXDG_INCLUDE_DIRS} ${Qt5X11Extras_INCLUDE_DIRS} + ${dbusmenu-qt5_INCLUDE_DIRS} ) # Warning: This must be before add_subdirectory(panel). Move with caution. @@ -194,6 +197,13 @@ if(TASKBAR_PLUGIN) add_subdirectory(plugin-taskbar) endif() +setByDefault(STATUSNOTIFIER_PLUGIN Yes) +if(STATUSNOTIFIER_PLUGIN) + list(APPEND STATIC_PLUGINS "statusnotifier") + set(ENABLED_PLUGINS ${ENABLED_PLUGINS} "Status Notifier") + add_subdirectory(plugin-statusnotifier) +endif() + setByDefault(TRAY_PLUGIN Yes) if(TRAY_PLUGIN) list(APPEND STATIC_PLUGINS "tray") diff --git a/panel/plugin.cpp b/panel/plugin.cpp index 87f9b40e1..9428f406e 100644 --- a/panel/plugin.cpp +++ b/panel/plugin.cpp @@ -46,7 +46,6 @@ #include #include #include -#include // for std::lower_bound() // statically linked built-in plugins #include "../plugin-clock/lxqtclock.h" // clock @@ -55,6 +54,7 @@ #include "../plugin-quicklaunch/lxqtquicklaunchplugin.h" // quicklaunch #include "../plugin-showdesktop/showdesktop.h" // showdesktop #include "../plugin-taskbar/lxqttaskbarplugin.h" // taskbar +#include "../plugin-statusnotifier/statusnotifier.h" // statusnotifier #include "../plugin-tray/lxqttrayplugin.h" // tray #include "../plugin-worldclock/lxqtworldclock.h" // worldclock @@ -187,6 +187,7 @@ ILxQtPanelPluginLibrary* Plugin::findStaticPlugin(const QString &libraryName) static LxQtQuickLaunchPluginLibrary quicklaunch_lib; // quicklaunch static ShowDesktopLibrary showdesktop_lib; //showdesktop static LxQtTaskBarPluginLibrary taskbar_lib; //taskbar + static StatusNotifierLibrary statusnotifier_lib; // statusnotifier static LxQtTrayPluginLibrary tray_lib; //tray static LxQtWorldClockLibrary worldclock_lib; // worldclock @@ -198,6 +199,7 @@ ILxQtPanelPluginLibrary* Plugin::findStaticPlugin(const QString &libraryName) QStringLiteral("quicklaunch"), QStringLiteral("showdesktop"), QStringLiteral("taskbar"), + QStringLiteral("statusnotifier"), QStringLiteral("tray"), QStringLiteral("worldclock") }; @@ -209,16 +211,15 @@ ILxQtPanelPluginLibrary* Plugin::findStaticPlugin(const QString &libraryName) &quicklaunch_lib, &showdesktop_lib, &taskbar_lib, + &statusnotifier_lib, &tray_lib, &worldclock_lib }; - // for small tables, binary search is often faster than hash tables - const QString* end = names + sizeof(names)/sizeof(QString); - const QString* it = std::lower_bound(names, end, libraryName); - if(it != end && *it == libraryName) { - return staticPlugins[(it - names)]; - } + for (int i = 0; i < sizeof(names) / sizeof(QString); i++) + if (names[i] == libraryName) + return staticPlugins[i]; + return NULL; } diff --git a/plugin-statusnotifier/CMakeLists.txt b/plugin-statusnotifier/CMakeLists.txt new file mode 100644 index 000000000..f47c101b4 --- /dev/null +++ b/plugin-statusnotifier/CMakeLists.txt @@ -0,0 +1,47 @@ +set(PLUGIN "statusnotifier") + +include(CheckLibraryExists) + +set(QT_USE_QTDBUS 1) +set(QT_USE_QTXML 1) + +set(HEADERS + statusnotifier.h + dbustypes.h + statusnotifierbutton.h + statusnotifieriteminterface.h + statusnotifierwatcher.h + statusnotifierwidget.h +) + +set(SOURCES + statusnotifier.cpp + dbustypes.cpp + statusnotifierbutton.cpp + statusnotifieriteminterface.cpp + statusnotifierwatcher.cpp + statusnotifierwidget.cpp +) + +set(MOCS + statusnotifier.h + dbustypes.h + statusnotifierbutton.h + statusnotifieriteminterface.h + statusnotifierwatcher.h + statusnotifierwidget.h +) + +qt5_add_dbus_adaptor(SOURCES + org.kde.StatusNotifierItem.xml + statusnotifieriteminterface.h + StatusNotifierItemInterface +) + +set(LIBRARIES + ${LXQT_LIBRARIES} + ${QTXDG_LIBRARIES} + ${dbusmenu-qt5_LIBRARIES} +) + +BUILD_LXQT_PLUGIN(${PLUGIN}) diff --git a/plugin-statusnotifier/LICENSE b/plugin-statusnotifier/LICENSE new file mode 100644 index 000000000..6b156fe1d --- /dev/null +++ b/plugin-statusnotifier/LICENSE @@ -0,0 +1,675 @@ +GNU 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. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/plugin-statusnotifier/dbustypes.cpp b/plugin-statusnotifier/dbustypes.cpp new file mode 100644 index 000000000..a1df2603f --- /dev/null +++ b/plugin-statusnotifier/dbustypes.cpp @@ -0,0 +1,47 @@ +#include "dbustypes.h" + +// Marshall the IconPixmap data into a D-Bus argument +QDBusArgument &operator<<(QDBusArgument &argument, const IconPixmap &icon) +{ + argument.beginStructure(); + argument << icon.width; + argument << icon.height; + argument << icon.bytes; + argument.endStructure(); + return argument; +} + +// Retrieve the ImageStruct data from the D-Bus argument +const QDBusArgument &operator>>(const QDBusArgument &argument, IconPixmap &icon) +{ + argument.beginStructure(); + argument >> icon.width; + argument >> icon.height; + argument >> icon.bytes; + argument.endStructure(); + return argument; +} + +// Marshall the ToolTip data into a D-Bus argument +QDBusArgument &operator<<(QDBusArgument &argument, const ToolTip &toolTip) +{ + argument.beginStructure(); + argument << toolTip.iconName; + argument << toolTip.iconPixmap; + argument << toolTip.title; + argument << toolTip.description; + argument.endStructure(); + return argument; +} + +// Retrieve the ToolTip data from the D-Bus argument +const QDBusArgument &operator>>(const QDBusArgument &argument, ToolTip &toolTip) +{ + argument.beginStructure(); + argument >> toolTip.iconName; + argument >> toolTip.iconPixmap; + argument >> toolTip.title; + argument >> toolTip.description; + argument.endStructure(); + return argument; +} diff --git a/plugin-statusnotifier/dbustypes.h b/plugin-statusnotifier/dbustypes.h new file mode 100644 index 000000000..2a5809fc7 --- /dev/null +++ b/plugin-statusnotifier/dbustypes.h @@ -0,0 +1,30 @@ +#include + +#ifndef DBUSTYPES_H +#define DBUSTYPES_H + +struct IconPixmap { + int width; + int height; + QByteArray bytes; +}; + +typedef QList IconPixmapList; + +struct ToolTip { + QString iconName; + QList iconPixmap; + QString title; + QString description; +}; + +QDBusArgument &operator<<(QDBusArgument &argument, const IconPixmap &icon); +const QDBusArgument &operator>>(const QDBusArgument &argument, IconPixmap &icon); + +QDBusArgument &operator<<(QDBusArgument &argument, const ToolTip &toolTip); +const QDBusArgument &operator>>(const QDBusArgument &argument, ToolTip &toolTip); + +Q_DECLARE_METATYPE(IconPixmap) +Q_DECLARE_METATYPE(ToolTip) + +#endif // DBUSTYPES_H diff --git a/plugin-statusnotifier/org.kde.StatusNotifierItem.xml b/plugin-statusnotifier/org.kde.StatusNotifierItem.xml new file mode 100644 index 000000000..0a563c549 --- /dev/null +++ b/plugin-statusnotifier/org.kde.StatusNotifierItem.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugin-statusnotifier/resources/statusnotifier.desktop.in b/plugin-statusnotifier/resources/statusnotifier.desktop.in new file mode 100644 index 000000000..a6cc6c42f --- /dev/null +++ b/plugin-statusnotifier/resources/statusnotifier.desktop.in @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=Service +ServiceTypes=LxQtPanel/Plugin +Name=Status Notifier Plugin +Comment=Status Notifier Plugin diff --git a/plugin-statusnotifier/statusnotifier.cpp b/plugin-statusnotifier/statusnotifier.cpp new file mode 100644 index 000000000..899398ce5 --- /dev/null +++ b/plugin-statusnotifier/statusnotifier.cpp @@ -0,0 +1,13 @@ +#include "statusnotifier.h" + +StatusNotifier::StatusNotifier(const ILxQtPanelPluginStartupInfo &startupInfo) : + QObject(), + ILxQtPanelPlugin(startupInfo) +{ + m_widget = new StatusNotifierWidget(this); +} + +void StatusNotifier::realign() +{ + m_widget->realign(); +} diff --git a/plugin-statusnotifier/statusnotifier.h b/plugin-statusnotifier/statusnotifier.h new file mode 100644 index 000000000..5d3385cef --- /dev/null +++ b/plugin-statusnotifier/statusnotifier.h @@ -0,0 +1,34 @@ +#ifndef STATUSNOTIFIER_PLUGIN_H +#define STATUSNOTIFIER_PLUGIN_H + +#include "../panel/ilxqtpanelplugin.h" +#include "statusnotifierwidget.h" + +class StatusNotifier : public QObject, public ILxQtPanelPlugin +{ + Q_OBJECT +public: + StatusNotifier(const ILxQtPanelPluginStartupInfo &startupInfo); + + bool isSeparate() const { return true; } + void realign(); + QString themeId() const { return "StatusNotifier"; } + QWidget *widget() { return m_widget; } + +private: + StatusNotifierWidget *m_widget; +}; + +class StatusNotifierLibrary : public QObject, public ILxQtPanelPluginLibrary +{ + Q_OBJECT +// Q_PLUGIN_METADATA(IID "lxde-qt.org/Panel/PluginInterface/3.0") + Q_INTERFACES(ILxQtPanelPluginLibrary) +public: + ILxQtPanelPlugin *instance(const ILxQtPanelPluginStartupInfo &startupInfo) + { + return new StatusNotifier(startupInfo); + } +}; + +#endif // STATUSNOTIFIER_PLUGIN_H diff --git a/plugin-statusnotifier/statusnotifierbutton.cpp b/plugin-statusnotifier/statusnotifierbutton.cpp new file mode 100644 index 000000000..423409c7c --- /dev/null +++ b/plugin-statusnotifier/statusnotifierbutton.cpp @@ -0,0 +1,141 @@ +#include "statusnotifierbutton.h" + +StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath) : menu(0) +{ + interface = new org::kde::StatusNotifierItem(service, objectPath, QDBusConnection::sessionBus()); + + newIcon(); + newToolTip(); + + QString menuPath = interface->menu().path(); + if (!menuPath.isEmpty()) { + DBusMenuImporter *menuImporter = new DBusMenuImporter(service, menuPath); + menu = menuImporter->menu(); + } + + connect(interface, SIGNAL(NewIcon()), this, SLOT(newIcon())); + connect(interface, SIGNAL(NewToolTip()), this, SLOT(newToolTip())); + + connect(this, SIGNAL(clicked()), this, SLOT(showMenu())); + +} + +void StatusNotifierButton::showMenu() +{ + if (menu != NULL) + { + menu->exec(this->mapToGlobal(QPoint(0, 0))); + } +} + +void StatusNotifierButton::mouseReleaseEvent(QMouseEvent *event) +{ + if (event->button() == Qt::MidButton) { + setDown(false); + interface->Activate(QCursor::pos().x(), QCursor::pos().y()); + } + QToolButton::mouseReleaseEvent(event); +} + +void StatusNotifierButton::wheelEvent(QWheelEvent *event) +{ + interface->Scroll(event->delta(), "vertical"); +} + +void StatusNotifierButton::newIcon() +{ + QString attentionIconName = interface->attentionIconName(); + QString iconName = attentionIconName.isEmpty() ? + interface->iconName() : attentionIconName; + + if (!iconName.isEmpty()) + { + QString iconThemePath = interface->iconThemePath(); + + QIcon icon; + if (icon.hasThemeIcon(iconName)) + { + icon = QIcon::fromTheme(iconName); + setIcon(icon); + } + else + { + QDir themeDir(iconThemePath); + if (themeDir.exists(iconName + ".png")) + { + icon.addFile(themeDir.filePath(iconName + ".png")); + } + + if (themeDir.exists("hicolor")) + { + themeDir.cd("hicolor"); + + QStringList sizes = themeDir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + foreach (QString dir, sizes) + { + QStringList dirs = QDir(themeDir.filePath(dir)).entryList(QDir::AllDirs | QDir::NoDotAndDotDot); + icon.addFile(QDir(themeDir.path() + "/" + dir + "/" + dirs.at(0)).filePath(iconName + ".png")); + } + } + + if (icon.isNull()) { + icon = QIcon::fromTheme("image-missing"); + setIcon(icon); + } + else + { + setIcon(icon); + } + } + } + else + { + QList attentionIconPixmaps = interface->attentionIconPixmap(); + QList iconPixmaps = attentionIconPixmaps; + if (attentionIconPixmaps.isEmpty()) + { + iconPixmaps = interface->iconPixmap(); + } + else if (attentionIconPixmaps.first().bytes.isEmpty()) + { + iconPixmaps = interface->iconPixmap(); + } + + if (iconPixmaps.isEmpty()) + { + setIcon(QIcon::fromTheme("image-missing")); + return; + } + else if (iconPixmaps.first().bytes.isEmpty()) + { + setIcon(QIcon::fromTheme("image-missing")); + return; + } + + IconPixmap iconPixmap = iconPixmaps.first(); + QImage image((uchar*) iconPixmap.bytes.data(), iconPixmap.width, iconPixmap.height, QImage::Format_ARGB32); + const uchar *end = image.constBits() + image.byteCount(); + uchar *dest = reinterpret_cast(iconPixmap.bytes.data()); + for (const uchar *src = image.constBits(); src < end; src += 4, dest += 4) + qToUnaligned(qToBigEndian(qFromUnaligned(src)), dest); + + image = QImage((uchar*) iconPixmap.bytes.data(), iconPixmap.width, iconPixmap.height, QImage::Format_ARGB32); + QPixmap pixmap = QPixmap::fromImage(image); + QIcon icon(pixmap); + setIcon(icon); + } +} + +void StatusNotifierButton::newToolTip() +{ + QString toolTipTitle = interface->toolTip().title; + + if (toolTipTitle.isEmpty()) + { + setToolTip(interface->title()); + } + else + { + setToolTip(toolTipTitle); + } +} diff --git a/plugin-statusnotifier/statusnotifierbutton.h b/plugin-statusnotifier/statusnotifierbutton.h new file mode 100644 index 000000000..74f5e027e --- /dev/null +++ b/plugin-statusnotifier/statusnotifierbutton.h @@ -0,0 +1,55 @@ +#ifndef STATUSNOTIFIERBUTTON_H +#define STATUSNOTIFIERBUTTON_H + +#include "../panel/ilxqtpanelplugin.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "statusnotifieriteminterface.h" + +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +template inline T qFromUnaligned(const uchar *src) +{ + T dest; + const size_t size = sizeof(T); + memcpy(&dest, src, size); + return dest; +} +#endif + +class StatusNotifierButton : public QToolButton +{ + Q_OBJECT + +public: + StatusNotifierButton(QString service, QString objectPath); + +public slots: + void showMenu(); + + void newIcon(); + void newToolTip(); + +private: + QMenu *menu; + org::kde::StatusNotifierItem *interface; + +protected: + void mouseReleaseEvent(QMouseEvent *event); + void wheelEvent(QWheelEvent *event); + +signals: + void midButtonPressed(int x, int y); + void wheelRotated(int delta, QString orientation); +}; + +#endif // STATUSNOTIFIERBUTTON_H diff --git a/plugin-statusnotifier/statusnotifieriteminterface.cpp b/plugin-statusnotifier/statusnotifieriteminterface.cpp new file mode 100644 index 000000000..efde5a971 --- /dev/null +++ b/plugin-statusnotifier/statusnotifieriteminterface.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c StatusNotifierItemInterface -p statusnotifieriteminterface -i dbustypes.h dbus-ifaces/org.kde.StatusNotifierItem.xml + * + * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd. + * + * This is an auto-generated file. + * This file may have been hand-edited. Look for HAND-EDIT comments + * before re-generating it. + */ + +#include "statusnotifieriteminterface.h" + +/* + * Implementation of interface class StatusNotifierItemInterface + */ + +StatusNotifierItemInterface::StatusNotifierItemInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) + : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) +{ +} + +StatusNotifierItemInterface::~StatusNotifierItemInterface() +{ +} + diff --git a/plugin-statusnotifier/statusnotifieriteminterface.h b/plugin-statusnotifier/statusnotifieriteminterface.h new file mode 100644 index 000000000..78ffacdf2 --- /dev/null +++ b/plugin-statusnotifier/statusnotifieriteminterface.h @@ -0,0 +1,146 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -c StatusNotifierItemInterface -p statusnotifieriteminterface -i dbustypes.h dbus-ifaces/org.kde.StatusNotifierItem.xml + * + * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd. + * + * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. + */ + +#ifndef STATUSNOTIFIERITEMINTERFACE_H +#define STATUSNOTIFIERITEMINTERFACE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include "dbustypes.h" + +/* + * Proxy class for interface org.kde.StatusNotifierItem + */ +class StatusNotifierItemInterface: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticInterfaceName() + { return "org.kde.StatusNotifierItem"; } + +public: + StatusNotifierItemInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + + ~StatusNotifierItemInterface(); + + Q_PROPERTY(QString AttentionIconName READ attentionIconName) + inline QString attentionIconName() const + { return qvariant_cast< QString >(property("AttentionIconName")); } + + Q_PROPERTY(IconPixmapList AttentionIconPixmap READ attentionIconPixmap) + inline IconPixmapList attentionIconPixmap() const + { return qvariant_cast< IconPixmapList >(property("AttentionIconPixmap")); } + + Q_PROPERTY(QString AttentionMovieName READ attentionMovieName) + inline QString attentionMovieName() const + { return qvariant_cast< QString >(property("AttentionMovieName")); } + + Q_PROPERTY(QString Category READ category) + inline QString category() const + { return qvariant_cast< QString >(property("Category")); } + + Q_PROPERTY(QString IconName READ iconName) + inline QString iconName() const + { return qvariant_cast< QString >(property("IconName")); } + + Q_PROPERTY(IconPixmapList IconPixmap READ iconPixmap) + inline IconPixmapList iconPixmap() const + { return qvariant_cast< IconPixmapList >(property("IconPixmap")); } + + Q_PROPERTY(QString IconThemePath READ iconThemePath) + inline QString iconThemePath() const + { return qvariant_cast< QString >(property("IconThemePath")); } + + Q_PROPERTY(QString Id READ id) + inline QString id() const + { return qvariant_cast< QString >(property("Id")); } + + Q_PROPERTY(bool ItemIsMenu READ itemIsMenu) + inline bool itemIsMenu() const + { return qvariant_cast< bool >(property("ItemIsMenu")); } + + Q_PROPERTY(QDBusObjectPath Menu READ menu) + inline QDBusObjectPath menu() const + { return qvariant_cast< QDBusObjectPath >(property("Menu")); } + + Q_PROPERTY(QString OverlayIconName READ overlayIconName) + inline QString overlayIconName() const + { return qvariant_cast< QString >(property("OverlayIconName")); } + + Q_PROPERTY(IconPixmapList OverlayIconPixmap READ overlayIconPixmap) + inline IconPixmapList overlayIconPixmap() const + { return qvariant_cast< IconPixmapList >(property("OverlayIconPixmap")); } + + Q_PROPERTY(QString Status READ status) + inline QString status() const + { return qvariant_cast< QString >(property("Status")); } + + Q_PROPERTY(QString Title READ title) + inline QString title() const + { return qvariant_cast< QString >(property("Title")); } + + Q_PROPERTY(ToolTip ToolTip READ toolTip) + inline ToolTip toolTip() const + { return qvariant_cast< ToolTip >(property("ToolTip")); } + + Q_PROPERTY(int WindowId READ windowId) + inline int windowId() const + { return qvariant_cast< int >(property("WindowId")); } + +public Q_SLOTS: // METHODS + inline QDBusPendingReply<> Activate(int x, int y) + { + QList argumentList; + argumentList << QVariant::fromValue(x) << QVariant::fromValue(y); + return asyncCallWithArgumentList(QStringLiteral("Activate"), argumentList); + } + + inline QDBusPendingReply<> ContextMenu(int x, int y) + { + QList argumentList; + argumentList << QVariant::fromValue(x) << QVariant::fromValue(y); + return asyncCallWithArgumentList(QStringLiteral("ContextMenu"), argumentList); + } + + inline QDBusPendingReply<> Scroll(int delta, const QString &orientation) + { + QList argumentList; + argumentList << QVariant::fromValue(delta) << QVariant::fromValue(orientation); + return asyncCallWithArgumentList(QStringLiteral("Scroll"), argumentList); + } + + inline QDBusPendingReply<> SecondaryActivate(int x, int y) + { + QList argumentList; + argumentList << QVariant::fromValue(x) << QVariant::fromValue(y); + return asyncCallWithArgumentList(QStringLiteral("SecondaryActivate"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void NewAttentionIcon(); + void NewIcon(); + void NewOverlayIcon(); + void NewStatus(const QString &status); + void NewTitle(); + void NewToolTip(); +}; + +namespace org { + namespace kde { + typedef ::StatusNotifierItemInterface StatusNotifierItem; + } +} +#endif diff --git a/plugin-statusnotifier/statusnotifierwatcher.cpp b/plugin-statusnotifier/statusnotifierwatcher.cpp new file mode 100644 index 000000000..2d23e4ef3 --- /dev/null +++ b/plugin-statusnotifier/statusnotifierwatcher.cpp @@ -0,0 +1,55 @@ +#include "statusnotifierwatcher.h" +#include + +StatusNotifierWatcher::StatusNotifierWatcher(QObject *parent) : QObject(parent) +{ + qRegisterMetaType("IconPixmap"); + qDBusRegisterMetaType(); + qRegisterMetaType("IconPixmapList"); + qDBusRegisterMetaType(); + qRegisterMetaType("ToolTip"); + qDBusRegisterMetaType(); + + serviceWatcher = new QDBusServiceWatcher; + serviceWatcher->setConnection(QDBusConnection::sessionBus()); + + connect(serviceWatcher, SIGNAL(serviceUnregistered(QString)), this, SLOT(removeItem(QString))); +} + +StatusNotifierWatcher::~StatusNotifierWatcher() +{ + +} + +void StatusNotifierWatcher::RegisterStatusNotifierItem(QString service) +{ + QString path = "/StatusNotifierItem"; + + // workaround for sni-qt + if (service.contains("/")) + { + path = service; + service = message().service(); + } + + m_services << service; + serviceWatcher->addWatchedService(service); + + emit StatusNotifierItemRegistered(); + emit itemAdded(service, path); +} + +void StatusNotifierWatcher::RegisterStatusNotifierHost(QString service) +{ + Q_UNUSED(service); +} + +void StatusNotifierWatcher::removeItem(QString service) +{ + int index = m_services.indexOf(service); + m_services.removeAt(index); + serviceWatcher->removeWatchedService(service); + + emit StatusNotifierItemUnregistered(); + emit itemRemoved(index); +} diff --git a/plugin-statusnotifier/statusnotifierwatcher.h b/plugin-statusnotifier/statusnotifierwatcher.h new file mode 100644 index 000000000..75ba00335 --- /dev/null +++ b/plugin-statusnotifier/statusnotifierwatcher.h @@ -0,0 +1,46 @@ +#ifndef STATUSNOTIFIERWATCHER_H +#define STATUSNOTIFIERWATCHER_H + +#include +#include +#include +#include +#include + +#include "dbustypes.h" + +class StatusNotifierWatcher : public QObject, protected QDBusContext +{ + Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "org.kde.StatusNotifierWatcher") + Q_SCRIPTABLE Q_PROPERTY(bool IsStatusNotifierHostRegistered READ isStatusNotifierHostRegistered) + Q_SCRIPTABLE Q_PROPERTY(int ProtocolVersion READ protocolVersion) + Q_SCRIPTABLE Q_PROPERTY(QStringList RegisteredStatusNotifierItems READ registeredStatusNotifierItems) +public: + explicit StatusNotifierWatcher(QObject *parent = 0); + ~StatusNotifierWatcher(); + + bool isStatusNotifierHostRegistered() const { return true; } + int protocolVersion() const { return 1; } + QStringList registeredStatusNotifierItems() const { return m_services; } + + QStringList itemServices() const { return m_services; } +signals: + Q_SCRIPTABLE void StatusNotifierItemRegistered(); + Q_SCRIPTABLE void StatusNotifierItemUnregistered(); + Q_SCRIPTABLE void StatusNotifierHostRegistered(); + + void itemAdded(QString service, QString objectPath); + void itemRemoved(int index); +public slots: + Q_SCRIPTABLE void RegisterStatusNotifierItem(QString service); + Q_SCRIPTABLE void RegisterStatusNotifierHost(QString service); + + void removeItem(QString service); +private: + QStringList m_services; + + QDBusServiceWatcher *serviceWatcher; +}; + +#endif // STATUSNOTIFIERWATCHER_H diff --git a/plugin-statusnotifier/statusnotifierwidget.cpp b/plugin-statusnotifier/statusnotifierwidget.cpp new file mode 100644 index 000000000..b8665adb6 --- /dev/null +++ b/plugin-statusnotifier/statusnotifierwidget.cpp @@ -0,0 +1,58 @@ +#include "statusnotifierwidget.h" + +StatusNotifierWidget::StatusNotifierWidget(ILxQtPanelPlugin *plugin, QWidget *parent) : + QWidget(parent), + m_plugin(plugin) +{ + m_watcher = new StatusNotifierWatcher; + + if (!QDBusConnection::sessionBus().registerService("org.kde.StatusNotifierWatcher")) + { + qDebug() << QDBusConnection::sessionBus().lastError().message(); + } + if (!QDBusConnection::sessionBus().registerObject("/StatusNotifierWatcher", m_watcher, QDBusConnection::ExportScriptableContents)) + { + qDebug() << QDBusConnection::sessionBus().lastError().message(); + } + + connect(m_watcher, SIGNAL(itemAdded(QString,QString)), this, SLOT(addButton(QString,QString))); + connect(m_watcher, SIGNAL(itemRemoved(int)), this, SLOT(removeButton(int))); + + layout = new LxQt::GridLayout(this); + setLayout(layout); + realign(); +} + +void StatusNotifierWidget::addButton(QString service, QString objectPath) +{ + StatusNotifierButton *button = new StatusNotifierButton(service, objectPath); + + layout->addWidget(button); + layout->setAlignment(button, Qt::AlignCenter); + button->show(); +} + +void StatusNotifierWidget::removeButton(int index) +{ + layout->itemAt(index)->widget()->deleteLater(); + layout->removeWidget(layout->itemAt(index)->widget()); +} + +void StatusNotifierWidget::realign() +{ + layout->setEnabled(false); + + ILxQtPanel *panel = m_plugin->panel(); + if (panel->isHorizontal()) + { + layout->setRowCount(panel->lineCount()); + layout->setColumnCount(0); + } + else + { + layout->setColumnCount(panel->lineCount()); + layout->setRowCount(0); + } + + layout->setEnabled(true); +} diff --git a/plugin-statusnotifier/statusnotifierwidget.h b/plugin-statusnotifier/statusnotifierwidget.h new file mode 100644 index 000000000..a6931f704 --- /dev/null +++ b/plugin-statusnotifier/statusnotifierwidget.h @@ -0,0 +1,32 @@ +#ifndef STATUSNOTIFIERWIDGET_H +#define STATUSNOTIFIERWIDGET_H + +#include + +#include + +#include "statusnotifierbutton.h" +#include "statusnotifierwatcher.h" + +class StatusNotifierWidget : public QWidget +{ + Q_OBJECT + +public: + StatusNotifierWidget(ILxQtPanelPlugin *plugin, QWidget *parent = 0); + +signals: + +public slots: + void addButton(QString service, QString objectPath); + void removeButton(int index); + + void realign(); + +private: + LxQt::GridLayout *layout; + ILxQtPanelPlugin *m_plugin; + StatusNotifierWatcher *m_watcher; +}; + +#endif // STATUSNOTIFIERWIDGET_H