Changeset 594


Ignore:
Timestamp:
01/23/07 19:44:02 (6 years ago)
Author:
mickey
Message:

add outline for openmoko-panel-battery

Location:
trunk/src/target/OM-2007
Files:
23 added
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro

    r588 r594  
    4949} 
    5050 
    51 contains( TEMPLATE, app ) { 
    52         message( configuring application $$TARGET ) 
    53         DESTDIR = $(OPENMOKODIR)/bin 
    54 } 
    55  
    56 contains( TEMPLATE, lib ) { 
    57         message( configuring library $$TARGET ) 
    58         DESTDIR = $(OPENMOKODIR)/lib 
    59 } 
    60  
    6151contains ( MOKOTYPE, panel-plugin ) { 
    6252    DATADIR = $(OPENMOKODIR)/panel-plugins/$$TARGET/data 
     53    TEMPLATE = lib 
    6354} 
    6455!contains ( MOKOTYPE, panel-plugin ) { 
    … …  
    8576} 
    8677 
     78contains( TEMPLATE, app ) { 
     79    message( configuring application $$TARGET ) 
     80    DESTDIR = $(OPENMOKODIR)/bin 
     81} 
     82 
     83contains( TEMPLATE, lib ) { 
     84    message( configuring library $$TARGET ) 
     85    DESTDIR = $(OPENMOKODIR)/lib 
     86} 
     87 
     88 
    8789DEFINES += G_LOG_DOMAIN=\\\"$$TARGET\\\" 

  • trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/Makefile.am

    r591 r594  
    11AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" 
    2 AM_CFLAGS = -Wall -Werror -g -std=c99 -pedantic @MATCHBOX_PANEL_CFLAGS@ @OPENMOKO_CFLAGS@ 
     2AM_CFLAGS = -Wall -Werror -g -std=c99 -pedantic @OPENMOKO_CFLAGS@ 
    33 
    44appletdir = $(libdir)/matchbox-panel/ 

  • trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c

    r591 r594  
    3232    g_debug( "openmoko-panel-demo-simple new" ); 
    3333 
     34    // simple demo just uses the stock MokoPanelApplet class 
     35    // more sophisticated way of using it is to derive from it 
    3436    MokoPanelApplet* applet = moko_panel_applet_new(); 
    3537 
    … …  
    5759} 
    5860 
    59  

  • trunk/src/target/OM-2007/examples/openmoko-panel-demo/configure.ac

    r555 r594  
    1212 
    1313# base deps 
    14 PKG_CHECK_MODULES(OPENMOKO, openmoko-libs >= 0.0.1,, 
    15                  AC_MSG_ERROR([*** Required OpenMoko Libraries >= 0.0.1 not installed ***])) 
     14PKG_CHECK_MODULES(MATCHBOX_PANEL, matchbox-panel >= 0.1,, 
     15                 AC_MSG_ERROR([*** Required Matchbox Panel 2 >= 0.1 not installed ***])) 
    1616LIBS="$LIBS $GTK_LIBS" 
    17 CFLAGS="$CFLAGS $OPENMOKO_CFLAGS" 
     17CFLAGS="$CFLAGS $MATCHBOX_PANEL" 
    1818 
    1919# output stuff 

  • trunk/src/target/OM-2007/examples/openmoko-panel-demo/openmoko-panel-demo.pro

    r588 r594  
    1 HEADERS = src/demo-panel-applet.h 
    2 SOURCES = src/demo-panel-applet.c src/main.c 
     1SOURCES = src/demo-panel-applet.c 
    32 
    43MOKOCONFIG = mokoui 

  • trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/Makefile.am

    r507 r594  
    1 INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic 
     1AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\" -DGETTEXT_PACKAGE=\"matchbox-panel\" 
     2AM_CFLAGS = -Wall -std=c99 -pedantic @MATCHBOX_PANEL_CFLAGS@ 
    23 
    3 bin_PROGRAMS = openmoko-panel-demo 
     4appletdir = $(pkglibdir) 
     5applet_LTLIBRARIES = libopenmoko-panel-demo.la 
    46 
    5 openmoko_panel_demo_SOURCES = demo-panel-applet.c main.c 
     7libopenmoko_panel_demo_la_SOURCES = main.c panel-demo-applet.c 
    68 
    7 openmoko_panel_demo_LDADD = @OPENMOKO_LIBS@ 
     9MAINTAINERCLEANFILES = Makefile.in 
    810 

  • trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.c

    r589 r594  
    1717 */ 
    1818 
    19 #include "demo-panel-applet.h" 
    20  
    21 #include <libmb/mbpixbuf.h> 
    22  
    2319#undef DEBUG_THIS_FILE 
    2420#ifdef DEBUG_THIS_FILE 
    … …  
    2824#endif 
    2925 
    30 G_DEFINE_TYPE (DemoPanelApplet, demo_panel_applet, MOKO_TYPE_PANEL_APPLET); 
    31  
    32 #define PANEL_APPLET_GET_PRIVATE(o)   (G_TYPE_INSTANCE_GET_PRIVATE ((o), DEMO_TYPE_PANEL_APPLET, DemoPanelAppletPrivate)) 
    33  
    34 typedef struct _DemoPanelAppletPrivate 
    35 { 
    36 } DemoPanelAppletPrivate; 
    37  
    38 /* parent class pointer */ 
    39 MokoPanelAppletClass* parent_class = NULL; 
    40  
    41 /* forward declarations */ 
    42 void demo_panel_applet_clicked(DemoPanelApplet* self); 
    43 void demo_panel_applet_tap_hold(DemoPanelApplet* self); 
    44 void demo_panel_applet_paint(DemoPanelApplet* self, Drawable drw); 
    45  
    46 static void 
    47 demo_panel_applet_dispose(GObject* object) 
    48 { 
    49     if (G_OBJECT_CLASS (demo_panel_applet_parent_class)->dispose) 
    50         G_OBJECT_CLASS (demo_panel_applet_parent_class)->dispose (object); 
    51 } 
    52  
    53 static void 
    54 demo_panel_applet_finalize(GObject* object) 
    55 { 
    56     G_OBJECT_CLASS (demo_panel_applet_parent_class)->finalize (object); 
    57 } 
    58  
    59 static void 
    60 demo_panel_applet_class_init(DemoPanelAppletClass* klass) 
    61 { 
    62     /* hook parent */ 
    63     GObjectClass* object_class = G_OBJECT_CLASS (klass); 
    64     parent_class = g_type_class_peek_parent(klass); 
    65  
    66     /* add private */ 
    67     g_type_class_add_private (klass, sizeof(DemoPanelAppletPrivate)); 
    68  
    69     /* hook destruction */ 
    70     object_class->dispose = demo_panel_applet_dispose; 
    71     object_class->finalize = demo_panel_applet_finalize; 
    72  
    73     /* virtual methods */ 
    74     MokoPanelAppletClass* applet_class = MOKO_PANEL_APPLET_CLASS(klass); 
    75     applet_class->clicked = demo_panel_applet_clicked; 
    76     applet_class->tap_hold = demo_panel_applet_tap_hold; 
    77     applet_class->paint_callback = demo_panel_applet_paint; 
    78  
    79     /* install properties */ 
    80 } 
    81  
    82 DemoPanelApplet* 
    83 demo_panel_applet_new(void) 
    84 { 
    85     return g_object_new(DEMO_TYPE_PANEL_APPLET, NULL); 
    86 } 
    87  
    88 static void 
    89 demo_panel_applet_init(DemoPanelApplet* self) 
    90 { 
    91     /* Populate your instance here */ 
    92 } 
    93  
    94 void demo_panel_applet_clicked(DemoPanelApplet* self) 
    95 { 
    96     g_debug( "demo-panel-applet CLICKED" ); 
    97 } 
    98  
    99 void demo_panel_applet_tap_hold(DemoPanelApplet* self) 
    100 { 
    101     g_debug( "demo-panel-applet TAP-HOLD" ); 
    102 } 
    103  
    104 void demo_panel_applet_paint(DemoPanelApplet* self, Drawable drw) 
    105 { 
    106     MokoPanelApplet* panel = MOKO_PANEL_APPLET(self); 
    107     MBPixbufImage* background = mb_tray_app_get_background( panel->mb_applet, panel->mb_pixbuf ); 
    108  
    109     for ( int y = 0; y < mb_tray_app_height( panel->mb_applet ); ++y ) 
    110     { 
    111         for ( int x = 0; x < mb_tray_app_width( panel->mb_applet ); ++x ) 
    112         { 
    113             mb_pixbuf_img_plot_pixel( panel->mb_pixbuf, background, x, y, y*x, x*3, y*2 ); 
    114         } 
    115     } 
    116     //mb_pixbuf_img_composite( self->mb_pixbuf, background, self->mb_pixbuf_image_scaled, 0, 0 ); 
    117     mb_pixbuf_img_render_to_drawable( panel->mb_pixbuf, background, drw, 0, 0 ); 
    118     mb_pixbuf_img_free( panel->mb_pixbuf, background ); 
    119  
    120     g_debug( "demo-panel-applet PAINT" ); 
    121 } 

  • trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c

    r590 r594  
    9292 
    9393    /* install signals */ 
    94     moko_panel_applet_signals[CLICKED] = g_signal_new ("clicked", 
     94    moko_panel_applet_signals[CLICKED] = g_signal_new("clicked", 
    9595            G_TYPE_FROM_CLASS (klass), 
    9696            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 
    … …  
    101101            G_TYPE_NONE, 0); 
    102102 
    103     moko_panel_applet_signals[TAP_HOLD] = g_signal_new ("tap-hold", 
     103    moko_panel_applet_signals[TAP_HOLD] = g_signal_new("tap-hold", 
    104104            G_TYPE_FROM_CLASS (klass), 
    105105            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, 
    … …  
    210210    else 
    211211        gtk_image_set_from_file( self->icon, filename ); 
     212} 
     213 
     214void moko_panel_applet_set_pixbuf(MokoPanelApplet* self, GdkPixbuf* pixbuf) 
     215{ 
     216    if ( !self->icon ) 
     217    { 
     218        self->icon = gtk_image_new_from_pixbuf( pixbuf ); 
     219        g_return_if_fail( self->icon ); 
     220        gtk_container_add( GTK_CONTAINER(self->eventbox), GTK_WIDGET(self->icon) ); 
     221        gtk_widget_show( GTK_WIDGET(self->icon) ); 
     222    } 
     223    else 
     224        gtk_image_set_from_pixbuf( self->icon, pixbuf ); 
     225} 
     226 
     227void moko_panel_applet_set_widget(MokoPanelApplet* self, GtkWidget* widget) 
     228{ 
     229    gtk_container_add( GTK_CONTAINER(self->eventbox), GTK_WIDGET(widget) ); 
    212230} 
    213231 

  • trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h

    r590 r594  
    3333#include <gtk/gtkwidget.h> 
    3434#include <gtk/gtkwindow.h> 
     35 
     36#include <gdk/gdkpixbuf.h> 
    3537 
    3638#include <X11/X.h> 
    … …  
    7678/* simple interface */ 
    7779void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename, gboolean scaling); 
     80void moko_panel_applet_set_pixbuf(MokoPanelApplet* self, GdkPixbuf* pixbuf); 
     81void moko_panel_applet_set_widget(MokoPanelApplet* self, GtkWidget* widget); 
    7882void moko_panel_applet_get_positioning_hint(MokoPanelApplet* self, GtkWidget* popup, int* x, int* y); 
    7983void moko_panel_applet_set_popup(MokoPanelApplet* self, GtkWidget* popup, MokoPanelAppletPopupType type); 
    … …  
    8185void moko_panel_applet_close_popup(MokoPanelApplet* self); 
    8286 
    83 /* advanced interface */ 
    84 void moko_panel_applet_request_size(MokoPanelApplet* self, int x, int y); 
    85 void moko_panel_applet_request_offset(MokoPanelApplet* self, int offset); 
    86  
    8787G_END_DECLS 
    8888 

  • trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/openmoko-panel-clock.pro

    r479 r594  
    11MOKOCONFIG = mokoui 
     2MOKOTYPE = panel-plugin 
    23 
    34SOURCES = src/openmoko-panel-clock.c 

  • trunk/src/target/OM-2007/panel-plugins/openmoko-panel-clock/src/openmoko-panel-clock.c

    r592 r594  
    1 /*  moko-panel-applet.c 
     1/*  openmoko-panel-clock.c 
    22 * 
    33 *  Authored by Michael 'Mickey' Lauer <mlauer@vanille-media.de> 

  • trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro

    r588 r594  
    11TEMPLATE = subdirs 
    22SUBDIRS = \ 
     3  openmoko-panel-battery \ 
    34  openmoko-panel-clock \ 
    45  openmoko-panel-mainmenu 
Note: See TracChangeset for help on using the changeset viewer.