[maemo-commits] [maemo-commits] r9060 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Jan 11 14:38:41 EET 2007
- Previous message: [maemo-commits] r9059 - in projects/haf/branches/maemo-af-desktop/python-hildon-desktop: . libhildondesktop
- Next message: [maemo-commits] r9061 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildonwm test
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2007-01-11 14:38:39 +0200 (Thu, 11 Jan 2007) New Revision: 9060 Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.h Log: 2007-01-11 Lucas Rocha <lucas.rocha at nokia.com> * libhildondesktop/hildon-home-applet.[ch]: rename HILDON_HOME_APPLET_RESIZE_TYPE_TYPE to HILDON_TYPE_HOME_APPLET_RESIZE_TYPE for consistency. * libhildondesktop/hildon-desktop-panel.[ch]: rename hildon_desktop_panel_flip_panel to hildon_desktop_panel_flip for consistency. * libhildondesktop/hildon-desktop-panel-window.[ch]: add GType definition for HildonDesktopPanelWindowOrientation. * libhildondesktop/Makefile.am: add hildon-home-titlebar.h to instalation. Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-01-11 12:38:39 UTC (rev 9060) @@ -1,3 +1,16 @@ +2007-01-11 Lucas Rocha <lucas.rocha at nokia.com> + + * libhildondesktop/hildon-home-applet.[ch]: rename + HILDON_HOME_APPLET_RESIZE_TYPE_TYPE to + HILDON_TYPE_HOME_APPLET_RESIZE_TYPE for consistency. + * libhildondesktop/hildon-desktop-panel.[ch]: rename + hildon_desktop_panel_flip_panel to hildon_desktop_panel_flip for + consistency. + * libhildondesktop/hildon-desktop-panel-window.[ch]: add GType definition + for HildonDesktopPanelWindowOrientation. + * libhildondesktop/Makefile.am: add hildon-home-titlebar.h to + instalation. + 2007-01-11 Johan Bilien <johan.bilien at nokia.com> * libhildondesktop/hildon-home-area.c: Set applet to layout mode Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am 2007-01-11 12:38:39 UTC (rev 9060) @@ -21,6 +21,7 @@ hildon-thumb-menu-item.h \ hildon-home-applet.h \ hildon-home-area.h \ + hildon-home-titlebar.h \ hildon-home-window.h \ libhildondesktop.h \ libhildonmenu.h Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.c 2007-01-11 12:38:39 UTC (rev 9060) @@ -110,6 +110,40 @@ gboolean grab_keyboard, guint32 timestamp); +GType +hildon_desktop_panel_window_orientation_get_type (void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GFlagsValue values[] = { + { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_TOP, + "HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_TOP", + "top" }, + { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_LEFT, + "HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_LEFT", + "left" }, + { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_RIGHT, + "HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_RIGHT", + "right" }, + { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_BOTTOM, + "HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_BOTTOM", + "bottom" }, + { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_VERTICAL, + "HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_VERTICAL", + "vertical" }, + { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_HORIZONTAL, + "HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_HORIZONTAL", + "horizontal" }, + { 0, NULL, NULL } + }; + + etype = g_flags_register_static ("HildonDesktopPanelWindowOrientationType", values); + } + + return etype; +} + static void hildon_desktop_panel_window_class_init (HildonDesktopPanelWindowClass *dskwindow_class) { Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.h 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel-window.h 2007-01-11 12:38:39 UTC (rev 9060) @@ -44,6 +44,8 @@ #define HILDON_DESKTOP_IS_PANEL_WINDOW(obj) (GTK_CHECK_TYPE (obj, HILDON_DESKTOP_TYPE_PANEL_WINDOW)) #define HILDON_DESKTOP_IS_PANEL_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), HILDON_DESKTOP_TYPE_PANEL_WINDOW)) +#define HILDON_DESKTOP_TYPE_PANEL_WINDOW_ORIENTATION (hildon_desktop_panel_window_orientation_get_type()) + typedef enum { HILDON_DESKTOP_PANEL_WINDOW_ORIENTATION_TOP = 1 << 0, @@ -80,14 +82,10 @@ GType hildon_desktop_panel_window_get_type (void); +GType hildon_desktop_panel_window_orientation_get_type (void); + GtkWidget *hildon_desktop_panel_window_new (void); -void hildon_desktop_panel_window_set_sensitive (HildonDesktopPanelWindow *window, - gboolean sensitive); - -void hildon_desktop_panel_window_set_focus (HildonDesktopPanelWindow *window, - gboolean focus); - void hildon_desktop_panel_window_set_multiscreen_handler (HildonDesktopPanelWindow *window, HildonDesktopMultiscreen *ms); Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.c 2007-01-11 12:38:39 UTC (rev 9060) @@ -95,7 +95,7 @@ panel_class->get_orientation = hildon_desktop_panel_get_orientation; panel_class->set_orientation = hildon_desktop_panel_set_orientation; - panel_class->flip_panel = hildon_desktop_panel_flip_panel; + panel_class->flip = hildon_desktop_panel_flip; panel_class->add_button = hildon_desktop_panel_add_button; panel_class->panel_flipped = NULL; @@ -816,7 +816,7 @@ } void -hildon_desktop_panel_flip_panel (HildonDesktopPanel *panel) +hildon_desktop_panel_flip (HildonDesktopPanel *panel) { g_return_if_fail (panel && HILDON_DESKTOP_IS_PANEL (panel)); #ifndef PERFORMANCE Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-desktop-panel.h 2007-01-11 12:38:39 UTC (rev 9060) @@ -61,7 +61,7 @@ GtkOrientation (*get_orientation) (HildonDesktopPanel *panel); - void (*flip_panel) (HildonDesktopPanel *panel); + void (*flip) (HildonDesktopPanel *panel); void (*panel_flipped) (HildonDesktopPanel *panel); }; @@ -76,7 +76,7 @@ GtkOrientation hildon_desktop_panel_get_orientation (HildonDesktopPanel *panel); -void hildon_desktop_panel_flip_panel (HildonDesktopPanel *panel); +void hildon_desktop_panel_flip (HildonDesktopPanel *panel); G_END_DECLS Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c 2007-01-11 12:38:39 UTC (rev 9060) @@ -312,7 +312,7 @@ "Type of resizability", "Whether the applet can be resized " "vertically, horizontally, or both", - HILDON_HOME_APPLET_RESIZE_TYPE_TYPE, + HILDON_TYPE_HOME_APPLET_RESIZE_TYPE, HILDON_HOME_APPLET_RESIZE_NONE, G_PARAM_READWRITE); Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.h 2007-01-11 12:38:39 UTC (rev 9060) @@ -42,7 +42,7 @@ #define HILDON_IS_HOME_APPLET_CLASS(klass) \ (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_HOME_APPLET)) -#define HILDON_HOME_APPLET_RESIZE_TYPE_TYPE \ +#define HILDON_TYPE_HOME_APPLET_RESIZE_TYPE \ (hildon_home_applet_resize_type_get_type()) Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.h 2007-01-11 12:33:21 UTC (rev 9059) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.h 2007-01-11 12:38:39 UTC (rev 9060) @@ -29,7 +29,6 @@ #include "hildon-home-applet.h" #include "hildon-home-area.h" -#define HILDON_TYPE_HOME_TITLEBAR_MODE (hildon_home_titlebar_mode_get_type ()) #define HILDON_TYPE_HOME_TITLEBAR (hildon_home_titlebar_get_type ()) #define HILDON_HOME_TITLEBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), HILDON_TYPE_HOME_TITLEBAR, HildonHomeTitlebar)) #define HILDON_IS_HOME_TITLEBAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), HILDON_TYPE_HOME_TITLEBAR)) @@ -37,6 +36,8 @@ #define HILDON_IS_HOME_TITLEBAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_HOME_TITLEBAR)) #define HILDON_HOME_TITLEBAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), HILDON_TYPE_HOME_TITLEBAR, HildonHomeTitlebarClass)) +#define HILDON_TYPE_HOME_TITLEBAR_MODE (hildon_home_titlebar_mode_get_type ()) + G_BEGIN_DECLS typedef enum {
- Previous message: [maemo-commits] r9059 - in projects/haf/branches/maemo-af-desktop/python-hildon-desktop: . libhildondesktop
- Next message: [maemo-commits] r9061 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildonwm test
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]