liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into hidpi-icons

Browse Source
This commit is contained in:
Hombre
2019-02-28 21:57:44 +01:00
parent d66437dd98 1786731f4a
commit 2d0b376ae9
8 changed files with 804 additions and 2202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtgui/editwindow.cc
View File

@@ -63,16 +63,16 @@ EditWindow::EditWindow (RTWindow* p) : resolution(96.), parent(p) , isFullscreen
property_destroy_with_parent().set_value(false);
mainNB = Gtk::manage (new Gtk::Notebook ());
mainNB->set_scrollable (true);
mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &EditWindow::on_mainNB_switch_page) );
mainNB = Gtk::manage(new Gtk::Notebook ());
mainNB->set_scrollable(true);
mainNB->signal_switch_page().connect_notify(sigc::mem_fun(*this, &EditWindow::on_mainNB_switch_page));
signal_key_press_event().connect( sigc::mem_fun(*this, &EditWindow::keyPressed) );
signal_key_press_event().connect(sigc::mem_fun(*this, &EditWindow::keyPressed));
Gtk::VBox* mainBox = Gtk::manage (new Gtk::VBox ());
mainBox->pack_start (*mainNB);
Gtk::VBox* mainBox = Gtk::manage(new Gtk::VBox());
mainBox->pack_start(*mainNB);
add (*mainBox);
add(*mainBox);
}

11
rtgui/options.cc
View File

@@ -352,7 +352,14 @@ void Options::setDefaults()
fbShowDateTime = true;
fbShowBasicExif = true;
fbShowExpComp = false;
#ifdef WIN32
// use windows setting for visibility of hidden files/folders
SHELLFLAGSTATE sft = { 0 };
SHGetSettings(&sft, SSF_SHOWALLOBJECTS);
fbShowHidden = sft.fShowAllObjects;
#else
fbShowHidden = false;
#endif
fbArrangement = 2; // was 0
navRGBUnit = NavigatorUnit::PERCENT;
navHSVUnit = NavigatorUnit::PERCENT;
@@ -930,9 +937,11 @@ void Options::readFromFile(Glib::ustring fname)
fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp");
}
#ifndef WIN32
if (keyFile.has_key("File Browser", "BrowserShowsHidden")) {
fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden");
}
#endif
if (keyFile.has_key("File Browser", "MaxPreviewHeight")) {
maxThumbnailHeight = keyFile.get_integer("File Browser", "MaxPreviewHeight");
@@ -1887,7 +1896,9 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_boolean("File Browser", "BrowserShowsDate", fbShowDateTime);
keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif);
keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp);
#ifndef WIN32
keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden);
#endif
keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize);
keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab);
keyFile.set_integer("File Browser", "ThumbnailSizeQueue", thumbSizeQueue);

2
rtgui/sharpenmicro.cc
View File

@@ -32,7 +32,7 @@ SharpenMicro::SharpenMicro () : FoldableToolPanel(this, "sharpenmicro", M("TP_SH
auto m = ProcEventMapper::getInstance();
EvSharpenMicroContrast = m->newEvent(SHARPENING, "HISTORY_MSG_MICROCONTRAST_CONTRAST");
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_CONTRAST"), 0, 100, 1, 20));
contrast = Gtk::manage(new Adjuster (M("TP_SHARPENMICRO_CONTRAST"), 0, 200, 1, 20));
contrast->setAdjusterListener (this);
contrast->show();