comparison: src/conversation.c
src/conversation.c
- changeset 555
- bea0ece30600
- parent 551
- 505ac0258f49
- child 557
- 78eaec78b5bd
equal
deleted
inserted
replaced
| 554:ee3f87e0db61 | 555:bea0ece30600 |
|---|---|
| 310 | 310 |
| 311 if (find_log_info(p->name)) | 311 if (find_log_info(p->name)) |
| 312 rm_log(find_log_info(p->name)); | 312 rm_log(find_log_info(p->name)); |
| 313 else | 313 else |
| 314 show_log_dialog(p->name); | 314 show_log_dialog(p->name); |
| 315 } | |
| 316 | |
| 317 void insert_smiley(GtkWidget *widget, struct conversation *c) | |
| 318 { | |
| 319 if (state_lock) | |
| 320 return; | |
| 321 | |
| 322 show_smiley_dialog(c, NULL); | |
| 323 | |
| 324 return; | |
| 315 } | 325 } |
| 316 | 326 |
| 317 int close_callback(GtkWidget *widget, struct conversation *c) | 327 int close_callback(GtkWidget *widget, struct conversation *c) |
| 318 { | 328 { |
| 319 if (c->window) | 329 if (c->window) |
| 1171 } | 1181 } |
| 1172 } | 1182 } |
| 1173 | 1183 |
| 1174 | 1184 |
| 1175 GtkWidget *build_conv_toolbar(struct conversation *c) { | 1185 GtkWidget *build_conv_toolbar(struct conversation *c) { |
| 1176 GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *palette_i, *link_i, *font_i; | 1186 GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *palette_i, *link_i, *font_i, *smiley_i; |
| 1177 GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *palette_p, *link_p, *font_p; | 1187 GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *palette_p, *link_p, *font_p, *smiley_p; |
| 1178 GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *palette, *link, *font; | 1188 GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *palette, *link, *font, *smiley; |
| 1179 GdkBitmap *mask; | 1189 GdkBitmap *mask; |
| 1180 GtkWidget *toolbar; | 1190 GtkWidget *toolbar; |
| 1181 GtkWidget *win; | 1191 GtkWidget *win; |
| 1182 GtkWidget *entry; | 1192 GtkWidget *entry; |
| 1183 | 1193 |
| 1234 gtk_widget_show(big_p); | 1244 gtk_widget_show(big_p); |
| 1235 font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, | 1245 font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, |
| 1236 &win->style->white, fontface_xpm ); | 1246 &win->style->white, fontface_xpm ); |
| 1237 font_p = gtk_pixmap_new(font_i, mask); | 1247 font_p = gtk_pixmap_new(font_i, mask); |
| 1238 gtk_widget_show(font_p); | 1248 gtk_widget_show(font_p); |
| 1249 smiley_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, smile_xpm); | |
| 1250 /*gdk_pixmap_create_from_xpm_d(win->window, &mask | |
| 1251 &win->style->white, smile_xpm);*/ | |
| 1252 smiley_p = gtk_pixmap_new(smiley_i, mask); | |
| 1253 gtk_widget_show(smiley_p); | |
| 1239 | 1254 |
| 1240 bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1255 bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
| 1241 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, | 1256 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, |
| 1242 _("Bold"), _("Bold Text"), _("Bold"), bold_p, | 1257 _("Bold"), _("Bold Text"), _("Bold"), bold_p, |
| 1243 GTK_SIGNAL_FUNC(do_bold), entry); | 1258 GTK_SIGNAL_FUNC(do_bold), entry); |
| 1272 _("Color"), palette_p, GTK_SIGNAL_FUNC(toggle_color), c); | 1287 _("Color"), palette_p, GTK_SIGNAL_FUNC(toggle_color), c); |
| 1273 wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1288 wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
| 1274 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1289 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
| 1275 NULL, _("Logging"), _("Enable logging"), | 1290 NULL, _("Logging"), _("Enable logging"), |
| 1276 _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c); | 1291 _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c); |
| 1292 smiley = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | |
| 1293 GTK_TOOLBAR_CHILD_BUTTON, | |
| 1294 NULL, _("Smiley"), _("Insert smiley face"), | |
| 1295 _("Smiley"), smiley_p, GTK_SIGNAL_FUNC(insert_smiley), c); | |
| 1277 speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), | 1296 speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), |
| 1278 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, | 1297 GTK_TOOLBAR_CHILD_TOGGLEBUTTON, |
| 1279 NULL, _("Sound"), _("Enable sounds"), | 1298 NULL, _("Sound"), _("Enable sounds"), |
| 1280 _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound); | 1299 _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound); |
| 1281 c->makesound=0; | 1300 c->makesound=0; |
| 1301 gtk_button_set_relief(GTK_BUTTON(wood), GTK_RELIEF_NONE); | 1320 gtk_button_set_relief(GTK_BUTTON(wood), GTK_RELIEF_NONE); |
| 1302 gtk_button_set_relief(GTK_BUTTON(palette), GTK_RELIEF_NONE); | 1321 gtk_button_set_relief(GTK_BUTTON(palette), GTK_RELIEF_NONE); |
| 1303 gtk_button_set_relief(GTK_BUTTON(link), GTK_RELIEF_NONE); | 1322 gtk_button_set_relief(GTK_BUTTON(link), GTK_RELIEF_NONE); |
| 1304 gtk_button_set_relief(GTK_BUTTON(font), GTK_RELIEF_NONE); | 1323 gtk_button_set_relief(GTK_BUTTON(font), GTK_RELIEF_NONE); |
| 1305 gtk_button_set_relief(GTK_BUTTON(small), GTK_RELIEF_NONE); | 1324 gtk_button_set_relief(GTK_BUTTON(small), GTK_RELIEF_NONE); |
| 1325 gtk_button_set_relief(GTK_BUTTON(smiley), GTK_RELIEF_NONE); | |
| 1306 } | 1326 } |
| 1307 | 1327 |
| 1308 gtk_widget_show(toolbar); | 1328 gtk_widget_show(toolbar); |
| 1309 | 1329 |
| 1310 c->bold = bold; | 1330 c->bold = bold; |
