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

improved GUI for the "image type" field of dynamic profile rules

Browse Source
This commit is contained in:
Alberto Griggio 2018-10-29 09:36:17 +01:00
parent cef5d12779
commit 4d9871110b
3 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtdata/languages/default
View File

@ -43,6 +43,10 @@ DYNPROFILEEDITOR_DELETE;Delete
DYNPROFILEEDITOR_EDIT;Edit DYNPROFILEEDITOR_EDIT;Edit
DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule DYNPROFILEEDITOR_EDIT_RULE;Edit Dynamic Profile Rule
DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression. DYNPROFILEEDITOR_ENTRY_TOOLTIP;The matching is case insensitive.\nUse the "re:" prefix to enter\na regular expression.
DYNPROFILEEDITOR_IMGTYPE_ANY;Any
DYNPROFILEEDITOR_IMGTYPE_STD;Standard
DYNPROFILEEDITOR_IMGTYPE_HDR;HDR
DYNPROFILEEDITOR_IMGTYPE_PS;Pixel Shift
DYNPROFILEEDITOR_MOVE_DOWN;Move Down DYNPROFILEEDITOR_MOVE_DOWN;Move Down
DYNPROFILEEDITOR_MOVE_UP;Move Up DYNPROFILEEDITOR_MOVE_UP;Move Up
DYNPROFILEEDITOR_NEW;New DYNPROFILEEDITOR_NEW;New

50
rtgui/dynamicprofilepanel.cc
View File

@ -41,7 +41,17 @@ DynamicProfilePanel::EditDialog::EditDialog (const Glib::ustring &title, Gtk::Wi
add_optional (M ("EXIFFILTER_CAMERA"), has_camera_, camera_); add_optional (M ("EXIFFILTER_CAMERA"), has_camera_, camera_);
add_optional (M ("EXIFFILTER_LENS"), has_lens_, lens_); add_optional (M ("EXIFFILTER_LENS"), has_lens_, lens_);
add_optional (M ("EXIFFILTER_IMAGETYPE"), has_imagetype_, imagetype_);
imagetype_ = Gtk::manage (new MyComboBoxText());
imagetype_->append(Glib::ustring("(") + M("DYNPROFILEEDITOR_IMGTYPE_ANY") + ")");
imagetype_->append(M("DYNPROFILEEDITOR_IMGTYPE_STD"));
imagetype_->append(M("DYNPROFILEEDITOR_IMGTYPE_HDR"));
imagetype_->append(M("DYNPROFILEEDITOR_IMGTYPE_PS"));
imagetype_->set_active(0);
hb = Gtk::manage (new Gtk::HBox());
hb->pack_start (*Gtk::manage (new Gtk::Label (M ("EXIFFILTER_IMAGETYPE"))), false, false, 4);
hb->pack_start (*imagetype_, true, true, 2);
get_content_area()->pack_start (*hb, Gtk::PACK_SHRINK, 4);
add_range (M ("EXIFFILTER_ISO"), iso_min_, iso_max_); add_range (M ("EXIFFILTER_ISO"), iso_min_, iso_max_);
add_range (M ("EXIFFILTER_APERTURE"), fnumber_min_, fnumber_max_); add_range (M ("EXIFFILTER_APERTURE"), fnumber_min_, fnumber_max_);
@ -82,8 +92,17 @@ void DynamicProfilePanel::EditDialog::set_rule (
has_lens_->set_active (rule.lens.enabled); has_lens_->set_active (rule.lens.enabled);
lens_->set_text (rule.lens.value); lens_->set_text (rule.lens.value);
has_imagetype_->set_active (rule.imagetype.enabled); if (!rule.imagetype.enabled) {
imagetype_->set_text (rule.imagetype.value); imagetype_->set_active(0);
} else if (rule.imagetype.value == "STD") {
imagetype_->set_active(1);
} else if (rule.imagetype.value == "HDR") {
imagetype_->set_active(2);
} else if (rule.imagetype.value == "PS") {
imagetype_->set_active(3);
} else {
imagetype_->set_active(0);
}
profilepath_->updateProfileList(); profilepath_->updateProfileList();
@ -116,8 +135,20 @@ DynamicProfileRule DynamicProfilePanel::EditDialog::get_rule()
ret.lens.enabled = has_lens_->get_active(); ret.lens.enabled = has_lens_->get_active();
ret.lens.value = lens_->get_text(); ret.lens.value = lens_->get_text();
ret.imagetype.enabled = has_imagetype_->get_active(); ret.imagetype.enabled = imagetype_->get_active_row_number() > 0;
ret.imagetype.value = imagetype_->get_text(); switch (imagetype_->get_active_row_number()) {
case 1:
ret.imagetype.value = "STD";
break;
case 2:
ret.imagetype.value = "HDR";
break;
case 3:
ret.imagetype.value = "PS";
break;
default:
ret.imagetype.value = "";
}
ret.profilepath = profilepath_->getFullPathFromActiveRow(); ret.profilepath = profilepath_->getFullPathFromActiveRow();
@ -478,7 +509,14 @@ void DynamicProfilePanel::render_lens (
void DynamicProfilePanel::render_imagetype ( void DynamicProfilePanel::render_imagetype (
Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter) Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter)
{ {
RENDER_OPTIONAL_ (imagetype); auto row = *iter;
Gtk::CellRendererText *ct = static_cast<Gtk::CellRendererText *>(cell);
DynamicProfileRule::Optional o = row[columns_.imagetype];
if (o.enabled) {
ct->property_text() = M(std::string("DYNPROFILEEDITOR_IMGTYPE_") + o.value);
} else { \
ct->property_text() = "";
}
} }
#undef RENDER_OPTIONAL_ #undef RENDER_OPTIONAL_

3
rtgui/dynamicprofilepanel.h
View File

@ -112,8 +112,7 @@ private:
Gtk::CheckButton *has_lens_; Gtk::CheckButton *has_lens_;
Gtk::Entry *lens_; Gtk::Entry *lens_;
Gtk::CheckButton *has_imagetype_; MyComboBoxText *imagetype_;
Gtk::Entry *imagetype_;
ProfileStoreComboBox *profilepath_; ProfileStoreComboBox *profilepath_;
}; };