Issue 2755:Add color profile file type filter for Monitor Color Profile chooser

This commit is contained in:
DrSlony
2015-04-30 09:16:35 +02:00
parent 4f72fe6d8c
commit d263c8b18b
8 changed files with 103 additions and 104 deletions

View File

@@ -532,10 +532,10 @@ Gtk::Widget* Preferences::getPerformancePanel () {
fprevdemo->add (*hbprevdemo);
hbprevdemo->set_border_width(4);
mainContainer->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4);
Gtk::Frame* ftiffserialize = Gtk::manage (new Gtk::Frame (M("PREFERENCES_SERIALIZE_TIFF_READ")));
Gtk::HBox* htiffserialize = Gtk::manage (new Gtk::HBox (false, 4));
ctiffserialize = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SERIALIZE_TIFF_READ_LABEL")) );
ctiffserialize = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_SERIALIZE_TIFF_READ_LABEL")) );
ctiffserialize->set_tooltip_text(M("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP"));
htiffserialize->pack_start (*ctiffserialize);
ftiffserialize->add (*htiffserialize);
@@ -675,7 +675,19 @@ Gtk::Widget* Preferences::getColorManagementPanel () {
iccDir = Gtk::manage (new Gtk::FileChooserButton (M("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
Gtk::Label* pdlabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_ICCDIR")+":", Gtk::ALIGN_LEFT));
Gtk::FileFilter monProfileFilter_colprof;
monProfileFilter_colprof.set_name(M("FILECHOOSER_FILTER_COLPROF"));
monProfileFilter_colprof.add_pattern("*.icc");
monProfileFilter_colprof.add_pattern("*.ICC");
monProfileFilter_colprof.add_pattern("*.icm");
monProfileFilter_colprof.add_pattern("*.ICM");
Gtk::FileFilter monProfileFilter_any;
monProfileFilter_any.set_name(M("FILECHOOSER_FILTER_ANY"));
monProfileFilter_any.add_pattern("*");
monProfile = Gtk::manage (new Gtk::FileChooserButton (M("PREFERENCES_MONITORICC"), Gtk::FILE_CHOOSER_ACTION_OPEN));
monProfile->add_filter (monProfileFilter_colprof);
monProfile->add_filter (monProfileFilter_any);
Gtk::Label* mplabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_MONITORICC")+":", Gtk::ALIGN_LEFT));
#if defined(WIN32) // Auto-detection not implemented for Linux, see issue 851
@@ -1472,7 +1484,7 @@ void Preferences::fillPreferences () {
forImageComboChanged(); // update the tooltip
dateformat->set_text (moptions.dateFormat);
panFactor->set_value (moptions.panAccelFactor);
rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan);
rememberZoomPanCheckbutton->set_active (moptions.rememberZoomAndPan);
ctiffserialize->set_active(moptions.serializeTiffRead);
#if !defined(__APPLE__) // monitor profile not supported on apple
if (safe_file_test (moptions.rtSettings.monitorProfile, Glib::FILE_TEST_EXISTS))