Hello community,
here is the log from the commit of package xournal
checked in at Fri Mar 9 01:52:03 CET 2007.
--------
--- xournal/xournal.changes 2007-01-08 20:08:28.000000000 +0100
+++ /mounts/work_src_done/STABLE/xournal/xournal.changes 2007-03-08 13:37:33.529952000 +0100
@@ -1,0 +2,15 @@
+Thu Mar 8 11:23:00 CET 2007 - dkukawka@suse.de
+
+- updated to new upstream version 0.3.3:
+ - bugfix: upon loading a new file, zoom is set to default
+ startup zoom
+ - config option to allow input from a mouse or other core pointer
+ device
+ - config file entry to specify a default location for open/save
+ (patch contributed by Andy Neitzke)
+ - config file entries to customize visibility and position of
+ toolbars
+ - icon (thanks to Michele Codutti)
+- added new icon for the desktop file
+
+-------------------------------------------------------------------
Old:
----
xournal-0.3.2.tar.bz2
New:
----
xournal-0.3.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xournal.spec ++++++
--- /var/tmp/diff_new_pack.uO6668/_old 2007-03-09 01:51:52.000000000 +0100
+++ /var/tmp/diff_new_pack.uO6668/_new 2007-03-09 01:51:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xournal (Version 0.3.2)
+# spec file for package xournal (Version 0.3.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: xournal
BuildRequires: gtk2-devel libgnomecanvas-devel libgnomeprintui-devel update-desktop-files
URL: http://math.mit.edu/~auroux/software/xournal/
-Version: 0.3.2
+Version: 0.3.3
Release: 1
Summary: Xournal is an application for notetaking, sketching, keeping a journal using a stylus
License: GNU General Public License (GPL)
@@ -66,7 +66,19 @@
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
-%changelog -n xournal
+%changelog
+* Thu Mar 08 2007 - dkukawka@suse.de
+- updated to new upstream version 0.3.3:
+ - bugfix: upon loading a new file, zoom is set to default
+ startup zoom
+ - config option to allow input from a mouse or other core pointer
+ device
+ - config file entry to specify a default location for open/save
+ (patch contributed by Andy Neitzke)
+ - config file entries to customize visibility and position of
+ toolbars
+ - icon (thanks to Michele Codutti)
+- added new icon for the desktop file
* Mon Jan 08 2007 - dkukawka@suse.de
- updated to new upstream version 0.3.2:
- preferences file and Save Preferences command
++++++ xournal-0.3.2.tar.bz2 -> xournal-0.3.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/ChangeLog new/xournal-0.3.3/ChangeLog
--- old/xournal-0.3.2/ChangeLog 2006-11-25 17:50:52.000000000 +0100
+++ new/xournal-0.3.3/ChangeLog 2007-01-31 17:29:14.000000000 +0100
@@ -1,3 +1,11 @@
+Version 0.3.3 (Jan 31, 2007):
+ - bugfix: upon loading a new file, zoom is set to default startup zoom
+ - config option to allow input from a mouse or other core pointer device
+ - config file entry to specify a default location for open/save
+ (patch contributed by Andy Neitzke)
+ - config file entries to customize visibility and position of toolbars
+ - icon (thanks to Michele Codutti)
+
Version 0.3.2 (Nov 25, 2006):
- preferences file and Save Preferences command
- extra customization (via preferences file)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/configure.in new/xournal-0.3.3/configure.in
--- old/xournal-0.3.2/configure.in 2006-11-25 05:35:33.000000000 +0100
+++ new/xournal-0.3.3/configure.in 2007-01-31 17:40:34.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(xournal, 0.3.2)
+AM_INIT_AUTOMAKE(xournal, 0.3.3)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/html-doc/manual.html new/xournal-0.3.3/html-doc/manual.html
--- old/xournal-0.3.2/html-doc/manual.html 2006-11-25 18:27:02.000000000 +0100
+++ new/xournal-0.3.3/html-doc/manual.html 2007-01-31 17:47:50.000000000 +0100
@@ -24,7 +24,7 @@
Xournal User's Manual
</h2>
<p style="font-size: 0.95em; text-align: center; color: rgb(0,0,0)">
- Version 0.3.2
+ Version 0.3.3
</p>
<hr />
<p>
@@ -38,6 +38,7 @@
</p>
<p>
Xournal can be downloaded at
+<a href="http://xournal.sourceforge.net/">http://xournal.sourceforge.net/</a> or
<a href="http://math.mit.edu/~auroux/software/xournal/">http://math.mit.edu/~auroux/software/xournal/</a>
</p>
<p>
@@ -503,7 +504,8 @@
options which cannot be set from the user interface, such as: the
display resolution in pixels per inch, the step increment in zoom factors,
the tool selected at startup, the thickness of the various drawing tools,
-...
+the default directory for opening and saving files, the visibility and
+position of the menu and toolbars, ...
</p>
<hr />
<a name="author"></a>
@@ -528,6 +530,17 @@
<a name="changelog"></a>
<h2 class="subtitle">Version history</h2>
<p>
+Version 0.3.3 (January 31, 2007):
+<ul>
+ <li>bugfix: upon loading a new file, zoom is set to default startup zoom</li>
+ <li>config option to allow input from a mouse or other core pointer device</li>
+ <li>config file entry to specify a default location for open/save
+ (patch contributed by Andy Neitzke)</li>
+ <li>config file entries to customize visibility and position of toolbars</li>
+ <li>icon (thanks to Michele Codutti)</li>
+</ul>
+</p>
+<p>
Version 0.3.2 (November 25, 2006):
<ul>
<li>preferences file and Save Preferences command</li>
@@ -883,6 +896,20 @@
use USB instead; the BottomX and BottomY values correspond to the physical
resolution of the tablet and will vary from one model to another.
</p>
+<p>
+For historical reasons, most X servers do not allow the input device
+designated as the "core pointer" in the X server's configuration file
+to be used as an XInput extension device. Thus, your tablet input devices
+should <b>not</b> be designated as the core pointer device. Instead, they
+should be configured with the "SendCoreEvents" option, which enables them
+to simultaneously generate XInput extension events and move the cursor on
+the screen. Since high-resolution coordinates cannot be obtained for the
+core pointer device, it is disabled in Xournal by default.
+Starting with version 0.3.3,
+it is possible to have core events processed alongside with extension
+events (uncheck "Discard Core Events" in the Options menu); however, in
+some rare cases this may lead to a loss of resolution on all devices.
+</p>
<h3 class="subsub">The cursor doesn't appear in the right place...</h3>
<p>
If the mouse pointer does not follow accurately the position of the stylus,
@@ -976,10 +1003,10 @@
This patch fixes rotation and calibration issues with the linuxwacom driver
version 0.7.0.
<ul>
-<li>The <a href="http://math.mit.edu/~auroux/software/xournal/linuxwacom-0.7.0-rotate-patch">patch
+<li>The <a href="http://xournal.sourceforge.net/linuxwacom-0.7.0-rotate-patch">patch
file</a> for the linuxwacom source code (also included with the Xournal
distribution).</li>
-<li>The <a href="http://math.mit.edu/~auroux/software/xournal/linuxwacom-rotate-patch.tar.gz">patched
+<li>The <a href="http://xournal.sourceforge.net/linuxwacom-rotate-patch.tar.gz">patched
binaries</a> for the X.org X server.</li>
</ul>
This patch has been included in version 0.7.6 of the linuxwacom driver,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/NEWS new/xournal-0.3.3/NEWS
--- old/xournal-0.3.2/NEWS 2006-11-25 18:36:11.000000000 +0100
+++ new/xournal-0.3.3/NEWS 2007-01-31 17:43:10.000000000 +0100
@@ -1,7 +1,9 @@
-Version 0.3.2 (November 25, 2006)
+Version 0.3.3 (January 31, 2007)
Installation: see INSTALL
User's manual: see html-doc/manual.html
-Updates: see http://math.mit.edu/~auroux/software/xournal/
+Updates: see http://xournal.sourceforge.net/
+ or http://math.mit.edu/~auroux/software/xournal/
+
See also: http://sourceforge.net/projects/xournal
Files old/xournal-0.3.2/pixmaps/notepad.png and new/xournal-0.3.3/pixmaps/notepad.png differ
Files old/xournal-0.3.2/pixmaps/xournal.png and new/xournal-0.3.3/pixmaps/xournal.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/README new/xournal-0.3.3/README
--- old/xournal-0.3.2/README 2006-11-25 18:36:18.000000000 +0100
+++ new/xournal-0.3.3/README 2007-01-31 17:45:00.000000000 +0100
@@ -1,7 +1,9 @@
-Version 0.3.2 (November 25, 2006)
+Version 0.3.3 (January 31, 2007)
Installation: see INSTALL
User's manual: see html-doc/manual.html
-Updates: see http://math.mit.edu/~auroux/software/xournal/
+Updates: see http://xournal.sourceforge.net/
+ or http://math.mit.edu/~auroux/software/xournal/
+
See also: http://sourceforge.net/projects/xournal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/src/main.c new/xournal-0.3.3/src/main.c
--- old/xournal-0.3.2/src/main.c 2006-11-25 17:04:46.000000000 +0100
+++ new/xournal-0.3.3/src/main.c 2007-01-31 02:42:51.000000000 +0100
@@ -130,8 +130,6 @@
gtk_toggle_tool_button_set_active(
GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), TRUE);
gtk_window_fullscreen(GTK_WINDOW(winMain));
- gtk_widget_hide(GET_COMPONENT("menubar"));
- gtk_widget_hide(GET_COMPONENT("hbox1"));
}
@@ -182,7 +180,7 @@
dev_list = gdk_devices_list();
while (dev_list != NULL) {
device = (GdkDevice *)dev_list->data;
- if (device->source != GDK_SOURCE_MOUSE) {
+ if (device != gdk_device_get_core_pointer()) {
/* get around a GDK bug: map the valuator range CORRECTLY to [0,1] */
#if ENABLE_XINPUT_BUGFIX
gdk_device_set_axis_use(device, 0, GDK_AXIS_IGNORE);
@@ -191,7 +189,6 @@
gdk_device_set_mode(device, GDK_MODE_SCREEN);
can_xinput = TRUE;
}
- else gdk_device_set_mode(device, GDK_MODE_DISABLED);
dev_list = dev_list->next;
}
if (!can_xinput)
@@ -217,6 +214,7 @@
update_undo_redo_enabled();
update_copy_paste_enabled();
+ update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]);
// show everything...
@@ -278,6 +276,7 @@
winMain = create_winMain ();
init_stuff (argc, argv);
+ gtk_window_set_icon(GTK_WINDOW(winMain), create_pixbuf("xournal.png"));
gtk_main ();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/src/TODO new/xournal-0.3.3/src/TODO
--- old/xournal-0.3.2/src/TODO 2006-11-25 18:47:19.000000000 +0100
+++ new/xournal-0.3.3/src/TODO 2007-01-31 17:11:52.000000000 +0100
@@ -21,8 +21,17 @@
- recalibration upon screen resize / compensation for miscalibration
- find a better behavior for vertical space tool across page boundaries ?
- key mappings (pgup/dn for full page, up/dn for scroll)
+ (customize secondary mappings for tablet button use ?)
- copy/paste of an entire page (beware if PDF bg is not compatible!)
- simple drawing tools: rectangles, ellipses
- option to save all annotated files within the .xoj
- non-antialiased version for handhelds
- customize autogenerated save file names
+- optimize speed in hand tool (process groups of motion events)?
+ (setting 1 pixel min threshold doesn't help -- look at GTK+ scrollbar code?)
+- layer dialog box to set visibility status of each layer regardless of
+ which layer is being edited
+- display corruption on scroll down when bottom of window is obscured??
+ (probably a gnomecanvas or X bug -- expose event generated for wrong
+ region, or not processed?)
+- bitmap preview for document icon in desktop environments?
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/src/xo-callbacks.c new/xournal-0.3.3/src/xo-callbacks.c
--- old/xournal-0.3.2/src/xo-callbacks.c 2006-11-25 17:27:34.000000000 +0100
+++ new/xournal-0.3.3/src/xo-callbacks.c 2007-01-30 02:33:18.000000000 +0100
@@ -25,7 +25,7 @@
{
if (close_journal()) {
new_journal();
- ui.zoom = DEFAULT_ZOOM;
+ ui.zoom = ui.startup_zoom;
update_page_stuff();
gtk_adjustment_set_value(gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)), 0);
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
@@ -58,6 +58,8 @@
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");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(attach_opt), FALSE);
gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER (dialog), attach_opt);
@@ -81,7 +83,7 @@
gtk_main_iteration();
}
new_journal();
- ui.zoom = DEFAULT_ZOOM;
+ ui.zoom = ui.startup_zoom;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
update_page_stuff();
success = init_bgpdf(filename, TRUE, file_domain);
@@ -123,7 +125,9 @@
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 (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
+
if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
gtk_widget_destroy(dialog);
return;
@@ -202,6 +206,8 @@
else {
curtime = time(NULL);
strftime(stime, 30, "%F-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);
}
@@ -379,6 +385,8 @@
} else {
curtime = time(NULL);
strftime(stime, 30, "%F-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);
in_fn = NULL;
}
@@ -1340,7 +1348,7 @@
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_add_pattern(filt_all, "*");
@@ -1366,6 +1374,8 @@
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 (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
gtk_widget_destroy(dialog);
@@ -2090,17 +2100,20 @@
struct Page *tmppage;
GtkWidget *dialog;
int mapping;
-
+ gboolean is_core;
+
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!
- if (ui.use_xinput) {
- if (event->device->source == GDK_SOURCE_MOUSE) 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.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);
fix_xinput_coords((GdkEvent *)event);
}
- else if (event->device->source != GDK_SOURCE_MOUSE) return FALSE;
+ ui.is_corestroke = is_core;
if (ui.use_erasertip && event->device->source == GDK_SOURCE_ERASER)
mapping = NUM_BUTTONS;
@@ -2180,15 +2193,16 @@
GdkEventButton *event,
gpointer user_data)
{
+ 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
- if (ui.use_xinput) {
- if (event->device->source == GDK_SOURCE_MOUSE) return FALSE;
- fix_xinput_coords((GdkEvent *)event);
- }
- else if (event->device->source != GDK_SOURCE_MOUSE) 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 (ui.cur_item_type == ITEM_STROKE) {
finalize_stroke();
@@ -2246,16 +2260,15 @@
GdkEventMotion *event,
gpointer user_data)
{
- gboolean looks_wrong;
+ gboolean looks_wrong, is_core;
double pt[2];
if (ui.cur_item_type == ITEM_NONE) return FALSE; // we don't care
- if (ui.use_xinput) {
- if (event->device->source == GDK_SOURCE_MOUSE) return FALSE;
- fix_xinput_coords((GdkEvent *)event);
- }
- else if (event->device->source != GDK_SOURCE_MOUSE) 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);
looks_wrong = !(event->state & (1<<(7+ui.which_mouse_button)));
@@ -2347,6 +2360,7 @@
{
ui.allow_xinput = ui.use_xinput =
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+ update_mappings_menu();
}
void
@@ -2586,16 +2600,10 @@
gtk_toggle_tool_button_set_active(
GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), ui.fullscreen);
- if (ui.fullscreen) {
- gtk_window_fullscreen(GTK_WINDOW(winMain));
- gtk_widget_hide(GET_COMPONENT("menubar"));
- gtk_widget_hide(GET_COMPONENT("hbox1"));
- }
- else {
- gtk_window_unfullscreen(GTK_WINDOW(winMain));
- gtk_widget_show(GET_COMPONENT("menubar"));
- gtk_widget_show(GET_COMPONENT("hbox1"));
- }
+ 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]);
}
@@ -2989,3 +2997,11 @@
ui.print_ruling = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
}
+void
+on_optionsDiscardCore_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ ui.discard_corepointer =
+ gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem));
+ update_mappings_menu();
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/src/xo-callbacks.h new/xournal-0.3.3/src/xo-callbacks.h
--- old/xournal-0.3.2/src/xo-callbacks.h 2006-11-25 17:02:44.000000000 +0100
+++ new/xournal-0.3.3/src/xo-callbacks.h 2007-01-28 16:01:27.000000000 +0100
@@ -596,3 +596,7 @@
void
on_optionsPrintRuling_activate (GtkMenuItem *menuitem,
gpointer user_data);
+
+void
+on_optionsDiscardCore_activate (GtkMenuItem *menuitem,
+ gpointer user_data);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xournal-0.3.2/src/xo-file.c new/xournal-0.3.3/src/xo-file.c
--- old/xournal-0.3.2/src/xo-file.c 2006-11-25 17:25:09.000000000 +0100
+++ new/xournal-0.3.3/src/xo-file.c 2007-01-30 03:17:00.000000000 +0100
@@ -619,7 +619,7 @@
close_journal();
while (bgpdf.status != STATUS_NOT_INIT) gtk_main_iteration();
new_journal();
- ui.zoom = DEFAULT_ZOOM;
+ ui.zoom = ui.startup_zoom;
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
update_page_stuff();
return init_bgpdf(filename, TRUE, DOMAIN_ABSOLUTE);
@@ -664,7 +664,7 @@
ui.layerno = ui.cur_page->nlayers-1;
ui.cur_layer = (struct Layer *)(g_list_last(ui.cur_page->layers)->data);
ui.saved = TRUE;
- ui.zoom = DEFAULT_ZOOM;
+ ui.zoom = ui.startup_zoom;
update_file_name(g_strdup(filename));
gnome_canvas_set_pixels_per_unit(canvas, ui.zoom);
make_canvas_items();
@@ -1066,7 +1066,7 @@
bgpdf.requests = NULL;
bgpdf.create_pages = create_pages;
bgpdf.has_failed = FALSE;
- add_bgpdf_request(-1, DEFAULT_ZOOM, FALSE); // request all pages
+ add_bgpdf_request(-1, ui.startup_zoom, FALSE); // request all pages
return TRUE;
}
@@ -1091,7 +1091,7 @@
bg->filename = refstring_ref(bgpdf.filename);
bg->file_domain = bgpdf.file_domain;
bg->file_page_seq = pageno;
- bg->pixbuf_scale = DEFAULT_ZOOM;
+ bg->pixbuf_scale = ui.startup_zoom;
bg->pixbuf_dpi = bgpg->dpi;
if (journal.npages < pageno) {
@@ -1222,7 +1222,7 @@
int i, j;
DEFAULT_ZOOM = DISPLAY_DPI_DEFAULT/72.0;
- ui.zoom = 1.0*DEFAULT_ZOOM;
+ ui.zoom = ui.startup_zoom = 1.0*DEFAULT_ZOOM;
ui.default_page.height = 792.0;
ui.default_page.width = 612.0;
ui.default_page.bg->type = BG_SOLID;
@@ -1231,6 +1231,7 @@
ui.default_page.bg->ruling = RULING_LINED;
ui.view_continuous = TRUE;
ui.allow_xinput = TRUE;
+ ui.discard_corepointer = TRUE;
ui.bg_apply_all_pages = FALSE;
ui.use_erasertip = FALSE;
ui.window_default_width = 720;
@@ -1244,6 +1245,18 @@
ui.progressive_bg = TRUE;
ui.print_ruling = TRUE;
ui.default_unit = UNIT_CM;
+ ui.default_path = NULL;
+
+ // the default UI vertical order
+ ui.vertical_order[0][0] = 1;
+ ui.vertical_order[0][1] = 2;
+ ui.vertical_order[0][2] = 3;
+ ui.vertical_order[0][3] = 0;
+ ui.vertical_order[0][4] = 4;
+ ui.vertical_order[1][0] = 2;
+ ui.vertical_order[1][1] = 3;
+ ui.vertical_order[1][2] = 0;
+ ui.vertical_order[1][3] = ui.vertical_order[1][4] = -1;
ui.toolno[0] = ui.startuptool = TOOL_PEN;
ui.ruler[0] = ui.startupruler = FALSE;
@@ -1265,7 +1278,6 @@
g_memmove(&(ui.brushes[j][i]), &(ui.brushes[0][i]), sizeof(struct Brush));
// predef_thickness is already initialized as a global variable
-
GS_BITMAP_DPI = 144;
PDFTOPPM_PRINTING_DPI = 150;
}
@@ -1284,6 +1296,23 @@
#endif
+const char *vorder_usernames[VBOX_MAIN_NITEMS+1] =
+ {"drawarea", "menu", "main_toolbar", "pen_toolbar", "statusbar", NULL};
+
+gchar *verbose_vertical_order(int *order)
+{
+ gchar buf[80], *p; // longer than needed
+ int i;
+
+ p = buf;
+ for (i=0; i