Merge branch 'dev' into favorites-gui

This commit is contained in:
Lawrence Lee
2023-01-02 15:37:07 -08:00
193 changed files with 64046 additions and 10050 deletions

View File

@@ -62,9 +62,9 @@ protected:
Gtk::Label* labmga;
Gtk::Box* gabox;
Gtk::Label* blr;
Gtk::Label* blg;
Gtk::Label* blb;
//Gtk::Label* blr;
//Gtk::Label* blg;
//Gtk::Label* blb;
Gtk::Button* neutral;
sigc::connection neutralconn;
@@ -86,12 +86,12 @@ private:
rtengine::ProcEvent EvICMprimariMethod;
rtengine::ProcEvent EvICMprofileMethod;
rtengine::ProcEvent EvICMtempMethod;
rtengine::ProcEvent EvICMpredx;
rtengine::ProcEvent EvICMpredy;
rtengine::ProcEvent EvICMpgrex;
rtengine::ProcEvent EvICMpgrey;
rtengine::ProcEvent EvICMpblux;
rtengine::ProcEvent EvICMpbluy;
//rtengine::ProcEvent EvICMpredx;
//rtengine::ProcEvent EvICMpredy;
//rtengine::ProcEvent EvICMpgrex;
//rtengine::ProcEvent EvICMpgrey;
//rtengine::ProcEvent EvICMpblux;
//rtengine::ProcEvent EvICMpbluy;
rtengine::ProcEvent EvICMgamm;
rtengine::ProcEvent EvICMslop;
rtengine::ProcEvent EvICMtrcinMethod;
@@ -115,9 +115,7 @@ private:
Gtk::Box* wprimBox;
Gtk::Label* wprimlab;
Gtk::Label* cielab;
Gtk::Box* redBox;
Gtk::Box* greBox;
Gtk::Box* bluBox;
Gtk::Grid* primCoordGrid;
Gtk::Box* riaHBox;
Gtk::Box* preBox;
Gtk::Box* iVBox;