X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-callbacks.c;h=c38299659be2ee8879e32c4ccca16f20d4be8404;hb=e648cece76b671b5b0e165acc6d14178e8de1000;hp=5e3a3cdf1f1f5f21bb3653b756b3e05b35dd2503;hpb=62e6c9d87f653624015e8dacd4c5e5abbec4cffa;p=xournal.git diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c index 5e3a3cd..c382996 100644 --- a/src/xo-callbacks.c +++ b/src/xo-callbacks.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "xournal.h" #include "xo-callbacks.h" @@ -18,6 +19,7 @@ #include "xo-file.h" #include "xo-paint.h" #include "xo-print.h" +#include "xo-shapes.h" void on_fileNew_activate (GtkMenuItem *menuitem, @@ -49,15 +51,15 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, reset_focus(); if (!ok_to_close()) return; // user aborted on save confirmation - dialog = gtk_file_chooser_dialog_new("Open PDF", GTK_WINDOW (winMain), + dialog = gtk_file_chooser_dialog_new(_("Open PDF"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_all, "All files"); + gtk_file_filter_set_name(filt_all, _("All files")); gtk_file_filter_add_pattern(filt_all, "*"); filt_pdf = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_pdf, "PDF files"); + gtk_file_filter_set_name(filt_pdf, _("PDF files")); gtk_file_filter_add_pattern(filt_pdf, "*.pdf"); gtk_file_filter_add_pattern(filt_pdf, "*.PDF"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf); @@ -65,7 +67,7 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path); - attach_opt = gtk_check_button_new_with_label("Attach file to the journal"); + attach_opt = gtk_check_button_new_with_label(_("Attach file to the journal")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt); @@ -100,7 +102,7 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, /* open failed */ dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", filename); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), filename); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); g_free(filename); @@ -120,15 +122,15 @@ on_fileOpen_activate (GtkMenuItem *menuitem, reset_focus(); if (!ok_to_close()) return; // user aborted on save confirmation - dialog = gtk_file_chooser_dialog_new("Open Journal", GTK_WINDOW (winMain), + dialog = gtk_file_chooser_dialog_new(_("Open Journal"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_all, "All files"); + gtk_file_filter_set_name(filt_all, _("All files")); gtk_file_filter_add_pattern(filt_all, "*"); filt_xoj = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_xoj, "Xournal files"); + gtk_file_filter_set_name(filt_xoj, _("Xournal files")); gtk_file_filter_add_pattern(filt_xoj, "*.xoj"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_xoj); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); @@ -149,7 +151,7 @@ on_fileOpen_activate (GtkMenuItem *menuitem, /* open failed */ dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", filename); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), filename); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); g_free(filename); @@ -178,7 +180,7 @@ on_fileSave_activate (GtkMenuItem *menuitem, set_cursor_busy(FALSE); /* save failed */ dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error saving file '%s'", ui.filename); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error saving file '%s'"), ui.filename); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } @@ -198,7 +200,7 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); - dialog = gtk_file_chooser_dialog_new("Save Journal", GTK_WINDOW (winMain), + dialog = gtk_file_chooser_dialog_new(_("Save Journal"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); @@ -223,10 +225,10 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, } filt_all = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_all, "All files"); + gtk_file_filter_set_name(filt_all, _("All files")); gtk_file_filter_add_pattern(filt_all, "*"); filt_xoj = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_xoj, "Xournal files"); + gtk_file_filter_set_name(filt_xoj, _("Xournal files")); gtk_file_filter_add_pattern(filt_xoj, "*.xoj"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_xoj); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); @@ -252,7 +254,7 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, if (warn) { warning_dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - "Should the file %s be overwritten?", filename); + _("Should the file %s be overwritten?"), filename); if (gtk_dialog_run(GTK_DIALOG(warning_dialog)) == GTK_RESPONSE_YES) warn = FALSE; gtk_widget_destroy(warning_dialog); @@ -271,7 +273,7 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, set_cursor_busy(FALSE); /* save failed */ dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error saving file '%s'", filename); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error saving file '%s'"), filename); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); g_free(filename); @@ -290,7 +292,7 @@ void on_filePrint_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *printDialog, *preview; + GtkWidget *printDialog; GnomePrintJob *gpj; int fromPage, toPage; int response; @@ -324,10 +326,10 @@ on_filePrint_activate (GtkMenuItem *menuitem, gpj = gnome_print_job_new(config); /* was NULL */ gnome_print_config_unref(config); /* end */ - printDialog = gnome_print_dialog_new(gpj, (guchar *)"Print", GNOME_PRINT_DIALOG_RANGE); + printDialog = gnome_print_dialog_new(gpj, (guchar *) _("Print"), GNOME_PRINT_DIALOG_RANGE); gnome_print_dialog_construct_range_page(GNOME_PRINT_DIALOG(printDialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_RANGE, - 1, journal.npages, (guchar *)"Current page", (guchar *)"Pages"); + 1, journal.npages, (guchar *) _("Current page"), (guchar *) _("Pages")); /* don't have "Current page" as option, else it becomes the default!! */ gtk_dialog_set_response_sensitive(GTK_DIALOG(printDialog), @@ -379,12 +381,11 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, char *filename, *in_fn; char stime[30]; time_t curtime; - int response; gboolean warn; end_text(); reset_focus(); - dialog = gtk_file_chooser_dialog_new("Export to PDF", GTK_WINDOW (winMain), + dialog = gtk_file_chooser_dialog_new(_("Export to PDF"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); @@ -407,10 +408,10 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, } filt_all = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_all, "All files"); + gtk_file_filter_set_name(filt_all, _("All files")); gtk_file_filter_add_pattern(filt_all, "*"); filt_pdf = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_pdf, "PDF files"); + gtk_file_filter_set_name(filt_pdf, _("PDF files")); gtk_file_filter_add_pattern(filt_pdf, "*.pdf"); gtk_file_filter_add_pattern(filt_pdf, "*.PDF"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf); @@ -428,7 +429,7 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, if (warn) { warning_dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - "Should the file %s be overwritten?", filename); + _("Should the file %s be overwritten?"), filename); if (gtk_dialog_run(GTK_DIALOG(warning_dialog)) == GTK_RESPONSE_YES) warn = FALSE; gtk_widget_destroy(warning_dialog); @@ -441,7 +442,7 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, if (!print_to_pdf(filename)) { set_cursor_busy(FALSE); dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error creating file '%s'", filename); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error creating file '%s'"), filename); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } @@ -472,6 +473,7 @@ on_editUndo_activate (GtkMenuItem *menuitem, struct Background *tmp_bg; double tmp_x, tmp_y; gchar *tmpstr; + GnomeCanvasGroup *group; end_text(); reset_focus(); @@ -485,7 +487,7 @@ on_editUndo_activate (GtkMenuItem *menuitem, undo->layer->items = g_list_remove(undo->layer->items, undo->item); undo->layer->nitems--; } - else if (undo->type == ITEM_ERASURE) { + else if (undo->type == ITEM_ERASURE || undo->type == ITEM_RECOGNIZER) { for (list = undo->erasurelist; list!=NULL; list = list->next) { erasure = (struct UndoErasureData *)list->data; // delete all the created items @@ -574,6 +576,11 @@ on_editUndo_activate (GtkMenuItem *menuitem, move_journal_items_by(undo->itemlist, -undo->val_x, -undo->val_y, undo->layer2, undo->layer, undo->auxlist); } + else if (undo->type == ITEM_RESIZESEL) { + resize_journal_items_by(undo->itemlist, + 1/undo->scaling_x, 1/undo->scaling_y, + -undo->val_x/undo->scaling_x, -undo->val_y/undo->scaling_y); + } else if (undo->type == ITEM_PASTE) { for (itemlist = undo->itemlist; itemlist != NULL; itemlist = itemlist->next) { it = (struct Item *)itemlist->data; @@ -622,10 +629,12 @@ on_editUndo_activate (GtkMenuItem *menuitem, g_memmove(&tmp_brush, &(it->brush), sizeof(struct Brush)); g_memmove(&(it->brush), list->data, sizeof(struct Brush)); g_memmove(list->data, &tmp_brush, sizeof(struct Brush)); - if (it->type == ITEM_STROKE && it->canvas_item != NULL) - gnome_canvas_item_set(it->canvas_item, - "fill-color-rgba", it->brush.color_rgba, - "width-units", it->brush.thickness, NULL); + if (it->type == ITEM_STROKE && it->canvas_item != NULL) { + // remark: a variable-width item might have lost its variable-width + group = (GnomeCanvasGroup *) it->canvas_item->parent; + gtk_object_destroy(GTK_OBJECT(it->canvas_item)); + make_canvas_item_one(group, it); + } if (it->type == ITEM_TEXT && it->canvas_item != NULL) gnome_canvas_item_set(it->canvas_item, "fill-color-rgba", it->brush.color_rgba, NULL); @@ -678,6 +687,7 @@ on_editRedo_activate (GtkMenuItem *menuitem, struct Layer *l; double tmp_x, tmp_y; gchar *tmpstr; + GnomeCanvasGroup *group; end_text(); reset_focus(); @@ -690,7 +700,7 @@ on_editRedo_activate (GtkMenuItem *menuitem, redo->layer->items = g_list_append(redo->layer->items, redo->item); redo->layer->nitems++; } - else if (redo->type == ITEM_ERASURE) { + else if (redo->type == ITEM_ERASURE || redo->type == ITEM_RECOGNIZER) { for (list = redo->erasurelist; list!=NULL; list = list->next) { erasure = (struct UndoErasureData *)list->data; target = g_list_find(redo->layer->items, erasure->item); @@ -787,6 +797,10 @@ on_editRedo_activate (GtkMenuItem *menuitem, move_journal_items_by(redo->itemlist, redo->val_x, redo->val_y, redo->layer, redo->layer2, NULL); } + else if (redo->type == ITEM_RESIZESEL) { + resize_journal_items_by(redo->itemlist, + redo->scaling_x, redo->scaling_y, redo->val_x, redo->val_y); + } else if (redo->type == ITEM_PASTE) { for (itemlist = redo->itemlist; itemlist != NULL; itemlist = itemlist->next) { it = (struct Item *)itemlist->data; @@ -828,10 +842,12 @@ on_editRedo_activate (GtkMenuItem *menuitem, g_memmove(&tmp_brush, &(it->brush), sizeof(struct Brush)); g_memmove(&(it->brush), list->data, sizeof(struct Brush)); g_memmove(list->data, &tmp_brush, sizeof(struct Brush)); - if (it->type == ITEM_STROKE && it->canvas_item != NULL) - gnome_canvas_item_set(it->canvas_item, - "fill-color-rgba", it->brush.color_rgba, - "width-units", it->brush.thickness, NULL); + if (it->type == ITEM_STROKE && it->canvas_item != NULL) { + // remark: a variable-width item might have lost its variable-width + group = (GnomeCanvasGroup *) it->canvas_item->parent; + gtk_object_destroy(GTK_OBJECT(it->canvas_item)); + make_canvas_item_one(group, it); + } if (it->type == ITEM_TEXT && it->canvas_item != NULL) gnome_canvas_item_set(it->canvas_item, "fill-color-rgba", it->brush.color_rgba, NULL); @@ -1032,7 +1048,6 @@ on_viewNextPage_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); if (ui.pageno == journal.npages-1) { // create a page at end - if (page_ops_forbidden()) return; on_journalNewPageEnd_activate(menuitem, user_data); return; } @@ -1089,7 +1104,6 @@ on_journalNewPageBefore_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); - if (page_ops_forbidden()) return; reset_selection(); pg = new_page(ui.cur_page); journal.pages = g_list_insert(journal.pages, pg, ui.pageno); @@ -1111,7 +1125,6 @@ on_journalNewPageAfter_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); - if (page_ops_forbidden()) return; reset_selection(); pg = new_page(ui.cur_page); journal.pages = g_list_insert(journal.pages, pg, ui.pageno+1); @@ -1133,7 +1146,6 @@ on_journalNewPageEnd_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); - if (page_ops_forbidden()) return; reset_selection(); pg = new_page((struct Page *)g_list_last(journal.pages)->data); journal.pages = g_list_append(journal.pages, pg); @@ -1156,7 +1168,6 @@ on_journalDeletePage_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); - if (page_ops_forbidden()) return; if (journal.npages == 1) return; reset_selection(); prepare_new_undo(); @@ -1463,12 +1474,12 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); - dialog = gtk_file_chooser_dialog_new("Open Background", GTK_WINDOW (winMain), + dialog = gtk_file_chooser_dialog_new(_("Open Background"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); filt_all = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_all, "All files"); + gtk_file_filter_set_name(filt_all, _("All files")); gtk_file_filter_add_pattern(filt_all, "*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all); @@ -1476,7 +1487,7 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, if (!gtk_check_version(2, 6, 0)) { filt_pix = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_pix, "Bitmap files"); + gtk_file_filter_set_name(filt_pix, _("Bitmap files")); gtk_file_filter_add_pixbuf_formats(filt_pix); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pix); } @@ -1484,14 +1495,14 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, #endif filt_pspdf = gtk_file_filter_new(); - gtk_file_filter_set_name(filt_pspdf, "PS/PDF files (as bitmaps)"); + gtk_file_filter_set_name(filt_pspdf, _("PS/PDF files (as bitmaps)")); gtk_file_filter_add_pattern(filt_pspdf, "*.ps"); gtk_file_filter_add_pattern(filt_pspdf, "*.PS"); gtk_file_filter_add_pattern(filt_pspdf, "*.pdf"); gtk_file_filter_add_pattern(filt_pspdf, "*.PDF"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pspdf); - attach_opt = gtk_check_button_new_with_label("Attach file to the journal"); + attach_opt = gtk_check_button_new_with_label(_("Attach file to the journal")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE); gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt); @@ -1514,7 +1525,7 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, if (bglist == NULL) { dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - "Error opening background '%s'", filename); + _("Error opening background '%s'"), filename); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); g_free(filename); @@ -1681,8 +1692,9 @@ on_toolsPen_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_PEN; - ui.ruler[0] = FALSE; ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.cur_brush->ruler = ui.default_brushes[TOOL_PEN].ruler; + ui.cur_brush->recognizer = ui.default_brushes[TOOL_PEN].recognizer; update_mapping_linkings(TOOL_PEN); update_tool_buttons(); update_tool_menu(); @@ -1710,7 +1722,6 @@ on_toolsEraser_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_ERASER; - ui.ruler[0] = FALSE; ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]); update_mapping_linkings(TOOL_ERASER); update_tool_buttons(); @@ -1739,8 +1750,9 @@ on_toolsHighlighter_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_HIGHLIGHTER; - ui.ruler[0] = FALSE; ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]); + ui.cur_brush->ruler = ui.default_brushes[TOOL_HIGHLIGHTER].ruler; + ui.cur_brush->recognizer = ui.default_brushes[TOOL_HIGHLIGHTER].recognizer; update_mapping_linkings(TOOL_HIGHLIGHTER); update_tool_buttons(); update_tool_menu(); @@ -1767,7 +1779,6 @@ on_toolsText_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_TEXT; - ui.ruler[0] = FALSE; ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); update_mapping_linkings(-1); update_tool_buttons(); @@ -1803,7 +1814,6 @@ on_toolsSelectRectangle_activate (GtkMenuItem *menuitem, end_text(); reset_focus(); ui.toolno[0] = TOOL_SELECTRECT; - ui.ruler[0] = FALSE; update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -1831,7 +1841,6 @@ on_toolsVerticalSpace_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_VERTSPACE; - ui.ruler[0] = FALSE; update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -2068,7 +2077,7 @@ on_toolsTextFont_activate (GtkMenuItem *menuitem, GtkWidget *dialog; gchar *str; - dialog = gtk_font_selection_dialog_new("Select Font"); + dialog = gtk_font_selection_dialog_new(_("Select Font")); str = make_cur_font_name(); gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(dialog), str); g_free(str); @@ -2093,7 +2102,6 @@ on_toolsDefaultPen_activate (GtkMenuItem *menuitem, g_memmove(&(ui.brushes[0][TOOL_PEN]), ui.default_brushes+TOOL_PEN, sizeof(struct Brush)); ui.toolno[0] = TOOL_PEN; ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); - ui.ruler[0] = FALSE; update_mapping_linkings(TOOL_PEN); update_tool_buttons(); update_tool_menu(); @@ -2114,7 +2122,6 @@ on_toolsDefaultEraser_activate (GtkMenuItem *menuitem, g_memmove(&(ui.brushes[0][TOOL_ERASER]), ui.default_brushes+TOOL_ERASER, sizeof(struct Brush)); ui.toolno[0] = TOOL_ERASER; ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]); - ui.ruler[0] = FALSE; update_mapping_linkings(TOOL_ERASER); update_tool_buttons(); update_tool_menu(); @@ -2135,7 +2142,6 @@ on_toolsDefaultHighlighter_activate (GtkMenuItem *menuitem, g_memmove(&(ui.brushes[0][TOOL_HIGHLIGHTER]), ui.default_brushes+TOOL_HIGHLIGHTER, sizeof(struct Brush)); ui.toolno[0] = TOOL_HIGHLIGHTER; ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]); - ui.ruler[0] = FALSE; update_mapping_linkings(TOOL_HIGHLIGHTER); update_tool_buttons(); update_tool_menu(); @@ -2153,7 +2159,6 @@ on_toolsDefaultText_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_TEXT; - ui.ruler[0] = FALSE; ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); ui.cur_brush->color_no = ui.default_brushes[TOOL_PEN].color_no; ui.cur_brush->color_rgba = ui.default_brushes[TOOL_PEN].color_rgba; @@ -2207,7 +2212,41 @@ void on_toolsRuler_activate (GtkMenuItem *menuitem, gpointer user_data) { - gboolean active; + gboolean active, current; + + if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_CHECK_MENU_ITEM) + active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); + else + active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); + + if (ui.cur_mapping != 0) return; + current = (ui.toolno[0] == TOOL_PEN || ui.toolno[0] == TOOL_HIGHLIGHTER) && ui.cur_brush->ruler; + if (active == current) return; + + end_text(); + reset_focus(); + if (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER) { + reset_selection(); + ui.toolno[0] = TOOL_PEN; + ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + update_color_menu(); + update_tool_buttons(); + update_tool_menu(); + update_cursor(); + } + + ui.cur_brush->ruler = active; + if (active) ui.cur_brush->recognizer = FALSE; + update_mapping_linkings(ui.toolno[0]); + update_ruler_indicator(); +} + + +void +on_toolsReco_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gboolean active, current; if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_CHECK_MENU_ITEM) active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); @@ -2215,11 +2254,12 @@ on_toolsRuler_activate (GtkMenuItem *menuitem, active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); if (ui.cur_mapping != 0) return; - if (active == ui.ruler[0]) return; + current = (ui.toolno[0] == TOOL_PEN || ui.toolno[0] == TOOL_HIGHLIGHTER) && ui.cur_brush->recognizer; + if (active == current) return; end_text(); reset_focus(); - if (active && (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER)) { + if (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER) { reset_selection(); ui.toolno[0] = TOOL_PEN; ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); @@ -2229,7 +2269,11 @@ on_toolsRuler_activate (GtkMenuItem *menuitem, update_cursor(); } - ui.ruler[0] = active; + ui.cur_brush->recognizer = active; + if (active) { + ui.cur_brush->ruler = FALSE; + reset_recognizer(); + } update_mapping_linkings(ui.toolno[0]); update_ruler_indicator(); } @@ -2284,7 +2328,6 @@ on_buttonToolDefault_clicked (GtkToolButton *toolbutton, switch_mapping(0); if (ui.toolno[0] < NUM_STROKE_TOOLS) { g_memmove(&(ui.brushes[0][ui.toolno[0]]), ui.default_brushes+ui.toolno[0], sizeof(struct Brush)); - ui.ruler[0] = FALSE; update_mapping_linkings(ui.toolno[0]); update_thickness_buttons(); update_color_buttons(); @@ -2343,14 +2386,23 @@ on_canvas_button_press_event (GtkWidget *widget, if (event->button > 3) return FALSE; // no painting with the mouse wheel! if (event->type != GDK_BUTTON_PRESS) return FALSE; // double-clicks may have broken axes member (free'd) due to a bug in GDK - if (!is_core) { - // re-get the axis values since Synaptics sends bogus ones - gdk_device_get_state(event->device, event->window, event->axes, NULL); + if (!is_core) fix_xinput_coords((GdkEvent *)event); - } + +#ifdef INPUT_DEBUG + printf("DEBUG: ButtonDown (%s) (x,y)=(%.2f,%.2f)\n", + is_core?"core":"xinput", event->x, event->y); +#endif + if (!finite(event->x) || !finite(event->y)) return FALSE; // Xorg 7.3 bug if (ui.cur_item_type == ITEM_TEXT && !is_event_within_textview(event)) end_text(); + if (ui.cur_item_type == ITEM_STROKE && ui.is_corestroke && !is_core && + ui.cur_path.num_points == 1) { + // Xorg 7.3+ sent core event before XInput event: fix initial point + ui.is_corestroke = FALSE; + get_pointer_coords((GdkEvent *)event, ui.cur_path.coords); + } if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something ui.is_corestroke = is_core; @@ -2384,12 +2436,12 @@ on_canvas_button_press_event (GtkWidget *widget, if (ui.cur_layer == NULL) { /* warn */ dialog = gtk_message_dialog_new(GTK_WINDOW(winMain), GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "Drawing is not allowed on the " - "background layer.\n Switching to Layer 1."); + GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("Drawing is not allowed on the " + "background layer.\n Switching to Layer 1.")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); on_viewShowLayer_activate(NULL, NULL); - return; + return FALSE; } // switch mappings if needed @@ -2407,7 +2459,8 @@ on_canvas_button_press_event (GtkWidget *widget, } } - // if this can be a selection move, then it takes precedence over anything else + // if this can be a selection move or resize, then it takes precedence over anything else + if (start_resizesel((GdkEvent *)event)) return FALSE; if (start_movesel((GdkEvent *)event)) return FALSE; if (ui.toolno[mapping] != TOOL_SELECTREGION && ui.toolno[mapping] != TOOL_SELECTRECT) @@ -2461,6 +2514,7 @@ on_canvas_button_release_event (GtkWidget *widget, if (ui.cur_item_type == ITEM_STROKE) { finalize_stroke(); + if (ui.cur_brush->recognizer) recognize_patterns(); } else if (ui.cur_item_type == ITEM_ERASURE) { finalize_erasure(); @@ -2471,6 +2525,9 @@ on_canvas_button_release_event (GtkWidget *widget, else if (ui.cur_item_type == ITEM_MOVESEL || ui.cur_item_type == ITEM_MOVESEL_VERT) { finalize_movesel(); } + else if (ui.cur_item_type == ITEM_RESIZESEL) { + finalize_resizesel(); + } else if (ui.cur_item_type == ITEM_HAND) { ui.cur_item_type = ITEM_NONE; } @@ -2505,6 +2562,24 @@ on_canvas_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { + // If zoomed-out and in single page mode, switch pages with PgUp/PgDn. + if (!ui.view_continuous && + (0.96 * ui.zoom * ui.cur_page->height < + GTK_WIDGET(canvas)->allocation.height)) { + if (event->keyval == GDK_Page_Down) { + end_text(); + reset_focus(); + if (ui.pageno == journal.npages-1) { return FALSE; } + do_switch_page(ui.pageno+1, TRUE, FALSE); + } + if (event->keyval == GDK_Page_Up) { + end_text(); + reset_focus(); + if (ui.pageno == 0) { return FALSE; } + do_switch_page(ui.pageno-1, TRUE, FALSE); + } + } + return FALSE; } @@ -2516,19 +2591,37 @@ on_canvas_motion_notify_event (GtkWidget *widget, { gboolean looks_wrong, is_core; double pt[2]; - - if (ui.cur_item_type == ITEM_NONE) return FALSE; // we don't care + + /* we don't care about this event unless some operation is in progress; + or if there's a selection (then we might want to change the mouse + cursor to indicate the possibility of resizing) */ + if (ui.cur_item_type == ITEM_NONE && ui.selection==NULL) return FALSE; is_core = (event->device == gdk_device_get_core_pointer()); if (!ui.use_xinput && !is_core) return FALSE; - if (ui.use_xinput && is_core && !ui.is_corestroke) return FALSE; if (!is_core) fix_xinput_coords((GdkEvent *)event); + if (!finite(event->x) || !finite(event->y)) return FALSE; // Xorg 7.3 bug + + if (ui.selection!=NULL && ui.cur_item_type == ITEM_NONE) { + get_pointer_coords((GdkEvent *)event, pt); + update_cursor_for_resize(pt); + return FALSE; + } + if (ui.use_xinput && is_core && !ui.is_corestroke) return FALSE; + if (!is_core) ui.is_corestroke = FALSE; + +#ifdef INPUT_DEBUG + printf("DEBUG: MotionNotify (%s) (x,y)=(%.2f,%.2f)\n", + is_core?"core":"xinput", event->x, event->y); +#endif + looks_wrong = !(event->state & (1<<(7+ui.which_mouse_button))); if (looks_wrong) { /* mouse button shouldn't be up... give up */ if (ui.cur_item_type == ITEM_STROKE) { finalize_stroke(); + if (ui.cur_brush->recognizer) recognize_patterns(); } else if (ui.cur_item_type == ITEM_ERASURE) { finalize_erasure(); @@ -2539,6 +2632,9 @@ on_canvas_motion_notify_event (GtkWidget *widget, else if (ui.cur_item_type == ITEM_MOVESEL || ui.cur_item_type == ITEM_MOVESEL_VERT) { finalize_movesel(); } + else if (ui.cur_item_type == ITEM_RESIZESEL) { + finalize_resizesel(); + } switch_mapping(0); return FALSE; } @@ -2560,6 +2656,9 @@ on_canvas_motion_notify_event (GtkWidget *widget, else if (ui.cur_item_type == ITEM_MOVESEL || ui.cur_item_type == ITEM_MOVESEL_VERT) { continue_movesel((GdkEvent *)event); } + else if (ui.cur_item_type == ITEM_RESIZESEL) { + continue_resizesel((GdkEvent *)event); + } else if (ui.cur_item_type == ITEM_HAND) { do_hand((GdkEvent *)event); } @@ -2694,7 +2793,6 @@ on_spinPageNo_value_changed (GtkSpinButton *spinbutton, val = gtk_spin_button_get_value_as_int(spinbutton) - 1; if (val == journal.npages) { // create a page at end - if (page_ops_forbidden()) return; on_journalNewPageEnd_activate(NULL, NULL); return; } @@ -2966,7 +3064,7 @@ on_mru_activate (GtkMenuItem *menuitem, /* open failed */ dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", ui.mru[which]); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), ui.mru[which]); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); delete_mru_entry(which); @@ -3057,9 +3155,6 @@ on_button2CopyBrush_activate (GtkMenuItem *menuitem, } ui.linked_brush[1] = BRUSH_COPIED; g_memmove(&(ui.brushes[1][ui.toolno[1]]), &(ui.brushes[0][ui.toolno[1]]), sizeof(struct Brush)); - ui.ruler[1] = ui.ruler[0]; - if (ui.toolno[1]!=TOOL_PEN && ui.toolno[1]!=TOOL_HIGHLIGHTER) - ui.ruler[1] = FALSE; } @@ -3147,9 +3242,6 @@ on_button3CopyBrush_activate (GtkMenuItem *menuitem, } ui.linked_brush[2] = BRUSH_COPIED; g_memmove(&(ui.brushes[2][ui.toolno[2]]), &(ui.brushes[0][ui.toolno[2]]), sizeof(struct Brush)); - ui.ruler[2] = ui.ruler[0]; - if (ui.toolno[2]!=TOOL_PEN && ui.toolno[2]!=TOOL_HIGHLIGHTER) - ui.ruler[2] = FALSE; } // the set zoom dialog @@ -3279,7 +3371,6 @@ on_toolsHand_activate (GtkMenuItem *menuitem, reset_focus(); reset_selection(); ui.toolno[0] = TOOL_HAND; - ui.ruler[0] = FALSE; update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -3389,3 +3480,17 @@ on_optionsAutoSavePrefs_activate (GtkMenuItem *menuitem, ui.auto_save_prefs = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); } +void +on_optionsPressureSensitive_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + int i; + end_text(); + reset_focus(); + ui.pressure_sensitivity = + gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); + for (i=0; i<=NUM_BUTTONS; i++) + ui.brushes[i][TOOL_PEN].variable_width = ui.pressure_sensitivity; + update_mappings_menu(); +} +