comparison: pidgin/gtkimhtmltoolbar.c
pidgin/gtkimhtmltoolbar.c
- branch
- release-2.2.1
- changeset 20404
- d5e4f520e5e7
- parent 20147
- 66f05a854eee
- parent 20330
- 650a7af9c238
equal
deleted
inserted
replaced
| 20187:11fecadc1233 | 20404:d5e4f520e5e7 |
|---|---|
| 1164 GtkWidget *bbox, *box = gtk_hbox_new(FALSE, 0); | 1164 GtkWidget *bbox, *box = gtk_hbox_new(FALSE, 0); |
| 1165 GtkWidget *image; | 1165 GtkWidget *image; |
| 1166 GtkWidget *label; | 1166 GtkWidget *label; |
| 1167 GtkWidget *insert_button; | 1167 GtkWidget *insert_button; |
| 1168 GtkWidget *font_button; | 1168 GtkWidget *font_button; |
| 1169 GtkWidget *smiley_button; | |
| 1169 GtkWidget *font_menu; | 1170 GtkWidget *font_menu; |
| 1170 GtkWidget *insert_menu; | 1171 GtkWidget *insert_menu; |
| 1171 GtkWidget *menuitem; | 1172 GtkWidget *menuitem; |
| 1172 GtkWidget *sep; | 1173 GtkWidget *sep; |
| 1173 int i; | 1174 int i; |
| 1265 gtk_widget_show_all(insert_button); | 1266 gtk_widget_show_all(insert_button); |
| 1266 | 1267 |
| 1267 insert_menu = gtk_menu_new(); | 1268 insert_menu = gtk_menu_new(); |
| 1268 g_object_set_data(G_OBJECT(toolbar), "insert_menu", insert_menu); | 1269 g_object_set_data(G_OBJECT(toolbar), "insert_menu", insert_menu); |
| 1269 | 1270 |
| 1270 menuitem = gtk_menu_item_new_with_mnemonic(_("_Smiley")); | |
| 1271 g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->smiley); | |
| 1272 gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem); | |
| 1273 g_signal_connect(G_OBJECT(toolbar->smiley), "notify::sensitive", | |
| 1274 G_CALLBACK(button_sensitiveness_changed), menuitem); | |
| 1275 | |
| 1276 menuitem = gtk_menu_item_new_with_mnemonic(_("_Image")); | 1271 menuitem = gtk_menu_item_new_with_mnemonic(_("_Image")); |
| 1277 g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->image); | 1272 g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->image); |
| 1278 gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem); | 1273 gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem); |
| 1279 g_signal_connect(G_OBJECT(toolbar->image), "notify::sensitive", | 1274 g_signal_connect(G_OBJECT(toolbar->image), "notify::sensitive", |
| 1280 G_CALLBACK(button_sensitiveness_changed), menuitem); | 1275 G_CALLBACK(button_sensitiveness_changed), menuitem); |
| 1292 | 1287 |
| 1293 g_signal_connect_swapped(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(gtk_widget_activate), insert_button); | 1288 g_signal_connect_swapped(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(gtk_widget_activate), insert_button); |
| 1294 g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu); | 1289 g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu); |
| 1295 g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button); | 1290 g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button); |
| 1296 toolbar->sml = NULL; | 1291 toolbar->sml = NULL; |
| 1292 | |
| 1293 /* Sep */ | |
| 1294 sep = gtk_vseparator_new(); | |
| 1295 gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0); | |
| 1296 gtk_widget_show_all(sep); | |
| 1297 | |
| 1298 /* Smiley */ | |
| 1299 smiley_button = gtk_button_new(); | |
| 1300 gtk_button_set_relief(GTK_BUTTON(smiley_button), GTK_RELIEF_NONE); | |
| 1301 bbox = gtk_hbox_new(FALSE, 3); | |
| 1302 gtk_container_add(GTK_CONTAINER(smiley_button), bbox); | |
| 1303 image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); | |
| 1304 gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0); | |
| 1305 label = gtk_label_new_with_mnemonic(_("_Smiley")); | |
| 1306 gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); | |
| 1307 gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0); | |
| 1308 g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley); | |
| 1309 gtk_widget_show_all(smiley_button); | |
| 1297 | 1310 |
| 1298 gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0); | 1311 gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0); |
| 1299 g_object_set_data(G_OBJECT(hbox), "lean-view", box); | 1312 g_object_set_data(G_OBJECT(hbox), "lean-view", box); |
| 1300 | 1313 |
| 1301 purple_prefs_connect_callback(toolbar, PIDGIN_PREFS_ROOT "/conversations/toolbar/wide", | 1314 purple_prefs_connect_callback(toolbar, PIDGIN_PREFS_ROOT "/conversations/toolbar/wide", |
