Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1641 - trunk/src/target/OM-2007/openmoko-libs/libmokoui
([EMAIL PROTECTED])
2. r1642 -
trunk/src/target/OM-2007/applications/openmoko-calculator/po
([EMAIL PROTECTED])
3. r1643 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src
([EMAIL PROTECTED])
4. r1644 -
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src
([EMAIL PROTECTED])
5. r1645 - trunk/oe/conf/distro/include ([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-04-03 00:16:12 +0200 (Tue, 03 Apr 2007)
New Revision: 1641
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
Log:
libmokoui: force application and filter menu to always be of a certain size.
closes #130
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
2007-04-02 21:00:26 UTC (rev 1640)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
2007-04-02 22:16:12 UTC (rev 1641)
@@ -1,19 +1,19 @@
/*
* libmokoui -- OpenMoko Application Framework UI Library
- *
+ *
* Authored by Michael 'Mickey' Lauer <[EMAIL PROTECTED]>
- *
+ *
* Copyright (C) 2006-2007 OpenMoko Inc.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser Public License as published by
* the Free Software Foundation; version 2 of the license.
- *
+ *
* 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 Lesser Public License for more details.
- *
+ *
* Current Version: $Rev$ ($Date$) [$Author$]
*/
@@ -85,7 +85,7 @@
return GTK_WIDGET(g_object_new(moko_menu_box_get_type(), NULL));
}
-void moko_menu_box_clear(MokoMenuBox *f) /* Destruction */
+void moko_menu_box_clear(MokoMenuBox* f) /* Destruction */
{
/* destruct your widgets here */
}
@@ -141,6 +141,15 @@
g_signal_emit( G_OBJECT(self), moko_menu_box_signals[FILTER_CHANGED], 0,
text );
}
+static void cb_menu_size_request( GtkWidget* widget, GtkRequisition*
requisition, MokoMenuBox* self )
+{
+ // force popup menus to open with a certain width as per designer's
request. See bug #130
+ GtkAllocation* a = &( GTK_WIDGET(self) )->allocation;
+ moko_debug( "size request of menu = %d / %d -- forcing width to %d",
requisition->width, requisition->height, a->width / 2.5 );
+ if ( requisition->width != a->width / 2.5 )
+ requisition->width = a->width / 2.5;
+}
+
void moko_menu_box_set_application_menu(MokoMenuBox* self, GtkMenu* menu)
{
moko_debug( "moko_menu_box_set_application_menu" );
@@ -155,12 +164,13 @@
}
GtkWidget* appitem = gtk_image_menu_item_new_with_label(
g_get_application_name() );
GtkWidget* appicon = gtk_image_new_from_stock(
"openmoko-application-menu-icon", GTK_ICON_SIZE_MENU );
- gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM (appitem), appicon );
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(appitem), appicon );
gtk_widget_set_name( GTK_WIDGET(appitem), "transparent" );
priv->appitem = appitem;
- priv->appmenu = GTK_WIDGET (menu);
- gtk_menu_item_set_submenu( GTK_MENU_ITEM (appitem), GTK_WIDGET (menu) );
- gtk_menu_shell_append( GTK_MENU_SHELL (priv->menubar_l), appitem );
+ priv->appmenu = GTK_WIDGET(menu);
+ g_signal_connect( G_OBJECT(menu), "size-request",
G_CALLBACK(cb_menu_size_request), self );
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(appitem), GTK_WIDGET(menu) );
+ gtk_menu_shell_append( GTK_MENU_SHELL(priv->menubar_l), appitem );
//FIXME hack to popup the first menu if user clicks on menubar
g_signal_connect( priv->menubar_l, "button-press-event",
G_CALLBACK(cb_button_release), menu );
@@ -177,15 +187,16 @@
priv->menubar_r = gtk_menu_bar_new();
gtk_widget_set_name( priv->menubar_r, "mokomenubox-filter-menubar" );
gtk_box_pack_end( GTK_BOX(self), priv->menubar_r, TRUE, TRUE, 0 );
-
+
filtitem = gtk_image_menu_item_new_with_label( "Filter Menu" );
GtkWidget* filticon = gtk_image_new_from_stock(
"openmoko-filter-menu-icon", GTK_ICON_SIZE_MENU );
- gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM (filtitem),
filticon );
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(filtitem), filticon
);
gtk_widget_set_name( filtitem, "transparent" );
priv->filteritem = filtitem;
- priv->filtermenu = GTK_WIDGET (menu);
- gtk_menu_shell_append( GTK_MENU_SHELL (priv->menubar_r),
priv->filteritem );
- gtk_menu_item_set_submenu( GTK_MENU_ITEM (priv->filteritem),
priv->filtermenu );
+ priv->filtermenu = GTK_WIDGET(menu);
+ g_signal_connect( G_OBJECT(menu), "size-request",
G_CALLBACK(cb_menu_size_request), self );
+ gtk_menu_shell_append( GTK_MENU_SHELL(priv->menubar_r),
priv->filteritem );
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(priv->filteritem),
priv->filtermenu );
}
priv->filtermenu = GTK_WIDGET (menu);
gtk_menu_item_set_submenu( GTK_MENU_ITEM (priv->filteritem),
priv->filtermenu );
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-03 00:27:22 +0200 (Tue, 03 Apr 2007)
New Revision: 1642
Added:
trunk/src/target/OM-2007/applications/openmoko-calculator/po/POTFILES.in
Log:
openmoko-calculator: add missing POTFILES.in. closes #380 and #384
Added: trunk/src/target/OM-2007/applications/openmoko-calculator/po/POTFILES.in
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/po/POTFILES.in
2007-04-02 22:16:12 UTC (rev 1641)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/po/POTFILES.in
2007-04-02 22:27:22 UTC (rev 1642)
@@ -0,0 +1,2 @@
+data/openmoko-calculator.desktop
+src/calc-main.c
--- End Message ---
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-04-03 02:54:15 +0200 (Tue, 03 Apr 2007)
New Revision: 1643
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
Log:
openmoko-panel-gsm: delete gprs signal check testing codes
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
2007-04-02 22:27:22 UTC (rev 1642)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.c
2007-04-03 00:54:15 UTC (rev 1643)
@@ -149,6 +149,8 @@
moko_panel_gprs_signal_quality()
{
//some code for only for test, since there have not any methord to check out
gprs signal.
+if (0)
+{
test ++;
if (test > 11 || test < 0)
test = 0;
@@ -168,6 +170,8 @@
return UN_CONN;
}
}
+ return UN_CONN;
+}
void
gsm_watcher_install (void)
--- End Message ---
--- Begin Message ---
Author: zhiyong_sun
Date: 2007-04-03 03:25:05 +0200 (Tue, 03 Apr 2007)
New Revision: 1644
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
Log:
openmoko-panel-gsm: bug fix, initialize gsm and gprs signal with UN_INIT
status, instead of UN_CONN avoid to UN_CONN status image show error.
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
2007-04-03 00:54:15 UTC (rev 1643)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/moko-gsm-conn.h
2007-04-03 01:25:05 UTC (rev 1644)
@@ -14,6 +14,7 @@
};
typedef enum{
+ UN_INIT = -1,
LEVEL_1 = 0,
LEVEL_2,
LEVEL_3,
Modified:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
===================================================================
---
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-04-03 00:54:15 UTC (rev 1643)
+++
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-gsm/src/openmoko-panel-gsm.c
2007-04-03 01:25:05 UTC (rev 1644)
@@ -109,9 +109,9 @@
applet->timeout_id = g_timeout_add(4000, (GSourceFunc) timeout_cb, applet);
applet->gsm.image = gtk_image_new ();//make an empty GtkImage object
- applet->gsm.status = UN_CONN;
+ applet->gsm.status = UN_INIT;
applet->gprs.image = gtk_image_new ();//make an empty GtkImage object
- applet->gprs.status = UN_CONN;
+ applet->gprs.status = UN_INIT;
applet->hbox = gtk_hbox_new(FALSE, 0);
gtk_widget_show (applet->hbox);
--- End Message ---
--- Begin Message ---
Author: rwhitby
Date: 2007-04-03 06:36:41 +0200 (Tue, 03 Apr 2007)
New Revision: 1645
Modified:
trunk/oe/conf/distro/include/openmoko.inc
Log:
openmoko.inc: Added PREFERRED_PROVIDERs for gtk+ and gdk pixbuf loaders (copied
from OE Angstrom conf).
Modified: trunk/oe/conf/distro/include/openmoko.inc
===================================================================
--- trunk/oe/conf/distro/include/openmoko.inc 2007-04-03 01:25:05 UTC (rev
1644)
+++ trunk/oe/conf/distro/include/openmoko.inc 2007-04-03 04:36:41 UTC (rev
1645)
@@ -89,6 +89,21 @@
PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+
#
# GPE
#
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
