=== modified file 'src/file.cpp' --- src/file.cpp 2017-01-22 19:05:28 +0000 +++ src/file.cpp 2017-01-25 01:41:06 +0000 @@ -420,19 +420,30 @@ "Old Inkscape files use 1in == 90px. CSS requires 1in == 96px.\n" "Drawing elements may be too small. This can be corrected by\n" "either setting the SVG 'viewBox' to compensate or by scaling\n" - "all the elements in the drawing."); + "all the elements in the drawing.\n\n" + "Even more information on https://inkscape.org/en/learn/faq#todo-todo-todo"); Gtk::Dialog scaleDialog( _("Old Inkscape file detected (90 DPI)")); + Gtk::Expander *advanced = new Gtk::Expander(_("More information")); + Gtk::Label info; - info.set_markup(msg.c_str()); + info.set_markup(_( + "We detected that you opened a file created with an older version of Inkscape.\n\n" + "If your drawing size was intended to match a real-life size (cm,in),\n" + "a recent change in Inkscape for compliance with CSS may have changed its apparent size.\n" + "We recommend choosing \"fit page to new size\" when in doubt.")); info.show(); #if WITH_GTKMM_3_0 scaleDialog.get_content_area()->pack_start(info, false, false, 20); + scaleDialog.get_content_area()->add(*advanced); #else scaleDialog.get_vbox()->pack_start(info, false, false, 20); + scaleDialog.get_vbox()->add(*advanced); #endif + advanced->add_label(msg); + advanced->show(); Gtk::CheckButton backupButton( _("Create backup file (in same directory).") ); bool backup = prefs->getBool("/options/dpifixbackup", true); @@ -445,9 +456,9 @@ scaleDialog.get_vbox()->pack_start(backupButton, false, false, 20); #endif - scaleDialog.add_button(_("Set 'viewBox'"), 1); - scaleDialog.add_button(_("Scale elements"), 2); - scaleDialog.add_button(_("Ignore"), 3); + scaleDialog.add_button(_("Fit page to new size"), 1); + scaleDialog.add_button(_("Scale drawing to fit same page"), 2); + scaleDialog.add_button(_("My drawing is px-sized"),3); gint response = scaleDialog.run(); backup = backupButton.get_active(); @@ -518,19 +529,30 @@ "Drawings meant to match a physical size (e.g. Letter or A4)\n" "will be too small. Scaling the drawing can correct for this.\n" "Internal scaling can be handled either by setting the SVG 'viewBox'\n" - "attribute to compensate or by scaling all objects in the drawing."); + "attribute to compensate or by scaling all objects in the drawing.\n\n" + "Even more information on https://inkscape.org/en/learn/faq#todo-todo-todo"); Gtk::Dialog scaleDialog( _("Old Inkscape file detected (90 DPI)")); + + Gtk::Expander *advanced = new Gtk::Expander(_("More information")); Gtk::Label info; - info.set_markup(msg.c_str()); + info.set_markup(_( + "We detected that you opened a file created with an older version of Inkscape.\n\n" + "If your drawing size was intended to match a real-life size (cm,in),\n" + "a recent change in Inkscape for compliance with CSS may have changed its apparent size.\n" + "We recommend choosing \"fit page to new size\" when in doubt.")); info.show(); #if WITH_GTKMM_3_0 scaleDialog.get_content_area()->pack_start(info, false, false, 20); + scaleDialog.get_content_area()->add(*advanced); #else scaleDialog.get_vbox()->pack_start(info, false, false, 20); + scaleDialog.get_vbox()->add(*advanced); #endif + advanced->add_label(msg); + advanced->show(); Gtk::CheckButton backupButton( _("Create backup file (in same directory).") ); bool backup = prefs->getBool("/options/dpifixbackup", true); @@ -543,9 +565,9 @@ scaleDialog.get_vbox()->pack_start(backupButton, false, false, 20); #endif - scaleDialog.add_button(_("Set 'viewBox'"), 1); - scaleDialog.add_button(_("Scale elements"), 2); - scaleDialog.add_button(_("Ignore"), 3); + scaleDialog.add_button(_("Fit page to new size"), 1); + scaleDialog.add_button(_("Scale drawing to fit page"), 2); + scaleDialog.add_button(_("My drawing is px-sized"), 3); gint response = scaleDialog.run(); backup = backupButton.get_active();