X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-callbacks.c;h=7bc531a4cd0943bf31ccb7a5ee1779ac4a3cd671;hb=7e6e62ac799f806e47f88ba0573fa320c016e8e5;hp=d98cd4304b1b072192b11e27756ea454b92dcc24;hpb=b471a5e1ffc9ad87400f079679fdf261875d513e;p=xournal.git
diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c
index d98cd43..7bc531a 100644
--- a/src/xo-callbacks.c
+++ b/src/xo-callbacks.c
@@ -221,7 +221,7 @@ 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);
@@ -374,7 +374,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);
@@ -2258,7 +2258,7 @@ on_helpAbout_activate (GtkMenuItem *menuitem,
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);
}
@@ -2370,6 +2370,8 @@ on_canvas_button_press_event (GtkWidget *widget,
}
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);
@@ -2443,6 +2445,9 @@ on_canvas_button_press_event (GtkWidget *widget,
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) {