[maemo-commits] [maemo-commits] r9678 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . background-manager debian libhildondesktop libhildonwm src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Feb 6 14:54:54 EET 2007
- Previous message: [maemo-commits] r9677 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9679 - projects/haf/branches/maemo-af-desktop/hildon-desktop/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2007-02-06 14:54:51 +0200 (Tue, 06 Feb 2007) New Revision: 9678 Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/background-manager.c projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-memory.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watchable-app.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watched-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-button.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-menu-item.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-tooltip.c projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c Log: 2007-02-06 Johan Bilien <johan.bilien at nokia.com> Ported from hildon-libs to libhildon-1 and GTK+ 2.10 * src/hd-home-background.c: set the colormap of the window to the pixmap before applying as background * src/hd-home-window.[ch], libhildondesktop/hildon-home-window.[ch]: - moved key_press_event, _show_information_banner and _show_information_note from the lib to the app * src/hn-others-button.c: - moved hildon_finger to hildon_helper * libhildondesktop/hildon-home-titlebar.c: - movded hildon_gtk_widget_set to hildon_helper * configure.ac: - test for libhildon first, then fallback to hildon-libs * ALL: changed includes from hildon-widgets/* to hildon/* Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2007-02-06 12:54:51 UTC (rev 9678) @@ -1,3 +1,19 @@ +2007-02-06 Johan Bilien <johan.bilien at nokia.com> + + Ported from hildon-libs to libhildon-1 and GTK+ 2.10 + * src/hd-home-background.c: set the colormap of the window + to the pixmap before applying as background + * src/hd-home-window.[ch], libhildondesktop/hildon-home-window.[ch]: + - moved key_press_event, _show_information_banner and + _show_information_note from the lib to the app + * src/hn-others-button.c: + - moved hildon_finger to hildon_helper + * libhildondesktop/hildon-home-titlebar.c: + - movded hildon_gtk_widget_set to hildon_helper + * configure.ac: + - test for libhildon first, then fallback to hildon-libs + * ALL: changed includes from hildon-widgets/* to hildon/* + 2007-02-06 Moises Martinez <moises.martinez at nokia.com> * libhildondesktop/hildon-desktop-panel-expandable.c: Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/background-manager.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/background-manager.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/background-manager/background-manager.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -38,10 +38,7 @@ #include <libgnomevfs/gnome-vfs.h> #include <gconf/gconf-client.h> -#include <hildon-widgets/hildon-banner.h> -#include <hildon-widgets/hildon-note.h> - #define HILDON_HOME_IMAGE_FORMAT "png" #define HILDON_HOME_IMAGE_ALPHA_FULL 255 #define HILDON_HOME_GCONF_MMC_COVER_OPEN "/system/osso/af/mmc-cover-open" Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/configure.ac 2007-02-06 12:54:51 UTC (rev 9678) @@ -100,7 +100,11 @@ AC_SUBST(HILDONBASELIB_LIBS) AC_SUBST(HILDONBASELIB_CFLAGS) -PKG_CHECK_MODULES(HILDON, hildon-libs >= 0.12.0) +PKG_CHECK_MODULES(HILDON, + [hildon-1], + [AC_DEFINE(HAVE_LIBHILDON, [], [Whether libhildon-1 is present on the system])], + [PKG_CHECK_MODULES(HILDON, hildon-libs >= 0.12.0)]) + AC_SUBST(HILDON_LIBS) AC_SUBST(HILDON_CFLAGS) Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/debian/control 2007-02-06 12:54:51 UTC (rev 9678) @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Johan Bilien <johan.bilien at nokia.com> -Build-Depends: debhelper (>= 4.0.0), hildon-libs-dev (>= 0.14.9), pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, hildon-fm-dev (>= 0.15), libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, hildon-base-lib-dev +Build-Depends: debhelper (>= 4.0.0), libhildon1-dev, pkg-config, libosso-dev (>= 0.9.19), libosso-gnomevfs2-dev, osso-af-settings, hildon-fm-dev (>= 0.15), libosso-help-dev, libxtst-dev, libxml2-dev, osso-esd-dev, hildon-base-lib-dev Standards-Version: 3.6.0 Package: hildon-desktop 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-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-applet.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -22,6 +22,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "hildon-home-applet.h" #include "hildon-home-area.h" @@ -29,10 +32,13 @@ #include <gtk/gtkfixed.h> #include <gtk/gtkicontheme.h> + +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-defines.h> +#else #include <hildon-widgets/hildon-defines.h> +#endif - - #define APPLET_RESIZE_HANDLE_ICON "qgn_home_layoutmode_resize" #define APPLET_RESIZE_HANDLE_WIDTH 40 #define APPLET_RESIZE_HANDLE_HEIGHT 40 Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -26,7 +26,6 @@ #include "hildon-home-area.h" #include "hildon-home-applet.h" -#include <hildon-widgets/hildon-note.h> #include <string.h> /* strlen */ #include <errno.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-titlebar.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -35,10 +35,11 @@ #include <gtk/gtkimage.h> #include <gtk/gtkmain.h> -#include <hildon-widgets/hildon-banner.h> -#include <hildon-widgets/hildon-note.h> +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-helper.h> +#else #include <hildon-widgets/hildon-defines.h> -#include <hildon-widgets/hildon-caption.h> +#endif #include "hildon-home-titlebar.h" #include "hildon-home-area.h" @@ -460,14 +461,23 @@ priv->label = gtk_label_new (priv->normal_text); gtk_widget_set_composite_name (priv->label, "hildon-home-titlebar-label"); gtk_misc_set_alignment (GTK_MISC (priv->label), 0.0, 0.5); + +#ifdef HAVE_LIBHILDON + hildon_helper_set_logical_font (priv->label, + HILDON_HOME_TITLEBAR_MENU_LABEL_FONT); + hildon_helper_set_logical_color (priv->label, + GTK_RC_FG, + GTK_STATE_NORMAL, + HILDON_HOME_TITLEBAR_MENU_LABEL_COLOR); +#else hildon_gtk_widget_set_logical_font (priv->label, HILDON_HOME_TITLEBAR_MENU_LABEL_FONT); - /* hildon_gtk_widget_set_logical_color (priv->label, GTK_RC_FG, GTK_STATE_NORMAL, HILDON_HOME_TITLEBAR_MENU_LABEL_COLOR); - */ +#endif + gtk_container_add (GTK_CONTAINER (align), priv->label); gtk_widget_show (priv->label); Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -34,10 +34,6 @@ #include <glib.h> -#include <hildon-widgets/hildon-banner.h> -#include <hildon-widgets/hildon-note.h> -#include <hildon-widgets/hildon-defines.h> - #include <libhildonwm/hd-wm.h> #include "hildon-home-area.h" @@ -335,37 +331,6 @@ GTK_WIDGET_CLASS (hildon_home_window_parent_class)->show (widget); } -static gboolean -hildon_home_window_key_press_event (GtkWidget *widget, - GdkEventKey *event) -{ - HildonHomeWindowPrivate *priv = HILDON_HOME_WINDOW (widget)->priv; - - switch (event->keyval) - { - case HILDON_HARDKEY_MENU: - hildon_home_titlebar_toggle_menu (HILDON_HOME_TITLEBAR (priv->titlebar)); - break; - case HILDON_HARDKEY_ESC: - /* FIXME: Have a signal in HomeWindow instead */ - if (hildon_home_area_get_layout_mode ( - HILDON_HOME_AREA(priv->applet_area))) - g_signal_emit_by_name (G_OBJECT (priv->titlebar), "layout-cancel"); - - break; - default: - if (GTK_WIDGET_CLASS ( - hildon_home_window_parent_class)->key_press_event) - return GTK_WIDGET_CLASS ( - hildon_home_window_parent_class)->key_press_event (widget, - event); - else - return FALSE; - } - - return TRUE; -} - static void hildon_home_window_finalize (GObject *gobject) { @@ -632,7 +597,6 @@ gobject_class->get_property = hildon_home_window_get_property; gobject_class->finalize = hildon_home_window_finalize; - widget_class->key_press_event = hildon_home_window_key_press_event; widget_class->size_allocate = hildon_home_window_size_allocate; widget_class->expose_event = hildon_home_window_expose; widget_class->map = hildon_home_window_map; @@ -789,32 +753,6 @@ } void -hildon_home_window_show_information_note (HildonHomeWindow *window, - const gchar *text) -{ - GtkWidget *note = NULL; - - note = - hildon_note_new_information (NULL, - text); - - gtk_dialog_run (GTK_DIALOG (note)); - if (note) - gtk_widget_destroy (GTK_WIDGET (note)); -} - -void -hildon_home_window_show_information_banner (HildonHomeWindow *window, - const gchar *text) -{ - g_return_if_fail (GTK_IS_WIDGET (window) && text); - - hildon_banner_show_information (GTK_WIDGET (window), - NULL, - text); -} - -void hildon_home_window_set_desktop_dimmed (HildonHomeWindow *window, gboolean dimmed) { Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.h 2007-02-06 12:54:51 UTC (rev 9678) @@ -69,13 +69,6 @@ GtkWidget *hildon_home_window_get_titlebar (HildonHomeWindow *window); -void hildon_home_window_show_information_note(HildonHomeWindow *window, - const gchar *text); - -void hildon_home_window_show_information_banner - (HildonHomeWindow *window, - const gchar *text); - void hildon_home_window_applets_init (HildonHomeWindow *window); void hildon_home_window_select_applets (HildonHomeWindow *window); Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-memory.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-memory.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-memory.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -1,7 +1,7 @@ /* - * This file is part of maemo-af-desktop + * This file is part of hildon-desktop * - * Copyright (C) 2005, 2006 Nokia Corporation. + * Copyright (C) 2005, 2006, 2007 Nokia Corporation. * * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> * @@ -21,13 +21,25 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <signal.h> #include <X11/Xatom.h> #include <gdk/gdkx.h> + +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-defines.h> +#include <hildon/hildon-banner.h> +#include <hildon/hildon-note.h> +#else #include <hildon-widgets/hildon-defines.h> #include <hildon-widgets/hildon-banner.h> #include <hildon-widgets/hildon-note.h> +#endif + #include "hd-wm-types.h" #include "hd-wm-memory.h" #include "hd-wm-watched-window.h" Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watchable-app.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watchable-app.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watchable-app.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -1,8 +1,8 @@ /* -*- mode:C; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * This file is part of maemo-af-desktop + * This file is part of hildon-desktop * - * Copyright (C) 2005, 2006 Nokia Corporation. + * Copyright (C) 2005, 2006, 2007 Nokia Corporation. * * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> * @@ -22,12 +22,23 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <string.h> +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-defines.h> +#include <hildon/hildon-banner.h> +#include <hildon/hildon-note.h> +#else #include <hildon-widgets/hildon-defines.h> #include <hildon-widgets/hildon-banner.h> #include <hildon-widgets/hildon-note.h> +#endif + #define gettext(o) o #define dgettext(o,e) o #define _(o) o Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watched-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watched-window.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm-watched-window.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -1,8 +1,8 @@ /* -*- mode:C; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * This file is part of maemo-af-desktop + * This file is part of hildon-desktop * - * Copyright (C) 2005, 2006 Nokia Corporation. + * Copyright (C) 2005, 2006, 2007 Nokia Corporation. * * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> * @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <sys/types.h> #include <signal.h> #include <string.h> @@ -30,9 +34,17 @@ #include <gdk/gdkx.h> #include <gtk/gtk.h> /* needed by hildon-navigator-main.h */ #include <log-functions.h> + +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-defines.h> +#include <hildon/hildon-banner.h> +#include <hildon/hildon-note.h> +#else #include <hildon-widgets/hildon-defines.h> #include <hildon-widgets/hildon-banner.h> #include <hildon-widgets/hildon-note.h> +#endif + #include "hd-wm-watched-window.h" #include "hd-wm-watched-window-view.h" #include "hd-wm-watchable-app.h" Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildonwm/hd-wm.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -1,8 +1,8 @@ /* -*- mode:C; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * This file is part of maemo-af-desktop + * This file is part of hildon-desktop * - * Copyright (C) 2006 Nokia Corporation. + * Copyright (C) 2006, 2007 Nokia Corporation. * * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> * @@ -22,6 +22,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <string.h> #include <sys/types.h> @@ -33,10 +36,18 @@ #include <gdk/gdkx.h> #include <gdk/gdkevents.h> + +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-defines.h> +#include <hildon/hildon-banner.h> +#include <hildon/hildon-note.h> +#include <hildon/hildon-window.h> +#else #include <hildon-widgets/hildon-defines.h> #include <hildon-widgets/hildon-banner.h> #include <hildon-widgets/hildon-note.h> #include <hildon-widgets/hildon-window.h> +#endif #include <hildon-base-lib/hildon-base-dnotify.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background-dialog.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -38,8 +38,13 @@ #include <hildon-widgets/hildon-file-chooser-dialog.h> #endif +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-color-button.h> +#include <hildon/hildon-caption.h> +#else #include <hildon-widgets/hildon-color-button.h> #include <hildon-widgets/hildon-caption.h> +#endif #include <string.h> @@ -54,10 +59,6 @@ #include <gtk/gtkcellrenderertext.h> #include <gtk/gtkcelllayout.h> -#include <hildon-widgets/hildon-file-chooser-dialog.h> -#include <hildon-widgets/hildon-color-button.h> -#include <hildon-widgets/hildon-caption.h> - #include "hd-home-background-dialog.h" #include "hd-home-l10n.h" #include "hd-home-background.h" @@ -112,9 +113,7 @@ GtkWidget *color_button; GtkWidget *img_combo; GtkWidget *mode_combo; -#ifdef HAVE_LIBOSSOHELP - osso_context_t *osso_context; -#endif + gpointer osso_context; HDHomeBackground *background; }; @@ -610,19 +609,32 @@ hd_home_background_dialog_color_changed (HDHomeBackgroundDialog *dialog) { HDHomeBackgroundDialogPrivate *priv; +#ifdef HAVE_LIBHILDON + GdkColor color; +#else GdkColor *color; +#endif priv = HD_HOME_BACKGROUND_DIALOG_GET_PRIVATE (dialog); if (!priv->background) return; +#ifdef HAVE_LIBHILDON + hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->color_button), + &color); + + g_object_set (G_OBJECT (priv->background), + "color", &color, + NULL); +#else color = hildon_color_button_get_color (HILDON_COLOR_BUTTON (priv->color_button)); g_object_set (G_OBJECT (priv->background), "color", color, NULL); +#endif } static void Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-background.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -661,9 +661,15 @@ if (pixmap) { + GdkColormap *colormap; + g_object_weak_ref (G_OBJECT (pixmap), (GWeakNotify)free_pixmap, GINT_TO_POINTER((GDK_PIXMAP_XID (pixmap)))); + + colormap = gdk_drawable_get_colormap (GDK_DRAWABLE (data->window)); + gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap); + gdk_window_set_back_pixmap (data->window, pixmap, FALSE); g_object_unref (pixmap); } Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hd-home-window.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -36,8 +36,16 @@ #include <libhildondesktop/hildon-home-area.h> #include <libhildondesktop/hildon-home-titlebar.h> + +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-banner.h> +#include <hildon/hildon-note.h> +#include <hildon/hildon-defines.h> +#else #include <hildon-widgets/hildon-banner.h> #include <hildon-widgets/hildon-note.h> +#include <hildon-widgets/hildon-defines.h> +#endif #include "hd-home-l10n.h" #include "hd-home-background.h" @@ -124,9 +132,11 @@ static void hd_home_window_calibration_activate (HDHomeWindow *window); +#ifdef HAVE_LIBOSSOHELP static void hd_home_window_help_activate (HDHomeWindow *window); #endif +#endif static void hd_home_window_set_background_activate (HDHomeWindow *window); @@ -166,11 +176,23 @@ hd_home_window_map_event (GtkWidget *widget, GdkEventAny *event); +static gboolean +hd_home_window_key_press_event (GtkWidget *widget, + GdkEventKey *event); + static void hd_home_window_style_set (GtkWidget *widget, GtkStyle *style); static void +hd_home_window_show_information_note (HDHomeWindow *window, + const gchar *text); + +static void +hd_home_window_show_information_banner (HDHomeWindow *window, + const gchar *text); + +static void hd_home_window_class_init (HDHomeWindowClass *window_class) { GParamSpec *pspec; @@ -189,6 +211,7 @@ widget_class->map_event = hd_home_window_map_event; widget_class->style_set = hd_home_window_style_set; + widget_class->key_press_event = hd_home_window_key_press_event; hhwindow_class->layout_mode_accept = hd_home_window_layout_mode_accept; hhwindow_class->layout_mode_cancel = hd_home_window_layout_mode_cancel; @@ -571,6 +594,38 @@ } } +static gboolean +hd_home_window_key_press_event (GtkWidget *widget, + GdkEventKey *event) +{ + GtkWidget *titlebar = + hildon_home_window_get_titlebar (HILDON_HOME_WINDOW (widget)); + GtkWidget *area = + hildon_home_window_get_area (HILDON_HOME_WINDOW (widget)); + + switch (event->keyval) + { + case HILDON_HARDKEY_MENU: + hildon_home_titlebar_toggle_menu (HILDON_HOME_TITLEBAR (titlebar)); + break; + case HILDON_HARDKEY_ESC: + /* FIXME: Have a signal in HomeWindow instead */ + if (hildon_home_area_get_layout_mode (HILDON_HOME_AREA(area))) + g_signal_emit_by_name (G_OBJECT (titlebar), "layout-cancel"); + + break; + default: + if (GTK_WIDGET_CLASS (hd_home_window_parent_class)->key_press_event) + return GTK_WIDGET_CLASS ( + hd_home_window_parent_class)->key_press_event (widget, + event); + else + return FALSE; + } + + return TRUE; +} + static GtkWidget * hd_home_window_build_main_menu (HDHomeWindow *window) { @@ -651,6 +706,7 @@ gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item); gtk_widget_show (menu_item); +#ifdef HAVE_LIBOSSOHELP /* help */ menu_item = gtk_menu_item_new_with_label (HH_MENU_HELP); gtk_menu_shell_append (GTK_MENU_SHELL (tools_menu), menu_item); @@ -659,6 +715,7 @@ window); gtk_widget_show (menu_item); #endif +#endif return menu; @@ -693,7 +750,7 @@ window); gtk_widget_show (mi); -#ifdef HAVE_LIBOSSO +#ifdef HAVE_LIBOSSOHELP mi = gtk_menu_item_new_with_label (HH_MENU_LAYOUT_HELP); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); g_signal_connect_swapped (mi, "activate", @@ -746,7 +803,7 @@ } #endif -#ifdef HAVE_LIBOSSO +#ifdef HAVE_LIBOSSOHELP static void hd_home_window_help_activate (HDHomeWindow *window) { @@ -818,16 +875,16 @@ static void hd_home_window_settings_insensitive_press_cb (HDHomeWindow *window) { - hildon_home_window_show_information_banner (HILDON_HOME_WINDOW (window), - HH_APPLET_SETTINGS_BANNER); + hd_home_window_show_information_banner (window, + HH_APPLET_SETTINGS_BANNER); } static void hd_home_window_layout_insensitive_press_cb (HDHomeWindow *window) { - hildon_home_window_show_information_banner (HILDON_HOME_WINDOW (window), - HH_LAYOUT_UNAVAIL_BANNER); + hd_home_window_show_information_banner (window, + HH_LAYOUT_UNAVAIL_BANNER); } @@ -912,9 +969,11 @@ if (HILDON_IS_HOME_TITLEBAR (titlebar)) { +#ifdef HAVE_LIBOSSOHELP g_signal_connect_swapped (titlebar, "help-activate", G_CALLBACK (hd_home_window_help_activate), window); +#endif g_signal_connect_swapped (titlebar, "applet-activate", G_CALLBACK (hd_home_window_applet_activate), @@ -975,32 +1034,28 @@ static void hd_home_window_layout_mode_accept (HildonHomeWindow *window) { - HildonHomeWindow *hhwindow; GtkWidget *area; - hhwindow = HILDON_HOME_WINDOW (window); - area = hildon_home_window_get_area (hhwindow); + area = hildon_home_window_get_area (window); if (hildon_home_area_get_overlaps (HILDON_HOME_AREA (area))) { - hildon_home_window_show_information_note (window, - HH_LAYOUT_OVERLAP_TEXT); + hd_home_window_show_information_note (HD_HOME_WINDOW (window), + HH_LAYOUT_OVERLAP_TEXT); return; } if (HILDON_HOME_WINDOW_CLASS (hd_home_window_parent_class)->layout_mode_accept) - HILDON_HOME_WINDOW_CLASS (hd_home_window_parent_class)->layout_mode_accept (hhwindow); + HILDON_HOME_WINDOW_CLASS (hd_home_window_parent_class)->layout_mode_accept (window); } static void hd_home_window_layout_mode_cancel (HildonHomeWindow *window) { - HildonHomeWindow *hhwindow; GtkWidget *area; - hhwindow = HILDON_HOME_WINDOW (window); - area = hildon_home_window_get_area (hhwindow); + area = hildon_home_window_get_area (window); if (hildon_home_area_get_layout_changed (HILDON_HOME_AREA (area))) { @@ -1024,7 +1079,7 @@ } if (HILDON_HOME_WINDOW_CLASS (hd_home_window_parent_class)->layout_mode_cancel) - HILDON_HOME_WINDOW_CLASS (hd_home_window_parent_class)->layout_mode_cancel (hhwindow); + HILDON_HOME_WINDOW_CLASS (hd_home_window_parent_class)->layout_mode_cancel (window); } static void @@ -1117,3 +1172,27 @@ gtk_widget_show (dialog); } + +static void +hd_home_window_show_information_note (HDHomeWindow *window, + const gchar *text) +{ + GtkWidget *note = NULL; + + note = hildon_note_new_information (NULL, text); + + gtk_dialog_run (GTK_DIALOG (note)); + if (note) + gtk_widget_destroy (GTK_WIDGET (note)); +} + +static void +hd_home_window_show_information_banner (HDHomeWindow *window, + const gchar *text) +{ + g_return_if_fail (GTK_IS_WIDGET (window) && text); + + hildon_banner_show_information (GTK_WIDGET (window), + NULL, + text); +} Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-button.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-button.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-button.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -52,8 +52,6 @@ #include <gtk/gtklabel.h> #include <gtk/gtkmisc.h> -#include <hildon-widgets/gtk-infoprint.h> - #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-menu-item.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-menu-item.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-menu-item.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -48,8 +48,6 @@ #include <gtk/gtklabel.h> #include <gtk/gtkmisc.h> -#include <hildon-widgets/gtk-infoprint.h> - #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-switcher.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -65,11 +65,11 @@ #include <libosso.h> #endif -#ifndef HILDON_LIBS +#ifdef HAVE_LIBHILDON +#else #include <hildon-widgets/hildon-finger.h> #endif -#include <hildon-widgets/gtk-infoprint.h> #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-tooltip.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-tooltip.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-app-tooltip.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -43,8 +43,6 @@ #include <gtk/gtkmisc.h> #include <gtk/gtkwindow.h> -#include <hildon-widgets/gtk-infoprint.h> - #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/dbus.h> Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c 2007-02-06 12:47:46 UTC (rev 9677) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/hn-others-button.c 2007-02-06 12:54:51 UTC (rev 9678) @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <errno.h> #include <sys/resource.h> #include <string.h> @@ -40,7 +44,13 @@ #include <X11/Xatom.h> #include <hildon-base-lib/hildon-base-dnotify.h> + +#ifdef HAVE_LIBHILDON +#include <hildon/hildon-helper.h> +#else #include <hildon-widgets/hildon-finger.h> +#endif + #include <libhildondesktop/libhildonmenu.h> #include <libhildondesktop/hildon-desktop-panel-window.h> #include <libhildondesktop/hildon-thumb-menu-item.h> @@ -929,7 +939,11 @@ button); } +#ifdef HAVE_LIBHILDON + if (hildon_helper_event_button_is_finger (event)) +#else if (hildon_button_event_is_finger (event)) +#endif button->priv->thumb_pressed = TRUE; return TRUE;
- Previous message: [maemo-commits] r9677 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r9679 - projects/haf/branches/maemo-af-desktop/hildon-desktop/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]