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

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into dev

Browse Source
This commit is contained in:
Morgan Hardwood 2019-02-27 23:17:37 +01:00
commit b85bd6c7eb
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rtgui/editwindow.cc
View File

@ -53,15 +53,7 @@ EditWindow* EditWindow::getInstance(RTWindow* p, bool restore)
EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed(true) EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed(true)
{ {
Glib::ustring fName = "rawtherapee-logo-24.png"; set_default_icon(p->get_icon());
Glib::ustring fullPath = rtengine::findIconAbsolutePath(fName);
try {
set_default_icon_from_file (fullPath);
} catch(Glib::Exception& ex) {
printf ("%s\n", ex.what().c_str());
}
set_title_decorated(""); set_title_decorated("");
set_modal(false); set_modal(false);
set_resizable(true); set_resizable(true);
@ -69,16 +61,16 @@ EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed
property_destroy_with_parent().set_value(false); property_destroy_with_parent().set_value(false);
mainNB = Gtk::manage (new Gtk::Notebook ()); mainNB = Gtk::manage(new Gtk::Notebook ());
mainNB->set_scrollable (true); mainNB->set_scrollable(true);
mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &EditWindow::on_mainNB_switch_page) ); 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 ()); Gtk::VBox* mainBox = Gtk::manage(new Gtk::VBox());
mainBox->pack_start (*mainNB); mainBox->pack_start(*mainNB);
add (*mainBox); add(*mainBox);
} }

11
rtgui/options.cc
View File

@ -352,7 +352,14 @@ void Options::setDefaults()
fbShowDateTime = true; fbShowDateTime = true;
fbShowBasicExif = true; fbShowBasicExif = true;
fbShowExpComp = false; 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; fbShowHidden = false;
#endif
fbArrangement = 2; // was 0 fbArrangement = 2; // was 0
navRGBUnit = NavigatorUnit::PERCENT; navRGBUnit = NavigatorUnit::PERCENT;
navHSVUnit = NavigatorUnit::PERCENT; navHSVUnit = NavigatorUnit::PERCENT;
@ -930,9 +937,11 @@ void Options::readFromFile(Glib::ustring fname)
fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp"); fbShowExpComp = keyFile.get_boolean("File Browser", "BrowserShowsExpComp");
} }
#ifndef WIN32
if (keyFile.has_key("File Browser", "BrowserShowsHidden")) { if (keyFile.has_key("File Browser", "BrowserShowsHidden")) {
fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden"); fbShowHidden = keyFile.get_boolean("File Browser", "BrowserShowsHidden");
} }
#endif
if (keyFile.has_key("File Browser", "MaxPreviewHeight")) { if (keyFile.has_key("File Browser", "MaxPreviewHeight")) {
maxThumbnailHeight = keyFile.get_integer("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", "BrowserShowsDate", fbShowDateTime);
keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif); keyFile.set_boolean("File Browser", "BrowserShowsExif", fbShowBasicExif);
keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp); keyFile.set_boolean("File Browser", "BrowserShowsExpComp", fbShowExpComp);
#ifndef WIN32
keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden); keyFile.set_boolean("File Browser", "BrowserShowsHidden", fbShowHidden);
#endif
keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize); keyFile.set_integer("File Browser", "ThumbnailSize", thumbSize);
keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab); keyFile.set_integer("File Browser", "ThumbnailSizeTab", thumbSizeTab);
keyFile.set_integer("File Browser", "ThumbnailSizeQueue", thumbSizeQueue); 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(); auto m = ProcEventMapper::getInstance();
EvSharpenMicroContrast = m->newEvent(SHARPENING, "HISTORY_MSG_MICROCONTRAST_CONTRAST"); 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->setAdjusterListener (this);
contrast->show(); contrast->show();