diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index 29d4b6db1..6d0391232 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -103,9 +103,7 @@ void CropWindow::initZoomSteps() float z = 10./float(s); sprintf(lbl, "% 2d%%", int(z * 100)); bool is_major = (s == s/10 * 10); - if (is_major || options.extendedZoomLevelsForFit) { - zoomSteps.push_back(ZoomStep(lbl, z, s, is_major)); - } + zoomSteps.push_back(ZoomStep(lbl, z, s, is_major)); } zoom11index = zoomSteps.size(); for (int s = 1; s <= 8; ++s) { diff --git a/rtgui/options.cc b/rtgui/options.cc index 1bc7f1706..3daa764ec 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -348,7 +348,6 @@ void Options::setDefaults () lastScale = 5; panAccelFactor = 5; rememberZoomAndPan = true; - extendedZoomLevelsForFit = false; lastCropSize = 1; fbOnlyRaw = false; fbShowDateTime = true; @@ -1349,10 +1348,6 @@ int Options::readFromFile (Glib::ustring fname) rememberZoomAndPan = keyFile.get_boolean ("GUI", "RememberZoomAndPan"); } - if (keyFile.has_key ("GUI", "ExtendedZoomLevelsForFit")) { - extendedZoomLevelsForFit = keyFile.get_boolean ("GUI", "ExtendedZoomLevelsForFit"); - } - if (keyFile.has_key ("GUI", "LastCropSize")) { lastCropSize = keyFile.get_integer ("GUI", "LastCropSize"); } @@ -2028,7 +2023,6 @@ int Options::saveToFile (Glib::ustring fname) keyFile.set_integer ("GUI", "LastPreviewScale", lastScale); keyFile.set_integer ("GUI", "PanAccelFactor", panAccelFactor); keyFile.set_boolean ("GUI", "RememberZoomAndPan", rememberZoomAndPan); - keyFile.set_boolean ("GUI", "ExtendedZoomLevelsForFit", extendedZoomLevelsForFit); keyFile.set_integer ("GUI", "LastCropSize", lastCropSize); keyFile.set_boolean ("GUI", "ShowHistory", showHistory); keyFile.set_integer ("GUI", "ShowFilePanelState", showFilePanelState); diff --git a/rtgui/options.h b/rtgui/options.h index e090bd15f..7c0a3534d 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -215,7 +215,6 @@ public: bool filmStripShowFileNames; bool tabbedUI; bool rememberZoomAndPan; - bool extendedZoomLevelsForFit; int multiDisplayMode; // 0=none, 1=Edit panels on other display std::vector cutOverlayBrush; // Red;Green;Blue;Alpha , all ranging 0..1 std::vector navGuideBrush; // Red;Green;Blue;Alpha , all ranging 0..1 diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 97026a617..8130e2dfc 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -1133,17 +1133,11 @@ Gtk::Widget* Preferences::getGeneralPanel () navigationGrid->attach_next_to(*panFactorLabel, Gtk::POS_LEFT, 1, 1); navigationGrid->attach_next_to(*panFactor, *panFactorLabel, Gtk::POS_RIGHT, 1, 1); - Gtk::HBox *zoombox = Gtk::manage(new Gtk::HBox()); rememberZoomPanCheckbutton = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_REMEMBERZOOMPAN")) ); + setExpandAlignProperties(rememberZoomPanCheckbutton, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); rememberZoomPanCheckbutton->set_tooltip_text(M("PREFERENCES_REMEMBERZOOMPAN_TOOLTIP")); - extendedZoomLevelsCheckbutton = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_EXTENDEDZOOMLEVELS") + " (" + M("PREFERENCES_APPLNEXTSTARTUP") + ")") ); - extendedZoomLevelsCheckbutton->set_tooltip_text(M("PREFERENCES_EXTENDEDZOOMLEVELS_TOOLTIP")); - zoombox->set_spacing(10); - zoombox->pack_start(*rememberZoomPanCheckbutton); - zoombox->pack_start(*extendedZoomLevelsCheckbutton); - setExpandAlignProperties(zoombox, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE); - navigationGrid->attach_next_to(*zoombox, *panFactorLabel, Gtk::POS_BOTTOM, 2, 1); + navigationGrid->attach_next_to(*rememberZoomPanCheckbutton, *panFactorLabel, Gtk::POS_BOTTOM, 2, 1); fnav->add (*navigationGrid); mvbsd->attach_next_to(*fnav, *fclip, Gtk::POS_RIGHT, 1, 1); @@ -1577,7 +1571,6 @@ void Preferences::storePreferences () moptions.dateFormat = dateformat->get_text(); moptions.panAccelFactor = (int)panFactor->get_value(); moptions.rememberZoomAndPan = rememberZoomPanCheckbutton->get_active(); - moptions.extendedZoomLevelsForFit = extendedZoomLevelsCheckbutton->get_active(); moptions.fbShowDateTime = showDateTime->get_active (); moptions.fbShowBasicExif = showBasicExif->get_active (); moptions.fbShowExpComp = showExpComp->get_active (); @@ -1800,7 +1793,6 @@ void Preferences::fillPreferences () dateformat->set_text (moptions.dateFormat); panFactor->set_value (moptions.panAccelFactor); rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan); - extendedZoomLevelsCheckbutton->set_active (moptions.extendedZoomLevelsForFit); ctiffserialize->set_active(moptions.serializeTiffRead); setActiveTextOrIndex (*prtProfile, moptions.rtSettings.printerProfile, 0); diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 8bcfed2f0..18c8a466b 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -121,7 +121,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener Gtk::SpinButton* panFactor; Gtk::CheckButton* rememberZoomPanCheckbutton; - Gtk::CheckButton* extendedZoomLevelsCheckbutton; Gtk::ComboBoxText* view; Gtk::ComboBoxText* grey;