+2009-03-06 Alberto Garcia <agarcia@igalia.com>
+
+ Patch by Mox Soini (ext-mox.soini@nokia.com)
+
+ * tests/TEST-CASES.txt
+ * tests/check-hildon-banner.c
+ * tests/check-hildon-note.c
+ * src/hildon-banner.c
+ * src/hildon-code-dialog.c
+ * src/hildon-date-editor.c (real_set_calendar_icon_state)
+ * src/hildon-time-editor.c
+ * examples/hildon-lookup-example.c (main):
+ Replace obsolete icon names with new ones.
+
+ * src/hildon-find-toolbar-private.h:
+ * src/hildon-find-toolbar.c (hildon_find_toolbar_init)
+ (-hildon_find_toolbar_emit_search):
+ Remove find button and change icon of close button.
+
+ Fixes: NB#104819 (Clean up old icon names from hildon-widgets)
+
2009-03-05 Alberto Garcia <agarcia@igalia.com>
* src/hildon-time-button.c (hildon_time_button_new_step):
gtk_table_attach (table, create_button_with_icon (GTK_STOCK_CANCEL), 1, 2, 0, 1, 0, 0, 0, 0);
gtk_table_attach (table, create_button_with_icon (GTK_STOCK_QUIT), 2, 3, 0, 1, 0, 0, 0, 0);
- gtk_table_attach (table, create_button_with_icon (GTK_STOCK_MEDIA_PLAY), 0, 1, 1, 2, 0, 0, 0, 0);
+ gtk_table_attach (table, create_button_with_icon (GTK_STOCK_SAVE), 0, 1, 1, 2, 0, 0, 0, 0);
gtk_table_attach (table, create_button_with_icon (GTK_STOCK_MEDIA_PAUSE), 1, 2, 1, 2, 0, 0, 0, 0);
- gtk_table_attach (table, create_button_with_icon ("qgn_note_info"), 2, 3, 1, 2, 0, 0, 0, 0);
+ gtk_table_attach (table, create_button_with_icon (GTK_STOCK_FILE), 2, 3, 1, 2, 0, 0, 0, 0);
- gtk_table_attach (table, create_button_with_icon ("qgn_note_infoprint"), 0, 1, 2, 3, 0, 0, 0, 0);
- gtk_table_attach (table, create_button_with_icon ("qgn_indi_pball_a"), 1, 2, 2, 3, 0, 0, 0, 0);
- gtk_table_attach (table, create_button_with_icon ("qgn_note_confirm"), 2, 3, 2, 3, 0, 0, 0, 0);
-
gtk_table_set_col_spacings (table, 6);
gtk_table_set_row_spacings (table, 6);
/* default icons */
-#define HILDON_BANNER_DEFAULT_PROGRESS_ANIMATION "qgn_indi_pball_a"
+#define HILDON_BANNER_DEFAULT_PROGRESS_ANIMATION "indicator_update"
enum
{
#define WIDTH (100-HILDON_MARGIN_DEFAULT)
-#define BACKSPACE_ICON "qgn_calculator_backspace"
+#define BACKSPACE_ICON "general_backspace"
#define _(String) \
dgettext("hildon-libs", String)
g_assert (priv);
gtk_image_set_from_icon_name (GTK_IMAGE (priv->calendar_icon),
- pressed ? "qgn_widg_datedit_pr" : "qgn_widg_datedit", HILDON_ICON_SIZE_SMALL);
+ "widgets_date_editor", HILDON_ICON_SIZE_SMALL);
priv->calendar_icon_pressed = pressed;
}
{
GtkWidget* label;
GtkComboBoxEntry* entry_combo_box;
- GtkToolItem* find_button;
GtkToolItem* separator;
GtkToolItem* close_button;
gpointer data);
static void
-hildon_find_toolbar_emit_search (GtkButton *button,
- gpointer self);
-
-static void
hildon_find_toolbar_emit_close (GtkButton *button,
gpointer self);
}
static void
-hildon_find_toolbar_emit_search (GtkButton *button,
- gpointer self)
-{
- gboolean rb;
-
- /* Clicked search button. Perform search and add search prefix to history */
- g_signal_emit_by_name(self, "search", NULL);
- g_signal_emit_by_name(self, "history_append", &rb, NULL);
-}
-
-static void
hildon_find_toolbar_emit_close (GtkButton *button,
gpointer self)
{
"activate",
G_CALLBACK(hildon_find_toolbar_entry_activate), self);
- /* Find button */
- priv->find_button = gtk_tool_button_new (
- gtk_image_new_from_icon_name ("qgn_toolb_browser_gobutton",
- HILDON_ICON_SIZE_TOOLBAR),
- "Find");
-
- g_signal_connect (priv->find_button, "clicked",
- G_CALLBACK(hildon_find_toolbar_emit_search), self);
- gtk_widget_show_all( GTK_WIDGET(priv->find_button));
- gtk_toolbar_insert ( GTK_TOOLBAR(self), priv->find_button, -1);
- gtk_widget_set_size_request (GTK_WIDGET (priv->find_button), 72, -1);
- if ( GTK_WIDGET_CAN_FOCUS( GTK_BIN(priv->find_button)->child) )
- GTK_WIDGET_UNSET_FLAGS(
- GTK_BIN(priv->find_button)->child, GTK_CAN_FOCUS);
-
/* Separator */
priv->separator = gtk_separator_tool_item_new();
+ gtk_widget_set_size_request (GTK_WIDGET (priv->separator), 72, -1);
gtk_widget_show(GTK_WIDGET(priv->separator));
gtk_toolbar_insert (GTK_TOOLBAR(self), priv->separator, -1);
/* Close button */
priv->close_button = gtk_tool_button_new (
- gtk_image_new_from_icon_name ("qgn_toolb_gene_close",
+ gtk_image_new_from_icon_name ("general_close",
HILDON_ICON_SIZE_TOOLBAR),
"Close");
- gtk_widget_set_size_request (GTK_WIDGET (priv->close_button), 72, -1);
g_signal_connect(priv->close_button, "clicked",
G_CALLBACK(hildon_find_toolbar_emit_close), self);
gtk_widget_show_all(GTK_WIDGET(priv->close_button));
#define ICON_PRESSED 4
-#define ICON_NAME "qgn_widg_timedit"
+#define ICON_NAME "widgets_time_editor"
#define ICON_SIZE "timepicker-size"
- Errors detected: none.
1. Create confirmation with icon name note with regular values.
- a) Create new confirmation note with description set to a combination of letters, numbers and symbols and icon name "qgn_list_cp_calibration".
+ a) Create new confirmation note with description set to a combination of letters, numbers and symbols and icon name "dummy".
b) Create new confirmation note with description set to "" and icon name NULL.
2. Create confirmation with icon name note with invalid values.
1. Check creation of new animation banner with regular values.
a) Create an animation banner with NULL animation name and a text.
- b) Create an animation banner with qgn_list_mahjong animation name and an empty text.
+ b) Create an animation banner with dummy animation name and an empty text.
2. Check creation of new animation banner with invalid values.
a) Create an animation banner with NULL text.
* Purpose: Check creation of new animation banner with regular values
* Cases considered:
* - Create an animation banner with NULL animation name and TEST_STRING text.
- * - Create an animation banner with qgn_list_mahjong animation name and "" text.
+ * - Create an animation banner with dummy animation name and "" text.
*/
START_TEST (test_show_animation_regular)
{
gtk_widget_destroy(GTK_WIDGET(hildon_banner));
- /*Test 2: Create an animation banner with animation name set to "qgn_list_mahjong" and text set to "". */
+ /*Test 2: Create an animation banner with animation name set to "dummy" and text set to "". */
text="";
- animation_name = "qgn_list_mahjong";
+ animation_name = "dummy";
hildon_banner = HILDON_BANNER(hildon_banner_show_animation(b_window,animation_name,text));
fail_if(!HILDON_IS_BANNER(hildon_banner),
/*Test 2: Create an animation banner with NULL window. */
text="";
- animation_name = "qgn_list_mahjong";
+ animation_name = "dummy";
hildon_banner = HILDON_BANNER(hildon_banner_show_animation(NULL,animation_name,text));
fail_if(!HILDON_IS_BANNER(hildon_banner),
/**
* Purpose: Check that note dialog is properly created with description regular values.
* Cases considered:
- * - Create new confirmation note with description set to TEST_STRING and icon name "qgn_list_cp_calibration".
+ * - Create new confirmation note with description set to TEST_STRING and icon name "control_calibration_target".
* - Create new confirmation note with description set to "" and icon name NULL.
*
*/
/* Test 1: create new confirmation note with description set to TEST_STRING */
description = TEST_STRING;
- icon_name="qgn_list_cp_calibration";
+ icon_name="control_calibration_target";
note = HILDON_NOTE(hildon_note_new_confirmation_with_icon_name(n_window,description,icon_name));
fail_if(!HILDON_IS_NOTE(note),
"hildon-note: Creation failed with hildon_note_new_confirmation_with_icon_name");
invalid_note=NULL;
/* Test 2: create new confirmation note with description set to "NULL" */
- invalid_note = HILDON_NOTE(hildon_note_new_confirmation_with_icon_name(n_window,NULL,"qgn_list_cp_calibration"));
+ invalid_note = HILDON_NOTE(hildon_note_new_confirmation_with_icon_name(n_window,NULL,"control_calibration_target"));
fail_if(HILDON_IS_NOTE(invalid_note),
"hildon-note: Creation succeeded with hildon_note_new_confirmation_with_icon_name with message == NULL");
projects / hildon / commitdiff