r588 - in trunk/src/target/OM-2007: applications/openmoko-appmanager/src applications/openmoko-chordmaster/src applications/openmoko-mainmenu/src devel/qmake devel/scripts examples/openmoko-finger-demo/src examples/openmoko-panel-demo examples/openmoko-panel-demo/src examples/openmoko-panel-demo-simple examples/openmoko-panel-demo-simple/src examples/openmoko-stylus-demo/src examples/openmoko-stylus-demo-simple/src openmoko-libs/libmokoui panel-plugins panel-plugins/openmoko-panel-mainmenu panel-plugins/openmoko-panel-mainmenu/src templates
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Tue Jan 23 12:11:54 CET 2007
Author: mickey
Date: 2007-01-23 12:11:46 +0100 (Tue, 23 Jan 2007)
New Revision: 588
Removed:
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.c
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.h
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
Modified:
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.h
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.h
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.h
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.h
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
trunk/src/target/OM-2007/devel/scripts/launch-xoo
trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c
trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.h
trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro
trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c
trunk/src/target/OM-2007/examples/openmoko-panel-demo/openmoko-panel-demo.pro
trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.c
trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.h
trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/main.c
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c
trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.h
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c
trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
trunk/src/target/OM-2007/templates/gpl-header.h
trunk/src/target/OM-2007/templates/lgpl-header.h
Log:
first pass in header unification
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file application-menu.c
* @brief The application menu item
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/application-menu.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file application-menu.h
* @brief The application menu item
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
* @brief It is an infomation dialog that will display the all package
* that will be changed.
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/apply-dialog.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
* @brief It is an infomation dialog that will display the all package
* that will be changed.
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file appmanager-data.c
* @brief The all data that the application manager will used
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-data.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file appmanager-data.h
* @brief The all data that the application manager will used
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file appmanager-window.c
* @brief The application manager in the Openmoko
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/appmanager-window.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file appmanager-window.h
* @brief The application manager in the Openmoko
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file detail-area.c
* @brief The detail area in the main window
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/detail-area.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file detail-area.h
* @brief The detail area in the main window
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/errorcode.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file errorcode.h
* @brief The error code of the all function return
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file filter-menu.c
* @brief The filter menu item
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/filter-menu.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file filter-menu.h
* @brief The filter menu item
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
* @brief It is the dialog that displays the process of install/remove/upgrade
* packages.
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
* @brief It is the dialog that displays the process of install/remove/upgrade
* packages.
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file navigation-area.c
* @brief The navigation area in the main window
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/navigation-area.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file navigation-area.h
* @brief The navigation area in the main window
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file package-list.c
* @brief The package list that get from the lib ipkg
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file package-list.h
* @brief The package list that get from the lib ipkg
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file pixbuf-list.c
* @brief The package list that get from the lib ipkg
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/pixbuf-list.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file pixbuf-list.h
* @brief The package list that get from the lib ipkg
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file select-menu.c
* @brief The select menu that popuo in the treeview
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/select-menu.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file select-menu.h
* @brief The select menu that popuo in the treeview
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file tool-box.c
* @brief The tool box in the main window
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/tool-box.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
* @file tool-box.h
* @brief The tool box in the main window
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/callbacks.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro
===================================================================
--- trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/devel/qmake/openmoko-include.pro 2007-01-23 11:11:46 UTC (rev 588)
@@ -58,15 +58,23 @@
DESTDIR = $(OPENMOKODIR)/lib
}
+contains ( MOKOTYPE, panel-plugin ) {
+ DATADIR = $(OPENMOKODIR)/panel-plugins/$$TARGET/data
+}
+!contains ( MOKOTYPE, panel-plugin ) {
+ DATADIR = $(OPENMOKODIR)/applications/$$TARGET/data
+}
+contains ( TEMPLATE, lib ) {
+ DATADIR = $(OPENMOKODIR)/openmoko-libs/data
+}
+
contains( CONFIG, debug ) {
!contains( TEMPLATE, lib ) {
- APPDIR = $(OPENMOKODIR)/applications/$$TARGET/data
- DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
- DEFINES += DATADIR=\\\"$$APPDIR/\\\"
- system( ln -sf . $OPENMOKODIR/applications/$$TARGET/data/icons )
+ DEFINES += PKGDATADIR=\\\"$$DATADIR/\\\"
+ DEFINES += DATADIR=\\\"$$DATADIR/\\\"
+ system( ln -sf . $$DATADIR/icons )
}
contains( TEMPLATE, lib ) {
- APPDIR = $(OPENMOKODIR)/openmoko-libs/data
DEFINES += PKGDATADIR=\\\"$$APPDIR/\\\"
DEFINES += DATADIR=\\\"$$APPDIR/\\\"
}
Modified: trunk/src/target/OM-2007/devel/scripts/launch-xoo
===================================================================
--- trunk/src/target/OM-2007/devel/scripts/launch-xoo 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/devel/scripts/launch-xoo 2007-01-23 11:11:46 UTC (rev 588)
@@ -36,10 +36,8 @@
sleep 2
-matchbox-panel -display $DISPLAY \
- --orientation north \
- --default-apps '' \
- --no-session \
- --no-menu \
- --no-flip \
- --bgpixmap $SVN_TRUNK/OM-2007/artwork/images/pixmaps/openmoko-header-background.png &
+matchbox-panel --geometry=480x44 --end-applets=clock &
+
+sleep 2
+
+openmoko-footer &
Modified: trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.h
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-finger-demo/src/demo-main.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo/openmoko-panel-demo.pro
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo/openmoko-panel-demo.pro 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo/openmoko-panel-demo.pro 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,4 +2,5 @@
SOURCES = src/demo-panel-applet.c src/main.c
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
*
* Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2007 Vanille-Media
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.h
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/demo-panel-applet.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,7 +2,7 @@
*
* Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2007 Vanille-Media
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo/src/main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
@@ -33,6 +33,7 @@
moko_panel_system_init( &argc, &argv );
DemoPanelApplet* applet = demo_panel_applet_new();
+ moko_panel_applet_show( applet );
gtk_main();
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/openmoko-panel-demo-simple.pro 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,4 +1,5 @@
SOURCES = src/demo-panel-applet.c
MOKOCONFIG = mokoui
+MOKOTYPE = panel-plugin
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
Modified: trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-panel-demo-simple/src/demo-panel-applet.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
@@ -38,7 +38,7 @@
// see openmoko-panel-demo-simple for a more sophisticated example
MokoPanelApplet* applet = moko_panel_applet_new();
- moko_panel_applet_set_icon( applet, PKGDATADIR "/icon.png" );
+ moko_panel_applet_set_icon( applet, PKGDATADIR "/icon.png", TRUE );
// you can add a menu
GtkMenu* panelmenu = GTK_MENU(gtk_menu_new());
@@ -57,7 +57,7 @@
g_signal_connect( G_OBJECT(button), "clicked", G_CALLBACK(button_callback), applet );
moko_panel_applet_set_popup( applet, GTK_WIDGET(button), MOKO_PANEL_APPLET_CLICK_POPUP );
-
+ moko_panel_applet_show( applet );
gtk_main();
g_debug( "openmoko-panel-demo-simple ending" );
Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.h
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.h
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo-simple/src/demo-main.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Public License as published by
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
* Based on GtkAlignment which is (C) 1997-2000 GTK+ Team
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-alignment.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -4,11 +4,11 @@
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
* Inspired by hildon-program.c (C) 2006 Nokia Corporation.
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-application.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-details-window.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-dialog-window.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-tool-box.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-wheel.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-finger-window.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-fixed.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
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-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-menu-box.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Ken Zhao <ken_zhao at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-navigation-list.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Ken Zhao <ken_zhao at fic-sh.com.cn>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-paned-window.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,16 +2,16 @@
*
* Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 Vanille-Media
+ * 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 Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
+ * 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 Public License for more details.
+ * GNU Lesser Public License for more details.
*
* Current Version: $Rev$ ($Date$) [$Author: mickey $]
*/
@@ -27,6 +27,7 @@
#define DEBUG_THIS_FILE
#ifdef DEBUG_THIS_FILE
#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
+#define moko_debug_minder(predicate) moko_debug( __FUNCTION__ ); g_return_if_fail(predicate)
#else
#define moko_debug(fmt,...)
#endif
@@ -38,7 +39,9 @@
typedef struct _MokoPanelAppletPrivate
{
+ gboolean is_initialized;
gboolean hold_timeout_triggered;
+ gboolean scaling_requested;
} MokoPanelAppletPrivate;
enum {
@@ -157,9 +160,11 @@
mb_tray_app_set_button_callback( self->mb_applet, _mb_applet_button_callback );
self->mb_pixbuf = mb_pixbuf_new( mb_tray_app_xdisplay( self->mb_applet ), mb_tray_app_xscreen( self->mb_applet ) );
- mb_tray_app_main_init( self->mb_applet );
- gdk_window_add_filter( NULL, _moko_panel_applet_gdk_event_filter, self );
+ MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
+ priv->is_initialized = FALSE;
+ priv->scaling_requested = FALSE;
+ priv->hold_timeout_triggered = FALSE;
}
static GdkFilterReturn
@@ -216,6 +221,7 @@
{
moko_debug( "moko_panel_applet_resize_callback" );
moko_debug( "-- size = %d, %d", w, h );
+ MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
if ( !self->mb_pixbuf_image )
{
g_warning( "no valid icon for panel application during resize callback" );
@@ -223,6 +229,8 @@
}
if ( self->mb_pixbuf_image_scaled && self->mb_pixbuf_image_scaled->width == w && self->mb_pixbuf_image_scaled->height == h )
return;
+ if ( !priv->scaling_requested )
+ return;
moko_debug( "-- new size, scaling pixbuf" );
MBPixbufImage* scaled = mb_pixbuf_img_scale( self->mb_pixbuf, self->mb_pixbuf_image, w, h );
if ( self->mb_pixbuf_image_scaled )
@@ -233,16 +241,21 @@
void moko_panel_applet_real_paint_callback(MokoPanelApplet* self, Drawable drw)
{
moko_debug( "moko_panel_applet_paint_callback" );
- if ( !self->mb_pixbuf_image_scaled )
+ MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
+ MBPixbufImage* icon = priv->scaling_requested ? self->mb_pixbuf_image_scaled : self->mb_pixbuf_image;
+
+ if ( !icon )
{
g_warning( "no valid icon for panel application during paint callback" );
return;
}
MBPixbufImage* background = mb_tray_app_get_background( self->mb_applet, self->mb_pixbuf );
- mb_pixbuf_img_composite( self->mb_pixbuf, background, self->mb_pixbuf_image_scaled, 0, 0 );
+ mb_pixbuf_img_composite( self->mb_pixbuf, background, icon, 0, 0 );
mb_pixbuf_img_render_to_drawable( self->mb_pixbuf, background, drw, 0, 0 );
+#if 0
mb_pixbuf_img_free( self->mb_pixbuf, background );
+#endif
}
void moko_panel_applet_real_button_press_callback(MokoPanelApplet* self, int x, int y)
@@ -303,19 +316,25 @@
void moko_panel_applet_signal_tap_hold(MokoPanelApplet* self)
{
- moko_debug( "moko_panel_applet_signal_tap_hold" );
+ moko_debug( __FUNCTION__ );
moko_panel_applet_open_popup( self, MOKO_PANEL_APPLET_TAP_HOLD_POPUP );
}
////////////////
// PUBLIC API //
////////////////
-void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename)
+void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename, gboolean request_scaling)
{
- moko_debug( "moko_panel_applet_set_icon" );
- g_assert( self->mb_pixbuf );
+ moko_debug_minder( self->mb_pixbuf );
if ( self->mb_pixbuf_image ) mb_pixbuf_img_free( self->mb_pixbuf, self->mb_pixbuf_image );
self->mb_pixbuf_image = mb_pixbuf_img_new_from_file( self->mb_pixbuf, filename );
+ g_assert( self->mb_pixbuf_image );
+ MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
+ priv->scaling_requested = request_scaling;
+ if ( !request_scaling )
+ {
+ moko_panel_applet_request_size( self, mb_pixbuf_img_get_width( self->mb_pixbuf_image ), mb_pixbuf_img_get_height( self->mb_pixbuf_image ) );
+ }
}
void moko_panel_applet_set_popup(MokoPanelApplet* self, GtkWidget* popup, MokoPanelAppletPopupType type)
@@ -389,6 +408,7 @@
void moko_panel_applet_request_size(MokoPanelApplet* self, int x, int y)
{
+ moko_debug( "moko_panel_applet_request_size: %d, %d", x, y );
mb_tray_app_request_size( self->mb_applet, x, y );
}
@@ -396,3 +416,27 @@
{
mb_tray_app_request_offset( self->mb_applet, offset );
}
+
+void moko_panel_applet_show(MokoPanelApplet* self)
+{
+ MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
+ if ( !priv->is_initialized )
+ {
+ mb_tray_app_main_init( self->mb_applet );
+ gdk_window_add_filter( NULL, _moko_panel_applet_gdk_event_filter, self );
+ priv->is_initialized = TRUE;
+ }
+ else
+ {
+ mb_tray_app_unhide( self->mb_applet );
+ }
+}
+
+void moko_panel_applet_hide(MokoPanelApplet* self)
+{
+ MokoPanelAppletPrivate* priv = MOKO_PANEL_APPLET_GET_PRIVATE( self );
+ if ( priv->is_initialized )
+ {
+ mb_tray_app_hide( self->mb_applet );
+ }
+}
\ No newline at end of file
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-panel-applet.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,16 +2,16 @@
*
* Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 Vanille-Media
+ * 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 Public License as published by
- * the Free Software Foundation; version 2.1 of the license.
+ * 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 Public License for more details.
+ * GNU Lesser Public License for more details.
*
* Current Version: $Rev$ ($Date$) [$Author: mickey $]
*/
@@ -76,11 +76,13 @@
void moko_panel_system_init( int* argc, char*** argv );
/* simple interface */
-void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename);
+void moko_panel_applet_set_icon(MokoPanelApplet* self, const gchar* filename, gboolean scaling);
void moko_panel_applet_get_positioning_hint(MokoPanelApplet* self, GtkWidget* popup, int* x, int* y);
void moko_panel_applet_set_popup(MokoPanelApplet* self, GtkWidget* popup, MokoPanelAppletPopupType type);
void moko_panel_applet_open_popup(MokoPanelApplet* self, MokoPanelAppletPopupType type);
void moko_panel_applet_close_popup(MokoPanelApplet* self);
+void moko_panel_applet_show(MokoPanelApplet* self);
+void moko_panel_applet_show(MokoPanelApplet* self);
/* advanced interface */
void moko_panel_applet_request_size(MokoPanelApplet* self, int x, int y);
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-pixmap-button.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-search-bar.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tool-box.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-tree-view.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -2,11 +2,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -4,11 +4,11 @@
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
* Based on hildon-window.c (C) 2006 Nokia Corporation.
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-window.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,11 +3,11 @@
*
* Authored by Michael 'Mickey' Lauer <mlauer at vanille-media.de>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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.1 of the license.
+ * 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
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/openmoko-panel-mainmenu.pro 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,5 +1,8 @@
+MOKOTYPE = panel-plugin
MOKOCONFIG = mokoui
-SOURCES = src/openmoko-panel-mainmenu.c
+SOURCES = \
+ src/main.c
include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )
+
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/Makefile.am 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,10 +1,10 @@
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
+AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CFLAGS = @OPENMOKO_CFLAGS@ -Wall -std=c99 -pedantic
bin_PROGRAMS = openmoko-panel-mainmenu
-openmoko_panel_mainmenu_SOURCES = moko-panel-mainmenu.c\
- moko-panel-mainmenu.h\
- main.c
+openmoko_panel_mainmenu_SOURCES = \
+ main.c
openmoko_panel_mainmenu_LDADD = @OPENMOKO_LIBS@
Modified: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/main.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,37 +1,44 @@
-/* main.c
- *
- * Authored By Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
- *
- * Copyright (C) 2007 Vanille-Media
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 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 Public License for more details.
- *
- * Current Version: $Rev$ ($Date: 2006/12/21 18:03:04 $) [$Author: mickey $]
- */
-
-#include "moko-panel-mainmenu.h"
-
-#include <gtk/gtk.h>
-#include <libmb/mb.h>
-
-int
-main (int argc, char **argv)
-{
- MokoPanelMainmenu *app;
-
- moko_panel_system_init (&argc, &argv);
-
- app = moko_panel_mainmenu_new();
- moko_panel_applet_set_icon (MOKO_PANEL_APPLET (app), PKGDATADIR"/btn_menu.png");
-
- gtk_main ();
-
- return;
-}
+/*
+ * OpenMoko Main Menu + Panel Applet
+ *
+ * Copyright (C) 2007 First International Computer Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Public License as published by
+ * the Free Software Foundation; version 2.1 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 Public License for more details.
+ *
+ * Current Version: $Rev$ ($Date$) [$Author$]
+ */
+
+#include <libmokoui/moko-panel-applet.h>
+
+#include <gtk/gtk.h>
+#include <glib.h>
+
+static void button_callback( GtkButton* button, MokoPanelApplet* applet )
+{
+ moko_panel_applet_close_popup( applet );
+}
+
+int main( int argc, char** argv )
+{
+ g_debug( "openmoko-panel-demo-simple starting" );
+
+ moko_panel_system_init( &argc, &argv );
+
+ MokoPanelApplet* applet = moko_panel_applet_new();
+ moko_panel_applet_set_icon( applet, PKGDATADIR "/btn_menu.png", TRUE );
+ //moko_panel_applet_request_size( applet, 79, 32 );
+ moko_panel_applet_request_size( applet, 40, 32 );
+ moko_panel_applet_show( applet );
+
+ gtk_main();
+
+ g_debug( "openmoko-panel-demo-simple ending" );
+ return 0;
+}
Deleted: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,168 +0,0 @@
-/* moko-panel-mainmenu.c
- *
- * Authored By Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
- *
- * Copyright (C) 2007 Vanille-Media
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 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 Public License for more details.
- *
- * Current Version: $Rev$ ($Date: 2006/12/21 18:03:04 $) [$Author: mickey $]
- */
-#include "moko-panel-mainmenu.h"
-
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <libmb/mbpixbuf.h>
-
-#define DEBUG_THIS_FILE
-#ifdef DEBUG_THIS_FILE
-#define moko_debug(fmt,...) g_debug(fmt,##__VA_ARGS__)
-#else
-#define moko_debug(fmt,...)
-#endif
-
-G_DEFINE_TYPE (MokoPanelMainmenu, moko_panel_mainmenu, MOKO_TYPE_PANEL_APPLET);
-
-#define PANEL_APPLET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_PANEL_MAINMENU, MokoPanelMainmenuPrivate))
-
-typedef struct _MokoPanelMainmenuPrivate
-{
-};
-
-/* parent class pointer */
-MokoPanelAppletClass* parent_class = NULL;
-
-/* forward declarations */
-void moko_panel_mainmenu_clicked(MokoPanelMainmenu* self);
-void moko_panel_mainmenu_tap_hold(MokoPanelMainmenu* self);
-void moko_panel_mainmenu_paint(MokoPanelMainmenu* self, Drawable drw);
-void moko_panel_mainmenu_resize (MokoPanelMainmenu *self, Drawable drw);
-
-static void
-moko_panel_mainmenu_dispose(GObject* object)
-{
- if (G_OBJECT_CLASS (moko_panel_mainmenu_parent_class)->dispose)
- G_OBJECT_CLASS (moko_panel_mainmenu_parent_class)->dispose (object);
-}
-
-static void
-moko_panel_mainmenu_finalize(GObject* object)
-{
- G_OBJECT_CLASS (moko_panel_mainmenu_parent_class)->finalize (object);
-}
-
-static void
-moko_panel_mainmenu_class_init(MokoPanelMainmenuClass* klass)
-{
- /* hook parent */
- GObjectClass* object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent(klass);
-
- /* add private */
- g_type_class_add_private (klass, sizeof(MokoPanelMainmenuPrivate));
-
- /* hook destruction */
- object_class->dispose = moko_panel_mainmenu_dispose;
- object_class->finalize = moko_panel_mainmenu_finalize;
-
- /* virtual methods */
- MokoPanelAppletClass* applet_class = MOKO_PANEL_APPLET_CLASS(klass);
- applet_class->clicked = moko_panel_mainmenu_clicked;
- applet_class->tap_hold = moko_panel_mainmenu_tap_hold;
- applet_class->paint_callback = moko_panel_mainmenu_paint;
- applet_class->resize_callback = moko_panel_mainmenu_resize;
-
- /* install properties */
-}
-
-MokoPanelMainmenu*
-moko_panel_mainmenu_new (void)
-{
- return g_object_new(MOKO_TYPE_PANEL_MAINMENU, NULL);
-}
-
-static void
-moko_panel_mainmenu_init(MokoPanelMainmenu* self)
-{
- moko_debug ("moko panel mainmenu init");
- MokoPanelApplet *panel = MOKO_PANEL_APPLET(self);
- //g_free (panel->mb_applet);
- //mb_tray_app_main_init( panel->mb_applet );
-
-}
-
-void
-moko_panel_mainmenu_clicked(MokoPanelMainmenu* self)
-{
- g_debug( "demo-panel-applet CLICKED" );
-}
-
-void
-moko_panel_mainmenu_tap_hold(MokoPanelMainmenu* self)
-{
- g_debug( "demo-panel-applet TAP-HOLD" );
-}
-
-void
-moko_panel_mainmenu_paint(MokoPanelMainmenu* self, Drawable drw)
-{
- g_debug ("moko panel mainmenu paint");
- MokoPanelApplet* panel = MOKO_PANEL_APPLET(self);
- MBPixbufImage* background = mb_tray_app_get_background( panel->mb_applet, panel->mb_pixbuf );
- mb_pixbuf_img_copy_composite (panel->mb_pixbuf, background,
- panel->mb_pixbuf_image,
- 0, 0,
- mb_tray_app_width (panel->mb_applet),
- mb_tray_app_height (panel->mb_applet),
- 0, 0 );
-
- mb_pixbuf_img_render_to_drawable (panel->mb_pixbuf, background, drw, 0, 0);
-
- mb_pixbuf_img_free (panel->mb_pixbuf, background );
-
- g_debug( "demo-panel-applet PAINT" );
-}
-
-void
-moko_panel_mainmenu_resize(MokoPanelMainmenu * self, Drawable drw)
-{
- MokoPanelApplet *panel = MOKO_PANEL_APPLET(self);
- g_debug ("moko panel mainmenu resize");
- if (!panel->mb_pixbuf_image)
- return;
-
- int width = mb_pixbuf_img_get_width (panel->mb_pixbuf_image);
- int height = mb_pixbuf_img_get_height (panel->mb_pixbuf_image);
-
- moko_debug ("pixbuf: %d, %d", width, height);
- mb_tray_app_request_size (panel->mb_applet, width, height);
-
- width = mb_tray_app_width (panel->mb_applet);
- height = mb_tray_app_height (panel->mb_applet);
- moko_debug ("tray app: %d, %d", width, height);
-}
-
-static void
-fork_exec(char *cmd)
-{
- switch (fork())
- {
- case 0:
- setpgid(0, 0); /* Stop us killing child */
- mb_exec(cmd);
- fprintf(stderr, "openmoko-panel-gsm: Failed to Launch '%s'\n", cmd);
- exit(1);
- case -1:
- fprintf(stderr, "openmoko-panel-gsm: Failed to Launch '%s'", cmd);
- break;
- }
-}
-
Deleted: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/moko-panel-mainmenu.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,63 +0,0 @@
-/* moko-panel-mainmenu.h
- *
- * Authored By Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
- *
- * Copyright (C) 2007 Vanille-Media
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Public License as published by
- * the Free Software Foundation; version 2.1 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 Public License for more details.
- *
- * Current Version: $Rev$ ($Date: 2006/12/21 18:03:04 $) [$Author: mickey $]
- */
-
-#ifndef _MOKO_PANEL_MAINMENU_H_
-#define _MOKO_PANEL_MAINMENU_H_
-
-#include <libmokoui/moko-panel-applet.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-#define MOKO_TYPE_PANEL_MAINMENU moko_panel_mainmenu_get_type()
-#define MOKO_PANEL_MAINMENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- MOKO_TYPE_PANEL_MAINMENU, MokoPanelMainmenu))
-#define MOKO_PANEL_MAINMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
- MOKO_TYPE_PANEL_MAINMENU, MokoPanelMainmenuClass))
-#define MOKO_IS_PANEL_MAINMENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
- MOKO_TYPE_PANEL_MAINMENU))
-#define MOKO_IS_PANEL_MAINMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
- MOKO_TYPE_PANEL_MAINMENU))
-#define MOKO_PANEL_MAINMENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
- MOKO_TYPE_PANEL_MAINMENU, MokoPanelMainmenuClass))
-
-
-typedef struct _MokoPanelMainmenu MokoPanelMainmenu;
-typedef struct _MokoPanelMainmenuClass MokoPanelMainmenuClass;
-typedef struct _MokoPanelMainmenuPrivate MokoPanelMainmenuPrivate;
-
-struct _MokoPanelMainmenu {
- MokoPanelApplet parent;
-
- MokoPanelMainmenuPrivate *priv;
-};
-
-struct _MokoPanelMainmenuClass {
- MokoPanelAppletClass parent_class;
-};
-
-GType moko_panel_mainmenu_get_type ();
-
-MokoPanelMainmenu* moko_panel_mainmenu_new ();
-
-G_END_DECLS
-
-#endif /*_MOKO_PANEL_MAINMENU_H_*/
-
Deleted: trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/openmoko-panel-mainmenu/src/openmoko-panel-mainmenu.c 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,139 +0,0 @@
-#include <libmb/mb.h>
-#include <X11/Xlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include <gtk/gtk.h>
-
-static MBPixbuf *pb;
-static MBPixbufImage *image;
-static Display *dpy;
-
-/**
-*@brief execute an application
-*@param cmd command string
-*@return none
-*/
-static void
-fork_exec(char *cmd)
-{
- switch (fork())
- {
- case 0:
- setpgid(0, 0); /* Stop us killing child */
- mb_exec(cmd);
- fprintf(stderr, "openmoko-panel-gsm: Failed to Launch '%s'\n", cmd);
- exit(1);
- case -1:
- fprintf(stderr, "openmoko-panel-gsm: Failed to Launch '%s'", cmd);
- break;
- }
-}
-
-void
-paint_callback (MBTrayApp *app, Drawable drw )
-{
- MBPixbufImage *img_backing = NULL;
- img_backing = mb_tray_app_get_background (app, pb);
-
- mb_pixbuf_img_copy_composite (pb, img_backing,
- image,
- 0, 0,
- mb_tray_app_width(app),
- mb_tray_app_height(app),
- 0, 0 );
-
- mb_pixbuf_img_render_to_drawable(pb, img_backing, drw, 0, 0);
-
- mb_pixbuf_img_free( pb, img_backing );
-}
-
-void
-resize_callback (MBTrayApp *app, int w, int h )
-{
- int width = mb_pixbuf_img_get_width(image);
- int height = mb_pixbuf_img_get_height(image);
-
- mb_tray_app_request_size (app, width, height);
-}
-
-/**
-*@brief button callback function.
-*/
-void
-button_callback (MBTrayApp *app, int x, int y, Bool is_released )
-{
- XEvent ev;
- int done = 0;
- struct timeval then, now;
- Time click_time=800;
-
- gettimeofday(&then, NULL);
-
- //check the click type: tap "done = 1 "; tap with hold "done = 2";
- while (!done && !is_released)
- {
- if (XCheckMaskEvent(dpy,ButtonReleaseMask, &ev))
- if (ev.type == ButtonRelease)
- {
- done = 1;
- }
- gettimeofday(&now, NULL);
-
- if ((now.tv_usec-then.tv_usec) > (click_time*50000))
- {
- done = 2;
- }
- }
-
-//function for "tap" action.
- if (done == 1)
- {
- mb_tray_app_tray_send_message(app, "Run openmoko-mainmenu stylus based application", 6000);
- //fork_exec("opemoko-mainmenu"); //launch openmoko-preference.
- return;
- }
-//function for "tap with hold" action.
- else if (done == 2)
- {
- mb_tray_app_tray_send_message(app, "Run openmoko-mainmenu figure based application", 6000);
- fork_exec("openmoko-mainmenu");
- //fork_exec("openmoko-mainmenu --figure"); //launch openmoko-mainmenu.
- }
-}
-
-int
-main( int argc, char *argv[])
-{
- MBTrayApp *app = NULL;
- struct timeval tv;
-
- app = mb_tray_app_new ( "OpenMoko Mainmenu",
- resize_callback,
- paint_callback,
- &argc,
- &argv );
-
- dpy = mb_tray_app_xdisplay(app);
-
- pb = mb_pixbuf_new(mb_tray_app_xdisplay(app),
- mb_tray_app_xscreen(app));
-
- memset (&tv,0,sizeof(struct timeval));
- tv.tv_sec = 10;
- image = mb_pixbuf_img_new_from_file(pb, PKGDATADIR"/btn_menu.png");
-
- if (!image)
- fprintf (stderr, "openmoko-panel-mainmenu: Failed to load mainmenu plugin icon");
-
- mb_tray_app_set_button_callback (app, button_callback );
-
- mb_tray_app_request_offset(app, -1);
-
- mb_tray_app_main (app);
-
- XCloseDisplay(dpy);
-
- return 1;
-}
Modified: trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro
===================================================================
--- trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/panel-plugins/panel-plugins.pro 2007-01-23 11:11:46 UTC (rev 588)
@@ -1,5 +1,6 @@
TEMPLATE = subdirs
-SUBDIRS = openmoko-panel-clock
-# SUBDIRS = openmoko-panel-search
+SUBDIRS = \
+ openmoko-panel-clock \
+ openmoko-panel-mainmenu
Modified: trunk/src/target/OM-2007/templates/gpl-header.h
===================================================================
--- trunk/src/target/OM-2007/templates/gpl-header.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/templates/gpl-header.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by <Add your Name here>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 General Public License as published by
Modified: trunk/src/target/OM-2007/templates/lgpl-header.h
===================================================================
--- trunk/src/target/OM-2007/templates/lgpl-header.h 2007-01-23 03:27:34 UTC (rev 587)
+++ trunk/src/target/OM-2007/templates/lgpl-header.h 2007-01-23 11:11:46 UTC (rev 588)
@@ -3,7 +3,7 @@
*
* Authored by <Add your Name here>
*
- * Copyright (C) 2006 First International Computer Inc.
+ * 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 Library Public License as published by
More information about the commitlog
mailing list