double DEFAULT_ZOOM;
-// prevent interface items from getting bogus XInput events
-gboolean filter_extended_events (GtkWidget *widget, GdkEvent *event,
- gpointer user_data)
-{
- // prevent scrollbars from reacting to XInput events
- if (event->type == GDK_MOTION_NOTIFY &&
- event->motion.device != gdk_device_get_core_pointer())
- return TRUE;
- if ((event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS ||
- event->type == GDK_3BUTTON_PRESS || event->type == GDK_BUTTON_RELEASE) &&
- event->button.device != gdk_device_get_core_pointer())
- return TRUE;
- return FALSE;
-}
-
void init_stuff (int argc, char *argv[])
{
GtkWidget *w;
ui.layerbox_length = 0;
if (argc > 2 || (argc == 2 && argv[1][0] == '-')) {
- printf("Invalid command line parameters.\n"
- "Usage: %s [filename.xoj]\n", argv[0]);
+ printf(_("Invalid command line parameters.\n"
+ "Usage: %s [filename.xoj]\n"), argv[0]);
gtk_exit(0);
}
for (i=0; i < NUM_STROKE_TOOLS; i++) {
b = &(ui.brushes[j][i]);
b->tool_type = i;
- b->color_rgba = predef_colors_rgba[b->color_no];
- if (i == TOOL_HIGHLIGHTER) {
- b->color_rgba &= ui.hiliter_alpha_mask;
+ if (b->color_no>=0) {
+ b->color_rgba = predef_colors_rgba[b->color_no];
+ if (i == TOOL_HIGHLIGHTER) {
+ b->color_rgba &= ui.hiliter_alpha_mask;
+ }
}
b->thickness = predef_thickness[i][b->thickness_no];
}
GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), TRUE);
gtk_window_fullscreen(GTK_WINDOW(winMain));
}
+ gtk_button_set_relief(GTK_BUTTON(GET_COMPONENT("buttonColorChooser")), GTK_RELIEF_NONE);
allow_all_accels();
add_scroll_bindings();
g_signal_connect ((gpointer) canvas, "enter_notify_event",
G_CALLBACK (on_canvas_enter_notify_event),
NULL);
+ g_signal_connect ((gpointer) canvas, "leave_notify_event",
+ G_CALLBACK (on_canvas_leave_notify_event),
+ NULL);
g_signal_connect ((gpointer) canvas, "expose_event",
G_CALLBACK (on_canvas_expose_event),
NULL);
gtk_widget_set_sensitive(GET_COMPONENT("optionsUseXInput"), FALSE);
ui.use_xinput = ui.allow_xinput && can_xinput;
+ ui.need_emergency_disable_xinput = FALSE;
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAntialiasBG")), ui.antialias_bg);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsProgressiveBG")), ui.progressive_bg);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsShortenMenus")), ui.shorten_menus);
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoSavePrefs")), ui.auto_save_prefs);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsButtonSwitchMapping")), ui.button_switch_mapping);
hide_unimplemented();
/* fix a bug in GTK+ 2.16 and beyond: scrollbars shouldn't get extended
input events from pointer motion when cursor moves into main window */
#if GTK_CHECK_VERSION(2,14,0)
- if (!gtk_check_version(2, 14, 0)) {
+ if (!gtk_check_version(2, 16, 0)) {
g_signal_connect (
GET_COMPONENT("menubar"),
"event", G_CALLBACK (filter_extended_events),
(gpointer)(gtk_scrolled_window_get_hscrollbar(GTK_SCROLLED_WINDOW(w))),
"event", G_CALLBACK (filter_extended_events),
NULL);
+ g_signal_connect (
+ GET_COMPONENT("comboLayer"),
+ "notify::popup-shown", G_CALLBACK (combobox_popup_disable_xinput),
+ NULL);
}
#endif
set_cursor_busy(FALSE);
if (!success) {
w = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", argv[1]);
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), argv[1]);
gtk_dialog_run(GTK_DIALOG(w));
gtk_widget_destroy(w);
}
{
gchar *path, *path1, *path2;
+#ifdef ENABLE_NLS
+ bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+#endif
+
gtk_set_locale ();
gtk_init (&argc, &argv);