[maemo-commits] [maemo-commits] r11458 - in projects/haf/trunk/hildon-desktop: . libhildonwm src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri May 4 17:09:57 EEST 2007
- Previous message: [maemo-commits] r11457 - in projects/haf/trunk/hildon-desktop: . data src
- Next message: [maemo-commits] r11459 - projects/haf/trunk/clipboard-manager/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: moimart
Date: 2007-05-04 17:09:56 +0300 (Fri, 04 May 2007)
New Revision: 11458
Modified:
projects/haf/trunk/hildon-desktop/ChangeLog
projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c
projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.h
projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-types.h
projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.h
projects/haf/trunk/hildon-desktop/src/hn-others-button.c
Log:
* libhildonwm/hd-keys.[ch]:
- Added new shortcuts.
* libhildonwm/hd-wm.[ch]:
* libhildonwm/hd-wm-types.h:
* src/hn-others-button.c:
- Renamed others menu to new & fancy "all menu"
* ChangeLog updated.
Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-05-04 14:09:56 UTC (rev 11458)
@@ -1,3 +1,12 @@
+2007-05-04 Moises Martinez <moises.martinez at nokia.com>
+
+ * libhildonwm/hd-keys.[ch]:
+ - Added new shortcuts.
+ * libhildonwm/hd-wm.[ch]:
+ * libhildonwm/hd-wm-types.h:
+ * src/hn-others-button.c:
+ - Renamed others menu to new & fancy "all menu"
+
2007-05-04 Johan Bilien <johan.bilien at nokia.com>
* src/hd-home-window.c:
Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.c 2007-05-04 14:09:56 UTC (rev 11458)
@@ -123,6 +123,18 @@
}
static void
+hd_keys_action_application_close (HDKeysConfig *keys,
+ gpointer *user_data)
+{
+ HDWM *hdwm = hd_wm_get_singleton ();
+
+ HDWMWatchableApp *app =
+ hd_wm_watched_window_get_app (hd_wm_get_active_window ());
+
+ hd_wm_close_application (hdwm, hd_wm_watchable_app_get_info (app));
+}
+
+static void
hd_keys_switch_window (HDKeysConfig *keys,
gpointer *user_data)
{
@@ -151,6 +163,13 @@
}
static void
+hd_keys_launch_application (HDKeysConfig *keys,
+ gpointer *user_data)
+{
+
+}
+
+static void
hd_keys_action_tn_activate (HDKeysConfig *keys,
gpointer *user_data)
{
@@ -178,11 +197,11 @@
connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
if (dbus_error_is_set (&error))
- {
- g_warning ("Could not acquire the DBus system bus: %s", error.message);
- dbus_error_free (&error);
- return;
- }
+ {
+ g_warning ("Could not acquire the DBus system bus: %s", error.message);
+ dbus_error_free (&error);
+ return;
+ }
g_return_if_fail (connection);
@@ -215,7 +234,7 @@
{ HD_KEYS_GCONF_PATH "/task_switcher", HD_KEY_ACTION_TASK_SWITCHER,
hd_keys_action_tn_activate, GINT_TO_POINTER (HD_TN_ACTIVATE_MAIN_MENU) }, /* AS MENU */
{ HD_KEYS_GCONF_PATH "/task_launcher", HD_KEY_ACTION_TASK_LAUNCHER,
- hd_keys_action_tn_activate, GINT_TO_POINTER (HD_TN_ACTIVATE_OTHERS_MENU)}, /* OTHERS MENU */
+ hd_keys_action_tn_activate, GINT_TO_POINTER (HD_TN_ACTIVATE_ALL_MENU)}, /* OTHERS MENU */
{ HD_KEYS_GCONF_PATH "/power", HD_KEY_ACTION_POWER,
hd_keys_action_power, GINT_TO_POINTER(FALSE) },
{ HD_KEYS_GCONF_PATH "/home", HD_KEY_ACTION_HOME,
@@ -228,12 +247,14 @@
hd_keys_action_send_key, (gpointer)XK_F7 },
{ HD_KEYS_GCONF_PATH "/zoom_out", HD_KEY_ACTION_ZOOM_OUT,
hd_keys_action_send_key, (gpointer)XK_F8 },
- { HD_KEYS_GCONF_PATH "/switch_window_prev", HD_KEY_ACTION_SWITCH_WINDOW_PREV,
+ { HD_KEYS_GCONF_PATH "/window_switch_left", HD_KEY_ACTION_WINDOW_SWITCH_LEFT,
hd_keys_switch_window, GINT_TO_POINTER (FALSE) },
- { HD_KEYS_GCONF_PATH "/switch_window_next", HD_KEY_ACTION_SWITCH_WINDOW_NEXT,
+ { HD_KEYS_GCONF_PATH "/window_switch_right", HD_KEY_ACTION_WINDOW_SWITCH_RIGHT,
hd_keys_switch_window, GINT_TO_POINTER (TRUE) },
- /*{ HD_KEYS_GCONF_PATH "/launch_application", HD_KEY_ACTION_APPLICATION,
- hd_keys_launch_application, NULL },*/
+ { HD_KEYS_GCONF_PATH "/application_close", HD_KEY_ACTION_APPLICATION_CLOSE,
+ hd_keys_action_application_close, NULL},
+ { HD_KEYS_GCONF_PATH "/global/isearch_applet", HD_KEY_ACTION_APPLICATION,
+ hd_keys_launch_application, NULL },
{ NULL, 0, NULL, NULL }
};
Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.h 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-keys.h 2007-05-04 14:09:56 UTC (rev 11458)
@@ -45,6 +45,7 @@
{
HD_KEY_ACTION_UNKOWN = 0,
HD_KEY_ACTION_CLOSE,
+ HD_KEY_ACTION_APPLICATION_CLOSE,
HD_KEY_ACTION_MINIMIZE,
HD_KEY_ACTION_TASK_SWITCHER,
HD_KEY_ACTION_TASK_LAUNCHER,
@@ -54,8 +55,8 @@
HD_KEY_ACTION_FULLSCREEN,
HD_KEY_ACTION_ZOOM_IN,
HD_KEY_ACTION_ZOOM_OUT,
- HD_KEY_ACTION_SWITCH_WINDOW_PREV,
- HD_KEY_ACTION_SWITCH_WINDOW_NEXT,
+ HD_KEY_ACTION_WINDOW_SWITCH_LEFT,
+ HD_KEY_ACTION_WINDOW_SWITCH_RIGHT,
HD_KEY_ACTION_APPLICATION
}
HDKeyAction;
Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-types.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-types.h 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-types.h 2007-05-04 14:09:56 UTC (rev 11458)
@@ -77,7 +77,7 @@
{
HD_TN_ACTIVATE_KEY_FOCUS = 0,
HD_TN_ACTIVATE_MAIN_MENU = 1,
- HD_TN_ACTIVATE_OTHERS_MENU = 2,
+ HD_TN_ACTIVATE_ALL_MENU = 2,
HD_TN_ACTIVATE_PLUGIN1_MENU = 3,
HD_TN_ACTIVATE_PLUGIN2_MENU = 4,
HD_TN_ACTIVATE_LAST_APP_WINDOW = 5,
Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c 2007-05-04 14:09:56 UTC (rev 11458)
@@ -217,7 +217,7 @@
GHashTable *watched_apps;
- GtkWidget *others_menu;
+ GtkWidget *all_menu;
/* stack for the launch banner messages.
* Needed to work round gtk(hindon)_infoprint issues.
@@ -2140,12 +2140,12 @@
}
void
-hd_wm_set_others_menu_button (HDWM *hdwm, GtkWidget *widget)
+hd_wm_set_all_menu_button (HDWM *hdwm, GtkWidget *widget)
{
g_assert (hdwm && widget);
g_assert (HD_IS_WM (hdwm) && GTK_IS_WIDGET (widget));
- hdwm->priv->others_menu = widget;
+ hdwm->priv->all_menu = widget;
}
void
@@ -2280,9 +2280,9 @@
hdwm->priv->has_focus = FALSE;
hd_wm_focus_active_window (hdwm);
return;
- case HD_TN_ACTIVATE_OTHERS_MENU:
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (hdwm->priv->others_menu), TRUE);
- g_signal_emit_by_name (hdwm->priv->others_menu, "toggled");
+ case HD_TN_ACTIVATE_ALL_MENU:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (hdwm->priv->all_menu), TRUE);
+ g_signal_emit_by_name (hdwm->priv->all_menu, "toggled");
break;
default:
g_debug ("%s: %d, hd_wm_activate: deprecated. It was used to activate specific tasknavigator buttons",__FILE__,__LINE__);
Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.h 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.h 2007-05-04 14:09:56 UTC (rev 11458)
@@ -259,7 +259,7 @@
hd_wm_focus_active_window (HDWM *hdwm);
void
-hd_wm_set_others_menu_button (HDWM *hdwm, GtkWidget *widget);
+hd_wm_set_all_menu_button (HDWM *hdwm, GtkWidget *widget);
gboolean
hd_wm_fullscreen_mode (void);
Modified: projects/haf/trunk/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-others-button.c 2007-05-04 14:04:07 UTC (rev 11457)
+++ projects/haf/trunk/hildon-desktop/src/hn-others-button.c 2007-05-04 14:09:56 UTC (rev 11458)
@@ -176,7 +176,7 @@
gtk_widget_show_all (priv->button);
hdwm = hd_wm_get_singleton ();
- hd_wm_set_others_menu_button (hdwm, priv->button);
+ hd_wm_set_all_menu_button (hdwm, priv->button);
g_signal_connect (G_OBJECT (priv->button),
"button-press-event",
- Previous message: [maemo-commits] r11457 - in projects/haf/trunk/hildon-desktop: . data src
- Next message: [maemo-commits] r11459 - projects/haf/trunk/clipboard-manager/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]