X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finterface.c;h=fdabe072cb157dc76e20b6a2baf843fcb9914da2;hb=015a189138f13c3a2729f447153f204e4db05de3;hp=8aff9cf358e5f123c111f7d5f457605f9ca11a62;hpb=9d371665b5776eb4cb529fe8f242fccce32f6c8d;p=rugen diff --git a/src/interface.c b/src/interface.c index 8aff9cf..fdabe07 100644 --- a/src/interface.c +++ b/src/interface.c @@ -86,7 +86,7 @@ create_gdv1394d (void) GtkWidget *statusbar; gdv1394d = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (gdv1394d), _("Rugen")); + gtk_window_set_title (GTK_WINDOW (gdv1394d), _("Melted Client")); gtk_window_set_default_size (GTK_WINDOW (gdv1394d), 640, 480); vbox1 = gtk_vbox_new (FALSE, 0); @@ -137,7 +137,7 @@ create_gdv1394d (void) toolbar1 = gtk_toolbar_new (); gtk_widget_show (toolbar1); gtk_box_pack_start (GTK_BOX (hbox27), toolbar1, TRUE, TRUE, 0); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH_HORIZ); tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-connect", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1))); button_connect = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), @@ -226,8 +226,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_0, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_0, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_0), GTK_RELIEF_NONE); - - image19 = create_pixmap (gdv1394d, "editor_movie_i.xpm"); + gtk_widget_set_tooltip_text (transport_0, _("Beginning of playlist")); + + image19 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-begin-16.png") ); gtk_widget_show (image19); gtk_container_add (GTK_CONTAINER (transport_0), image19); @@ -237,8 +238,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_1, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_1, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_1), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_1, _("Start of clip")); - image18 = create_pixmap (gdv1394d, "editor_scene_i.xpm"); + image18 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-prev-16.png") ); gtk_widget_show (image18); gtk_container_add (GTK_CONTAINER (transport_1), image18); @@ -248,8 +250,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_2, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_2, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_2), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_2, _("Rewind")); - image17 = create_pixmap (gdv1394d, "editor_fast_i.xpm"); + image17 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-rew-16.png") ); gtk_widget_show (image17); gtk_container_add (GTK_CONTAINER (transport_2), image17); @@ -259,8 +262,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_3, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_3, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_3), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_3, _("Previous frame")); - image12 = create_pixmap (gdv1394d, "editor_step_i.xpm"); + image12 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-prev-frame-16.png") ); gtk_widget_show (image12); gtk_container_add (GTK_CONTAINER (transport_3), image12); @@ -270,8 +274,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_4, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_4, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_4), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_4, _("Pause")); - image11 = create_pixmap (gdv1394d, "editor_pause.xpm"); + image11 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-pause-16.png") ); gtk_widget_show (image11); gtk_container_add (GTK_CONTAINER (transport_4), image11); @@ -281,8 +286,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_5, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_5, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_5), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_5, _("Play")); - image9 = create_pixmap (gdv1394d, "editor_play.xpm"); + image9 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-play-16.png") ); gtk_widget_show (image9); gtk_container_add (GTK_CONTAINER (transport_5), image9); @@ -292,6 +298,7 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_6, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_6, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_6), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_6, _("Stop")); alignment9 = gtk_alignment_new (0.5, 0.5, 0, 0); gtk_widget_show (alignment9); @@ -301,7 +308,7 @@ create_gdv1394d (void) gtk_widget_show (hbox17); gtk_container_add (GTK_CONTAINER (alignment9), hbox17); - image10 = create_pixmap (gdv1394d, "editor_stop.xpm"); + image10 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-stop-16.png") ); gtk_widget_show (image10); gtk_box_pack_start (GTK_BOX (hbox17), image10, FALSE, FALSE, 0); @@ -316,8 +323,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_7, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_7, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_7), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_7, _("Next frame")); - image13 = create_pixmap (gdv1394d, "editor_step.xpm"); + image13 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-next-frame-16.png") ); gtk_widget_show (image13); gtk_container_add (GTK_CONTAINER (transport_7), image13); @@ -327,8 +335,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_8, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_8, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_8), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_8, _("Fast forward")); - image14 = create_pixmap (gdv1394d, "editor_fast.xpm"); + image14 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-fwd-16.png") ); gtk_widget_show (image14); gtk_container_add (GTK_CONTAINER (transport_8), image14); @@ -338,8 +347,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_9, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_9, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_9), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_9, _("Next clip")); - image15 = create_pixmap (gdv1394d, "editor_scene.xpm"); + image15 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-next-16.png") ); gtk_widget_show (image15); gtk_container_add (GTK_CONTAINER (transport_9), image15); @@ -349,8 +359,9 @@ create_gdv1394d (void) gtk_widget_set_size_request (transport_10, 34, 25); GTK_WIDGET_UNSET_FLAGS (transport_10, GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (transport_10), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (transport_10, _("End of playlist")); - image16 = create_pixmap (gdv1394d, "editor_movie.xpm"); + image16 = gtk_image_new_from_pixbuf( create_pixbuf ("stock_media-end-16.png") ); gtk_widget_show (image16); gtk_container_add (GTK_CONTAINER (transport_10), image16); @@ -455,10 +466,13 @@ create_window_connection (void) gtk_window_set_position (GTK_WINDOW (window_connection), GTK_WIN_POS_MOUSE); gtk_window_set_modal (GTK_WINDOW (window_connection), TRUE); gtk_window_set_resizable (GTK_WINDOW (window_connection), FALSE); - + gtk_container_set_border_width (GTK_CONTAINER (window_connection), 8); + table2 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table2); gtk_container_add (GTK_CONTAINER (window_connection), table2); + gtk_table_set_row_spacings (GTK_TABLE (table2), 8); + gtk_table_set_col_spacings (GTK_TABLE (table2), 8); label30 = gtk_label_new (_("Server ")); gtk_widget_show (label30); @@ -490,6 +504,29 @@ create_window_connection (void) (GtkAttachOptions) (0), 0, 0); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox4), GTK_BUTTONBOX_SPREAD); + button_cancel = gtk_button_new (); + gtk_widget_show (button_cancel); + gtk_container_add (GTK_CONTAINER (hbuttonbox4), button_cancel); + GTK_WIDGET_SET_FLAGS (button_cancel, GTK_CAN_DEFAULT); + gtk_button_set_relief (GTK_BUTTON (button_cancel), GTK_RELIEF_NONE); + + alignment3 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment3); + gtk_container_add (GTK_CONTAINER (button_cancel), alignment3); + + hbox9 = gtk_hbox_new (FALSE, 2); + gtk_widget_show (hbox9); + gtk_container_add (GTK_CONTAINER (alignment3), hbox9); + + image3 = gtk_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image3); + gtk_box_pack_start (GTK_BOX (hbox9), image3, FALSE, FALSE, 0); + + label33 = gtk_label_new_with_mnemonic (_("Cancel")); + gtk_widget_show (label33); + gtk_box_pack_start (GTK_BOX (hbox9), label33, FALSE, FALSE, 0); + gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_LEFT); + button_connect = gtk_button_new (); gtk_widget_show (button_connect); gtk_container_add (GTK_CONTAINER (hbuttonbox4), button_connect); @@ -516,29 +553,6 @@ create_window_connection (void) gtk_box_pack_start (GTK_BOX (hbox8), label32, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (label32), GTK_JUSTIFY_LEFT); - button_cancel = gtk_button_new (); - gtk_widget_show (button_cancel); - gtk_container_add (GTK_CONTAINER (hbuttonbox4), button_cancel); - GTK_WIDGET_SET_FLAGS (button_cancel, GTK_CAN_DEFAULT); - gtk_button_set_relief (GTK_BUTTON (button_cancel), GTK_RELIEF_NONE); - - alignment3 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment3); - gtk_container_add (GTK_CONTAINER (button_cancel), alignment3); - - hbox9 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox9); - gtk_container_add (GTK_CONTAINER (alignment3), hbox9); - - image3 = gtk_image_new_from_stock ("gtk-no", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image3); - gtk_box_pack_start (GTK_BOX (hbox9), image3, FALSE, FALSE, 0); - - label33 = gtk_label_new_with_mnemonic (_("Cancel")); - gtk_widget_show (label33); - gtk_box_pack_start (GTK_BOX (hbox9), label33, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_LEFT); - hbox10 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox10); gtk_table_attach (GTK_TABLE (table2), hbox10, 1, 2, 1, 2, @@ -979,7 +993,7 @@ create_page_clips (void) gtk_widget_show (mode_1); gtk_container_add (GTK_CONTAINER (menu1), mode_1); - mode_2 = gtk_menu_item_new_with_mnemonic (_("Queue")); + mode_2 = gtk_menu_item_new_with_mnemonic (_("Append")); gtk_widget_show (mode_2); gtk_container_add (GTK_CONTAINER (menu1), mode_2); @@ -1067,6 +1081,7 @@ create_page_clips (void) GTK_WIDGET_UNSET_FLAGS (button_clips_refresh, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (button_clips_refresh, GTK_CAN_DEFAULT); gtk_button_set_relief (GTK_BUTTON (button_clips_refresh), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button_clips_refresh, _("Refresh")); alignment5 = gtk_alignment_new (0, 0.5, 0, 0); gtk_widget_show (alignment5); @@ -1091,6 +1106,7 @@ create_page_clips (void) GTK_WIDGET_UNSET_FLAGS (button_clips_home, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (button_clips_home, GTK_CAN_DEFAULT); gtk_button_set_relief (GTK_BUTTON (button_clips_home), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button_clips_home, _("Load root folder")); alignment6 = gtk_alignment_new (0, 0.5, 0, 0); gtk_widget_show (alignment6); @@ -1115,6 +1131,7 @@ create_page_clips (void) GTK_WIDGET_UNSET_FLAGS (button_up, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (button_up, GTK_CAN_DEFAULT); gtk_button_set_relief (GTK_BUTTON (button_up), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button_up, _("Move clip up")); image21 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU); gtk_widget_show (image21); @@ -1126,6 +1143,7 @@ create_page_clips (void) GTK_WIDGET_UNSET_FLAGS (button_down, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (button_down, GTK_CAN_DEFAULT); gtk_button_set_relief (GTK_BUTTON (button_down), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button_down, _("Move clip down")); image22 = gtk_image_new_from_stock ("gtk-go-down", GTK_ICON_SIZE_MENU); gtk_widget_show (image22); @@ -1137,6 +1155,7 @@ create_page_clips (void) GTK_WIDGET_UNSET_FLAGS (button_remove, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (button_remove, GTK_CAN_DEFAULT); gtk_button_set_relief (GTK_BUTTON (button_remove), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button_remove, _("Remove clip")); image23 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU); gtk_widget_show (image23); @@ -1148,6 +1167,7 @@ create_page_clips (void) GTK_WIDGET_UNSET_FLAGS (button_clean, GTK_CAN_FOCUS); GTK_WIDGET_SET_FLAGS (button_clean, GTK_CAN_DEFAULT); gtk_button_set_relief (GTK_BUTTON (button_clean), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (button_clean, _("Remove all but current clip")); image24 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); gtk_widget_show (image24);