Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_button_test.c etk_canvas_test.c etk_colorpicker_test.c
etk_combobox_test.c etk_embed_test.c etk_entry_test.c
etk_filechooser_test.c etk_iconbox_test.c etk_image_test.c
etk_menu_test.c etk_notebook_test.c etk_paned_test.c
etk_progress_bar_test.c etk_scrolled_view_test.c
etk_slider_test.c etk_spin_button_test.c etk_table_test.c
etk_test.c etk_text_view_test.c etk_tree_test.c
etk_xdnd_test.c
Log Message:
* Improve the transition of the Etk_Embed test app
* Clean up the code of the test app of Etk_Notebook and Etk_Table
* Remove Gettext support from Etk_Test, since etk_test is an app for the
devs, and it doesn't need to be translated
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_button_test.c 5 Mar 2006 23:52:58 -0000 1.10
+++ etk_button_test.c 24 Jun 2006 17:54:06 -0000 1.11
@@ -19,49 +19,49 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Button Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Button Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(win), vbox);
- button_normal = etk_button_new_with_label(_("Normal button"));
- etk_tooltips_tip_set(button_normal, "This is a normal button");
+ button_normal = etk_button_new_with_label("Normal button");
+ etk_tooltips_tip_set(button_normal, "This is a normal button");
etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
- button_normal = etk_button_new_with_label(_("Button with an image"));
- etk_tooltips_tip_set(button_normal, "This is a normal button with an
image");
+ button_normal = etk_button_new_with_label("Button with an image");
+ etk_tooltips_tip_set(button_normal, "This is a normal button with an
image");
etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image));
etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
button_normal = etk_button_new();
- etk_tooltips_tip_set(button_normal, "This is a normal button with
nothing");
+ etk_tooltips_tip_set(button_normal, "This is a normal button with nothing");
etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
- button_check = etk_check_button_new_with_label(_("Check button"));
- etk_tooltips_tip_set(button_check, _("This is a check button"));
+ button_check = etk_check_button_new_with_label("Check button");
+ etk_tooltips_tip_set(button_check, "This is a check button");
etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
button_check = etk_check_button_new();
- etk_tooltips_tip_set(button_check, _("This is another check button"));
+ etk_tooltips_tip_set(button_check, "This is another check button");
etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
- button_radio = etk_radio_button_new_with_label(_("Radio button"), NULL);
- etk_tooltips_tip_set(button_radio, _("This is a radio button"));
+ button_radio = etk_radio_button_new_with_label("Radio button", NULL);
+ etk_tooltips_tip_set(button_radio, "This is a radio button");
etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
- etk_tooltips_tip_set(button_radio, _("This is another radio button"));
+ etk_tooltips_tip_set(button_radio, "This is another radio button");
etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
- button_toggle = etk_toggle_button_new_with_label(_("Toggle button"));
- etk_tooltips_tip_set(button_toggle, _("This is a toggle button"));
+ button_toggle = etk_toggle_button_new_with_label("Toggle button");
+ etk_tooltips_tip_set(button_toggle, "This is a toggle button");
etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
button_toggle = etk_toggle_button_new();
- etk_tooltips_tip_set(button_toggle, _("This is another toggle button"));
+ etk_tooltips_tip_set(button_toggle, "This is another toggle button");
etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
etk_widget_show_all(win);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_canvas_test.c 15 Jan 2006 11:07:16 -0000 1.7
+++ etk_canvas_test.c 24 Jun 2006 17:54:06 -0000 1.8
@@ -19,7 +19,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Canvas Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Canvas Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 5);
@@ -29,7 +29,7 @@
etk_widget_size_request_set(canvas, 300, 200);
etk_box_pack_start(ETK_BOX(vbox), canvas, ETK_TRUE, ETK_TRUE, 0);
- button = etk_button_new_with_label(_("Add object"));
+ button = etk_button_new_with_label("Add object");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_canvas_object_add), canvas);
etk_box_pack_start(ETK_BOX(vbox), button, ETK_FALSE, ETK_FALSE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_colorpicker_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_colorpicker_test.c 23 Dec 2005 14:48:14 -0000 1.5
+++ etk_colorpicker_test.c 24 Jun 2006 17:54:06 -0000 1.6
@@ -12,7 +12,7 @@
return;
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Color Picker Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Color Picker Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
cp = etk_colorpicker_new();
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_combobox_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_combobox_test.c 7 Apr 2006 15:36:10 -0000 1.4
+++ etk_combobox_test.c 24 Jun 2006 17:54:06 -0000 1.5
@@ -25,7 +25,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Combobox Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Combobox Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
@@ -33,7 +33,7 @@
etk_container_add(ETK_CONTAINER(win), vbox);
/* Simple combobox */
- frame = etk_frame_new(_("Simple combobox"));
+ frame = etk_frame_new("Simple combobox");
etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
combobox = etk_combobox_new_default();
@@ -43,7 +43,7 @@
etk_combobox_item_append(ETK_COMBOBOX(combobox), "Test 3");
/* More complex combobox */
- frame = etk_frame_new(_("Some stock icons"));
+ frame = etk_frame_new("Some stock icons");
etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
vbox = etk_vbox_new(ETK_FALSE, 3);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_embed_test.c 24 Jun 2006 16:57:24 -0000 1.2
+++ etk_embed_test.c 24 Jun 2006 17:54:06 -0000 1.3
@@ -95,6 +95,7 @@
Etk_Widget *embed;
Etk_Widget *table;
Etk_Widget *image;
+ Etk_Widget *alignment;
Etk_Widget *buttons[3];
Etk_Widget *labels[8];
Etk_Widget *entries[6];
@@ -106,6 +107,8 @@
buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
buttons[1] = etk_check_button_new();
buttons[2] = etk_check_button_new();
+ alignment = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
+ etk_container_add(ETK_CONTAINER(alignment), buttons[0]);
labels[0] = etk_label_new("App Name");
labels[1] = etk_label_new("Generic Info");
@@ -122,7 +125,7 @@
table = etk_table_new(2, 10, ETK_FALSE);
etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+ etk_table_attach(ETK_TABLE(table), alignment, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
for (i = 0; i < 6; i++)
{
@@ -147,14 +150,21 @@
static void _etk_test_embed_update()
{
double t;
- double percent;
+ int alpha;
Etk_Size embed_size;
int y;
- t = ETK_CLAMP(_etk_test_embed_time_get() - starting_time, 0.0, 2.0);
- percent = sin((t / 2.0) * (ETK_TEST_PI / 2));
- y = win_h - (0.75 * percent * win_h);
-
+ t = ETK_MAX(0.0, _etk_test_embed_time_get() - starting_time);
+ if (t <= 2.0)
+ {
+ y = win_h - (0.75 * sin((t / 2.0) * (ETK_TEST_PI / 2)) * win_h);
+ alpha = 0;
+ }
+ else
+ {
+ y = 0.25 * win_h;
+ alpha = ETK_CLAMP((t - 2.0) / 2.0, 0.0, 1.0) * 255;
+ }
evas_object_move(backdrop, 0, 0);
evas_object_resize(backdrop, win_w, y);
@@ -177,7 +187,7 @@
evas_object_move(panel_clip, 0, y);
evas_object_resize(panel_clip, win_w, win_h - y);
- evas_object_color_set(panel_clip, 255, 255, 255, percent * 255);
+ evas_object_color_set(panel_clip, 255, 255, 255, alpha);
etk_widget_size_request(embed, &embed_size);
evas_object_move(embed_object, (win_w - embed_size.w) / 2, y + 20);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_entry_test.c 25 Feb 2006 03:35:56 -0000 1.7
+++ etk_entry_test.c 24 Jun 2006 17:54:06 -0000 1.8
@@ -20,7 +20,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Entry Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Entry Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
table = etk_table_new(3, 2, ETK_FALSE);
@@ -29,11 +29,11 @@
entry = etk_entry_new();
etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
- button = etk_button_new_with_label(_("Print text"));
+ button = etk_button_new_with_label("Print text");
etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_print_clicked), NULL);
- button = etk_toggle_button_new_with_label(_("Toggle password"));
+ button = etk_toggle_button_new_with_label("Toggle password");
etk_table_attach(ETK_TABLE(table), button, 2, 2, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
etk_signal_connect("toggled", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_password_toggled), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_filechooser_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_filechooser_test.c 15 Jan 2006 11:07:16 -0000 1.2
+++ etk_filechooser_test.c 24 Jun 2006 17:54:06 -0000 1.3
@@ -13,7 +13,7 @@
}
dialog = etk_dialog_new();
- etk_window_title_set(ETK_WINDOW(dialog), _("Etk Filechooser"));
+ etk_window_title_set(ETK_WINDOW(dialog), "Etk Filechooser Test");
etk_signal_connect("delete_event", ETK_OBJECT(dialog),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
filechooser = etk_filechooser_widget_new();
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_iconbox_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_iconbox_test.c 10 Apr 2006 09:23:47 -0000 1.4
+++ etk_iconbox_test.c 24 Jun 2006 17:54:06 -0000 1.5
@@ -65,7 +65,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Iconbox Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Iconbox Test");
etk_widget_size_request_set(ETK_WIDGET(win), 100, 100);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_image_test.c 11 Feb 2006 00:28:31 -0000 1.5
+++ etk_image_test.c 24 Jun 2006 17:54:06 -0000 1.6
@@ -16,7 +16,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Image Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Image Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
@@ -24,8 +24,8 @@
images[1] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
etk_image_keep_aspect_set(ETK_IMAGE(images[1]), ETK_FALSE);
- labels[0] = etk_label_new(_("Keep aspect"));
- labels[1] = etk_label_new(_("Don't keep aspect"));
+ labels[0] = etk_label_new("Keep aspect");
+ labels[1] = etk_label_new("Don't keep aspect");
table = etk_table_new(2, 2, ETK_FALSE);
etk_table_attach_defaults(ETK_TABLE(table), images[0], 0, 0, 0, 0);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_menu_test.c 23 Jun 2006 18:14:50 -0000 1.12
+++ etk_menu_test.c 24 Jun 2006 17:54:06 -0000 1.13
@@ -30,7 +30,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Menu Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Menu Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 300, 200);
@@ -55,25 +55,25 @@
* Menu Bar
****************/
/* File Menu */
- menu_item = _etk_test_menu_item_new(_("File"), ETK_MENU_SHELL(menu_bar));
+ menu_item = _etk_test_menu_item_new("File", ETK_MENU_SHELL(menu_bar));
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _etk_test_menu_stock_item_new(_("Open"), ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Save"), ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Open", ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Save", ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu));
/* Edit Menu */
- menu_item = _etk_test_menu_item_new(_("Edit"), ETK_MENU_SHELL(menu_bar));
+ menu_item = _etk_test_menu_item_new("Edit", ETK_MENU_SHELL(menu_bar));
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _etk_test_menu_stock_item_new(_("Cut"), ETK_STOCK_EDIT_CUT,
ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Copy"), ETK_STOCK_EDIT_COPY,
ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Paste"), ETK_STOCK_EDIT_PASTE,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Cut", ETK_STOCK_EDIT_CUT,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Copy", ETK_STOCK_EDIT_COPY,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Paste", ETK_STOCK_EDIT_PASTE,
ETK_MENU_SHELL(menu));
/* Help Menu */
- menu_item = _etk_test_menu_item_new(_("Help"), ETK_MENU_SHELL(menu_bar));
+ menu_item = _etk_test_menu_item_new("Help", ETK_MENU_SHELL(menu_bar));
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _etk_test_menu_item_new(_("About"), ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new("About", ETK_MENU_SHELL(menu));
/****************
* Popup Menu
@@ -81,32 +81,32 @@
/* Main menu */
menu = etk_menu_new();
etk_signal_connect("mouse_down", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_menu_window_down_cb), menu);
- _etk_test_menu_stock_item_new(_("Open"), ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Save"), ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Open", ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Save", ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu));
_etk_test_menu_separator_new(ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Cut"), ETK_STOCK_EDIT_CUT,
ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Copy"), ETK_STOCK_EDIT_COPY,
ETK_MENU_SHELL(menu));
- _etk_test_menu_stock_item_new(_("Paste"), ETK_STOCK_EDIT_PASTE,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Cut", ETK_STOCK_EDIT_CUT,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Copy", ETK_STOCK_EDIT_COPY,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Paste", ETK_STOCK_EDIT_PASTE,
ETK_MENU_SHELL(menu));
_etk_test_menu_separator_new(ETK_MENU_SHELL(menu));
- menu_item = _etk_test_menu_item_new(_("Menu Item Test"),
ETK_MENU_SHELL(menu));
+ menu_item = _etk_test_menu_item_new("Menu Item Test", ETK_MENU_SHELL(menu));
/* Sub menu 1 */
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _etk_test_menu_stock_item_new(_("Item with image"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu));
- menu_item = _etk_test_menu_stock_item_new(_("Item with child"),
ETK_STOCK_DOCUMENT_OPEN, ETK_MENU_SHELL(menu));
+ _etk_test_menu_stock_item_new("Item with image", ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu));
+ menu_item = _etk_test_menu_stock_item_new("Item with child",
ETK_STOCK_DOCUMENT_OPEN, ETK_MENU_SHELL(menu));
_etk_test_menu_separator_new(ETK_MENU_SHELL(menu));
- _etk_test_menu_check_item_new(_("Item with check 1"), ETK_MENU_SHELL(menu));
- _etk_test_menu_check_item_new(_("Item with check 2"), ETK_MENU_SHELL(menu));
+ _etk_test_menu_check_item_new("Item with check 1", ETK_MENU_SHELL(menu));
+ _etk_test_menu_check_item_new("Item with check 2", ETK_MENU_SHELL(menu));
_etk_test_menu_separator_new(ETK_MENU_SHELL(menu));
- radio_item = _etk_test_menu_radio_item_new(_("Radio 1"), NULL,
ETK_MENU_SHELL(menu));
- radio_item = _etk_test_menu_radio_item_new(_("Radio 2"),
ETK_MENU_ITEM_RADIO(radio_item), ETK_MENU_SHELL(menu));
- _etk_test_menu_radio_item_new(_("Radio 3"),
ETK_MENU_ITEM_RADIO(radio_item), ETK_MENU_SHELL(menu));
+ radio_item = _etk_test_menu_radio_item_new("Radio 1", NULL,
ETK_MENU_SHELL(menu));
+ radio_item = _etk_test_menu_radio_item_new("Radio 2",
ETK_MENU_ITEM_RADIO(radio_item), ETK_MENU_SHELL(menu));
+ _etk_test_menu_radio_item_new("Radio 3", ETK_MENU_ITEM_RADIO(radio_item),
ETK_MENU_SHELL(menu));
/* Sub menu 2 */
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _etk_test_menu_item_new(_("Child Menu Test"), ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new("Child Menu Test", ETK_MENU_SHELL(menu));
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_notebook_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_notebook_test.c 25 May 2006 21:07:00 -0000 1.6
+++ etk_notebook_test.c 24 Jun 2006 17:54:06 -0000 1.7
@@ -21,7 +21,7 @@
return;
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Notebook Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Notebook Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
@@ -46,12 +46,12 @@
etk_container_add(ETK_CONTAINER(alignment), hbox);
button = etk_button_new_from_stock(ETK_STOCK_GO_PREVIOUS);
- etk_button_label_set(ETK_BUTTON(button), _("Previous"));
+ etk_button_label_set(ETK_BUTTON(button), "Previous");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_prev), notebook);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_TRUE, 0);
button = etk_button_new_from_stock(ETK_STOCK_GO_NEXT);
- etk_button_label_set(ETK_BUTTON(button), _("Next"));
+ etk_button_label_set(ETK_BUTTON(button), "Next");
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(etk_notebook_page_next), notebook);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_TRUE, 0);
@@ -61,59 +61,50 @@
/* Create the widget for the first page */
static Etk_Widget *_etk_test_notebook_page1_widget_create()
{
- Etk_Widget *widget[19];
Etk_Widget *table;
+ Etk_Widget *image;
+ Etk_Widget *alignment;
+ Etk_Widget *buttons[3];
+ Etk_Widget *labels[8];
+ Etk_Widget *entries[6];
+ int i;
+
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+
+ buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
+ buttons[1] = etk_check_button_new();
+ buttons[2] = etk_check_button_new();
+ alignment = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
+ etk_container_add(ETK_CONTAINER(alignment), buttons[0]);
+
+ labels[0] = etk_label_new("App Name");
+ labels[1] = etk_label_new("Generic Info");
+ labels[2] = etk_label_new("Comments");
+ labels[3] = etk_label_new("Executable");
+ labels[4] = etk_label_new("Window Name");
+ labels[5] = etk_label_new("Window Class");
+ labels[6] = etk_label_new("Startup Notify");
+ labels[7] = etk_label_new("Wait Exit");
- widget[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
- etk_button_label_set(ETK_BUTTON(widget[0]), _("Set Icon"));
- widget[18] = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
- etk_container_add(ETK_CONTAINER(widget[18]), widget[0]);
-
- widget[1] = etk_label_new(_("App name"));
- widget[2] = etk_entry_new();
-
- widget[3] = etk_label_new(_("Generic Info"));
- widget[4] = etk_entry_new();
-
- widget[5] = etk_label_new(_("Comments"));
- widget[6] = etk_entry_new();
-
- widget[7] = etk_label_new(_("Executable"));
- widget[8] = etk_entry_new();
-
- widget[9] = etk_label_new(_("Window name"));
- widget[10] = etk_entry_new();
-
- widget[11] = etk_label_new(_("Window class"));
- widget[12] = etk_entry_new();
-
- widget[13] = etk_label_new(_("Startup notify"));
- widget[14] = etk_check_button_new();
-
- widget[15] = etk_label_new(_("Wait exit"));
- widget[16] = etk_check_button_new();
+ for (i = 0; i < 6; i++)
+ entries[i] = etk_entry_new();
- widget[17] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), widget[17], 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), widget[18], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
- etk_table_attach(ETK_TABLE(table), widget[1], 0, 0, 2, 2, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[2], 1, 1, 2, 2);
- etk_table_attach(ETK_TABLE(table), widget[3], 0, 0, 3, 3, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[4], 1, 1, 3, 3);
- etk_table_attach(ETK_TABLE(table), widget[5], 0, 0, 4, 4, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VEXPAND);
- etk_table_attach_defaults(ETK_TABLE(table), widget[6], 1, 1, 4, 4);
- etk_table_attach(ETK_TABLE(table), widget[7], 0, 0, 5, 5, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[8], 1, 1, 5, 5);
- etk_table_attach(ETK_TABLE(table), widget[9], 0, 0, 6, 6, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[10], 1, 1, 6, 6);
- etk_table_attach(ETK_TABLE(table), widget[11], 0, 0, 7, 7, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[12], 1, 1, 7, 7);
- etk_table_attach(ETK_TABLE(table), widget[13], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[14], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), widget[15], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[16], 1, 1, 9, 9);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), alignment, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+
+ for (i = 0; i < 6; i++)
+ {
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_FILL_POLICY_HFILL);
+ etk_table_attach_defaults(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
+ }
+
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
+ etk_table_attach_defaults(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
+ etk_table_attach_defaults(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
+
return table;
}
@@ -133,19 +124,19 @@
vbox = etk_vbox_new(ETK_FALSE, 3);
etk_container_add(ETK_CONTAINER(alignment), vbox);
- button_normal = etk_button_new_with_label(_("Normal button"));
+ button_normal = etk_button_new_with_label("Normal button");
etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0);
- button_toggle = etk_toggle_button_new_with_label(_("Toggle button"));
+ button_toggle = etk_toggle_button_new_with_label("Toggle button");
etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0);
- button_check = etk_check_button_new_with_label(_("Check button"));
+ button_check = etk_check_button_new_with_label("Check button");
etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
button_check = etk_check_button_new();
etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0);
- button_radio = etk_radio_button_new_with_label(_("Radio button"), NULL);
+ button_radio = etk_radio_button_new_with_label("Radio button", NULL);
etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0);
button_radio =
etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio));
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_paned_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_paned_test.c 28 May 2006 15:56:06 -0000 1.5
+++ etk_paned_test.c 24 Jun 2006 17:54:06 -0000 1.6
@@ -18,7 +18,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Paned Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Paned Test");
etk_widget_size_request_set(win, 300, 300);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
@@ -32,15 +32,15 @@
hpaned = etk_hpaned_new();
etk_paned_child1_set(ETK_PANED(vpaned), hpaned, ETK_FALSE);
- label = etk_label_new(_("HPaned Child 1"));
+ label = etk_label_new("HPaned Child 1");
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
etk_paned_child1_set(ETK_PANED(hpaned), label, ETK_TRUE);
- label = etk_label_new(_("HPaned Child 2"));
+ label = etk_label_new("HPaned Child 2");
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
etk_paned_child2_set(ETK_PANED(hpaned), label, ETK_FALSE);
- label = etk_label_new(_("VPaned Child 2"));
+ label = etk_label_new("VPaned Child 2");
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
etk_paned_child2_set(ETK_PANED(vpaned), label, ETK_TRUE);
@@ -51,23 +51,23 @@
hbox = etk_hbox_new(ETK_TRUE, 0);
etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_TRUE, 0);
- frame = etk_frame_new(_("HPaned Properties"));
+ frame = etk_frame_new("HPaned Properties");
etk_box_pack_start(ETK_BOX(hbox), frame, ETK_TRUE, ETK_TRUE, 0);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
- check_button = etk_check_button_new_with_label(_("Child 1 Expand"));
+ check_button = etk_check_button_new_with_label("Child 1 Expand");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
- check_button = etk_check_button_new_with_label(_("Child 2 Expand"));
+ check_button = etk_check_button_new_with_label("Child 2 Expand");
etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
- frame = etk_frame_new(_("VPaned Properties"));
+ frame = etk_frame_new("VPaned Properties");
etk_box_pack_start(ETK_BOX(hbox), frame, ETK_TRUE, ETK_TRUE, 0);
vbox = etk_vbox_new(ETK_TRUE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox);
- check_button = etk_check_button_new_with_label(_("Child 1 Expand"));
+ check_button = etk_check_button_new_with_label("Child 1 Expand");
etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
- check_button = etk_check_button_new_with_label(_("Child 2 Expand"));
+ check_button = etk_check_button_new_with_label("Child 2 Expand");
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), ETK_TRUE);
etk_box_pack_start(ETK_BOX(vbox), check_button, ETK_TRUE, ETK_TRUE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_progress_bar_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_progress_bar_test.c 11 Feb 2006 00:28:31 -0000 1.4
+++ etk_progress_bar_test.c 24 Jun 2006 17:54:06 -0000 1.5
@@ -25,16 +25,16 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Progress Bar Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Progress Bar Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_TRUE, 5);
etk_container_add(ETK_CONTAINER(win), vbox);
- pbar = etk_progress_bar_new_with_text(_("0% done"));
+ pbar = etk_progress_bar_new_with_text("0% done");
etk_box_pack_start(ETK_BOX(vbox), pbar, ETK_TRUE, ETK_TRUE, 0);
- pbar2 = etk_progress_bar_new_with_text(_("Loading..."));
+ pbar2 = etk_progress_bar_new_with_text("Loading...");
etk_progress_bar_pulse_step_set(ETK_PROGRESS_BAR(pbar2), 0.015);
etk_box_pack_start(ETK_BOX(vbox), pbar2, ETK_TRUE, ETK_TRUE, 0);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_scrolled_view_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_scrolled_view_test.c 20 Nov 2005 10:33:28 -0000 1.2
+++ etk_scrolled_view_test.c 24 Jun 2006 17:54:06 -0000 1.3
@@ -14,7 +14,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Scrolled View Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Scrolled View Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 180, 180);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_slider_test.c 15 Jan 2006 11:07:16 -0000 1.3
+++ etk_slider_test.c 24 Jun 2006 17:54:06 -0000 1.4
@@ -17,7 +17,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Slider Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Slider Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_spin_button_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_spin_button_test.c 8 Feb 2006 12:49:38 -0000 1.1
+++ etk_spin_button_test.c 24 Jun 2006 17:54:06 -0000 1.2
@@ -19,7 +19,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Spin Button Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Spin Button Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
table = etk_table_new(2, 2, ETK_FALSE);
@@ -28,7 +28,7 @@
spin_button = etk_spin_button_new(0, 0, 0);
etk_table_attach(ETK_TABLE(table), spin_button, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
- button = etk_button_new_with_label(_("Get numerical value"));
+ button = etk_button_new_with_label("Get numerical value");
etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_spin_button_print_clicked), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_table_test.c 15 Jan 2006 11:07:16 -0000 1.7
+++ etk_table_test.c 24 Jun 2006 17:54:06 -0000 1.8
@@ -5,84 +5,75 @@
void etk_test_table_window_create(void *data)
{
static Etk_Widget *win = NULL;
- Etk_Widget *widget[21];
- Etk_Widget *vbox, *hbox, *table;
-
+ Etk_Widget *vbox, *hbox;
+ Etk_Widget *table;
+ Etk_Widget *image;
+ Etk_Widget *alignment;
+ Etk_Widget *buttons[5];
+ Etk_Widget *labels[8];
+ Etk_Widget *entries[6];
+ int i;
+
if (win)
{
etk_widget_show_all(ETK_WIDGET(win));
return;
- }
+ }
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Table Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Table Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- widget[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
- etk_button_label_set(ETK_BUTTON(widget[0]), _("Set Icon"));
-
- widget[20] = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
- etk_container_add(ETK_CONTAINER(widget[20]), widget[0]);
-
- widget[1] = etk_label_new(_("App name"));
- widget[2] = etk_entry_new();
-
- widget[3] = etk_label_new(_("Generic Info"));
- widget[4] = etk_entry_new();
-
- widget[5] = etk_label_new(_("Comments"));
- widget[6] = etk_entry_new();
-
- widget[7] = etk_label_new(_("Executable"));
- widget[8] = etk_entry_new();
-
- widget[9] = etk_label_new(_("Window name"));
- widget[10] = etk_entry_new();
-
- widget[11] = etk_label_new(_("Window class"));
- widget[12] = etk_entry_new();
-
- widget[13] = etk_label_new(_("Startup notify"));
- widget[14] = etk_check_button_new();
-
- widget[15] = etk_label_new(_("Wait exit"));
- widget[16] = etk_check_button_new();
+
+ image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+
+ buttons[0] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_OPEN);
+ buttons[1] = etk_check_button_new();
+ buttons[2] = etk_check_button_new();
+ buttons[3] = etk_button_new_from_stock(ETK_STOCK_DIALOG_CANCEL);
+ buttons[4] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
+
+ alignment = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
+ etk_container_add(ETK_CONTAINER(alignment), buttons[0]);
+
+ labels[0] = etk_label_new("App Name");
+ labels[1] = etk_label_new("Generic Info");
+ labels[2] = etk_label_new("Comments");
+ labels[3] = etk_label_new("Executable");
+ labels[4] = etk_label_new("Window Name");
+ labels[5] = etk_label_new("Window Class");
+ labels[6] = etk_label_new("Startup Notify");
+ labels[7] = etk_label_new("Wait Exit");
+
+ for (i = 0; i < 6; i++)
+ entries[i] = etk_entry_new();
+
- widget[17] = etk_button_new_from_stock(ETK_STOCK_DIALOG_CANCEL);
- widget[18] = etk_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
+ table = etk_table_new(2, 10, ETK_FALSE);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), alignment, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
- widget[19] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
+ for (i = 0; i < 6; i++)
+ {
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_FILL_POLICY_HFILL);
+ etk_table_attach_defaults(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
+ }
+
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
+ etk_table_attach_defaults(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
+ etk_table_attach_defaults(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
+
vbox = etk_vbox_new(ETK_FALSE, 0);
hbox = etk_hbox_new(ETK_FALSE, 0);
- table = etk_table_new(2, 10, ETK_FALSE);
-
etk_container_add(ETK_CONTAINER(win), vbox);
etk_box_pack_start(ETK_BOX(vbox), table, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_end(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), widget[18], ETK_FALSE, ETK_FALSE, 0);
- etk_box_pack_end(ETK_BOX(hbox), widget[17], ETK_FALSE, ETK_FALSE, 0);
-
- etk_table_attach(ETK_TABLE(table), widget[19], 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), widget[20], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
- etk_table_attach(ETK_TABLE(table), widget[1], 0, 0, 2, 2, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[2], 1, 1, 2, 2);
- etk_table_attach(ETK_TABLE(table), widget[3], 0, 0, 3, 3, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[4], 1, 1, 3, 3);
- etk_table_attach(ETK_TABLE(table), widget[5], 0, 0, 4, 4, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VEXPAND);
- etk_table_attach_defaults(ETK_TABLE(table), widget[6], 1, 1, 4, 4);
- etk_table_attach(ETK_TABLE(table), widget[7], 0, 0, 5, 5, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[8], 1, 1, 5, 5);
- etk_table_attach(ETK_TABLE(table), widget[9], 0, 0, 6, 6, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[10], 1, 1, 6, 6);
- etk_table_attach(ETK_TABLE(table), widget[11], 0, 0, 7, 7, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[12], 1, 1, 7, 7);
- etk_table_attach(ETK_TABLE(table), widget[13], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[14], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), widget[15], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), widget[16], 1, 1, 9, 9);
+ etk_box_pack_end(ETK_BOX(hbox), buttons[3], ETK_FALSE, ETK_FALSE, 0);
+ etk_box_pack_end(ETK_BOX(hbox), buttons[4], ETK_FALSE, ETK_FALSE, 0);
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etk_test.c 24 Jun 2006 15:59:12 -0000 1.22
+++ etk_test.c 24 Jun 2006 17:54:06 -0000 1.23
@@ -153,7 +153,7 @@
int i, j, num_examples;
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Test Application"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Test Application");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("destroyed", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_main_quit_cb), NULL);
@@ -169,7 +169,7 @@
num_examples++;
}
- frame = etk_frame_new(_(_etk_test_categories[i]));
+ frame = etk_frame_new(_etk_test_categories[i]);
etk_box_pack_start(ETK_BOX(vbox), frame, ETK_TRUE, ETK_TRUE, 0);
tables[i] = etk_table_new(ETK_TEST_NUM_COLS, (num_examples +
ETK_TEST_NUM_COLS - 1) / ETK_TEST_NUM_COLS, ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), tables[i]);
@@ -177,7 +177,7 @@
for (i = 0; i < _etk_test_num_examples; i++)
{
- button = etk_button_new_with_label(_(_etk_test_examples[i].name));
+ button = etk_button_new_with_label(_etk_test_examples[i].name);
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_examples[i].func), NULL);
j = current_ids[_etk_test_examples[i].category];
etk_table_attach_defaults(ETK_TABLE(tables[_etk_test_examples[i].category]),
button,
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_text_view_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_text_view_test.c 17 Jun 2006 12:02:40 -0000 1.4
+++ etk_text_view_test.c 24 Jun 2006 17:54:06 -0000 1.5
@@ -14,7 +14,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Text View Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Text View Test");
etk_widget_size_request_set(ETK_WIDGET(win), 400, 300);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etk_tree_test.c 28 Mar 2006 07:24:57 -0000 1.30
+++ etk_tree_test.c 24 Jun 2006 17:54:06 -0000 1.31
@@ -42,14 +42,14 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Tree Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk Tree Test");
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
table = etk_table_new(2, 3, ETK_FALSE);
etk_container_add(ETK_CONTAINER(win), table);
/* The tree: */
- label = etk_label_new(_("<h1>Tree:</h1>"));
+ label = etk_label_new("<h1>Tree:</h1>");
etk_table_attach(ETK_TABLE(table), label, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL);
tree = etk_tree_new();
@@ -58,27 +58,27 @@
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_TREE);
etk_tree_multiple_select_set(ETK_TREE(tree), ETK_TRUE);
- col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_EDJE), 90);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_double_new(ETK_TREE(tree)), 60);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 60);
- col4 = etk_tree_col_new(ETK_TREE(tree), _("Column 4"),
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
+ col1 = etk_tree_col_new(ETK_TREE(tree), "Column 1",
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_EDJE), 90);
+ col2 = etk_tree_col_new(ETK_TREE(tree), "Column 2",
etk_tree_model_double_new(ETK_TREE(tree)), 60);
+ col3 = etk_tree_col_new(ETK_TREE(tree), "Column 3",
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 60);
+ col4 = etk_tree_col_new(ETK_TREE(tree), "Column 4",
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
etk_tree_build(ETK_TREE(tree));
etk_signal_connect("cell_value_changed", ETK_OBJECT(col4),
ETK_CALLBACK(_etk_test_tree_checkbox_toggled_cb), NULL);
etk_tree_freeze(ETK_TREE(tree));
for (i = 0; i < 1000; i++)
{
- row = etk_tree_append(ETK_TREE(tree), col1, etk_theme_icon_theme_get(),
"places/user-home_16", _("Row1"),
+ row = etk_tree_append(ETK_TREE(tree), col1, etk_theme_icon_theme_get(),
"places/user-home_16", "Row1",
col2, 10.0, col3, PACKAGE_DATA_DIR "/images/1star.png", col4,
ETK_FALSE, NULL);
- row = etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"places/folder_16", _("Row2"),
+ row = etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"places/folder_16", "Row2",
col2, 20.0, col3, PACKAGE_DATA_DIR "/images/2stars.png", col4,
ETK_FALSE, NULL);
- etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"mimetypes/text-x-generic_16", _("Row3"),
+ etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(),
"mimetypes/text-x-generic_16", "Row3",
col2, 30.0, col3, PACKAGE_DATA_DIR "/images/3stars.png", col4,
ETK_FALSE, NULL);
}
etk_tree_thaw(ETK_TREE(tree));
/* The list: */
- label = etk_label_new(_("<h1>List:</h1>"));
+ label = etk_label_new("<h1>List:</h1>");
etk_table_attach(ETK_TABLE(table), label, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL);
tree = etk_tree_new();
@@ -91,10 +91,10 @@
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST);
etk_tree_multiple_select_set(ETK_TREE(tree), ETK_TRUE);
- col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_int_new(ETK_TREE(tree)), 90);
+ col1 = etk_tree_col_new(ETK_TREE(tree), "Column 1",
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
+ col2 = etk_tree_col_new(ETK_TREE(tree), "Column 2",
etk_tree_model_int_new(ETK_TREE(tree)), 90);
etk_tree_col_sort_func_set(col2, _etk_test_tree_compare_cb, NULL);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
+ col3 = etk_tree_col_new(ETK_TREE(tree), "Column 3",
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
etk_tree_build(ETK_TREE(tree));
_etk_test_tree_add_items(ETK_TREE(tree), 5000);
@@ -104,32 +104,32 @@
etk_signal_connect("row_activated", ETK_OBJECT(tree),
ETK_CALLBACK(_etk_test_tree_row_activated), NULL);
/* Frame */
- frame = etk_frame_new(_("List Actions"));
+ frame = etk_frame_new("List Actions");
etk_table_attach(ETK_TABLE(table), frame, 0, 1, 2, 2, 0, 0,
ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL);
hbox = etk_hbox_new(ETK_TRUE, 10);
etk_container_add(ETK_CONTAINER(frame), hbox);
- button = etk_button_new_with_label(_("Clear"));
+ button = etk_button_new_with_label("Clear");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_clear_list_cb), tree);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
- button = etk_button_new_with_label(_("Add 5 rows"));
+ button = etk_button_new_with_label("Add 5 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_5_cb), tree);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
- button = etk_button_new_with_label(_("Add 50 rows"));
+ button = etk_button_new_with_label("Add 50 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_50_cb), tree);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
- button = etk_button_new_with_label(_("Add 500 rows"));
+ button = etk_button_new_with_label("Add 500 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_500_cb), tree);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
- button = etk_button_new_with_label(_("Add 5000 rows"));
+ button = etk_button_new_with_label("Add 5000 rows");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_add_5000_cb), tree);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
- button = etk_button_new_with_label(_("Sort"));
+ button = etk_button_new_with_label("Sort");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_tree_sort_cb), tree);
etk_box_pack_start(ETK_BOX(hbox), button, ETK_TRUE, ETK_TRUE, 0);
@@ -147,7 +147,7 @@
tree = ETK_TREE(object);
row = etk_tree_selected_row_get(tree);
etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL,
&col1_string, etk_tree_nth_col_get(tree, 1), &col2_value,
etk_tree_nth_col_get(tree, 2), &col3_path, NULL);
- printf(_("Row dropped on %p: \"%s\" %d %s\n"), row, col1_string,
col2_value, col3_path);
+ printf("Row dropped on %p: \"%s\" %d %s\n", row, col1_string, col2_value,
col3_path);
}
/* TODO: doc */
@@ -223,25 +223,25 @@
tree = ETK_TREE(object);
etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL,
&col1_string, etk_tree_nth_col_get(tree, 1), &col2_value,
etk_tree_nth_col_get(tree, 2), &col3_path, NULL);
- printf(_("Row selected %p: \"%s\" %d %s\n"), row, col1_string, col2_value,
col3_path);
+ printf("Row selected %p: \"%s\" %d %s\n", row, col1_string, col2_value,
col3_path);
}
/* Called when a row is unselected */
static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row
*row, void *data)
{
- printf(_("Row unselected %p\n"), row);
+ printf("Row unselected %p\n", row);
}
/* Called when a row is clicked */
static void _etk_test_tree_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up_Down *event, void *data)
{
- printf(_("Row clicked %p. Button: %d. "), row, event->button);
+ printf("Row clicked %p. Button: %d. ", row, event->button);
if (event->flags & EVAS_BUTTON_TRIPLE_CLICK)
- printf(_("Triple Click\n"));
+ printf("Triple Click\n");
else if (event->flags & EVAS_BUTTON_DOUBLE_CLICK)
- printf(_("Double Click\n"));
+ printf("Double Click\n");
else
- printf(_("Single Click\n"));
+ printf("Single Click\n");
}
/* Called when a row is activated */
@@ -253,7 +253,7 @@
tree = ETK_TREE(object);
etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL,
&col1_string, etk_tree_nth_col_get(tree, 1), &col2_value,
etk_tree_nth_col_get(tree, 2), &col3_path, NULL);
- printf(_("Row activated %p: \"%s\" %d %s\n"), row, col1_string, col2_value,
col3_path);
+ printf("Row activated %p: \"%s\" %d %s\n", row, col1_string, col2_value,
col3_path);
}
/* Called when a checkbox of the tree is toggled */
@@ -267,9 +267,9 @@
etk_tree_row_fields_get(row, col, &checked, NULL);
if (checked)
- printf(_("Checkbox activated\n"));
+ printf("Checkbox activated\n");
else
- printf(_("Checkbox deactivated\n"));
+ printf("Checkbox deactivated\n");
}
/* Called when the "Clear" button is clicked */
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_xdnd_test.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_xdnd_test.c 1 Mar 2006 23:51:20 -0000 1.11
+++ etk_xdnd_test.c 24 Jun 2006 17:54:06 -0000 1.12
@@ -38,7 +38,7 @@
/* create window */
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk DnD / Selections Test"));
+ etk_window_title_set(ETK_WINDOW(win), "Etk DnD / Selections Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
@@ -56,8 +56,8 @@
dnd_types = calloc(dnd_types_num, sizeof(char*));
dnd_types[0] = strdup("text/uri-list");
- label = etk_label_new(_("No File Set"));
- button = etk_button_new_with_label(_("Drop a file here (text/uri-list)"));
+ label = etk_label_new("No File Set");
+ button = etk_button_new_with_label("Drop a file here (text/uri-list)");
etk_widget_dnd_dest_set(button, ETK_TRUE);
etk_widget_dnd_types_set(button, dnd_types, dnd_types_num);
etk_signal_connect("drag_drop", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_drag_drop_cb), label);
@@ -70,7 +70,7 @@
etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/e_icon.png");
- button = etk_button_new_with_label(_("Drop an image here"));
+ button = etk_button_new_with_label("Drop an image here");
etk_widget_dnd_dest_set(button, ETK_TRUE);
dnd_types_num = 1;
dnd_types = calloc(dnd_types_num, sizeof(char*));
@@ -83,7 +83,7 @@
sep = etk_hseparator_new();
etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
- label = etk_label_new(_("Drop some text below"));
+ label = etk_label_new("Drop some text below");
entry = etk_entry_new();
dnd_types_num = 1;
dnd_types = calloc(dnd_types_num, sizeof(char*));
@@ -97,7 +97,7 @@
sep = etk_hseparator_new();
etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
- button = etk_button_new_with_label(_("Drag Me!"));
+ button = etk_button_new_with_label("Drag Me!");
etk_widget_dnd_source_set(button, ETK_TRUE);
etk_widget_dnd_drag_widget_set(button, etk_button_new_with_label("This is a
test!"));
etk_widget_dnd_drag_data_set(button, dnd_types, dnd_types_num, "This is the
drag data!", strlen("This is the drag data!") + 1);
@@ -112,7 +112,7 @@
label = etk_label_new("");
etk_signal_connect("clipboard_received", ETK_OBJECT(label),
ETK_CALLBACK(_etk_test_xdnd_clipboard_text_request_cb), NULL);
- button = etk_button_new_with_label(_("Press me to paste text"));
+ button = etk_button_new_with_label("Press me to paste text");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_paste_cb), label);
etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 0);
@@ -121,7 +121,7 @@
etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
entry = etk_entry_new();
- button = etk_button_new_with_label(_("Click me to copy text below"));
+ button = etk_button_new_with_label("Click me to copy text below");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_copy_cb), entry);
etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_start(ETK_BOX(vbox2), entry, ETK_FALSE, ETK_FALSE, 0);
@@ -134,7 +134,7 @@
label = etk_label_new("");
etk_signal_connect("selection_received", ETK_OBJECT(label),
ETK_CALLBACK(_etk_test_xdnd_selection_text_request_cb), NULL);
- button = etk_button_new_with_label(_("Press me to get selection text"));
+ button = etk_button_new_with_label("Press me to get selection text");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_selection_get_cb), label);
etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_start(ETK_BOX(vbox2), label, ETK_FALSE, ETK_FALSE, 0);
@@ -143,7 +143,7 @@
etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
entry = etk_entry_new();
- button = etk_button_new_with_label(_("Click me to set selection text"));
+ button = etk_button_new_with_label("Click me to set selection text");
etk_signal_connect("clicked", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_button_selection_set_cb), entry);
etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
etk_box_pack_start(ETK_BOX(vbox2), entry, ETK_FALSE, ETK_FALSE, 0);
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
