=== modified file 'src/file.cpp' --- src/file.cpp 2017-01-22 19:05:28 +0000 +++ src/file.cpp 2017-01-25 00:46:38 +0000 @@ -423,16 +423,25 @@ "all the elements in the drawing."); Gtk::Dialog scaleDialog( _("Old Inkscape file detected (90 DPI)")); - - Gtk::Label info; - info.set_markup(msg.c_str()); + Gtk::Expander *advanced = new Gtk::Expander(_("Advanced")); + + + Gtk::Label info(_( + "We detected that you opened a file created with an older version of inkscape.\n" + "If your drawing size was intended to match a real-life size (cm,in),\n" + "a recent change in inkscape for coherence with CSS may have changed it.\n" + "We recommend choosing \"fix the page\" 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 +454,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, ignore this"),3); gint response = scaleDialog.run(); backup = backupButton.get_active(); @@ -521,16 +530,25 @@ "attribute to compensate or by scaling all objects in the drawing."); Gtk::Dialog scaleDialog( _("Old Inkscape file detected (90 DPI)")); + + Gtk::Expander *advanced = new Gtk::Expander(_("Advanced")); - Gtk::Label info; - info.set_markup(msg.c_str()); + Gtk::Label info(_( + "We detected that you opened a file created with an older version of inkscape.\n" + "If your drawing size was intended to match a real-life size (cm,in),\n" + "a recent change in inkscape for coherence with CSS may have changed it.\n" + "We recommend choosing \"fix the page\" 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 +561,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, ignore this"), 3); gint response = scaleDialog.run(); backup = backupButton.get_active();