Update to trunk r13525

(bzr r13341.1.142)

5 files changed, 39 insertions, 16 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 9141b2268..4e4616724 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -45,6 +45,7 @@
 #include "widgets/icon.h"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
+#include <algorithm>    // std::min
 
 #include "rdf.h"
 #include "ui/widget/entity-entry.h"
@@ -1735,9 +1736,9 @@ void DocumentProperties::onDocUnitChange()
     prefs->setBool("/options/transform/gradient", true);
     {
         ShapeEditor::blockSetItem(true);
-        gdouble viewscale = doc->getWidth().value("px")/doc->getRoot()->viewBox.width();
-        if (doc->getHeight().value("px")/doc->getRoot()->viewBox.height() < viewscale)
-            viewscale = doc->getHeight().value("px")/doc->getRoot()->viewBox.height();
+        gdouble viewscale_w = doc->getWidth().value("px")/doc->getRoot()->viewBox.width();
+        gdouble viewscale_h = doc->getHeight().value("px")/doc->getRoot()->viewBox.height();
+        gdouble viewscale = std::min(viewscale_h, viewscale_w);
         gdouble scale = Inkscape::Util::Quantity::convert(1, old_doc_unit, doc_unit);
         doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(-viewscale*doc->getRoot()->viewBox.min()[Geom::X] +
                                                                             (doc->getWidth().value("px") - viewscale*doc->getRoot()->viewBox.width())/2,
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index f1a29e971..5d065dc60 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -76,7 +76,8 @@ InkscapePreferences::InkscapePreferences()
     : UI::Widget::Panel ("", "/dialogs/preferences", SP_VERB_DIALOG_DISPLAY),
       _max_dialog_width(0),
       _max_dialog_height(0),
-      _current_page(0)
+      _current_page(0),
+      _init(true)
 {
     //get the width of a spinbutton
     Inkscape::UI::Widget::SpinButton* sb = new Inkscape::UI::Widget::SpinButton;
@@ -2000,6 +2001,7 @@ bool InkscapePreferences::PresentPage(const Gtk::TreeModel::iterator& iter)
     Gtk::TreeModel::Row row = *iter;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int desired_page = prefs->getInt("/dialogs/preferences/page", 0);
+    _init = false;
     if (desired_page == row[_page_list_columns._col_id])
     {
         if (desired_page >= PREFS_PAGE_TOOLS && desired_page <= PREFS_PAGE_TOOLS_CONNECTOR)
@@ -2049,7 +2051,9 @@ void InkscapePreferences::on_pagelist_selection_changed()
         Gtk::TreeModel::Row row = *iter;
         _current_page = row[_page_list_columns._col_page];
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        prefs->setInt("/dialogs/preferences/page", row[_page_list_columns._col_id]);
+        if (!_init) {
+            prefs->setInt("/dialogs/preferences/page", row[_page_list_columns._col_id]);
+        }
         _page_title.set_markup("<span size='large'><b>" + row[_page_list_columns._col_name] + "</b></span>");
         _page_frame.add(*_current_page);
         _current_page->show();
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 1c2151605..9f37626ed 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -532,6 +532,7 @@ private:
     InkscapePreferences();
     InkscapePreferences(InkscapePreferences const &d);
     InkscapePreferences operator=(InkscapePreferences const &d);
+    bool _init;
 };
 
 } // namespace Dialog
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 459e64041..ed39ebb32 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -14,8 +14,15 @@
 # include <config.h>
 #endif
 
+#ifdef WIN32
+#include <io.h>
+#include <windows.h>
+#endif
+
+#include <gtkmm.h>
+
+#include "preferences.h"
 #include "print.h"
-#include <gtkmm/stock.h>
 
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
@@ -29,11 +36,6 @@
 
 #include <glibmm/i18n.h>
 
-#ifdef WIN32
-#include <io.h>
-#include <windows.h>
-#endif
-
 
 static void draw_page(
 #ifdef WIN32
@@ -45,14 +47,18 @@ static void draw_page(
                       gint               /*page_nr*/,
                       gpointer           user_data)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     struct workaround_gtkmm *junk = (struct workaround_gtkmm*)user_data;
     //printf("%s %d\n",__FUNCTION__, page_nr);
 
     if (junk->_tab->as_bitmap()) {
         // Render as exported PNG
+        prefs->setBool("/dialogs/printing/asbitmap", true);
         gdouble width = (junk->_doc)->getWidth().value("px");
         gdouble height = (junk->_doc)->getHeight().value("px");
         gdouble dpi = junk->_tab->bitmap_dpi();
+        prefs->setDouble("/dialogs/printing/dpi", dpi);
+        
         std::string tmp_png;
         std::string tmp_base = "inkscape-print-png-XXXXXX";
 
@@ -93,7 +99,7 @@ static void draw_page(
                 cairo_get_matrix(cr, &m);
                 cairo_scale(cr, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi);
                 // FIXME: why is the origin offset??
-                cairo_set_source_surface(cr, png->cobj(), -16.0, -16.0);
+                cairo_set_source_surface(cr, png->cobj(), 0, 0);
                 cairo_paint(cr);
                 cairo_set_matrix(cr, &m);
             }
@@ -107,6 +113,7 @@ static void draw_page(
     }
     else {
         // Render as vectors
+        prefs->setBool("/dialogs/printing/asbitmap", false);
         Inkscape::Extension::Internal::CairoRenderer renderer;
         Inkscape::Extension::Internal::CairoRenderContext *ctx = renderer.createContext();
 
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index d6248df69..837387f7b 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -12,6 +12,9 @@
 # include <config.h>
 #endif
 
+#include <gtkmm.h>
+
+#include "preferences.h"
 #include "rendering-options.h"
 #include "util/units.h"
 #include <glibmm/i18n.h>
@@ -38,6 +41,7 @@ RenderingOptions::RenderingOptions () :
             Glib::ustring(""), Glib::ustring(""),
             false)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     // set up tooltips
     _radio_vector.set_tooltip_text(
                         _("Render using Cairo vector operations.  "
@@ -52,15 +56,21 @@ RenderingOptions::RenderingOptions () :
 
     set_border_width(2);
 
-    // default to vector operations
-    _radio_vector.set_active (true);
     Gtk::RadioButtonGroup group = _radio_vector.get_group ();
     _radio_bitmap.set_group (group);
     _radio_bitmap.signal_toggled().connect(sigc::mem_fun(*this, &RenderingOptions::_toggled));
-
+    
+    // default to vector operations
+    if (prefs->getBool("/dialogs/printing/asbitmap", false)) {
+        _radio_bitmap.set_active();
+    } else {
+        _radio_vector.set_active();
+    }
+    
     // configure default DPI
     _dpi.setRange(Inkscape::Util::Quantity::convert(1, "in", "pt"),2400.0);
-    _dpi.setValue(Inkscape::Util::Quantity::convert(1, "in", "pt"));
+    _dpi.setValue(prefs->getDouble("/dialogs/printing/dpi", 
+                                   Inkscape::Util::Quantity::convert(1, "in", "pt")));
     _dpi.setIncrements(1.0,10.0);
     _dpi.setDigits(0);
     _dpi.update();