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);
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);
/* 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);
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);
/* 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);
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);
}
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);
}
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);
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);
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);
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),
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);
}
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);
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);
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);
}
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;
}
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);
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);
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);
end_text();
reset_focus();
- if (page_ops_forbidden()) return;
if (journal.npages == 1) return;
reset_selection();
prepare_new_undo();
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);
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);
}
#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);
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);
reset_selection();
ui.toolno[0] = TOOL_PEN;
ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
- ui.cur_brush->ruler = FALSE;
- ui.cur_brush->recognizer = FALSE;
+ 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();
reset_selection();
ui.toolno[0] = TOOL_HIGHLIGHTER;
ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]);
- ui.cur_brush->ruler = FALSE;
- ui.cur_brush->recognizer = FALSE;
+ 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();
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);
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);
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);
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;
}
/* 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);