X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finterface.c;h=13048758f61d85467b8b42f0e918e6974bc76569;hb=a5fd42fcba5ce6d680f44c5c8e01c44deae91ed2;hp=1d841d3fb5a188a95c5f08c2c99e8bf261741c6f;hpb=4c1dc967fd477540e82566fff8d60e1c67ff3ca1;p=rugen diff --git a/src/interface.c b/src/interface.c index 1d841d3..1304875 100644 --- a/src/interface.c +++ b/src/interface.c @@ -31,24 +31,24 @@ create_gdv1394d (void) { GtkWidget *gdv1394d; GtkWidget *vbox1; - GtkWidget *handlebox2; +// GtkWidget *handlebox2; GtkWidget *hbox27; GtkWidget *vbox9; - GtkWidget *menubar; - GtkWidget *menuitem1; - GtkWidget *menuitem1_menu; - GtkWidget *item_connect; - GtkWidget *item_disconnect; - GtkWidget *separatormenuitem1; - GtkWidget *item_quit; +// GtkWidget *menubar; +// GtkWidget *menuitem1; +// GtkWidget *menuitem1_menu; +// GtkWidget *item_connect; +// GtkWidget *item_disconnect; +// GtkWidget *separatormenuitem1; +// GtkWidget *item_quit; GtkWidget *toolbar1; GtkWidget *tmp_toolbar_icon; GtkWidget *button_connect; GtkWidget *button_disconnect; - GtkWidget *vseparator1; - GtkWidget *button_quit; +// GtkWidget *vseparator1; +// GtkWidget *button_quit; GtkWidget *hbox; - GtkWidget *toolbar2; +// GtkWidget *toolbar2; GtkWidget *vbox6; GtkWidget *notebook1; GtkWidget *empty_notebook_page; @@ -93,96 +93,97 @@ create_gdv1394d (void) gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (gdv1394d), vbox1); - handlebox2 = gtk_handle_box_new (); - gtk_widget_show (handlebox2); - gtk_box_pack_start (GTK_BOX (vbox1), handlebox2, FALSE, FALSE, 0); +// handlebox2 = gtk_handle_box_new (); +// gtk_widget_show (handlebox2); +// gtk_box_pack_start (GTK_BOX (vbox1), handlebox2, FALSE, FALSE, 0); hbox27 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox27); - gtk_container_add (GTK_CONTAINER (handlebox2), hbox27); +// gtk_container_add (GTK_CONTAINER (handlebox2), hbox27); + gtk_box_pack_start (GTK_BOX (vbox1), hbox27, FALSE, FALSE, 0); vbox9 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox9); gtk_box_pack_start (GTK_BOX (hbox27), vbox9, TRUE, TRUE, 0); - menubar = gtk_menu_bar_new (); - gtk_widget_show (menubar); - gtk_box_pack_start (GTK_BOX (vbox9), menubar, TRUE, TRUE, 0); +// menubar = gtk_menu_bar_new (); +// gtk_widget_show (menubar); +// gtk_box_pack_start (GTK_BOX (vbox9), menubar, TRUE, TRUE, 0); - menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File")); - gtk_widget_show (menuitem1); - gtk_container_add (GTK_CONTAINER (menubar), menuitem1); +// menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File")); +// gtk_widget_show (menuitem1); +// gtk_container_add (GTK_CONTAINER (menubar), menuitem1); - menuitem1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu); +// menuitem1_menu = gtk_menu_new (); +// gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu); - item_connect = gtk_menu_item_new_with_mnemonic (_("_Connect")); - gtk_widget_show (item_connect); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), item_connect); +// item_connect = gtk_menu_item_new_with_mnemonic (_("_Connect")); +// gtk_widget_show (item_connect); +// gtk_container_add (GTK_CONTAINER (menuitem1_menu), item_connect); - item_disconnect = gtk_menu_item_new_with_mnemonic (_("_Disconnect")); - gtk_widget_show (item_disconnect); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), item_disconnect); +// item_disconnect = gtk_menu_item_new_with_mnemonic (_("_Disconnect")); +// gtk_widget_show (item_disconnect); +// gtk_container_add (GTK_CONTAINER (menuitem1_menu), item_disconnect); - separatormenuitem1 = gtk_menu_item_new (); - gtk_widget_show (separatormenuitem1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1); - gtk_widget_set_sensitive (separatormenuitem1, FALSE); +// separatormenuitem1 = gtk_menu_item_new (); +// gtk_widget_show (separatormenuitem1); +// gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1); +// gtk_widget_set_sensitive (separatormenuitem1, FALSE); - item_quit = gtk_menu_item_new_with_mnemonic (_("_Quit")); - gtk_widget_show (item_quit); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), item_quit); +// item_quit = gtk_menu_item_new_with_mnemonic (_("_Quit")); +// gtk_widget_show (item_quit); +// gtk_container_add (GTK_CONTAINER (menuitem1_menu), item_quit); toolbar1 = gtk_toolbar_new (); gtk_widget_show (toolbar1); - gtk_box_pack_start (GTK_BOX (hbox27), toolbar1, FALSE, FALSE, 0); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_ICONS); + gtk_box_pack_start (GTK_BOX (hbox27), toolbar1, TRUE, TRUE, 0); + gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH_HORIZ); - tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-yes", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1))); + 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), - GTK_TOOLBAR_CHILD_BUTTON, + GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", + "Connect", _("Connect to a server"), NULL, tmp_toolbar_icon, NULL, NULL); gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar1)->children)->data))->label), TRUE); gtk_widget_show (button_connect); - tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-stop", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1))); + tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-disconnect", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1))); button_disconnect = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), - GTK_TOOLBAR_CHILD_BUTTON, + GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", + "Disconnect", _("Disconnect from server"), NULL, tmp_toolbar_icon, NULL, NULL); gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar1)->children)->data))->label), TRUE); gtk_widget_show (button_disconnect); - vseparator1 = gtk_vseparator_new (); - gtk_widget_show (vseparator1); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar1)); - gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), vseparator1, NULL, NULL); +// vseparator1 = gtk_vseparator_new (); +// gtk_widget_show (vseparator1); +// gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), vseparator1, NULL, NULL); - tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-quit", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1))); - button_quit = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - "", - _("Exit"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar1)->children)->data))->label), TRUE); - gtk_widget_show (button_quit); +// tmp_toolbar_icon = gtk_image_new_from_stock ("gtk-quit", gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar1))); +// button_quit = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar1), +// GTK_TOOLBAR_CHILD_BUTTON, +// NULL, +// "", +// _("Exit"), NULL, +// tmp_toolbar_icon, NULL, NULL); +// gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar1)->children)->data))->label), TRUE); +// gtk_widget_show (button_quit); hbox = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (vbox1), hbox, TRUE, TRUE, 0); - toolbar2 = gtk_toolbar_new (); - gtk_widget_show (toolbar2); - gtk_box_pack_start (GTK_BOX (hbox), toolbar2, FALSE, TRUE, 0); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar2), GTK_TOOLBAR_BOTH); - gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar2), GTK_ORIENTATION_VERTICAL); +// toolbar2 = gtk_toolbar_new (); +// gtk_widget_show (toolbar2); +// gtk_box_pack_start (GTK_BOX (hbox), toolbar2, FALSE, TRUE, 0); +// gtk_toolbar_set_style (GTK_TOOLBAR (toolbar2), GTK_TOOLBAR_BOTH); +// gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar2), GTK_ORIENTATION_VERTICAL); vbox6 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox6); @@ -195,6 +196,7 @@ create_gdv1394d (void) gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook1), FALSE); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook1), GTK_POS_RIGHT); gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook1)); + gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook1), FALSE); empty_notebook_page = gtk_vbox_new (FALSE, 0); gtk_widget_show (empty_notebook_page); @@ -224,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); @@ -235,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); @@ -246,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); @@ -257,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); @@ -268,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); @@ -279,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); @@ -290,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); @@ -299,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); @@ -314,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); @@ -325,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); @@ -336,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); @@ -347,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); @@ -368,23 +381,23 @@ create_gdv1394d (void) /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (gdv1394d, gdv1394d, "gdv1394d"); GLADE_HOOKUP_OBJECT (gdv1394d, vbox1, "vbox1"); - GLADE_HOOKUP_OBJECT (gdv1394d, handlebox2, "handlebox2"); +// GLADE_HOOKUP_OBJECT (gdv1394d, handlebox2, "handlebox2"); GLADE_HOOKUP_OBJECT (gdv1394d, hbox27, "hbox27"); GLADE_HOOKUP_OBJECT (gdv1394d, vbox9, "vbox9"); - GLADE_HOOKUP_OBJECT (gdv1394d, menubar, "menubar"); - GLADE_HOOKUP_OBJECT (gdv1394d, menuitem1, "menuitem1"); - GLADE_HOOKUP_OBJECT (gdv1394d, menuitem1_menu, "menuitem1_menu"); - GLADE_HOOKUP_OBJECT (gdv1394d, item_connect, "item_connect"); - GLADE_HOOKUP_OBJECT (gdv1394d, item_disconnect, "item_disconnect"); - GLADE_HOOKUP_OBJECT (gdv1394d, separatormenuitem1, "separatormenuitem1"); - GLADE_HOOKUP_OBJECT (gdv1394d, item_quit, "item_quit"); +// GLADE_HOOKUP_OBJECT (gdv1394d, menubar, "menubar"); +// GLADE_HOOKUP_OBJECT (gdv1394d, menuitem1, "menuitem1"); +// GLADE_HOOKUP_OBJECT (gdv1394d, menuitem1_menu, "menuitem1_menu"); +// GLADE_HOOKUP_OBJECT (gdv1394d, item_connect, "item_connect"); +// GLADE_HOOKUP_OBJECT (gdv1394d, item_disconnect, "item_disconnect"); +// GLADE_HOOKUP_OBJECT (gdv1394d, separatormenuitem1, "separatormenuitem1"); +// GLADE_HOOKUP_OBJECT (gdv1394d, item_quit, "item_quit"); GLADE_HOOKUP_OBJECT (gdv1394d, toolbar1, "toolbar1"); GLADE_HOOKUP_OBJECT (gdv1394d, button_connect, "button_connect"); GLADE_HOOKUP_OBJECT (gdv1394d, button_disconnect, "button_disconnect"); - GLADE_HOOKUP_OBJECT (gdv1394d, vseparator1, "vseparator1"); - GLADE_HOOKUP_OBJECT (gdv1394d, button_quit, "button_quit"); +// GLADE_HOOKUP_OBJECT (gdv1394d, vseparator1, "vseparator1"); +// GLADE_HOOKUP_OBJECT (gdv1394d, button_quit, "button_quit"); GLADE_HOOKUP_OBJECT (gdv1394d, hbox, "hbox"); - GLADE_HOOKUP_OBJECT (gdv1394d, toolbar2, "toolbar2"); +// GLADE_HOOKUP_OBJECT (gdv1394d, toolbar2, "toolbar2"); GLADE_HOOKUP_OBJECT (gdv1394d, vbox6, "vbox6"); GLADE_HOOKUP_OBJECT (gdv1394d, notebook1, "notebook1"); GLADE_HOOKUP_OBJECT (gdv1394d, label40, "label40");