[maemo-commits] [maemo-commits] r18113 - in projects/haf/trunk/hildon-control-panel: . debian src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Apr 20 17:30:14 EEST 2009
- Previous message: [maemo-commits] r18112 - in projects/haf/trunk/hildon-thumbnail: . debian
- Next message: [maemo-commits] r18114 - in projects/haf/trunk/ke-recv: debian src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: paradi
Date: 2009-04-20 17:29:50 +0300 (Mon, 20 Apr 2009)
New Revision: 18113
Modified:
projects/haf/trunk/hildon-control-panel/ChangeLog
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:
* src/hcp-rfs.c:
* src/hcp-rfs.h:
* src/hcp-window.c:
Fixed L10n issues.
* debian/control:
osso-system-lock-l10n-mr | osso-system-lock-l10n-mr0 added to Depends,
because secu_info_incorrectcode is shown
replaced hildon-theme-harry with hildon-theme-alpha in Recommends
section.
* src/hcp-window.c:
changed font type in application menu
Fixes: NB#108452 - "Control Panel Settings Option
?\195?\130?\194?\167copa_me_tools_rfs?\195?\130?\194?\167 is truncated"
Modified: projects/haf/trunk/hildon-control-panel/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-control-panel/ChangeLog 2009-04-20 12:05:23 UTC (rev 18112)
+++ projects/haf/trunk/hildon-control-panel/ChangeLog 2009-04-20 14:29:50 UTC (rev 18113)
@@ -1,3 +1,18 @@
+2009-04-20 Peter Aradi <peter.aradi at maemo.org>
+ * src/hcp-rfs.c:
+ * src/hcp-rfs.h:
+ * src/hcp-window.c:
+ Fixed L10n issues.
+ * debian/control:
+ osso-system-lock-l10n-mr | osso-system-lock-l10n-mr0 added to Depends,
+ because secu_info_incorrectcode is shown
+ replaced hildon-theme-harry with hildon-theme-alpha in Recommends
+ section.
+ * src/hcp-window.c:
+ changed font type in application menu
+ Fixes: NB#108452 - "Control Panel Settings Option
+ §copa_me_tools_rfs§ is truncated"
+
2009-03-23 Peter Aradi <peter.aradi at maemo.org>
* src/hcp-app.c:
Modified: projects/haf/trunk/hildon-control-panel/debian/control
===================================================================
--- projects/haf/trunk/hildon-control-panel/debian/control 2009-04-20 12:05:23 UTC (rev 18112)
+++ projects/haf/trunk/hildon-control-panel/debian/control 2009-04-20 14:29:50 UTC (rev 18113)
@@ -8,8 +8,8 @@
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)
-Recommends: hildon-theme-harry, hildon-keyboard, matchbox-window-manager
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, hildon-control-panel-l10n-mr | hildon-control-panel-l10n-mr0, osso-app-killer (>= 1.1), osso-system-lock-l10n-mr | osso-system-lock-l10n-mr0
+Recommends: hildon-theme-alpha, hildon-keyboard, matchbox-window-manager
Suggests: hildon-tests
Conflicts: hildon-base
Replaces: hildon-base, hildon-navigator (<= 0.8.10)
Modified: projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c
===================================================================
--- projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c 2009-04-20 12:05:23 UTC (rev 18112)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-rfs.c 2009-04-20 14:29:50 UTC (rev 18113)
@@ -39,8 +39,6 @@
#include "hcp-rfs.h"
#include "hcp-program.h"
-#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")
#define HCP_RFC_WARNING_DIALOG_WIDTH 450
@@ -49,8 +47,7 @@
* Asks the user for confirmation, returns TRUE if confirmed
*/
static gboolean hcp_rfs_display_warning (HCPProgram *program,
- const gchar *warning,
- const gchar *title)
+ const gchar *warning)
{
GtkWidget *confirm_dialog;
gint ret;
@@ -157,13 +154,12 @@
gboolean
-hcp_rfs (const gchar *warning, const gchar *title,
- const gchar *script)
+hcp_rfs (const gchar *warning, const gchar *script)
{
if (warning)
{
if (!hcp_rfs_display_warning (hcp_program_get_instance (),
- warning, title))
+ warning))
{
/* 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-04-20 12:05:23 UTC (rev 18112)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-rfs.h 2009-04-20 14:29:50 UTC (rev 18113)
@@ -25,7 +25,6 @@
#define __HCP_RFS_H__
gboolean hcp_rfs (const char *warning,
- const char *title,
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-04-20 12:05:23 UTC (rev 18112)
+++ projects/haf/trunk/hildon-control-panel/src/hcp-window.c 2009-04-20 14:29:50 UTC (rev 18113)
@@ -31,6 +31,8 @@
#include <hildon/hildon-program.h>
#include <hildon/hildon-defines.h>
#include <hildon/hildon-pannable-area.h>
+#include <hildon/hildon-button.h>
+#include <hildon/hildon-helper.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -65,15 +67,8 @@
};
#define HCP_TITLE _("copa_ap_cp_name")
-#define HCP_MENU_OPEN _("copa_me_open")
-#define HCP_MENU_SUB_VIEW _("copa_me_view")
-#define HCP_MENU_SMALL_ITEMS _("copa_me_view_small")
-#define HCP_MENU_LARGE_ITEMS _("copa_me_view_large")
-#define HCP_MENU_SUB_TOOLS _("copa_me_tools")
-#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_CLOSE _("copa_me_close")
#define HCP_STATE_GROUP "HildonControlPanel"
#define HCP_STATE_FOCUSED "Focussed"
@@ -84,11 +79,9 @@
#define HCP_OPERATOR_WIZARD_LAUNCH "launch_operator_wizard"
#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_CUD_WARNING _("cud_ia_text")
-#define HCP_CUD_WARNING_TITLE _("cud_ti_clear")
#define HCP_CUD_SCRIPT "/usr/sbin/osso-app-killer-cud.sh"
static void
@@ -379,7 +372,6 @@
hcp_window_clear_user_data (GtkWidget *widget, HCPWindow *window)
{
hcp_rfs (HCP_CUD_WARNING,
- HCP_CUD_WARNING_TITLE,
HCP_CUD_SCRIPT);
return TRUE;
@@ -389,7 +381,6 @@
hcp_window_reset_factory_settings (GtkWidget *widget, HCPWindow *window)
{
hcp_rfs (HCP_RFS_WARNING,
- HCP_RFS_WARNING_TITLE,
HCP_RFS_SCRIPT);
return TRUE;
@@ -559,15 +550,23 @@
#ifdef MAEMO_TOOLS
/* Reset Factory Settings */
- mi = gtk_button_new_with_label (HCP_MENU_RFS);
-
+ mi = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH |
+ HILDON_SIZE_FINGER_HEIGHT,
+ HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+ HCP_MENU_RFS, NULL);
+ hildon_helper_set_logical_font (mi, "SmallSystemFont");
+
hildon_app_menu_append (menu, GTK_BUTTON(mi));
g_signal_connect (mi, "clicked",
G_CALLBACK (hcp_window_reset_factory_settings), window);
/* Clean User Data */
- mi = gtk_button_new_with_label (HCP_MENU_CUD);
+ mi = hildon_button_new_with_text (HILDON_SIZE_AUTO_WIDTH |
+ HILDON_SIZE_FINGER_HEIGHT,
+ HILDON_BUTTON_ARRANGEMENT_VERTICAL,
+ HCP_MENU_CUD, NULL);
+ hildon_helper_set_logical_font (mi, "SmallSystemFont");
hildon_app_menu_append (menu, GTK_BUTTON(mi));
- Previous message: [maemo-commits] r18112 - in projects/haf/trunk/hildon-thumbnail: . debian
- Next message: [maemo-commits] r18114 - in projects/haf/trunk/ke-recv: debian src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]