diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index a5592e6da..30114c006 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -53,15 +53,7 @@ EditWindow* EditWindow::getInstance(RTWindow* p, bool restore) EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed(true) { - Glib::ustring fName = "rawtherapee-logo-24.png"; - 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_default_icon(p->get_icon()); set_title_decorated(""); set_modal(false); set_resizable(true); @@ -69,16 +61,16 @@ EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false), isClosed 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); } diff --git a/rtgui/options.cc b/rtgui/options.cc index b7975ddfe..b38a9f689 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -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); diff --git a/rtgui/sharpenmicro.cc b/rtgui/sharpenmicro.cc index 8686b747b..971f9247a 100644 --- a/rtgui/sharpenmicro.cc +++ b/rtgui/sharpenmicro.cc @@ -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();