[maemo-commits] [maemo-commits] r17660 - in projects/haf/trunk/hildon-control-panel: . data debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Mar 12 19:16:58 EET 2009
- Previous message: [maemo-commits] r17659 - projects/haf/trunk/clutter
- Next message: [maemo-commits] r17661 - in projects/haf/trunk/libmatchbox2: . matchbox/core
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: paradi Date: 2009-03-12 19:16:55 +0200 (Thu, 12 Mar 2009) New Revision: 17660 Modified: projects/haf/trunk/hildon-control-panel/ChangeLog projects/haf/trunk/hildon-control-panel/configure.ac projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.desktop.in projects/haf/trunk/hildon-control-panel/debian/control projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c projects/haf/trunk/hildon-control-panel/src/hcp-rfs.h projects/haf/trunk/hildon-control-panel/src/hcp-window.c Log: * debian/control: * configure.ac: * src/hcp-rfs.c: * src/hcp-rfs.h: Removed dependency from libhildonhelp0. Fixes: NB#105167 - "hildon-control-panel shouldn't depend on libhildonhelp0" * src/hcp-window.c: Updated menu to use new implementation. * data/hildon-control-panel.desktop.in: Added X-Maemo-Wm-Class property. Fixes: NB#103049 - "Blank screen is displaying..." Modified: projects/haf/trunk/hildon-control-panel/ChangeLog =================================================================== --- projects/haf/trunk/hildon-control-panel/ChangeLog 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/ChangeLog 2009-03-12 17:16:55 UTC (rev 17660) @@ -1,3 +1,19 @@ +2009-03-12 Peter Aradi <peter.aradi at maemo.org> + * debian/control: + * configure.ac: + * src/hcp-rfs.c: + * src/hcp-rfs.h: + Removed dependency from libhildonhelp0. + Fixes: NB#105167 - "hildon-control-panel shouldn't depend on + libhildonhelp0" + + * src/hcp-window.c: + Updated menu to use new implementation. + + * data/hildon-control-panel.desktop.in: + Added X-Maemo-Wm-Class property. + Fixes: NB#103049 - "Blank screen is displaying..." + 2009-02-10 Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Release 2.2.5 @@ -4,7 +20,7 @@ * configure.ac: 2.2.5 -2009-02-10 Peter Aradi <peter.aradi at blumsoft.eu> +2009-02-10 Peter Aradi <peter.aradi at maemo.org> * configure.ac: Corrected version number of libcodelockui. @@ -14,7 +30,7 @@ Updated localization domain for incorrect code message. Fixes: NB#98945 -2009-01-21 Peter Aradi <peter.aradi at blumsoft.eu> +2009-01-21 Peter Aradi <peter.aradi at maemo.org> * data/hildon-control-panel.desktop.in: Updated icon name, localization domain, Category and position in @@ -27,7 +43,7 @@ * configure.ac: 2.2.4 -2008-12-18 Peter Aradi <peter.aradi at blumsoft.eu> +2008-12-18 Peter Aradi <peter.aradi at maemo.org> * src/hcp-rfs.c: libcodelockui is used for password check instead of d-bus query from @@ -35,7 +51,7 @@ HildonNote is used for displaying confirmation notes. Fixes: NB#96274, NB#97055, NB#96246 -2008-12-18 Peter Aradi <peter.aradi at blumsoft.eu> +2008-12-18 Peter Aradi <peter.aradi at maemo.org> * src/hcp-app-list.c: removed XMAS fixes @@ -44,7 +60,7 @@ Release 2.2.3 -2008-12-16 Peter Aradi <peter.aradi at blumsoft.eu> +2008-12-16 Peter Aradi <peter.aradi at maemo.org> * src/hcp-app-list.c: logical ids -> UI strings XMAS hack @@ -54,12 +70,12 @@ * src/hcp-window.c: removed help from menu, according to UI spec -2008-12-03 Peter Aradi <peter.aradi at blumsoft.eu> +2008-12-03 Peter Aradi <peter.aradi at maemo.org> * src/hcp-grid.c: Use thumbsized icons. -2008-12-03 Peter Aradi <peter.aradi at blumsoft.eu> +2008-12-03 Peter Aradi <peter.aradi at maemo.org> * src/hcp-window.c: * src/hcp-window.h: @@ -69,13 +85,13 @@ Changed order of groups. Fixes #NB 92795 -2008-11-24 Peter Aradi <peter.aradi at blumsoft.eu> +2008-11-24 Peter Aradi <peter.aradi at maemo.org> * src/hcp-window.c: Menu now conforms to UI spec v 1.4 Fixes #NB 90260 -2008-11-12 Peter Aradi <peter.aradi at blumsoft.eu> +2008-11-12 Peter Aradi <peter.aradi at maemo.org> * src/hcp-window.c: The contents of former "Tools" submenu are shown when menu is pressed. @@ -85,7 +101,7 @@ Release 2.2.2 -2008-11-07 Peter Aradi <peter.aradi at blumsoft.eu> +2008-11-07 Peter Aradi <peter.aradi at maemo.org> * src/hcp-app-view.c * src/hcp-grid.h @@ -102,7 +118,7 @@ - the view has large icons Please see NB# 91702 for more details. -2008-10-17 Peter Aradi <peter.aradi at blumsoft.eu> +2008-10-17 Peter Aradi <peter.aradi at maemo.org> * src/hcp-app-view.c: change default value for icon size to HCP_ICON_SIZE_LARGE. Fixes NB #90236. @@ -110,7 +126,7 @@ "/schemas/apps/osso/apps/controlpanel/icon_size" key value to "true". Fixes NB #90236. -2008-09-30 Peter Aradi <peter.aradi at blumsoft.eu> +2008-09-30 Peter Aradi <peter.aradi at maemo.org> * src/hcp-main.c: g_thread_init called earlier. Fixes NB #86237. Modified: projects/haf/trunk/hildon-control-panel/configure.ac =================================================================== --- projects/haf/trunk/hildon-control-panel/configure.ac 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/configure.ac 2009-03-12 17:16:55 UTC (rev 17660) @@ -64,7 +64,6 @@ libosso >= 0.10.0 hildon-1 gnome-vfs-2.0 >= 2.8.3 - hildon-help gconf-2.0 >= 2.6.2 codelockui >= 1:1.5.6 ]) Modified: projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.desktop.in =================================================================== --- projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.desktop.in 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/data/hildon-control-panel.desktop.in 2009-03-12 17:16:55 UTC (rev 17660) @@ -14,3 +14,4 @@ X-Osso-User-Position=14 X-Maemo-Category=Main X-Text-Domain=hildon-control-panel +X-Maemo-Wm-Class=Controlpanel Modified: projects/haf/trunk/hildon-control-panel/debian/control =================================================================== --- projects/haf/trunk/hildon-control-panel/debian/control 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/debian/control 2009-03-12 17:16:55 UTC (rev 17660) @@ -2,13 +2,13 @@ Section: x11 Priority: optional Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> -Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, libhildonhelp-dev, maemo-launcher-dev (>= 0.22-1), libcodelockui1-dev +Build-Depends: debhelper (>= 4.0.0), libosso-gnomevfs2-dev, libhildon1-dev (>= 0.9.9), pkg-config, libosso-dev (>= 1.5), osso-af-settings, maemo-launcher-dev (>= 0.22-1), libcodelockui1-dev Standards-Version: 3.6.0 Package: hildon-control-panel Section: x11 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, hildon-control-panel-l10n-mr | hildon-control-panel-l10n-mr0, osso-app-killer (>= 1.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, hildon-control-panel-l10n-mr | hildon-control-panel-l10n-mr0, osso-app-killer (>= 1.1) Recommends: hildon-theme-harry, hildon-keyboard, matchbox-window-manager Suggests: hildon-tests Conflicts: hildon-base Modified: projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c =================================================================== --- projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c 2009-03-12 17:16:55 UTC (rev 17660) @@ -29,7 +29,6 @@ #include <strings.h> #include <hildon/hildon-code-dialog.h> -#include <hildon/hildon-help.h> #include <hildon/hildon-note.h> #include <hildon/hildon-banner.h> #include <codelockui.h> @@ -40,8 +39,6 @@ #include "hcp-rfs.h" #include "hcp-program.h" -#define HCP_CODE_DIALOG_HELP_TOPIC "Features_restorefactorysettings_passwordquerydialog" - #define HCP_RFS_INFOBANNER_OK _("rfs_bd_ok") #define HCP_RFS_INFOBANNER_CANCEL _("rfs_bd_cancel") #define HCP_RFS_IB_WRONG_LOCKCODE dgettext("osso-system-lock", "secu_info_incorrectcode") @@ -53,8 +50,7 @@ */ static gboolean hcp_rfs_display_warning (HCPProgram *program, const gchar *warning, - const gchar *title, - const gchar *help_topic) + const gchar *title) { GtkWidget *confirm_dialog; gint ret; @@ -95,10 +91,6 @@ dialog = codelock_create_dialog (&clui, TIMEOUT_FOOBAR, FALSE); - hildon_help_dialog_help_enable (GTK_DIALOG (dialog), - HCP_CODE_DIALOG_HELP_TOPIC, - program->osso); - gtk_widget_show_all (dialog); gtk_window_set_transient_for (GTK_WINDOW (dialog), @@ -131,7 +123,6 @@ NULL, HCP_RFS_IB_WRONG_LOCKCODE); - /* hildon_code_dialog_clear_code (HILDON_CODE_DIALOG (dialog)); */ codelock_clear_code (&clui); } } @@ -167,12 +158,12 @@ gboolean hcp_rfs (const gchar *warning, const gchar *title, - const gchar *script, const gchar *help_topic) + const gchar *script) { if (warning) { if (!hcp_rfs_display_warning (hcp_program_get_instance (), - warning, title, help_topic)) + warning, title)) { /* User canceled, return */ return TRUE; Modified: projects/haf/trunk/hildon-control-panel/src/hcp-rfs.h =================================================================== --- projects/haf/trunk/hildon-control-panel/src/hcp-rfs.h 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/src/hcp-rfs.h 2009-03-12 17:16:55 UTC (rev 17660) @@ -26,7 +26,6 @@ gboolean hcp_rfs (const char *warning, const char *title, - const char *script, - const char *help_topic); + const char *script); #endif Modified: projects/haf/trunk/hildon-control-panel/src/hcp-window.c =================================================================== --- projects/haf/trunk/hildon-control-panel/src/hcp-window.c 2009-03-12 16:29:42 UTC (rev 17659) +++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c 2009-03-12 17:16:55 UTC (rev 17660) @@ -27,7 +27,6 @@ #endif #include <libosso.h> -#include <hildon/hildon-help.h> #include <hildon/hildon-window.h> #include <hildon/hildon-program.h> #include <hildon/hildon-defines.h> @@ -74,11 +73,8 @@ #define HCP_MENU_SETUP_WIZARD _("copa_me_tools_setup_wizard") #define HCP_MENU_RFS _("copa_me_tools_rfs") #define HCP_MENU_CUD _("copa_me_tools_cud") -#define HCP_MENU_HELP _("copa_me_tools_help") #define HCP_MENU_CLOSE _("copa_me_close") -#define HCP_OSSO_HELP_ID "Utilities_controlpanel_mainview" - #define HCP_STATE_GROUP "HildonControlPanel" #define HCP_STATE_FOCUSED "Focussed" #define HCP_STATE_SCROLL_VALUE "ScrollValue" @@ -90,12 +86,10 @@ #define HCP_RFS_WARNING _("refs_ia_text") #define HCP_RFS_WARNING_TITLE _("rfs_ti_restore") #define HCP_RFS_SCRIPT "/usr/sbin/osso-app-killer-rfs.sh" -#define HCP_RFS_HELP_TOPIC "Features_restorefactorysettings_closealldialog" #define HCP_CUD_WARNING _("cud_ia_text") #define HCP_CUD_WARNING_TITLE _("cud_ti_clear") #define HCP_CUD_SCRIPT "/usr/sbin/osso-app-killer-cud.sh" -#define HCP_CUD_HELP_TOPIC "Features_clearuserdata_dialog" static void hcp_window_enforce_state (HCPWindow *window) @@ -386,8 +380,7 @@ { hcp_rfs (HCP_CUD_WARNING, HCP_CUD_WARNING_TITLE, - HCP_CUD_SCRIPT, - HCP_CUD_HELP_TOPIC); + HCP_CUD_SCRIPT); return TRUE; } @@ -397,8 +390,7 @@ { hcp_rfs (HCP_RFS_WARNING, HCP_RFS_WARNING_TITLE, - HCP_RFS_SCRIPT, - HCP_RFS_HELP_TOPIC); + HCP_RFS_SCRIPT); return TRUE; } @@ -520,7 +512,7 @@ HildonProgram *program; - GtkMenu *menu = NULL; + HildonAppMenu *menu = NULL; GtkWidget *mi = NULL; GtkWidget *scrolled_window = NULL; @@ -530,6 +522,7 @@ priv = window->priv; /* Why is this not read from the gtkrc?? -- Jobi */ +#if 0 /* Control Panel Grid */ gtk_rc_parse_string (" style \"hildon-control-panel-grid\" {" " CPGrid::n_columns = 2" @@ -544,11 +537,12 @@ " }" " widget \"*.hildon-control-panel-separator\" " " style \"hildon-control-panel-separator\""); +#endif program = HILDON_PROGRAM (hildon_program_get_instance ()); hildon_program_add_window (program, HILDON_WINDOW (window)); - + gtk_window_set_title (GTK_WINDOW (window), HCP_TITLE); @@ -558,26 +552,26 @@ g_signal_connect(G_OBJECT (program), "notify::is-topmost", G_CALLBACK (hcp_window_topmost_status_change), window); - menu = GTK_MENU (gtk_menu_new ()); + menu = HILDON_APP_MENU (hildon_app_menu_new ()); - hildon_window_set_menu (HILDON_WINDOW (window), menu); + hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (window), menu); #ifdef MAEMO_TOOLS /* Reset Factory Settings */ - mi = gtk_menu_item_new_with_label (HCP_MENU_RFS); + mi = gtk_button_new_with_label (HCP_MENU_RFS); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + hildon_app_menu_append (menu, GTK_BUTTON(mi)); - g_signal_connect (G_OBJECT (mi), "activate", + g_signal_connect (mi, "clicked", G_CALLBACK (hcp_window_reset_factory_settings), window); /* Clean User Data */ - mi = gtk_menu_item_new_with_label (HCP_MENU_CUD); + mi = gtk_button_new_with_label (HCP_MENU_CUD); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); + hildon_app_menu_append (menu, GTK_BUTTON(mi)); - g_signal_connect (G_OBJECT (mi), "activate", + g_signal_connect (mi, "clicked", G_CALLBACK (hcp_window_clear_user_data), window); #endif @@ -666,7 +660,7 @@ hcp_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { /* Buggy applets can crash controlpanel, so disabled for now */ - static gboolean enforce_state = FALSE; + static gboolean enforce_state = TRUE; GTK_WIDGET_CLASS (hcp_window_parent_class)->size_allocate (widget, allocation);
- Previous message: [maemo-commits] r17659 - projects/haf/trunk/clutter
- Next message: [maemo-commits] r17661 - in projects/haf/trunk/libmatchbox2: . matchbox/core
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]