Delete now obsolete "pseudo-hidpi" preference
This commit is contained in:
parent
5b2dc59fbf
commit
bb258e4024
@ -1828,7 +1828,6 @@ PREFERENCES_APPEARANCE_COLORPICKERFONT;Color picker font
|
||||
PREFERENCES_APPEARANCE_CROPMASKCOLOR;Crop mask color
|
||||
PREFERENCES_APPEARANCE_MAINFONT;Main font
|
||||
PREFERENCES_APPEARANCE_NAVGUIDECOLOR;Navigator guide color
|
||||
PREFERENCES_APPEARANCE_PSEUDOHIDPI;Pseudo-HiDPI mode
|
||||
PREFERENCES_APPEARANCE_THEME;Theme
|
||||
PREFERENCES_APPLNEXTSTARTUP;restart required
|
||||
PREFERENCES_AUTOMONPROFILE;Use operating system's main monitor color profile
|
||||
|
@ -358,7 +358,6 @@ void Options::setDefaults()
|
||||
fontSize = 10;
|
||||
CPFontFamily = "default";
|
||||
CPFontSize = 8;
|
||||
pseudoHiDPISupport = false;
|
||||
lastScale = 5;
|
||||
lastShowAllExif = false;
|
||||
panAccelFactor = 5;
|
||||
@ -1550,10 +1549,6 @@ void Options::readFromFile(Glib::ustring fname)
|
||||
CPFontSize = keyFile.get_integer("GUI", "CPFontSize");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("GUI", "PseudoHiDPISupport")) {
|
||||
pseudoHiDPISupport = keyFile.get_boolean("GUI", "PseudoHiDPISupport");
|
||||
}
|
||||
|
||||
if (keyFile.has_key("GUI", "LastPreviewScale")) {
|
||||
lastScale = keyFile.get_integer("GUI", "LastPreviewScale");
|
||||
}
|
||||
@ -2515,7 +2510,6 @@ void Options::saveToFile(Glib::ustring fname)
|
||||
keyFile.set_integer("GUI", "FontSize", fontSize);
|
||||
keyFile.set_string("GUI", "CPFontFamily", CPFontFamily);
|
||||
keyFile.set_integer("GUI", "CPFontSize", CPFontSize);
|
||||
keyFile.set_boolean("GUI", "PseudoHiDPISupport", pseudoHiDPISupport);
|
||||
keyFile.set_integer("GUI", "LastPreviewScale", lastScale);
|
||||
keyFile.set_boolean("GUI", "LastShowAllExif", lastShowAllExif);
|
||||
keyFile.set_integer("GUI", "PanAccelFactor", panAccelFactor);
|
||||
|
@ -254,7 +254,6 @@ public:
|
||||
int fontSize; // RT's main font size (units: pt)
|
||||
Glib::ustring CPFontFamily; // ColorPicker font family
|
||||
int CPFontSize; // ColorPicker font size (units: pt)
|
||||
bool pseudoHiDPISupport;
|
||||
bool fbOnlyRaw;
|
||||
bool fbShowDateTime;
|
||||
bool fbShowBasicExif;
|
||||
|
@ -1192,9 +1192,6 @@ Gtk::Widget* Preferences::getGeneralPanel()
|
||||
navGuideColorCB = Gtk::manage(new Gtk::ColorButton());
|
||||
navGuideColorCB->set_use_alpha(true);
|
||||
|
||||
pseudoHiDPI = Gtk::manage(new Gtk::CheckButton(M("PREFERENCES_APPEARANCE_PSEUDOHIDPI") + Glib::ustring (" (") + M ("PREFERENCES_APPLNEXTSTARTUP") + ")"));
|
||||
setExpandAlignProperties(pseudoHiDPI, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
|
||||
|
||||
Gtk::Separator *vSep = Gtk::manage(new Gtk::Separator(Gtk::ORIENTATION_VERTICAL));
|
||||
|
||||
|
||||
@ -1210,7 +1207,6 @@ Gtk::Widget* Preferences::getGeneralPanel()
|
||||
appearanceGrid->attach(*colorPickerFontFB, 1, 2, 1, 1);
|
||||
appearanceGrid->attach(*navGuideColorLbl, 3, 2, 1, 1);
|
||||
appearanceGrid->attach(*navGuideColorCB, 4, 2, 1, 1);
|
||||
appearanceGrid->attach(*pseudoHiDPI, 0, 3, 5, 1);
|
||||
|
||||
appearanceFrame->add(*appearanceGrid);
|
||||
vbGeneral->attach_next_to(*appearanceFrame, *flang, Gtk::POS_BOTTOM, 2, 1);
|
||||
@ -1779,8 +1775,6 @@ void Preferences::storePreferences()
|
||||
moptions.CPFontSize = cpfd.get_size() / Pango::SCALE;
|
||||
}
|
||||
|
||||
moptions.pseudoHiDPISupport = pseudoHiDPI->get_active();
|
||||
|
||||
const std::vector<ExternalEditorPreferences::EditorInfo> &editors = externalEditors->getEditors();
|
||||
moptions.externalEditors.resize(editors.size());
|
||||
moptions.externalEditorIndex =
|
||||
@ -2059,8 +2053,6 @@ void Preferences::fillPreferences()
|
||||
colorPickerFontFB->set_font_name (Glib::ustring::compose ("%1 %2", options.CPFontFamily, options.CPFontSize));
|
||||
}
|
||||
|
||||
pseudoHiDPI->set_active(options.pseudoHiDPISupport);
|
||||
|
||||
showDateTime->set_active(moptions.fbShowDateTime);
|
||||
showBasicExif->set_active(moptions.fbShowBasicExif);
|
||||
showExpComp->set_active(moptions.fbShowExpComp);
|
||||
|
@ -181,8 +181,6 @@ class Preferences final :
|
||||
Gtk::FontButton* colorPickerFontFB;
|
||||
Gtk::ColorButton* cropMaskColorCB;
|
||||
Gtk::ColorButton* navGuideColorCB;
|
||||
Gtk::CheckButton* pseudoHiDPI;
|
||||
|
||||
|
||||
Gtk::SpinButton* maxRecentFolders;
|
||||
Gtk::SpinButton* maxThumbHeightSB;
|
||||
|
Loading…
x
Reference in New Issue
Block a user