From: Faheem Pervez Date: Sun, 21 Mar 2010 08:19:02 +0000 (+0000) Subject: Upload 1.3 X-Git-Url: http://git.maemo.org/git/?p=sbrightapplet;a=commitdiff_plain;h=1a7e9388d08e029e6abacf96a73827e46c5877ab Upload 1.3 --- diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..508aebc --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Faheem Pervez diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..623b625 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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 Library General +Public License instead of this License. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..3da2d71 --- /dev/null +++ b/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = data src diff --git a/antigen.sh b/antigen.sh new file mode 100755 index 0000000..ff86dda --- /dev/null +++ b/antigen.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -ex +if test -f Makefile; then + make distclean +fi +rm -Rf autom4te.cache +rm -f *.tar.* *.tgz config.status.lineno ChangeLog NEWS README aclocal.m4 configure compile depcomp install-sh missing ltmain.sh config.guess config.sub config.h.in mkinstalldirs INSTALL config.log config.status libtool config.h.in~ +find . -name Makefile.in | xargs rm -f diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..9ad04eb --- /dev/null +++ b/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +set -ex +touch ChangeLog NEWS README +autoreconf --install --force diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..8d203fc --- /dev/null +++ b/configure.ac @@ -0,0 +1,21 @@ +AC_PREREQ[(2.58)] +AC_INIT([simple-brightness-applet], [1.1]) +AC_CONFIG_SRCDIR([src/simple-brightness-applet.c]) +AM_INIT_AUTOMAKE +AC_CONFIG_HEADER([config.h]) + +AC_PROG_CC +AC_PROG_INSTALL +AM_PROG_LIBTOOL + +PKG_CHECK_MODULES(BRIGHTNESS, hildon-1 libhildondesktop-1 gtk+-2.0 glib-2.0 gobject-2.0 gconf-2.0 libosso) +AC_SUBST(BRIGHTNESS_CFLAGS) +AC_SUBST(BRIGHTNESS_LIBS) + +HILDON_HOME_DESKTOP_DIR=`pkg-config libhildondesktop-1 --variable=hildonstatusmenudesktopentrydir` +AC_SUBST(HILDON_HOME_DESKTOP_DIR) + +HILDON_DESKTOP_LIB_DIR=`pkg-config libhildondesktop-1 --variable=hildondesktoplibdir` +AC_SUBST(HILDON_DESKTOP_LIB_DIR) + +AC_OUTPUT([Makefile src/Makefile data/Makefile]) diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..c9e3230 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,2 @@ +desktopdir = $(HILDON_HOME_DESKTOP_DIR) +desktop_DATA = simple-brightness-applet.desktop diff --git a/data/simple-brightness-applet.desktop b/data/simple-brightness-applet.desktop new file mode 100644 index 0000000..6e09f6d --- /dev/null +++ b/data/simple-brightness-applet.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Simple Brightness Applet +Comment=Simple Brightness Applet +Type=default +X-Path=simple-brightness-applet.so diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..63162d7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,18 @@ +simple-brightness-applet (1.1-1maemo0) unstable; urgency=low + + * Add ability to keep backlight on + * Add ability to launch Display Settings + + -- Faheem Pervez Sun, 4 Oct 2009 16:29:51 +0100 + +simple-brightness-applet (1.0-1) unstable; urgency=low + + * Clean up libtool stuff. + + -- Faheem Pervez Sun, 4 Oct 2009 16:29:51 +0100 + +simple-brightness-applet (1.0) unstable; urgency=low + + * Initial Release. + + -- Faheem Pervez Fri, 2 Oct 2009 14:38:04 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9cff153 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: simple-brightness-applet +Section: user/desktop +Priority: extra +Maintainer: Faheem Pervez +Build-Depends: debhelper (>= 5), autotools-dev, autoconf, libhildon1-dev, libhildondesktop1-dev, libgtk2.0-dev, libglib2.0-dev, libgconf2-dev, libosso-dev +Standards-Version: 3.7.2 + +Package: simple-brightness-applet +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple brightness statusarea applet + Allows you to: + * Adjust the brightness from 1-5; + * Launch the Display Settings Control Panel applet; and + * Keep the backlight on. + . +XB-Maemo-Display-Name: Simple Brightness Applet diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..106f96b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,23 @@ +This is simple-brightness-applet, written and maintained by Faheem Pervez +on Fri, 2 Oct 2009 14:38:04 +0100. + +Copyright Holder: Faheem Pervez + +License: + + 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 2 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ecc85d5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,72 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. + +#export DH_VERBOSE=1 + + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + + ./autogen.sh + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-static CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + + touch $@ + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -./antigen.sh + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/simple-brightness-applet install + find $(CURDIR)/debian/simple-brightness-applet -name "*.la" | xargs rm -f + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-arch +.PHONY: build clean binary-arch binary install configure diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..f0712ec --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,7 @@ +desktoplib_LTLIBRARIES = simple-brightness-applet.la +desktoplibdir = $(HILDON_DESKTOP_LIB_DIR) + +simple_brightness_applet_la_SOURCES = simple-brightness-applet.c simple-brightness-applet.h +simple_brightness_applet_la_CFLAGS = $(BRIGHTNESS_CFLAGS) +simple_brightness_applet_la_LIBADD = $(BRIGHTNESS_LIBS) +simple_brightness_applet_la_LDFLAGS = -module -avoid-version diff --git a/src/simple-brightness-applet.c b/src/simple-brightness-applet.c new file mode 100644 index 0000000..c97b812 --- /dev/null +++ b/src/simple-brightness-applet.c @@ -0,0 +1,323 @@ +/* + * simple-brightness-applet - simple statusarea applet that allows the user to select the brightness from a range of 1-5 + * + * Copyright (c) 2009 Faheem Pervez + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "simple-brightness-applet.h" + +#include +#include +#include +#include +#include + +#ifdef HILDON_DISABLE_DEPRECATED +#undef HILDON_DISABLE_DEPRECATED +#endif + +HD_DEFINE_PLUGIN_MODULE (SimpleBrightnessApplet, simple_brightness_applet, HD_TYPE_STATUS_MENU_ITEM) + +#define SIMPLE_BRIGHTNESS_GCONF_PATH "/system/osso/dsm/display" +#define BRIGHTNESS_KEY SIMPLE_BRIGHTNESS_GCONF_PATH "/display_brightness" + +#define SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ + SIMPLE_TYPE_BRIGHTNESS_APPLET, SimpleBrightnessAppletPrivate)) + +typedef struct _SimpleBrightnessAppletPrivate SimpleBrightnessAppletPrivate; + +struct _SimpleBrightnessAppletPrivate +{ + GConfClient *gconf_client; + GtkHBox *applet_contents; + HildonControlbar *brightness_ctrlbar; + GtkWidget *settings_dialog; + GtkWidget *dispchkbtn; + GtkWidget *applet_button; + + gulong brightness_ctrlbar_valchanged_id; + gulong dispchkbtn_toggled_id; + guint gconfnotify_id; + guint display_keepalive_timeout; + + gboolean dispchkbtn_active; + + osso_context_t *osso_context; +}; + +static void simple_brightness_applet_finalize (GObject *object); + +/* Callbacks: */ +static gboolean simple_brightness_applet_keep_backlight_alive (SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + + g_return_val_if_fail(priv->osso_context, FALSE); + + osso_display_state_on(priv->osso_context); + if (osso_display_blanking_pause(priv->osso_context) != OSSO_OK) + return FALSE; + else + return TRUE; +} + +static void simple_brightness_applet_on_gconf_value_changed (GConfClient *gconf_client G_GNUC_UNUSED, guint cnxn_id G_GNUC_UNUSED, GConfEntry *entry G_GNUC_UNUSED, SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + + g_signal_handler_block (priv->brightness_ctrlbar, priv->brightness_ctrlbar_valchanged_id); + hildon_controlbar_set_value (priv->brightness_ctrlbar, gconf_client_get_int(priv->gconf_client, BRIGHTNESS_KEY, NULL)); + g_signal_handler_unblock (priv->brightness_ctrlbar, priv->brightness_ctrlbar_valchanged_id); +} + +static void simple_brightness_applet_on_value_changed (HildonControlbar *brightness_ctrlbar G_GNUC_UNUSED, SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + + gconf_client_set_int (priv->gconf_client, BRIGHTNESS_KEY, hildon_controlbar_get_value (priv->brightness_ctrlbar), NULL); +} + +static void simple_brightness_applet_on_settings_button_clicked (GtkWidget *button, SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + gboolean failed = FALSE; + + gtk_widget_hide(priv->settings_dialog); + + if (priv->osso_context) + { + if (osso_cp_plugin_execute(priv->osso_context, "libcpdisplay.so", NULL, TRUE) != OSSO_OK) + failed = TRUE; + } + else + { + failed = TRUE; + } + + gtk_widget_destroy(priv->settings_dialog); + + if(failed) + hildon_banner_show_information(NULL, NULL, "Failed to show display settings"); +} + +static void simple_brightness_applet_on_dispchkbtn_toggled (GtkWidget *button G_GNUC_UNUSED, SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + GdkPixbuf *pixbuf = NULL; + + priv->dispchkbtn_active = hildon_check_button_get_active (HILDON_CHECK_BUTTON(priv->dispchkbtn)); + + g_signal_handler_block (priv->dispchkbtn, priv->dispchkbtn_toggled_id); + + gtk_widget_hide(priv->settings_dialog); + + if (priv->dispchkbtn_active) + { + simple_brightness_applet_keep_backlight_alive(plugin); + priv->display_keepalive_timeout = g_timeout_add_seconds(50, (GSourceFunc) simple_brightness_applet_keep_backlight_alive, plugin); + if (priv->display_keepalive_timeout == 0) + { + hildon_banner_show_information(NULL, NULL, "Failed to keep backlight on"); + priv->dispchkbtn_active = FALSE; + hildon_check_button_set_active(HILDON_CHECK_BUTTON(priv->dispchkbtn), priv->dispchkbtn_active); + g_signal_handler_unblock (priv->dispchkbtn, priv->dispchkbtn_toggled_id); + return; + } + + gtk_widget_set_name(priv->applet_button, "hildon-reject-button-finger"); + pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), "general_brightness", 18, 0, NULL); + if (pixbuf) + { + hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM (plugin), pixbuf); + g_object_unref (pixbuf); + pixbuf = NULL; + } + } + else + { + if(g_source_remove(priv->display_keepalive_timeout)) + { + gtk_widget_set_name(priv->applet_button, "GtkButton-finger"); + hd_status_plugin_item_set_status_area_icon (HD_STATUS_PLUGIN_ITEM (plugin), NULL); + priv->display_keepalive_timeout = 0; + } + else + { + priv->dispchkbtn_active = TRUE; + hildon_check_button_set_active(HILDON_CHECK_BUTTON(priv->dispchkbtn), priv->dispchkbtn_active); + } + } + + g_signal_handler_unblock (priv->dispchkbtn, priv->dispchkbtn_toggled_id); + gtk_widget_destroy(priv->settings_dialog); +} + +/* Setup applet and dialogs: */ +static void simple_brightness_applet_on_button_clicked (GtkWidget *button, SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + GtkWidget *toplevel, *settings_button; + GdkPixbuf *pixbuf = NULL; + + toplevel = gtk_widget_get_toplevel(button); + gtk_widget_hide (toplevel); + + priv->settings_dialog = gtk_dialog_new (); + gtk_window_set_title (GTK_WINDOW (priv->settings_dialog), "Simple Brightness Applet:"); + gtk_window_set_transient_for(GTK_WINDOW(priv->settings_dialog), GTK_WINDOW(toplevel)); + gtk_window_set_destroy_with_parent (GTK_WINDOW (priv->settings_dialog), TRUE); + + settings_button = hildon_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL); + hildon_button_set_title(HILDON_BUTTON (settings_button), "Open Display Settings..."); + pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), "general_brightness", 64, 0, NULL); + if (pixbuf) + { + GtkWidget *image; + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + pixbuf = NULL; + hildon_button_set_image(HILDON_BUTTON(settings_button), image); + } + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(priv->settings_dialog)->vbox), settings_button, TRUE, TRUE, 0); + g_signal_connect(settings_button, "clicked", G_CALLBACK(simple_brightness_applet_on_settings_button_clicked), plugin); + + priv->dispchkbtn = hildon_check_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + gtk_button_set_label(GTK_BUTTON (priv->dispchkbtn), "Keep display on"); + gtk_button_set_alignment(GTK_BUTTON(priv->dispchkbtn), 0.5f, 0.5f); + hildon_check_button_set_active(HILDON_CHECK_BUTTON(priv->dispchkbtn), priv->dispchkbtn_active); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(priv->settings_dialog)->vbox), priv->dispchkbtn, TRUE, TRUE, 0); + priv->dispchkbtn_toggled_id = g_signal_connect(priv->dispchkbtn, "toggled", G_CALLBACK(simple_brightness_applet_on_dispchkbtn_toggled), plugin); + + gtk_widget_show_all(priv->settings_dialog); +} + +static void simple_brightness_applet_setup (SimpleBrightnessApplet *plugin) +{ + GdkPixbuf *pixbuf = NULL; + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + + priv->applet_contents = GTK_HBOX (gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT)); + + priv->applet_button = hildon_gtk_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + gtk_box_pack_start (GTK_BOX (priv->applet_contents), priv->applet_button, FALSE, FALSE, 0); + g_signal_connect (priv->applet_button, "clicked", G_CALLBACK(simple_brightness_applet_on_button_clicked), plugin); + pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), "general_brightness", 64, 0, NULL); + if (pixbuf) + { + GtkWidget *image; + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + pixbuf = NULL; + gtk_button_set_image(GTK_BUTTON(priv->applet_button), image); + } + + priv->brightness_ctrlbar = HILDON_CONTROLBAR (hildon_controlbar_new ()); /* Yes, I know: I'm very naughty for using a depreciated widget. But let me know, Nokia, when you actually stop using it too. */ + hildon_gtk_widget_set_theme_size(GTK_WIDGET(priv->brightness_ctrlbar), HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + hildon_controlbar_set_range (priv->brightness_ctrlbar, gconf_client_get_int(priv->gconf_client, "/system/osso/dsm/display/display_brightness_level_step", NULL), gconf_client_get_int(priv->gconf_client, "/system/osso/dsm/display/max_display_brightness_levels", NULL)); + hildon_controlbar_set_value (priv->brightness_ctrlbar, gconf_client_get_int(priv->gconf_client, BRIGHTNESS_KEY, NULL)); + priv->brightness_ctrlbar_valchanged_id = g_signal_connect (priv->brightness_ctrlbar, "value-changed", G_CALLBACK(simple_brightness_applet_on_value_changed), plugin); + gtk_box_pack_start (GTK_BOX (priv->applet_contents), GTK_WIDGET (priv->brightness_ctrlbar), TRUE, TRUE, 0); + + gconf_client_add_dir (priv->gconf_client, SIMPLE_BRIGHTNESS_GCONF_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL); + priv->gconfnotify_id = gconf_client_notify_add (priv->gconf_client, BRIGHTNESS_KEY, (GConfClientNotifyFunc)simple_brightness_applet_on_gconf_value_changed, plugin, NULL, NULL); +} + +/* GObject stuff: */ +static void simple_brightness_applet_class_init (SimpleBrightnessAppletClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + + object_class->finalize = simple_brightness_applet_finalize; + + g_type_class_add_private (class, sizeof (SimpleBrightnessAppletPrivate)); +} + +static void simple_brightness_applet_class_finalize (SimpleBrightnessAppletClass *class G_GNUC_UNUSED) +{ +} + +static void simple_brightness_applet_init (SimpleBrightnessApplet *plugin) +{ + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + memset (priv, 0, sizeof (SimpleBrightnessAppletPrivate)); + + priv->dispchkbtn_active = FALSE; + priv->osso_context = osso_initialize(PACKAGE, PACKAGE_VERSION, TRUE, NULL); + priv->brightness_ctrlbar_valchanged_id = priv->dispchkbtn_toggled_id = priv->gconfnotify_id = priv->display_keepalive_timeout = 0; + priv->gconf_client = gconf_client_get_default (); + + simple_brightness_applet_setup (plugin); + gtk_container_add (GTK_CONTAINER (plugin), GTK_WIDGET(priv->applet_contents)); + gtk_widget_show_all (GTK_WIDGET(plugin)); +} + +static void simple_brightness_applet_finalize (GObject *object) +{ + SimpleBrightnessApplet *plugin = SIMPLE_BRIGHTNESS_APPLET (object); + SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin); + + if (priv->brightness_ctrlbar_valchanged_id != 0) + { + g_signal_handler_disconnect (priv->brightness_ctrlbar, priv->brightness_ctrlbar_valchanged_id); + priv->brightness_ctrlbar_valchanged_id = 0; + } + + if (priv->dispchkbtn_toggled_id != 0) + { + g_signal_handler_disconnect (priv->dispchkbtn, priv->dispchkbtn_toggled_id); + priv->dispchkbtn_toggled_id = 0; + } + + if (priv->display_keepalive_timeout != 0) + { + g_source_remove(priv->display_keepalive_timeout); + priv->display_keepalive_timeout = 0; + } + + if (priv->gconfnotify_id != 0) + { + gconf_client_notify_remove (priv->gconf_client, priv->gconfnotify_id); + priv->gconfnotify_id = 0; + gconf_client_remove_dir (priv->gconf_client, SIMPLE_BRIGHTNESS_GCONF_PATH, NULL); + } + + if (priv->gconf_client) + { + gconf_client_clear_cache (priv->gconf_client); + g_object_unref (priv->gconf_client); + priv->gconf_client = NULL; + } + + if (priv->osso_context) + { + osso_deinitialize(priv->osso_context); + priv->osso_context = NULL; + } + + G_OBJECT_CLASS (simple_brightness_applet_parent_class)->finalize (object); +} + +SimpleBrightnessApplet* simple_brightness_applet_new (void) +{ + return g_object_new (SIMPLE_TYPE_BRIGHTNESS_APPLET, NULL); +} diff --git a/src/simple-brightness-applet.h b/src/simple-brightness-applet.h new file mode 100644 index 0000000..344b85e --- /dev/null +++ b/src/simple-brightness-applet.h @@ -0,0 +1,69 @@ +/* + * simple-brightness-applet - simple statusarea applet that allows the user to select the brightness from a range of 1-5 + * + * Copyright (c) 2009 Faheem Pervez + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + */ + +#ifndef SIMPLE_BRIGHTNESS_APPLET_H +#define SIMPLE_BRIGHTNESS_APPLET_H + +#include +#include +#include + +G_BEGIN_DECLS + +#define SIMPLE_TYPE_BRIGHTNESS_APPLET (simple_brightness_applet_get_type ()) + +#define SIMPLE_BRIGHTNESS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + SIMPLE_TYPE_BRIGHTNESS_APPLET, SimpleBrightnessApplet)) + +#define SIMPLE_BRIGHTNESS_APPLET_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ + SIMPLE_TYPE_BRIGHTNESS_APPLET, SimpleBrightnessAppletClass)) + +#define SIMPLE_IS_BRIGHTNESS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + SIMPLE_TYPE_BRIGHTNESS_APPLET)) + +#define SIMPLE_IS_BRIGHTNESS_APPLET_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \ + SIMPLE_TYPE_BRIGHTNESS_APPLET)) + +#define SIMPLE_BRIGHTNESS_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + SIMPLE_TYPE_BRIGHTNESS_APPLET, SimpleBrightnessAppletClass)) + +typedef struct _SimpleBrightnessApplet SimpleBrightnessApplet; +typedef struct _SimpleBrightnessAppletClass SimpleBrightnessAppletClass; + +struct _SimpleBrightnessApplet +{ + HDStatusMenuItem hitem; +}; + +struct _SimpleBrightnessAppletClass +{ + HDStatusMenuItemClass parent_class; +}; + +GType simple_brightness_applet_get_type (void); + +SimpleBrightnessApplet* simple_brightness_applet_new (void); + +G_END_DECLS + +#endif /* SIMPLE_BRIGHTNESS_APPLET_H */ + diff --git a/welcome b/welcome deleted file mode 100644 index e69de29..0000000