comparison gui/dialog/url.c @ 36023:a04e8798227b

Cosmetic: Prefix all functions in dialog/tools.c with gtk. Additionally, rename AddHScaler() AddHScale(), AddVScaler() AddVScale() and AddComboBox() AddCombo() first.
author ib
date Sun, 31 Mar 2013 18:08:37 +0000
parents d2d776c8e040
children c667e34fb941
comparison
equal deleted inserted replaced
36022:bf5690e00dc6 36023:a04e8798227b
95 gtk_window_set_wmclass(GTK_WINDOW(URLDialog), "Network", "MPlayer"); 95 gtk_window_set_wmclass(GTK_WINDOW(URLDialog), "Network", "MPlayer");
96 96
97 gtk_widget_realize(URLDialog); 97 gtk_widget_realize(URLDialog);
98 gtkAddIcon(URLDialog); 98 gtkAddIcon(URLDialog);
99 99
100 vbox1 = AddVBox(AddDialogFrame(URLDialog), 0); 100 vbox1 = gtkAddVBox(gtkAddDialogFrame(URLDialog), 0);
101 hbox1 = AddHBox(vbox1, 1); 101 hbox1 = gtkAddHBox(vbox1, 1);
102 AddLabel("URL: ", hbox1); 102 gtkAddLabel("URL: ", hbox1);
103 103
104 URLCombo = AddComboBox(hbox1); 104 URLCombo = gtkAddCombo(hbox1);
105 /* 105 /*
106 * gtk_combo_new(); 106 * gtk_combo_new();
107 * gtk_widget_set_name( URLCombo,"URLCombo" ); 107 * gtk_widget_set_name( URLCombo,"URLCombo" );
108 * gtk_widget_show( URLCombo ); 108 * gtk_widget_show( URLCombo );
109 * gtk_box_pack_start( GTK_BOX( hbox1 ),URLCombo,TRUE,TRUE,0 ); 109 * gtk_box_pack_start( GTK_BOX( hbox1 ),URLCombo,TRUE,TRUE,0 );
110 */ 110 */
111 URLEntry = GTK_COMBO(URLCombo)->entry; 111 URLEntry = GTK_COMBO(URLCombo)->entry;
112 gtk_widget_set_name(URLEntry, "URLEntry"); 112 gtk_widget_set_name(URLEntry, "URLEntry");
113 gtk_widget_show(URLEntry); 113 gtk_widget_show(URLEntry);
114 114
115 AddHSeparator(vbox1); 115 gtkAddHSeparator(vbox1);
116 116
117 hbuttonbox1 = AddHButtonBox(vbox1); 117 hbuttonbox1 = gtkAddHButtonBox(vbox1);
118 gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_END); 118 gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_END);
119 gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 10); 119 gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 10);
120 120
121 Ok = AddButton(MSGTR_Ok, hbuttonbox1); 121 Ok = gtkAddButton(MSGTR_Ok, hbuttonbox1);
122 Cancel = AddButton(MSGTR_Cancel, hbuttonbox1); 122 Cancel = gtkAddButton(MSGTR_Cancel, hbuttonbox1);
123 123
124 gtk_widget_add_accelerator(Ok, "clicked", accel_group, GDK_Return, 0, GTK_ACCEL_VISIBLE); 124 gtk_widget_add_accelerator(Ok, "clicked", accel_group, GDK_Return, 0, GTK_ACCEL_VISIBLE);
125 gtk_widget_add_accelerator(Cancel, "clicked", accel_group, GDK_Escape, 0, GTK_ACCEL_VISIBLE); 125 gtk_widget_add_accelerator(Cancel, "clicked", accel_group, GDK_Escape, 0, GTK_ACCEL_VISIBLE);
126 126
127 gtk_signal_connect(GTK_OBJECT(URLDialog), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &URLDialog); 127 gtk_signal_connect(GTK_OBJECT(URLDialog), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &URLDialog);