X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-callbacks.c;h=8dad7c9fdd6b053286ea136be8fa6a6766e38ce8;hb=HEAD;hp=038507ad4724ae69c38de812836065d787d0dc2d;hpb=64fbee630efe4a6a731bcc7b68855d933946b050;p=xournal.git
diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c
index 038507a..8dad7c9 100644
--- a/src/xo-callbacks.c
+++ b/src/xo-callbacks.c
@@ -1,3 +1,19 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+
#ifdef HAVE_CONFIG_H
# include
#endif
@@ -7,8 +23,8 @@
#include
#include
#include
-#include
#include
+#include
#include "xournal.h"
#include "xo-callbacks.h"
@@ -17,12 +33,15 @@
#include "xo-misc.h"
#include "xo-file.h"
#include "xo-paint.h"
+#include "xo-selection.h"
#include "xo-print.h"
+#include "xo-shapes.h"
void
on_fileNew_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
if (close_journal()) {
new_journal();
ui.zoom = ui.startup_zoom;
@@ -43,24 +62,29 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem,
int file_domain;
gboolean success;
+ end_text();
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);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
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);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
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);
@@ -95,7 +119,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);
@@ -111,17 +135,21 @@ on_fileOpen_activate (GtkMenuItem *menuitem,
char *filename;
gboolean success;
+ end_text();
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);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
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);
@@ -142,7 +170,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);
@@ -156,6 +184,7 @@ on_fileSave_activate (GtkMenuItem *menuitem,
{
GtkWidget *dialog;
+ end_text();
if (ui.filename == NULL) {
on_fileSaveAs_activate(menuitem, user_data);
return;
@@ -169,7 +198,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);
}
@@ -187,9 +216,13 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem,
gboolean warn;
struct stat stat_buf;
- dialog = gtk_file_chooser_dialog_new("Save Journal", GTK_WINDOW (winMain),
+ end_text();
+ 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);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
if (ui.filename!=NULL) {
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.filename);
@@ -205,17 +238,17 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem,
}
else {
curtime = time(NULL);
- strftime(stime, 30, "%F-Note-%H-%M.xoj", localtime(&curtime));
+ strftime(stime, 30, "%Y-%m-%d-Note-%H-%M.xoj", localtime(&curtime));
if (ui.default_path!=NULL)
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), stime);
}
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);
@@ -241,7 +274,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);
@@ -260,7 +293,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);
@@ -274,85 +307,56 @@ on_filePrintOptions_activate (GtkMenuItem *menuitem,
}
-
void
on_filePrint_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkWidget *printDialog, *preview;
- GnomePrintJob *gpj;
+#if GTK_CHECK_VERSION(2, 10, 0)
+ GtkPrintOperation *print;
+ GtkPrintOperationResult res;
+
int fromPage, toPage;
int response;
- char *in_fn;
- guchar *s;
- GnomePrintConfig *config = gnome_print_config_default();
-
- if (ui.filename!=NULL) {
- if (g_str_has_suffix(ui.filename, ".xoj")) {
- in_fn = g_strdup(ui.filename);
- g_strlcpy(g_strrstr(in_fn, "xoj"), "pdf", 4);
- }
- else
- in_fn = g_strdup_printf("%s.pdf", ui.filename);
- gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"PDF");
- gnome_print_config_set(config, (guchar *)GNOME_PRINT_KEY_OUTPUT_FILENAME, (guchar *)in_fn);
- gnome_print_config_set(config, (guchar *)"Settings.Transport.Backend.FileName", (guchar *)in_fn);
- g_strlcpy(g_strrstr(in_fn, "pdf"), "ps", 3);
- gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"GENERIC");
- gnome_print_config_set (config, (guchar *)GNOME_PRINT_KEY_OUTPUT_FILENAME, (guchar *)in_fn);
- s = gnome_print_config_get(config, (guchar *)"Settings.Transport.Backend.FileName");
- if (s != NULL) {
- g_free(s);
- gnome_print_config_set(config, (guchar *)"Settings.Transport.Backend.FileName", (guchar *)in_fn);
- }
- g_free(in_fn);
- }
-
- 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);
- 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");
- /* don't have "Current page" as option, else it becomes the default!! */
-
- gtk_dialog_set_response_sensitive(GTK_DIALOG(printDialog),
- GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, FALSE);
- /* the print-job-preview "feature" is completely, hopelessly broken */
-
- response = gtk_dialog_run(GTK_DIALOG(printDialog));
- if (response <= 0) {
- gtk_widget_destroy(printDialog);
- return;
- }
+ char *in_fn, *p;
+ end_text();
+ if (!gtk_check_version(2, 10, 0)) {
+ print = gtk_print_operation_new();
/*
- if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW) {
- print_job_render(gpj, 0, journal.npages-1);
- gtk_widget_destroy(printDialog);
- preview = gnome_print_job_preview_new(gpj, (guchar *)"Preview");
- try_fix_print_preview_ui(preview);
- gtk_window_set_modal(GTK_WINDOW(preview), TRUE);
- gtk_widget_show_all(preview);
- }
+ if (!ui.print_settings)
+ ui.print_settings = gtk_print_settings_new();
+ if (ui.filename!=NULL) {
+ if (g_str_has_suffix(ui.filename, ".xoj")) {
+ in_fn = g_strdup(ui.filename);
+ g_strlcpy(g_strrstr(in_fn, "xoj"), "pdf", 4);
+ }
+ else in_fn = g_strdup_printf("%s.pdf", ui.filename);
+ gtk_print_settings_set(ui.print_settings, GTK_PRINT_SETTINGS_OUTPUT_URI,
+ g_filename_to_uri(in_fn, NULL, NULL));
+ g_free(in_fn);
+ }
*/
-
- if (response == GNOME_PRINT_DIALOG_RESPONSE_PRINT) {
- switch(gnome_print_dialog_get_range(GNOME_PRINT_DIALOG(printDialog))) {
- case GNOME_PRINT_RANGE_RANGE:
- gnome_print_dialog_get_range_page(GNOME_PRINT_DIALOG(printDialog), &fromPage, &toPage);
- fromPage--;
- toPage--;
- break;
- default:
- fromPage = 0;
- toPage = journal.npages-1;
+ if (ui.print_settings!=NULL)
+ gtk_print_operation_set_print_settings (print, ui.print_settings);
+ gtk_print_operation_set_n_pages(print, journal.npages);
+ gtk_print_operation_set_current_page(print, ui.pageno);
+ gtk_print_operation_set_show_progress(print, TRUE);
+ if (ui.filename!=NULL) {
+ p = g_utf8_strrchr(ui.filename, -1, '/');
+ if (p==NULL) p = ui.filename;
+ else p++;
+ gtk_print_operation_set_job_name(print, p);
}
-
- gtk_widget_destroy(printDialog);
- print_job_render(gpj, fromPage, toPage);
+ g_signal_connect (print, "draw_page", G_CALLBACK (print_job_render_page), NULL);
+ res = gtk_print_operation_run(print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+ GTK_WINDOW(winMain), NULL);
+ if (res == GTK_PRINT_OPERATION_RESULT_APPLY) {
+ if (ui.print_settings!=NULL) g_object_unref(ui.print_settings);
+ ui.print_settings = g_object_ref(gtk_print_operation_get_print_settings(print));
+ }
+ g_object_unref(print);
}
+#endif
}
@@ -366,12 +370,15 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem,
char *filename, *in_fn;
char stime[30];
time_t curtime;
- int response;
gboolean warn;
- dialog = gtk_file_chooser_dialog_new("Export to PDF", GTK_WINDOW (winMain),
+ end_text();
+ 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);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
if (ui.filename!=NULL) {
if (g_str_has_suffix(ui.filename, ".xoj")) {
@@ -384,7 +391,7 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem,
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), g_basename(in_fn));
} else {
curtime = time(NULL);
- strftime(stime, 30, "%F-Note-%H-%M.pdf", localtime(&curtime));
+ strftime(stime, 30, "%Y-%m-%d-Note-%H-%M.pdf", localtime(&curtime));
if (ui.default_path!=NULL)
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER (dialog), stime);
@@ -392,11 +399,12 @@ 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);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
@@ -412,7 +420,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);
@@ -425,7 +433,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);
}
@@ -438,6 +446,7 @@ void
on_fileQuit_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
if (ok_to_close()) gtk_main_quit ();
}
@@ -453,10 +462,14 @@ on_editUndo_activate (GtkMenuItem *menuitem,
struct Brush tmp_brush;
struct Background *tmp_bg;
double tmp_x, tmp_y;
+ gchar *tmpstr;
+ GnomeCanvasGroup *group;
+ end_text();
if (undo == NULL) return; // nothing to undo!
reset_selection(); // safer
- if (undo->type == ITEM_STROKE) {
+ reset_recognizer(); // safer
+ if (undo->type == ITEM_STROKE || undo->type == ITEM_TEXT || undo->type == ITEM_IMAGE) {
// we're keeping the stroke info, but deleting the canvas item
gtk_object_destroy(GTK_OBJECT(undo->item->canvas_item));
undo->item->canvas_item = NULL;
@@ -464,7 +477,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
@@ -476,11 +489,8 @@ on_editUndo_activate (GtkMenuItem *menuitem,
undo->layer->nitems--;
}
// recreate the deleted one
- erasure->item->canvas_item = gnome_canvas_item_new(undo->layer->group,
- gnome_canvas_line_get_type(), "points", erasure->item->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", erasure->item->brush.color_rgba,
- "width-units", erasure->item->brush.thickness, NULL);
+ make_canvas_item_one(undo->layer->group, erasure->item);
+
undo->layer->items = g_list_insert(undo->layer->items, erasure->item,
erasure->npos);
if (erasure->npos == 0)
@@ -556,6 +566,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;
@@ -592,16 +607,9 @@ on_editUndo_activate (GtkMenuItem *menuitem,
(undo->val >= 0) ? undo->val:0);
undo->page->nlayers++;
- for (itemlist = undo->layer->items; itemlist!=NULL; itemlist = itemlist->next) {
- it = (struct Item *)itemlist->data;
- if (it->type == ITEM_STROKE) {
- it->canvas_item = gnome_canvas_item_new(undo->layer->group,
- gnome_canvas_line_get_type(), "points", it->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", it->brush.color_rgba,
- "width-units", it->brush.thickness, NULL);
- }
- }
+ for (itemlist = undo->layer->items; itemlist!=NULL; itemlist = itemlist->next)
+ make_canvas_item_one(undo->layer->group, (struct Item *)itemlist->data);
+
do_switch_page(ui.pageno, FALSE, FALSE); // show the restored layer & others...
}
else if (undo->type == ITEM_REPAINTSEL) {
@@ -611,12 +619,39 @@ 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)
+ 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,
- "width-units", it->brush.thickness, NULL);
+ "fill-color-rgba", it->brush.color_rgba, NULL);
}
}
+ else if (undo->type == ITEM_TEXT_EDIT) {
+ tmpstr = undo->str;
+ undo->str = undo->item->text;
+ undo->item->text = tmpstr;
+ gnome_canvas_item_set(undo->item->canvas_item, "text", tmpstr, NULL);
+ update_item_bbox(undo->item);
+ }
+ else if (undo->type == ITEM_TEXT_ATTRIB) {
+ tmpstr = undo->str;
+ undo->str = undo->item->font_name;
+ undo->item->font_name = tmpstr;
+ tmp_x = undo->val_x;
+ undo->val_x = undo->item->font_size;
+ undo->item->font_size = tmp_x;
+ g_memmove(&tmp_brush, undo->brush, sizeof(struct Brush));
+ g_memmove(undo->brush, &(undo->item->brush), sizeof(struct Brush));
+ g_memmove(&(undo->item->brush), &tmp_brush, sizeof(struct Brush));
+ gnome_canvas_item_set(undo->item->canvas_item,
+ "fill-color-rgba", undo->item->brush.color_rgba, NULL);
+ update_text_item_displayfont(undo->item);
+ update_item_bbox(undo->item);
+ }
// move item from undo to redo stack
u = undo;
@@ -641,32 +676,28 @@ on_editRedo_activate (GtkMenuItem *menuitem,
struct Background *tmp_bg;
struct Layer *l;
double tmp_x, tmp_y;
+ gchar *tmpstr;
+ GnomeCanvasGroup *group;
+ end_text();
if (redo == NULL) return; // nothing to redo!
reset_selection(); // safer
- if (redo->type == ITEM_STROKE) {
+ reset_recognizer(); // safer
+ if (redo->type == ITEM_STROKE || redo->type == ITEM_TEXT || redo->type == ITEM_IMAGE) {
// re-create the canvas_item
- redo->item->canvas_item = gnome_canvas_item_new(redo->layer->group,
- gnome_canvas_line_get_type(), "points", redo->item->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", redo->item->brush.color_rgba,
- "width-units", redo->item->brush.thickness, NULL);
+ make_canvas_item_one(redo->layer->group, redo->item);
// reinsert the item on its layer
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);
// re-create all the created items
for (itemlist = erasure->replacement_items; itemlist!=NULL; itemlist = itemlist->next) {
it = (struct Item *)itemlist->data;
- it->canvas_item = gnome_canvas_item_new(redo->layer->group,
- gnome_canvas_line_get_type(), "points", it->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", it->brush.color_rgba,
- "width-units", it->brush.thickness, NULL);
+ make_canvas_item_one(redo->layer->group, it);
redo->layer->items = g_list_insert_before(redo->layer->items, target, it);
redo->layer->nitems++;
lower_canvas_item_to(redo->layer->group, it->canvas_item, erasure->item->canvas_item);
@@ -739,7 +770,7 @@ on_editRedo_activate (GtkMenuItem *menuitem,
}
journal.pages = g_list_remove(journal.pages, redo->page);
journal.npages--;
- if (ui.pageno > undo->val || ui.pageno == journal.npages) ui.pageno--;
+ if (ui.pageno > redo->val || ui.pageno == journal.npages) ui.pageno--;
ui.cur_page = NULL;
// so do_switch_page() won't try to remap the layers of the defunct page
do_switch_page(ui.pageno, TRUE, TRUE);
@@ -756,14 +787,14 @@ 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;
- it->canvas_item = gnome_canvas_item_new(redo->layer->group,
- gnome_canvas_line_get_type(), "points", it->path,
- "cap-style", GDK_CAP_ROUND, "join-style", GDK_JOIN_ROUND,
- "fill-color-rgba", it->brush.color_rgba,
- "width-units", it->brush.thickness, NULL);
+ make_canvas_item_one(redo->layer->group, it);
redo->layer->items = g_list_append(redo->layer->items, it);
redo->layer->nitems++;
}
@@ -801,12 +832,45 @@ 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)
+ 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,
- "width-units", it->brush.thickness, NULL);
+ "fill-color-rgba", it->brush.color_rgba, NULL);
+ if (it->type == ITEM_IMAGE && 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);
+ }
}
}
+ else if (redo->type == ITEM_TEXT_EDIT) {
+ tmpstr = redo->str;
+ redo->str = redo->item->text;
+ redo->item->text = tmpstr;
+ gnome_canvas_item_set(redo->item->canvas_item, "text", tmpstr, NULL);
+ update_item_bbox(redo->item);
+ }
+ else if (redo->type == ITEM_TEXT_ATTRIB) {
+ tmpstr = redo->str;
+ redo->str = redo->item->font_name;
+ redo->item->font_name = tmpstr;
+ tmp_x = redo->val_x;
+ redo->val_x = redo->item->font_size;
+ redo->item->font_size = tmp_x;
+ g_memmove(&tmp_brush, redo->brush, sizeof(struct Brush));
+ g_memmove(redo->brush, &(redo->item->brush), sizeof(struct Brush));
+ g_memmove(&(redo->item->brush), &tmp_brush, sizeof(struct Brush));
+ gnome_canvas_item_set(redo->item->canvas_item,
+ "fill-color-rgba", redo->item->brush.color_rgba, NULL);
+ update_text_item_displayfont(redo->item);
+ update_item_bbox(redo->item);
+ }
// move item from redo to undo stack
u = redo;
@@ -823,6 +887,7 @@ void
on_editCut_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
selection_to_clip();
selection_delete();
}
@@ -832,6 +897,7 @@ void
on_editCopy_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
selection_to_clip();
}
@@ -840,6 +906,7 @@ void
on_editPaste_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
clipboard_paste();
}
@@ -848,6 +915,7 @@ void
on_editDelete_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
selection_delete();
}
@@ -899,7 +967,9 @@ on_viewZoomIn_activate (GtkMenuItem *menuitem,
if (ui.zoom > MAX_ZOOM) return;
ui.zoom *= ui.zoom_step_factor;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
@@ -910,7 +980,9 @@ on_viewZoomOut_activate (GtkMenuItem *menuitem,
if (ui.zoom < MIN_ZOOM) return;
ui.zoom /= ui.zoom_step_factor;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
@@ -920,7 +992,9 @@ on_viewNormalSize_activate (GtkMenuItem *menuitem,
{
ui.zoom = DEFAULT_ZOOM;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
@@ -930,7 +1004,9 @@ on_viewPageWidth_activate (GtkMenuItem *menuitem,
{
ui.zoom = (GTK_WIDGET(canvas))->allocation.width/ui.cur_page->width;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
@@ -938,6 +1014,7 @@ void
on_viewFirstPage_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
do_switch_page(0, TRUE, FALSE);
}
@@ -946,6 +1023,7 @@ void
on_viewPreviousPage_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
if (ui.pageno == 0) return;
do_switch_page(ui.pageno-1, TRUE, FALSE);
}
@@ -955,8 +1033,8 @@ void
on_viewNextPage_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
if (ui.pageno == journal.npages-1) { // create a page at end
- if (page_ops_forbidden()) return;
on_journalNewPageEnd_activate(menuitem, user_data);
return;
}
@@ -968,6 +1046,7 @@ void
on_viewLastPage_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
do_switch_page(journal.npages-1, TRUE, FALSE);
}
@@ -976,6 +1055,7 @@ void
on_viewShowLayer_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
if (ui.layerno == ui.cur_page->nlayers-1) return;
reset_selection();
ui.layerno++;
@@ -989,6 +1069,7 @@ void
on_viewHideLayer_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
if (ui.layerno == -1) return;
reset_selection();
gnome_canvas_item_hide(GNOME_CANVAS_ITEM(ui.cur_layer->group));
@@ -1005,7 +1086,7 @@ on_journalNewPageBefore_activate (GtkMenuItem *menuitem,
{
struct Page *pg;
- if (page_ops_forbidden()) return;
+ end_text();
reset_selection();
pg = new_page(ui.cur_page);
journal.pages = g_list_insert(journal.pages, pg, ui.pageno);
@@ -1025,7 +1106,7 @@ on_journalNewPageAfter_activate (GtkMenuItem *menuitem,
{
struct Page *pg;
- if (page_ops_forbidden()) return;
+ end_text();
reset_selection();
pg = new_page(ui.cur_page);
journal.pages = g_list_insert(journal.pages, pg, ui.pageno+1);
@@ -1045,7 +1126,7 @@ on_journalNewPageEnd_activate (GtkMenuItem *menuitem,
{
struct Page *pg;
- if (page_ops_forbidden()) return;
+ end_text();
reset_selection();
pg = new_page((struct Page *)g_list_last(journal.pages)->data);
journal.pages = g_list_append(journal.pages, pg);
@@ -1066,9 +1147,10 @@ on_journalDeletePage_activate (GtkMenuItem *menuitem,
GList *layerlist, *itemlist;
struct Layer *l;
- if (page_ops_forbidden()) return;
+ end_text();
if (journal.npages == 1) return;
reset_selection();
+ reset_recognizer(); // safer
prepare_new_undo();
undo->type = ITEM_DELETE_PAGE;
undo->val = ui.pageno;
@@ -1100,6 +1182,7 @@ on_journalNewLayer_activate (GtkMenuItem *menuitem,
{
struct Layer *l;
+ end_text();
reset_selection();
l = g_new(struct Layer, 1);
l->items = NULL;
@@ -1128,8 +1211,10 @@ on_journalDeleteLayer_activate (GtkMenuItem *menuitem,
{
GList *list;
+ end_text();
if (ui.cur_layer == NULL) return;
reset_selection();
+ reset_recognizer(); // safer
prepare_new_undo();
undo->type = ITEM_DELETE_LAYER;
undo->val = ui.layerno;
@@ -1199,6 +1284,7 @@ on_journalPaperSize_activate (GtkMenuItem *menuitem,
struct Page *pg;
GList *pglist;
+ end_text();
papersize_dialog = create_papersizeDialog();
papersize_width = ui.cur_page->width;
papersize_height = ui.cur_page->height;
@@ -1248,7 +1334,8 @@ void
on_papercolorWhite_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_papercolor_activate(menuitem, COLOR_WHITE);
+ end_text();
+ process_papercolor_activate(menuitem, COLOR_WHITE, predef_bgcolors_rgba[COLOR_WHITE]);
}
@@ -1256,7 +1343,8 @@ void
on_papercolorYellow_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_papercolor_activate(menuitem, COLOR_YELLOW);
+ end_text();
+ process_papercolor_activate(menuitem, COLOR_YELLOW, predef_bgcolors_rgba[COLOR_YELLOW]);
}
@@ -1264,7 +1352,8 @@ void
on_papercolorPink_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_papercolor_activate(menuitem, COLOR_RED);
+ end_text();
+ process_papercolor_activate(menuitem, COLOR_RED, predef_bgcolors_rgba[COLOR_RED]);
}
@@ -1272,7 +1361,8 @@ void
on_papercolorOrange_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_papercolor_activate(menuitem, COLOR_ORANGE);
+ end_text();
+ process_papercolor_activate(menuitem, COLOR_ORANGE, predef_bgcolors_rgba[COLOR_ORANGE]);
}
@@ -1280,7 +1370,8 @@ void
on_papercolorBlue_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_papercolor_activate(menuitem, COLOR_BLUE);
+ end_text();
+ process_papercolor_activate(menuitem, COLOR_BLUE, predef_bgcolors_rgba[COLOR_BLUE]);
}
@@ -1288,7 +1379,8 @@ void
on_papercolorGreen_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_papercolor_activate(menuitem, COLOR_GREEN);
+ end_text();
+ process_papercolor_activate(menuitem, COLOR_GREEN, predef_bgcolors_rgba[COLOR_GREEN]);
}
@@ -1296,7 +1388,25 @@ void
on_papercolorOther_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
+ GtkWidget *dialog;
+ GtkColorSelection *colorsel;
+ gint result;
+ guint rgba;
+ GdkColor gdkcolor;
+
+ end_text();
+ dialog = gtk_color_selection_dialog_new(_("Pick a Paper Color"));
+ colorsel = GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(dialog)->colorsel);
+ if (ui.cur_page->bg->type == BG_SOLID) rgba = ui.cur_page->bg->color_rgba;
+ else rgba = ui.default_page.bg->color_rgba;
+ rgb_to_gdkcolor(rgba, &gdkcolor);
+ gtk_color_selection_set_current_color(colorsel, &gdkcolor);
+
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+ gtk_color_selection_get_current_color(colorsel, &gdkcolor);
+ process_papercolor_activate(menuitem, COLOR_OTHER, gdkcolor_to_rgba(gdkcolor, 0xffff));
+ }
+ gtk_widget_destroy(dialog);
}
@@ -1304,6 +1414,7 @@ void
on_paperstylePlain_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
process_paperstyle_activate(menuitem, RULING_NONE);
}
@@ -1312,6 +1423,7 @@ void
on_paperstyleLined_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
process_paperstyle_activate(menuitem, RULING_LINED);
}
@@ -1320,6 +1432,7 @@ void
on_paperstyleRuled_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
process_paperstyle_activate(menuitem, RULING_RULED);
}
@@ -1328,6 +1441,7 @@ void
on_paperstyleGraph_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
process_paperstyle_activate(menuitem, RULING_GRAPH);
}
@@ -1345,12 +1459,16 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem,
char *filename;
gboolean attach;
- dialog = gtk_file_chooser_dialog_new("Open Background", GTK_WINDOW (winMain),
+ end_text();
+ 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);
+#ifdef FILE_DIALOG_SIZE_BUGFIX
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+#endif
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);
@@ -1358,7 +1476,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);
}
@@ -1366,12 +1484,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);
@@ -1394,7 +1514,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);
@@ -1444,7 +1564,9 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem,
if (ui.zoom != DEFAULT_ZOOM) {
ui.zoom = DEFAULT_ZOOM;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
do_switch_page(ui.pageno, TRUE, TRUE);
}
@@ -1455,6 +1577,7 @@ on_journalScreenshot_activate (GtkMenuItem *menuitem,
{
struct Background *bg;
+ end_text();
reset_selection();
gtk_window_iconify(GTK_WINDOW(winMain)); // hide ourselves
gdk_display_sync(gdk_display_get_default());
@@ -1488,7 +1611,9 @@ on_journalScreenshot_activate (GtkMenuItem *menuitem,
if (ui.zoom != DEFAULT_ZOOM) {
ui.zoom = DEFAULT_ZOOM;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
do_switch_page(ui.pageno, TRUE, TRUE);
}
@@ -1500,6 +1625,7 @@ on_journalApplyAllPages_activate (GtkMenuItem *menuitem,
{
gboolean active;
+ end_text();
active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
if (active == ui.bg_apply_all_pages) return;
ui.bg_apply_all_pages = active;
@@ -1548,13 +1674,16 @@ on_toolsPen_activate (GtkMenuItem *menuitem,
return;
}
- if (ui.cur_mapping != 0) return;
- if (ui.toolno[0] == TOOL_PEN) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_PEN) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
reset_selection();
- ui.toolno[0] = TOOL_PEN;
- ui.ruler[0] = FALSE;
- ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
+ ui.toolno[ui.cur_mapping] = TOOL_PEN;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][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();
@@ -1575,13 +1704,14 @@ on_toolsEraser_activate (GtkMenuItem *menuitem,
return;
}
- if (ui.cur_mapping != 0) return;
- if (ui.toolno[0] == TOOL_ERASER) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_ERASER) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
reset_selection();
- ui.toolno[0] = TOOL_ERASER;
- ui.ruler[0] = FALSE;
- ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]);
+ ui.toolno[ui.cur_mapping] = TOOL_ERASER;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_ERASER]);
update_mapping_linkings(TOOL_ERASER);
update_tool_buttons();
update_tool_menu();
@@ -1602,13 +1732,16 @@ on_toolsHighlighter_activate (GtkMenuItem *menuitem,
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_HIGHLIGHTER) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
reset_selection();
- ui.toolno[0] = TOOL_HIGHLIGHTER;
- ui.ruler[0] = FALSE;
- ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]);
+ ui.toolno[ui.cur_mapping] = TOOL_HIGHLIGHTER;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][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();
@@ -1621,7 +1754,53 @@ void
on_toolsText_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) {
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
+ return;
+ } else {
+ if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)))
+ return;
+ }
+
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_TEXT) return;
+
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ reset_selection();
+ ui.toolno[ui.cur_mapping] = TOOL_TEXT;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
+ update_mapping_linkings(-1);
+ update_tool_buttons();
+ update_tool_menu();
+ update_color_menu();
+ update_cursor();
+}
+
+void
+on_toolsImage_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) {
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
+ return;
+ } else {
+ if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)))
+ return;
+ }
+
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_IMAGE) return;
+
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
+ reset_selection();
+ ui.toolno[ui.cur_mapping] = TOOL_IMAGE;
+ update_mapping_linkings(-1);
+ update_tool_buttons();
+ update_tool_menu();
+ update_color_menu();
+ update_cursor();
}
@@ -1629,7 +1808,25 @@ void
on_toolsSelectRegion_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
+ if (GTK_OBJECT_TYPE(menuitem) == GTK_TYPE_RADIO_MENU_ITEM) {
+ if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)))
+ return;
+ } else {
+ if (!gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)))
+ return;
+ }
+
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_SELECTREGION) return;
+
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
+ ui.toolno[ui.cur_mapping] = TOOL_SELECTREGION;
+ update_mapping_linkings(-1);
+ update_tool_buttons();
+ update_tool_menu();
+ update_color_menu();
+ update_cursor();
}
@@ -1645,11 +1842,12 @@ on_toolsSelectRectangle_activate (GtkMenuItem *menuitem,
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_SELECTRECT) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_SELECTRECT) return;
- ui.toolno[0] = TOOL_SELECTRECT;
- ui.ruler[0] = FALSE;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
+ ui.toolno[ui.cur_mapping] = TOOL_SELECTRECT;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
@@ -1670,12 +1868,13 @@ on_toolsVerticalSpace_activate (GtkMenuItem *menuitem,
return;
}
- if (ui.cur_mapping != 0) return; // not user-generated
- if (ui.toolno[0] == TOOL_VERTSPACE) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated
+ if (ui.toolno[ui.cur_mapping] == TOOL_VERTSPACE) return;
+ ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon)
+ end_text();
reset_selection();
- ui.toolno[0] = TOOL_VERTSPACE;
- ui.ruler[0] = FALSE;
+ ui.toolno[ui.cur_mapping] = TOOL_VERTSPACE;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
@@ -1688,7 +1887,7 @@ void
on_colorBlack_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_BLACK);
+ process_color_activate(menuitem, COLOR_BLACK, predef_colors_rgba[COLOR_BLACK]);
}
@@ -1696,8 +1895,7 @@ void
on_colorBlue_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_BLUE);
-
+ process_color_activate(menuitem, COLOR_BLUE, predef_colors_rgba[COLOR_BLUE]);
}
@@ -1705,7 +1903,7 @@ void
on_colorRed_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_RED);
+ process_color_activate(menuitem, COLOR_RED, predef_colors_rgba[COLOR_RED]);
}
@@ -1713,7 +1911,7 @@ void
on_colorGreen_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_GREEN);
+ process_color_activate(menuitem, COLOR_GREEN, predef_colors_rgba[COLOR_GREEN]);
}
@@ -1721,7 +1919,7 @@ void
on_colorGray_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_GRAY);
+ process_color_activate(menuitem, COLOR_GRAY, predef_colors_rgba[COLOR_GRAY]);
}
@@ -1729,7 +1927,7 @@ void
on_colorLightBlue_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_LIGHTBLUE);
+ process_color_activate(menuitem, COLOR_LIGHTBLUE, predef_colors_rgba[COLOR_LIGHTBLUE]);
}
@@ -1737,7 +1935,7 @@ void
on_colorLightGreen_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_LIGHTGREEN);
+ process_color_activate(menuitem, COLOR_LIGHTGREEN, predef_colors_rgba[COLOR_LIGHTGREEN]);
}
@@ -1745,7 +1943,7 @@ void
on_colorMagenta_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_MAGENTA);
+ process_color_activate(menuitem, COLOR_MAGENTA, predef_colors_rgba[COLOR_MAGENTA]);
}
@@ -1753,7 +1951,7 @@ void
on_colorOrange_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_ORANGE);
+ process_color_activate(menuitem, COLOR_ORANGE, predef_colors_rgba[COLOR_ORANGE]);
}
@@ -1761,7 +1959,7 @@ void
on_colorYellow_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_YELLOW);
+ process_color_activate(menuitem, COLOR_YELLOW, predef_colors_rgba[COLOR_YELLOW]);
}
@@ -1769,7 +1967,7 @@ void
on_colorWhite_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- process_color_activate(menuitem, COLOR_WHITE);
+ process_color_activate(menuitem, COLOR_WHITE, predef_colors_rgba[COLOR_WHITE]);
}
@@ -1777,7 +1975,7 @@ void
on_colorOther_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
+ gtk_button_clicked(GTK_BUTTON(GET_COMPONENT("buttonColorChooser")));
}
@@ -1850,6 +2048,7 @@ on_eraserStandard_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return;
+ end_text();
ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_STANDARD;
update_mapping_linkings(TOOL_ERASER);
}
@@ -1860,6 +2059,7 @@ on_eraserWhiteout_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return;
+ end_text();
ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_WHITEOUT;
update_mapping_linkings(TOOL_ERASER);
}
@@ -1870,6 +2070,7 @@ on_eraserDeleteStrokes_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem))) return;
+ end_text();
ui.brushes[0][TOOL_ERASER].tool_options = TOOLOPT_ERASER_STROKES;
update_mapping_linkings(TOOL_ERASER);
}
@@ -1903,20 +2104,32 @@ void
on_toolsTextFont_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
-}
-
+ GtkWidget *dialog;
+ gchar *str;
+
+ 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);
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
+ gtk_widget_destroy(dialog);
+ return;
+ }
+ str = gtk_font_selection_dialog_get_font_name(GTK_FONT_SELECTION_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+ process_font_sel(str);
+}
void
on_toolsDefaultPen_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
switch_mapping(0);
+ end_text();
reset_selection();
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();
@@ -1931,11 +2144,11 @@ on_toolsDefaultEraser_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
switch_mapping(0);
+ end_text();
reset_selection();
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();
@@ -1950,11 +2163,11 @@ on_toolsDefaultHighlighter_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
switch_mapping(0);
+ end_text();
reset_selection();
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();
@@ -1967,7 +2180,25 @@ void
on_toolsDefaultText_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
-
+ switch_mapping(0);
+ if (ui.toolno[0]!=TOOL_TEXT) end_text();
+ reset_selection();
+ ui.toolno[0] = TOOL_TEXT;
+ 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;
+ g_free(ui.font_name);
+ ui.font_name = g_strdup(ui.default_font_name);
+ ui.font_size = ui.default_font_size;
+ if (ui.cur_item_type == ITEM_TEXT) {
+ refont_text_item(ui.cur_item, ui.font_name, ui.font_size);
+ }
+ update_font_button();
+ update_mapping_linkings(-1);
+ update_tool_buttons();
+ update_tool_menu();
+ update_color_menu();
+ update_cursor();
}
@@ -1975,9 +2206,30 @@ void
on_toolsSetAsDefault_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- if (ui.cur_mapping!=0) return;
- if (ui.toolno[0] < NUM_STROKE_TOOLS)
- g_memmove(ui.default_brushes+ui.toolno[0], &(ui.brushes[0][ui.toolno[0]]), sizeof(struct Brush));
+ struct Item *it;
+
+ if (ui.cur_mapping!=0 && !ui.button_switch_mapping) return;
+ if (ui.toolno[ui.cur_mapping] < NUM_STROKE_TOOLS)
+ g_memmove(ui.default_brushes+ui.toolno[ui.cur_mapping],
+ &(ui.brushes[ui.cur_mapping][ui.toolno[ui.cur_mapping]]), sizeof(struct Brush));
+ if (ui.toolno[ui.cur_mapping] == TOOL_TEXT) {
+ if (ui.cur_item_type == ITEM_TEXT) {
+ g_free(ui.font_name);
+ ui.font_name = g_strdup(ui.cur_item->font_name);
+ ui.font_size = ui.cur_item->font_size;
+ }
+ else if (ui.selection!=NULL && ui.selection->items!=NULL &&
+ ui.selection->items->next==NULL &&
+ (it=(struct Item*)ui.selection->items->data)->type == ITEM_TEXT) {
+ g_free(ui.font_name);
+ ui.font_name = g_strdup(it->font_name);
+ ui.font_size = it->font_size;
+ }
+ g_free(ui.default_font_name);
+ ui.default_font_name = g_strdup(ui.font_name);
+ ui.default_font_size = ui.font_size;
+ }
+ end_text();
}
@@ -1985,28 +2237,69 @@ 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;
- if (active == ui.ruler[0]) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ current = (ui.toolno[ui.cur_mapping] == TOOL_PEN || ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) && ui.cur_brush->ruler;
+ if (active == current) return;
+
+ ui.cur_mapping = 0;
+ end_text();
+ if (ui.toolno[ui.cur_mapping]!=TOOL_PEN && ui.toolno[ui.cur_mapping]!=TOOL_HIGHLIGHTER) {
+ reset_selection();
+ ui.toolno[ui.cur_mapping] = TOOL_PEN;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
+ update_color_menu();
+ update_tool_buttons();
+ update_tool_menu();
+ update_cursor();
+ }
- if (active && (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER)) {
+ ui.cur_brush->ruler = active;
+ if (active) ui.cur_brush->recognizer = FALSE;
+ update_mapping_linkings(ui.toolno[ui.cur_mapping]);
+ 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));
+ else
+ active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem));
+
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ current = (ui.toolno[ui.cur_mapping] == TOOL_PEN || ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) && ui.cur_brush->recognizer;
+ if (active == current) return;
+
+ ui.cur_mapping = 0;
+ end_text();
+ if (ui.toolno[ui.cur_mapping]!=TOOL_PEN && ui.toolno[ui.cur_mapping]!=TOOL_HIGHLIGHTER) {
reset_selection();
- ui.toolno[0] = TOOL_PEN;
- ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
+ ui.toolno[ui.cur_mapping] = TOOL_PEN;
+ ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]);
update_color_menu();
update_tool_buttons();
update_tool_menu();
update_cursor();
}
- ui.ruler[0] = active;
- update_mapping_linkings(ui.toolno[0]);
+ ui.cur_brush->recognizer = active;
+ if (active) {
+ ui.cur_brush->ruler = FALSE;
+ reset_recognizer();
+ }
+ update_mapping_linkings(ui.toolno[ui.cur_mapping]);
update_ruler_indicator();
}
@@ -2015,6 +2308,7 @@ void
on_optionsSavePreferences_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
save_config_to_file();
}
@@ -2034,10 +2328,11 @@ on_helpAbout_activate (GtkMenuItem *menuitem,
GtkWidget *aboutDialog;
GtkLabel *labelTitle;
+ end_text();
aboutDialog = create_aboutDialog ();
labelTitle = GTK_LABEL(g_object_get_data(G_OBJECT(aboutDialog), "labelTitle"));
gtk_label_set_markup(labelTitle,
- "Xournal " VERSION "");
+ "Xournal " VERSION_STRING "");
gtk_dialog_run (GTK_DIALOG(aboutDialog));
gtk_widget_destroy(aboutDialog);
}
@@ -2047,10 +2342,14 @@ void
on_buttonToolDefault_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
+ if (ui.toolno[0]==TOOL_TEXT) {
+ on_toolsDefaultText_activate(NULL, NULL);
+ return;
+ }
+ end_text();
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();
@@ -2067,8 +2366,8 @@ void
on_buttonFine_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- if (ui.cur_mapping != 0) return;
- process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_FINE);
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_FINE);
}
@@ -2076,8 +2375,8 @@ void
on_buttonMedium_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- if (ui.cur_mapping != 0) return;
- process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_MEDIUM);
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_MEDIUM);
}
@@ -2085,8 +2384,8 @@ void
on_buttonThick_clicked (GtkToolButton *toolbutton,
gpointer user_data)
{
- if (ui.cur_mapping != 0) return;
- process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_THICK);
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_THICK);
}
@@ -2096,68 +2395,129 @@ on_canvas_button_press_event (GtkWidget *widget,
gpointer user_data)
{
double pt[2];
- gboolean page_change;
- struct Page *tmppage;
GtkWidget *dialog;
int mapping;
gboolean is_core;
+ struct Item *item;
+ GdkEvent scroll_event;
- if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something
- if (event->button > 3) return FALSE; // no painting with the mouse wheel!
+#ifdef INPUT_DEBUG
+ printf("DEBUG: ButtonPress (%s) (x,y)=(%.2f,%.2f), button %d, modifier %x\n",
+ event->device->name, event->x, event->y, event->button, event->state);
+#endif
+ // abort any page changes pending in the spin button, and take the focus
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(GET_COMPONENT("spinPageNo")), ui.pageno+1);
+ reset_focus();
+
is_core = (event->device == gdk_device_get_core_pointer());
if (!ui.use_xinput && !is_core) return FALSE;
if (ui.use_xinput && is_core && ui.discard_corepointer) return FALSE;
- 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 (event->type != GDK_BUTTON_PRESS) return FALSE;
+ // double-clicks may have broken axes member (free'd) due to a bug in GDK
+
+ if (event->button > 3) { // scroll wheel events! don't paint...
+ if (ui.use_xinput && !gtk_check_version(2, 17, 0) && event->button <= 7) {
+ /* with GTK+ 2.17 and later, the entire widget hierarchy is xinput-aware,
+ so the core button event gets discarded and the scroll event never
+ gets processed by the main window. This is arguably a GTK+ bug.
+ We work around it. */
+ scroll_event.scroll.type = GDK_SCROLL;
+ scroll_event.scroll.window = event->window;
+ scroll_event.scroll.send_event = event->send_event;
+ scroll_event.scroll.time = event->time;
+ scroll_event.scroll.x = event->x;
+ scroll_event.scroll.y = event->y;
+ scroll_event.scroll.state = event->state;
+ scroll_event.scroll.device = event->device;
+ scroll_event.scroll.x_root = event->x_root;
+ scroll_event.scroll.y_root = event->y_root;
+ if (event->button == 4) scroll_event.scroll.direction = GDK_SCROLL_UP;
+ else if (event->button == 5) scroll_event.scroll.direction = GDK_SCROLL_DOWN;
+ else if (event->button == 6) scroll_event.scroll.direction = GDK_SCROLL_LEFT;
+ else scroll_event.scroll.direction = GDK_SCROLL_RIGHT;
+ gtk_widget_event(GET_COMPONENT("scrolledwindowMain"), &scroll_event);
+ }
+ return FALSE;
+ }
+ if ((event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK)) != 0) return FALSE;
+ // no control-clicking or alt-clicking
+ if (!is_core) gdk_device_get_state(event->device, event->window, event->axes, NULL);
+ // synaptics touchpads send bogus axis values with ButtonDown
+ if (!is_core)
fix_xinput_coords((GdkEvent *)event);
+
+ if (!finite_sized(event->x) || !finite_sized(event->y)) return FALSE; // Xorg 7.3 bug
+
+ if (ui.cur_item_type == ITEM_TEXT) {
+ if (!is_event_within_textview(event)) end_text();
+ else return FALSE;
}
+ 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;
+ ui.stroke_device = event->device;
+ get_pointer_coords((GdkEvent *)event, ui.cur_path.coords);
+ }
+ if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something
+
+ // if button_switch_mapping enabled, button 2 or 3 clicks only switch mapping
+ if (ui.button_switch_mapping && event->button > 1) {
+ ui.which_unswitch_button = event->button;
+ switch_mapping(event->button-1);
+ return FALSE;
+ }
+
ui.is_corestroke = is_core;
+ ui.stroke_device = event->device;
if (ui.use_erasertip && event->device->source == GDK_SOURCE_ERASER)
- mapping = NUM_BUTTONS;
+ mapping = NUM_BUTTONS;
+ else if (ui.button_switch_mapping) {
+ mapping = ui.cur_mapping;
+ if (!mapping && (event->state & GDK_BUTTON2_MASK)) mapping = 1;
+ if (!mapping && (event->state & GDK_BUTTON3_MASK)) mapping = 2;
+ }
else mapping = event->button-1;
// check whether we're in a page
- page_change = FALSE;
- tmppage = ui.cur_page;
get_pointer_coords((GdkEvent *)event, pt);
- while (ui.view_continuous && (pt[1] < - VIEW_CONTINUOUS_SKIP)) {
- if (ui.pageno == 0) break;
- page_change = TRUE;
- ui.pageno--;
- tmppage = g_list_nth_data(journal.pages, ui.pageno);
- pt[1] += tmppage->height + VIEW_CONTINUOUS_SKIP;
- }
- while (ui.view_continuous && (pt[1] > tmppage->height + VIEW_CONTINUOUS_SKIP)) {
- if (ui.pageno == journal.npages-1) break;
- pt[1] -= tmppage->height + VIEW_CONTINUOUS_SKIP;
- page_change = TRUE;
- ui.pageno++;
- tmppage = g_list_nth_data(journal.pages, ui.pageno);
- }
- if (page_change) do_switch_page(ui.pageno, FALSE, FALSE);
+ set_current_page(pt);
// can't paint on the background...
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
ui.which_mouse_button = event->button;
switch_mapping(mapping);
+#ifdef WIN32
+ update_cursor();
+#endif
+
+ // in text tool, clicking in a text area edits it
+ if (ui.toolno[mapping] == TOOL_TEXT) {
+ item = click_is_in_text(ui.cur_layer, pt[0], pt[1]);
+ if (item!=NULL) {
+ reset_selection();
+ start_text((GdkEvent *)event, item);
+ return FALSE;
+ }
+ }
- // 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)
@@ -2168,6 +2528,8 @@ on_canvas_button_press_event (GtkWidget *widget,
if (ui.toolno[mapping] == TOOL_HAND) {
ui.cur_item_type = ITEM_HAND;
get_pointer_coords((GdkEvent *)event, ui.hand_refpt);
+ ui.hand_refpt[0] += ui.cur_page->hoffset;
+ ui.hand_refpt[1] += ui.cur_page->voffset;
}
else if (ui.toolno[mapping] == TOOL_PEN || ui.toolno[mapping] == TOOL_HIGHLIGHTER ||
(ui.toolno[mapping] == TOOL_ERASER && ui.cur_brush->tool_options == TOOLOPT_ERASER_WHITEOUT)) {
@@ -2178,12 +2540,21 @@ on_canvas_button_press_event (GtkWidget *widget,
do_eraser((GdkEvent *)event, ui.cur_brush->thickness/2,
ui.cur_brush->tool_options == TOOLOPT_ERASER_STROKES);
}
+ else if (ui.toolno[mapping] == TOOL_SELECTREGION) {
+ start_selectregion((GdkEvent *)event);
+ }
else if (ui.toolno[mapping] == TOOL_SELECTRECT) {
start_selectrect((GdkEvent *)event);
}
else if (ui.toolno[mapping] == TOOL_VERTSPACE) {
start_vertspace((GdkEvent *)event);
}
+ else if (ui.toolno[mapping] == TOOL_TEXT) {
+ start_text((GdkEvent *)event, NULL);
+ }
+ else if (ui.toolno[mapping] == TOOL_IMAGE) {
+ insert_image((GdkEvent *)event);
+ }
return FALSE;
}
@@ -2195,32 +2566,47 @@ on_canvas_button_release_event (GtkWidget *widget,
{
gboolean is_core;
- if (ui.cur_item_type == ITEM_NONE) return FALSE; // not doing anything
-
- if (event->button != ui.which_mouse_button) return FALSE; // ignore
+#ifdef INPUT_DEBUG
+ printf("DEBUG: ButtonRelease (%s) (x,y)=(%.2f,%.2f), button %d, modifier %x\n",
+ event->device->name, event->x, event->y, event->button, event->state);
+#endif
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 (ui.ignore_other_devices && ui.stroke_device!=event->device) return FALSE;
if (!is_core) fix_xinput_coords((GdkEvent *)event);
+ if (event->button != ui.which_mouse_button &&
+ event->button != ui.which_unswitch_button)
+ return FALSE;
+
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();
}
+ else if (ui.cur_item_type == ITEM_SELECTREGION) {
+ finalize_selectregion();
+ }
else if (ui.cur_item_type == ITEM_SELECTRECT) {
finalize_selectrect();
}
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;
}
+
+ if (!ui.which_unswitch_button || event->button == ui.which_unswitch_button)
+ switch_mapping(0); // will reset ui.which_unswitch_button
- switch_mapping(0);
return FALSE;
}
@@ -2230,7 +2616,53 @@ on_canvas_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event,
gpointer user_data)
{
+ GList *dev_list;
+ GdkDevice *dev;
+
+#ifdef INPUT_DEBUG
+ printf("DEBUG: enter notify\n");
+#endif
+ /* re-enable input devices after they've been emergency-disabled
+ by leave_notify */
+ if (!gtk_check_version(2, 17, 0)) {
+ gdk_flush();
+ gdk_error_trap_push();
+ for (dev_list = gdk_devices_list(); dev_list != NULL; dev_list = dev_list->next) {
+ dev = GDK_DEVICE(dev_list->data);
+ gdk_device_set_mode(dev, GDK_MODE_SCREEN);
+ }
+ ui.is_corestroke = ui.saved_is_corestroke;
+ gdk_flush();
+ gdk_error_trap_pop();
+ }
+ return FALSE;
+}
+
+gboolean
+on_canvas_leave_notify_event (GtkWidget *widget,
+ GdkEventCrossing *event,
+ gpointer user_data)
+{
+ GList *dev_list;
+ GdkDevice *dev;
+#ifdef INPUT_DEBUG
+ printf("DEBUG: leave notify (mode=%d, details=%d)\n", event->mode, event->detail);
+#endif
+ /* emergency disable XInput to avoid segfaults (GTK+ 2.17) or
+ interface non-responsiveness (GTK+ 2.18) */
+ if (!gtk_check_version(2, 17, 0)) {
+ gdk_flush();
+ gdk_error_trap_push();
+ for (dev_list = gdk_devices_list(); dev_list != NULL; dev_list = dev_list->next) {
+ dev = GDK_DEVICE(dev_list->data);
+ gdk_device_set_mode(dev, GDK_MODE_DISABLED);
+ }
+ ui.saved_is_corestroke = ui.is_corestroke;
+ ui.is_corestroke = TRUE;
+ gdk_flush();
+ gdk_error_trap_pop();
+ }
return FALSE;
}
@@ -2250,6 +2682,54 @@ on_canvas_key_press_event (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
+ GtkAdjustment *adj;
+ gint pgheight;
+
+ // Esc leaves text edition, or leaves fullscreen mode
+ if (event->keyval == GDK_Escape) {
+ if (ui.cur_item_type == ITEM_TEXT) {
+ end_text();
+ return TRUE;
+ }
+ else if (ui.fullscreen) {
+ do_fullscreen(FALSE);
+ return TRUE;
+ }
+ else return FALSE;
+ }
+
+ /* In single page mode, switch pages with PgUp/PgDn (or Up/Dn)
+ when there's nowhere else to go. */
+ pgheight = GTK_WIDGET(canvas)->allocation.height;
+ adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(GET_COMPONENT("scrolledwindowMain")));
+
+ if (event->keyval == GDK_Page_Down || event->keyval == GDK_Down) {
+ if (!ui.view_continuous &&
+ (0.96 * ui.zoom * ui.cur_page->height < pgheight ||
+ adj->value == adj->upper-pgheight))
+ {
+ end_text();
+ if (ui.pageno < journal.npages-1)
+ do_switch_page(ui.pageno+1, TRUE, FALSE);
+ return TRUE;
+ }
+ if (adj->value == adj->upper-pgheight) return TRUE; // don't send focus away
+ }
+
+ if (event->keyval == GDK_Page_Up || event->keyval == GDK_Up) {
+ if (!ui.view_continuous &&
+ (0.96 * ui.zoom * ui.cur_page->height < pgheight ||
+ adj->value == adj->lower))
+ {
+ end_text();
+ if (ui.pageno != 0) {
+ do_switch_page(ui.pageno-1, TRUE, FALSE);
+ gtk_adjustment_set_value(adj, adj->upper-pgheight);
+ }
+ return TRUE;
+ }
+ if (adj->value == adj->lower) return TRUE; // don't send focus away
+ }
return FALSE;
}
@@ -2262,29 +2742,66 @@ 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
+ GdkModifierType mask;
+
+ /* 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;
+ if (ui.cur_item_type == ITEM_TEXT || ui.cur_item_type == ITEM_IMAGE) 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_sized(event->x) || !finite_sized(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) {
+ ui.is_corestroke = FALSE;
+ ui.stroke_device = event->device;
+ }
+ if (ui.ignore_other_devices && ui.stroke_device!=event->device) return FALSE;
+
+#ifdef INPUT_DEBUG
+ printf("DEBUG: MotionNotify (%s) (x,y)=(%.2f,%.2f), modifier %x\n",
+ event->device->name, event->x, event->y, event->state);
+#endif
+
looks_wrong = !(event->state & (1<<(7+ui.which_mouse_button)));
+ if (looks_wrong) {
+ gdk_device_get_state(ui.stroke_device, event->window, NULL, &mask);
+ looks_wrong = !(mask & (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();
}
+ else if (ui.cur_item_type == ITEM_SELECTREGION) {
+ finalize_selectregion();
+ }
else if (ui.cur_item_type == ITEM_SELECTRECT) {
finalize_selectrect();
}
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;
+ }
switch_mapping(0);
return FALSE;
}
@@ -2296,6 +2813,9 @@ on_canvas_motion_notify_event (GtkWidget *widget,
do_eraser((GdkEvent *)event, ui.cur_brush->thickness/2,
ui.cur_brush->tool_options == TOOLOPT_ERASER_STROKES);
}
+ else if (ui.cur_item_type == ITEM_SELECTREGION) {
+ continue_selectregion((GdkEvent *)event);
+ }
else if (ui.cur_item_type == ITEM_SELECTRECT) {
get_pointer_coords((GdkEvent *)event, pt);
ui.selection->bbox.right = pt[0];
@@ -2306,6 +2826,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);
}
@@ -2321,7 +2844,7 @@ on_comboLayer_changed (GtkComboBox *combobox,
if (ui.in_update_page_stuff) return; // avoid a bad retroaction
- gtk_widget_grab_focus(GTK_WIDGET(canvas)); // stop focus on us
+ end_text();
val = gtk_combo_box_get_active(combobox);
if (val == -1) return;
@@ -2349,6 +2872,7 @@ on_winMain_delete_event (GtkWidget *widget,
GdkEvent *event,
gpointer user_data)
{
+ end_text();
if (ok_to_close()) gtk_main_quit();
return TRUE;
}
@@ -2358,8 +2882,54 @@ void
on_optionsUseXInput_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
ui.allow_xinput = ui.use_xinput =
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+
+/* HOW THINGS USED TO BE:
+
+ We'd like on_canvas_... to get BOTH core and xinput events. Up to
+ GTK+ 2.16 this is achieved by making only the canvas's parent
+ GdkWindow xinput-aware, rather than the entire hierarchy.
+ Otherwise, the proximity detection code in GDK is broken and
+ we'll lose core events.
+
+ Up to GTK+ 2.10, gtk_widget_set_extension_events() only sets
+ extension events for the widget's main window itself; in GTK+ 2.11
+ also traverses GDK child windows that belong to the widget
+ and sets their extension events too. We want to avoid that.
+ So we use gdk_input_set_extension_events() directly on the canvas.
+
+ As much as possible, we'd like to keep doing this, though GTK+ 2.17
+ is making our life harder (crasher bugs require us to disable XInput
+ while editing text or using the layers combo box, but disabling
+ XInput while in a XInput-aware window causes the interface to become
+ non-responsive).
+*/
+
+#ifndef WIN32
+ if (!gtk_check_version(2, 17, 0)) {
+#endif
+ /* GTK+ 2.17 and later: everybody shares a single native window,
+ so we'll never get any core events, and we might as well set
+ extension events the way we're supposed to. Doing so helps solve
+ crasher bugs in 2.17, and prevents us from losing two-button
+ events in 2.18 */
+ gtk_widget_set_extension_events(GTK_WIDGET (canvas),
+ ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
+#ifndef WIN32
+ } else {
+#endif
+ /* GTK+ 2.16 and earlier: we only activate extension events on the
+ canvas's parent GdkWindow. This allows us to keep receiving core
+ events. */
+ gdk_input_set_extension_events(GTK_WIDGET(canvas)->window,
+ GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK,
+ ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE);
+#ifndef WIN32
+ }
+#endif
+
update_mappings_menu();
}
@@ -2390,7 +2960,10 @@ on_vscroll_changed (GtkAdjustment *adjustment,
ui.pageno--;
tmppage = g_list_nth_data(journal.pages, ui.pageno);
}
- if (need_update) do_switch_page(ui.pageno, FALSE, FALSE);
+ if (need_update) {
+ end_text();
+ do_switch_page(ui.pageno, FALSE, FALSE);
+ }
return;
}
@@ -2402,12 +2975,16 @@ on_spinPageNo_value_changed (GtkSpinButton *spinbutton,
if (ui.in_update_page_stuff) return; // avoid a bad retroaction
- gtk_widget_grab_focus(GTK_WIDGET(canvas)); // stop blink-blink text cursor
+ /* in preparation for end_text(), send focus to the canvas if it's not ours.
+ (avoid issues with Gtk trying to send focus to the dead text widget) */
+
+ if (!GTK_WIDGET_HAS_FOCUS(spinbutton))
+ gtk_widget_grab_focus(GTK_WIDGET(canvas));
+ end_text();
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;
}
@@ -2426,6 +3003,7 @@ on_journalDefaultBackground_activate (GtkMenuItem *menuitem,
struct Page *pg;
GList *pglist;
+ end_text();
reset_selection();
pg = ui.cur_page;
@@ -2461,6 +3039,7 @@ on_journalSetAsDefault_activate (GtkMenuItem *menuitem,
{
if (ui.cur_page->bg->type != BG_SOLID) return;
+ end_text();
prepare_new_undo();
undo->type = ITEM_NEW_DEFAULT_BG;
undo->val_x = ui.default_page.width;
@@ -2594,16 +3173,7 @@ on_viewFullscreen_activate (GtkMenuItem *menuitem,
active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem));
if (active == ui.fullscreen) return;
- ui.fullscreen = active;
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(GET_COMPONENT("viewFullscreen")), ui.fullscreen);
- gtk_toggle_tool_button_set_active(
- GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), ui.fullscreen);
-
- if (ui.fullscreen) gtk_window_fullscreen(GTK_WINDOW(winMain));
- else gtk_window_unfullscreen(GTK_WINDOW(winMain));
-
- update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]);
+ do_fullscreen(active);
}
@@ -2611,25 +3181,13 @@ void
on_optionsButtonMappings_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
ui.use_erasertip =
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
update_mappings_menu();
}
-void
-on_optionsAntialiasBG_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- gboolean active;
-
- active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
- if (ui.antialias_bg == active) return;
- ui.antialias_bg = active;
- rescale_bg_pixmaps();
-}
-
-
void
on_optionsProgressiveBG_activate (GtkMenuItem *menuitem,
gpointer user_data)
@@ -2638,6 +3196,7 @@ on_optionsProgressiveBG_activate (GtkMenuItem *menuitem,
active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
if (ui.progressive_bg == active) return;
+ end_text();
ui.progressive_bg = active;
if (!ui.progressive_bg) rescale_bg_pixmaps();
}
@@ -2651,6 +3210,7 @@ on_mru_activate (GtkMenuItem *menuitem,
gboolean success;
GtkWidget *dialog;
+ end_text();
if (!ok_to_close()) return; // user aborted on save confirmation
for (which = 0 ; which < MRU_SIZE; which++) {
@@ -2665,7 +3225,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);
@@ -2700,7 +3260,15 @@ void
on_button2Text_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ process_mapping_activate(menuitem, 1, TOOL_TEXT);
+}
+
+void
+on_button2Image_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ process_mapping_activate(menuitem, 1, TOOL_IMAGE);
}
@@ -2735,6 +3303,7 @@ on_button2LinkBrush_activate (GtkMenuItem *menuitem,
int i;
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))) return;
+ end_text();
ui.linked_brush[1] = BRUSH_LINKED;
for (i=0;i= NUM_STROKE_TOOLS) {
ui.linked_brush[1] = BRUSH_STATIC;
update_mappings_menu_linkings();
@@ -2752,9 +3322,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;
}
@@ -2786,7 +3353,15 @@ void
on_button3Text_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ process_mapping_activate(menuitem, 2, TOOL_TEXT);
+}
+
+void
+on_button3Image_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ process_mapping_activate(menuitem, 2, TOOL_IMAGE);
}
@@ -2821,6 +3396,7 @@ on_button3LinkBrush_activate (GtkMenuItem *menuitem,
int i;
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))) return;
+ end_text();
ui.linked_brush[2] = BRUSH_LINKED;
for (i=0;i= NUM_STROKE_TOOLS) {
ui.linked_brush[2] = BRUSH_STATIC;
update_mappings_menu_linkings();
@@ -2838,9 +3415,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
@@ -2856,6 +3430,7 @@ on_viewSetZoom_activate (GtkMenuItem *menuitem,
double test_w, test_h;
GtkSpinButton *spinZoom;
+ end_text();
zoom_dialog = create_zoomDialog();
zoom_percent = 100*ui.zoom / DEFAULT_ZOOM;
spinZoom = GTK_SPIN_BUTTON(g_object_get_data(G_OBJECT(zoom_dialog), "spinZoom"));
@@ -2881,7 +3456,9 @@ on_viewSetZoom_activate (GtkMenuItem *menuitem,
if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) {
ui.zoom = DEFAULT_ZOOM*zoom_percent/100;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
+ rescale_text_items();
rescale_bg_pixmaps();
+ rescale_images();
}
} while (response == GTK_RESPONSE_APPLY);
@@ -2960,12 +3537,13 @@ on_toolsHand_activate (GtkMenuItem *menuitem,
return;
}
- if (ui.cur_mapping != 0) return;
- if (ui.toolno[0] == TOOL_HAND) return;
+ if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return;
+ if (ui.toolno[ui.cur_mapping] == TOOL_HAND) return;
+ ui.cur_mapping = 0;
+ end_text();
reset_selection();
- ui.toolno[0] = TOOL_HAND;
- ui.ruler[0] = FALSE;
+ ui.toolno[ui.cur_mapping] = TOOL_HAND;
update_mapping_linkings(-1);
update_tool_buttons();
update_tool_menu();
@@ -2994,14 +3572,114 @@ void
on_optionsPrintRuling_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
+ end_text();
ui.print_ruling = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
}
void
-on_optionsDiscardCore_activate (GtkMenuItem *menuitem,
+on_optionsAutoloadPdfXoj_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ end_text();
+ ui.autoload_pdf_xoj = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+}
+
+void
+on_fontButton_font_set (GtkFontButton *fontbutton,
+ gpointer user_data)
+{
+ gchar *str;
+
+ str = g_strdup(gtk_font_button_get_font_name(fontbutton));
+ process_font_sel(str);
+}
+
+void
+on_optionsLeftHanded_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- ui.discard_corepointer =
+ end_text();
+ ui.left_handed = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+ gtk_scrolled_window_set_placement(GTK_SCROLLED_WINDOW(GET_COMPONENT("scrolledwindowMain")),
+ ui.left_handed?GTK_CORNER_TOP_RIGHT:GTK_CORNER_TOP_LEFT);
+}
+
+void
+on_optionsShortenMenus_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ gchar *item, *nextptr;
+ GtkWidget *w;
+
+ end_text();
+ ui.shorten_menus = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+
+ /* go over the item list */
+ item = ui.shorten_menu_items;
+ while (*item==' ') item++;
+ while (*item) {
+ nextptr = strchr(item, ' ');
+ if (nextptr!=NULL) *nextptr = 0;
+ // hide or show the item
+ w = GET_COMPONENT(item);
+ if (w != NULL) {
+ if (ui.shorten_menus) gtk_widget_hide(w);
+ else gtk_widget_show(w);
+ }
+ // next item
+ if (nextptr==NULL) break;
+ *nextptr = ' ';
+ item = nextptr;
+ while (*item==' ') item++;
+ }
+
+ // just in case someone tried to unhide stuff they shouldn't be seeing
+ hide_unimplemented();
+ // maybe we should also make sure the drawing area stays visible ?
+}
+
+void
+on_optionsAutoSavePrefs_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ end_text();
+ 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();
+ 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();
}
+
+
+void
+on_buttonColorChooser_set (GtkColorButton *colorbutton,
+ gpointer user_data)
+{
+ GdkColor gdkcolor;
+ guint16 alpha;
+
+ gtk_color_button_get_color(colorbutton, &gdkcolor);
+ alpha = gtk_color_button_get_alpha(colorbutton);
+ process_color_activate((GtkMenuItem*)colorbutton, COLOR_OTHER, gdkcolor_to_rgba(gdkcolor, alpha));
+}
+
+
+void
+on_optionsButtonsSwitchMappings_activate(GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ end_text();
+ switch_mapping(0);
+ ui.button_switch_mapping = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+}
+
+