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

merge with dev

Browse Source
This commit is contained in:
Desmis
2019-03-01 09:06:07 +01:00
parent 873ed72f3c 1786731f4a
commit fad78993a4
6 changed files with 602 additions and 1699 deletions
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)
{
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);
}

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();