diff --git a/rtdata/icons/svg/arrow-down-small.svg b/rtdata/icons/svg/arrow-down-small.svg new file mode 100644 index 000000000..d17ba4329 --- /dev/null +++ b/rtdata/icons/svg/arrow-down-small.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/arrow-left-small.svg b/rtdata/icons/svg/arrow-left-small.svg new file mode 100644 index 000000000..54eafbc29 --- /dev/null +++ b/rtdata/icons/svg/arrow-left-small.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/arrow-right-small.svg b/rtdata/icons/svg/arrow-right-small.svg new file mode 100644 index 000000000..43bfdd4e8 --- /dev/null +++ b/rtdata/icons/svg/arrow-right-small.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/arrow-up-small.svg b/rtdata/icons/svg/arrow-up-small.svg new file mode 100644 index 000000000..b5609c5d7 --- /dev/null +++ b/rtdata/icons/svg/arrow-up-small.svg @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/beforeafter.svg b/rtdata/icons/svg/beforeafter.svg new file mode 100644 index 000000000..420a555dc --- /dev/null +++ b/rtdata/icons/svg/beforeafter.svg @@ -0,0 +1,123 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-black.svg b/rtdata/icons/svg/circle-black.svg new file mode 100644 index 000000000..aa335e0fe --- /dev/null +++ b/rtdata/icons/svg/circle-black.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-blue-yellow.svg b/rtdata/icons/svg/circle-blue-yellow.svg new file mode 100644 index 000000000..8cf03a92d --- /dev/null +++ b/rtdata/icons/svg/circle-blue-yellow.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-blue.svg b/rtdata/icons/svg/circle-blue.svg new file mode 100644 index 000000000..af2f747c6 --- /dev/null +++ b/rtdata/icons/svg/circle-blue.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-cyan-red.svg b/rtdata/icons/svg/circle-cyan-red.svg new file mode 100644 index 000000000..29df8b5c6 --- /dev/null +++ b/rtdata/icons/svg/circle-cyan-red.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-empty-darkgray.svg b/rtdata/icons/svg/circle-empty-darkgray.svg new file mode 100644 index 000000000..0f21427a6 --- /dev/null +++ b/rtdata/icons/svg/circle-empty-darkgray.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-empty-gray.svg b/rtdata/icons/svg/circle-empty-gray.svg new file mode 100644 index 000000000..803b0de20 --- /dev/null +++ b/rtdata/icons/svg/circle-empty-gray.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-gray-blue.svg b/rtdata/icons/svg/circle-gray-blue.svg new file mode 100644 index 000000000..df7b30f47 --- /dev/null +++ b/rtdata/icons/svg/circle-gray-blue.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-gray-green.svg b/rtdata/icons/svg/circle-gray-green.svg new file mode 100644 index 000000000..c34327b60 --- /dev/null +++ b/rtdata/icons/svg/circle-gray-green.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-gray-red.svg b/rtdata/icons/svg/circle-gray-red.svg new file mode 100644 index 000000000..2ef522fbd --- /dev/null +++ b/rtdata/icons/svg/circle-gray-red.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-green.svg b/rtdata/icons/svg/circle-green.svg new file mode 100644 index 000000000..88e8de37d --- /dev/null +++ b/rtdata/icons/svg/circle-green.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-magenta.svg b/rtdata/icons/svg/circle-magenta.svg new file mode 100644 index 000000000..e1cd67cc9 --- /dev/null +++ b/rtdata/icons/svg/circle-magenta.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-purple.svg b/rtdata/icons/svg/circle-purple.svg new file mode 100644 index 000000000..788154ce8 --- /dev/null +++ b/rtdata/icons/svg/circle-purple.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-red-cyan.svg b/rtdata/icons/svg/circle-red-cyan.svg new file mode 100644 index 000000000..dc9f1c754 --- /dev/null +++ b/rtdata/icons/svg/circle-red-cyan.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-red.svg b/rtdata/icons/svg/circle-red.svg new file mode 100644 index 000000000..24ee2b29b --- /dev/null +++ b/rtdata/icons/svg/circle-red.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-white.svg b/rtdata/icons/svg/circle-white.svg new file mode 100644 index 000000000..0d00f3f32 --- /dev/null +++ b/rtdata/icons/svg/circle-white.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-yellow-blue.svg b/rtdata/icons/svg/circle-yellow-blue.svg new file mode 100644 index 000000000..10ba3b1ca --- /dev/null +++ b/rtdata/icons/svg/circle-yellow-blue.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/circle-yellow.svg b/rtdata/icons/svg/circle-yellow.svg new file mode 100644 index 000000000..f22e7a580 --- /dev/null +++ b/rtdata/icons/svg/circle-yellow.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/template-16.svg b/rtdata/icons/svg/template-16.svg new file mode 100644 index 000000000..90e732734 --- /dev/null +++ b/rtdata/icons/svg/template-16.svg @@ -0,0 +1,103 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + diff --git a/rtdata/icons/svg/template-24.svg b/rtdata/icons/svg/template-24.svg new file mode 100644 index 000000000..76e91dbe7 --- /dev/null +++ b/rtdata/icons/svg/template-24.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + image/svg+xml + + + + + Maciej Dworak + + + + + + + + RawTherapee icon. + + + + + + + + + + + + + + diff --git a/rtgui/cacorrection.cc b/rtgui/cacorrection.cc index e303b5660..4dbf09af6 100644 --- a/rtgui/cacorrection.cc +++ b/rtgui/cacorrection.cc @@ -26,10 +26,10 @@ using namespace rtengine::procparams; CACorrection::CACorrection () : FoldableToolPanel(this, "cacorrection", M("TP_CACORRECTION_LABEL")) { - Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png")); - Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png")); - Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png")); - Gtk::Image* icablueR = Gtk::manage (new RTImage ("ajd-ca-blue2.png")); + Gtk::Image* icaredL = Gtk::manage (new RTImage ("circle-red-cyan.png")); + Gtk::Image* icaredR = Gtk::manage (new RTImage ("circle-cyan-red.png")); + Gtk::Image* icablueL = Gtk::manage (new RTImage ("circle-blue-yellow.png")); + Gtk::Image* icablueR = Gtk::manage (new RTImage ("circle-yellow-blue.png")); red = Gtk::manage (new Adjuster (M("TP_CACORRECTION_RED"), -0.005, 0.005, 0.0001, 0, icaredL, icaredR)); red->setAdjusterListener (this); diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc index f8dee05df..63e73c087 100644 --- a/rtgui/colorappearance.cc +++ b/rtgui/colorappearance.cc @@ -268,10 +268,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance" wbmHBox->pack_start (*wbmodel); p1VBox->pack_start (*wbmHBox); - Gtk::Image* itempL = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* itempR = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* igreenL = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* itempL = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* itempR = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green.png")); tempsc = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider)); @@ -575,10 +575,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance" p3VBox = Gtk::manage ( new Gtk::VBox()); p3VBox->set_spacing (2); - Gtk::Image* itempL1 = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* itempR1 = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* itempL1 = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* itempR1 = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green.png")); // adaplum = Gtk::manage (new Adjuster (M ("TP_COLORAPP_ADAPTVIEWING"), 0.1, 16384., 0.1, 16.)); adaplum = Gtk::manage (new Adjuster (M ("TP_COLORAPP_ADAPTVIEWING"), MINLA0, MAXLA0, 0.01, 16, NULL, NULL, &wbSlider2la, &wbla2Slider)); @@ -590,8 +590,8 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance" adaplum->set_tooltip_markup (M ("TP_COLORAPP_ADAPTVIEWING_TOOLTIP")); p3VBox->pack_start (*adaplum); -// Gtk::Image* iblueredL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png")); -// Gtk::Image* iblueredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png")); +// Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue.png")); +// Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red.png")); degreeout = Gtk::manage (new Adjuster (M ("TP_COLORAPP_CIECAT_DEGREE"), 0., 100., 1., 100.)); @@ -604,10 +604,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance" degreeout->set_tooltip_markup (M ("TP_COLORAPP_DEGREE_TOOLTIP")); p3VBox->pack_start (*degreeout); /* - Gtk::Image* itempL1 = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* itempR1 = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* itempL1 = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* itempR1 = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green.png")); */ tempout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempR1, itempL1, &wbSlider2Temp, &wbTemp2Slider)); greenout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_GREEN"), MINGREEN0, MAXGREEN0, 0.001, 1.0, igreenR1, igreenL1)); diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc index a7f063460..28585b4e3 100644 --- a/rtgui/colortoning.cc +++ b/rtgui/colortoning.cc @@ -226,26 +226,26 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR Gtk::VBox *chanMixerMidBox = Gtk::manage (new Gtk::VBox()); Gtk::VBox *chanMixerShadowsBox = Gtk::manage (new Gtk::VBox()); - Gtk::Image* iblueR = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* iyelL = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* imagL = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png")); - Gtk::Image* icyanL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png")); - Gtk::Image* iredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png")); + Gtk::Image* iblueR = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iyelL = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* imagL = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green.png")); + Gtk::Image* icyanL = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iredR = Gtk::manage (new RTImage ("circle-red.png")); - Gtk::Image* iblueRm = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* iyelLm = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* imagLm = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenRm = Gtk::manage (new RTImage ("ajd-wb-green2.png")); - Gtk::Image* icyanLm = Gtk::manage (new RTImage ("ajd-wb-bluered1.png")); - Gtk::Image* iredRm = Gtk::manage (new RTImage ("ajd-wb-bluered2.png")); + Gtk::Image* iblueRm = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iyelLm = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* imagLm = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenRm = Gtk::manage (new RTImage ("circle-green.png")); + Gtk::Image* icyanLm = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iredRm = Gtk::manage (new RTImage ("circle-red.png")); - Gtk::Image* iblueRh = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* iyelLh = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* imagLh = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenRh = Gtk::manage (new RTImage ("ajd-wb-green2.png")); - Gtk::Image* icyanLh = Gtk::manage (new RTImage ("ajd-wb-bluered1.png")); - Gtk::Image* iredRh = Gtk::manage (new RTImage ("ajd-wb-bluered2.png")); + Gtk::Image* iblueRh = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iyelLh = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* imagLh = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenRh = Gtk::manage (new RTImage ("circle-green.png")); + Gtk::Image* icyanLh = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iredRh = Gtk::manage (new RTImage ("circle-red.png")); redhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., icyanLh, iredRh )); greenhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., imagLh , igreenRh)); diff --git a/rtgui/fattaltonemap.cc b/rtgui/fattaltonemap.cc index af2b9eddf..f97d758d4 100644 --- a/rtgui/fattaltonemap.cc +++ b/rtgui/fattaltonemap.cc @@ -32,8 +32,8 @@ FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_ amount = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_AMOUNT"), 1., 100., 1., 30.)); threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 100., 1., 0.0)); - Gtk::Image *al = Gtk::manage(new RTImage("adj-black.png")); - Gtk::Image *ar = Gtk::manage(new RTImage("adj-white.png")); + Gtk::Image *al = Gtk::manage(new RTImage("circle-black.png")); + Gtk::Image *ar = Gtk::manage(new RTImage("circle-white.png")); anchor = Gtk::manage(new Adjuster(M("TP_TM_FATTAL_ANCHOR"), 1, 100, 1, 50, al, ar)); amount->setAdjusterListener(this); diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 4d6994e23..3195c0555 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -207,7 +207,7 @@ FileBrowser::FileBrowser () : Gtk::Menu* submenuLabel = Gtk::manage (new Gtk::Menu ()); for (int i = 0; i <= 5; i++) { - submenuLabel->attach (*Gtk::manage(colorlabel[i] = new MyImageMenuItem (M(Glib::ustring::compose("%1%2", "FILEBROWSER_POPUPCOLORLABEL", i)), i == 0 ? "cglabel0.png" : Glib::ustring::compose("%1%2%3", "clabel", i, ".png"))), 0, 1, p, p + 1); + submenuLabel->attach (*Gtk::manage(colorlabel[i] = new MyImageMenuItem (M(Glib::ustring::compose("%1%2", "FILEBROWSER_POPUPCOLORLABEL", i)), i == 0 ? "circle-empty-gray.png" : Glib::ustring::compose("%1%2%3", "clabel", i, ".png"))), 0, 1, p, p + 1); p++; } @@ -215,7 +215,7 @@ FileBrowser::FileBrowser () : menuLabel->set_submenu (*submenuLabel); } else { for (int i = 0; i <= 5; i++) { - pmenu->attach (*Gtk::manage(colorlabel[i] = new MyImageMenuItem (M(Glib::ustring::compose("%1%2", "FILEBROWSER_POPUPCOLORLABEL", i)), i == 0 ? "cglabel0.png" : Glib::ustring::compose("%1%2%3", "clabel", i, ".png"))), 0, 1, p, p + 1); + pmenu->attach (*Gtk::manage(colorlabel[i] = new MyImageMenuItem (M(Glib::ustring::compose("%1%2", "FILEBROWSER_POPUPCOLORLABEL", i)), i == 0 ? "circle-empty-gray.png" : Glib::ustring::compose("%1%2%3", "clabel", i, ".png"))), 0, 1, p, p + 1); p++; } } @@ -452,7 +452,7 @@ FileBrowser::FileBrowser () : pmenuColorLabels = new Gtk::Menu (); for (int i = 0; i <= 5; i++) { - pmenuColorLabels->attach (*Gtk::manage(colorlabel_pop[i] = new MyImageMenuItem (M(Glib::ustring::compose("%1%2", "FILEBROWSER_POPUPCOLORLABEL", i)), i == 0 ? "cglabel0.png" : Glib::ustring::compose("%1%2%3", "clabel", i, ".png"))), 0, 1, c, c + 1); + pmenuColorLabels->attach (*Gtk::manage(colorlabel_pop[i] = new MyImageMenuItem (M(Glib::ustring::compose("%1%2", "FILEBROWSER_POPUPCOLORLABEL", i)), i == 0 ? "circle-empty-gray.png" : Glib::ustring::compose("%1%2%3", "clabel", i, ".png"))), 0, 1, c, c + 1); c++; } diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 86c530661..bd11a1e4d 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -189,8 +189,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : bRank[i]->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false); } - iUnCLabeled = new RTImage ("clabel0.png"); - igUnCLabeled = new RTImage ("cglabel0.png"); + iUnCLabeled = new RTImage ("circle-empty-darkgray.png"); + igUnCLabeled = new RTImage ("circle-empty-gray.png"); bUnCLabeled = Gtk::manage(new Gtk::ToggleButton ()); bUnCLabeled->set_active (false); bUnCLabeled->set_image (*igUnCLabeled); diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc index 286324bdf..7abbe36c6 100644 --- a/rtgui/filethumbnailbuttonset.cc +++ b/rtgui/filethumbnailbuttonset.cc @@ -49,12 +49,12 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry) unTrashIcon = RTImage::createFromPng ("undelete-thumbnail.png"); processIcon = RTImage::createFromPng ("processing-thumbnail.png"); - colorLabelIcon_0 = RTImage::createFromPng ("cglabel0.png"); //("nocolorlabel.png"); - colorLabelIcon_1 = RTImage::createFromPng ("clabel1.png"); - colorLabelIcon_2 = RTImage::createFromPng ("clabel2.png"); - colorLabelIcon_3 = RTImage::createFromPng ("clabel3.png"); - colorLabelIcon_4 = RTImage::createFromPng ("clabel4.png"); - colorLabelIcon_5 = RTImage::createFromPng ("clabel5.png"); + colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray.png"); //("nocolorlabel.png"); + colorLabelIcon_1 = RTImage::createFromPng ("circle-red.png"); + colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow.png"); + colorLabelIcon_3 = RTImage::createFromPng ("circle-green.png"); + colorLabelIcon_4 = RTImage::createFromPng ("circle-blue.png"); + colorLabelIcon_5 = RTImage::createFromPng ("circle-purple.png"); iconsLoaded = true; } diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc index 75c60a7a2..563d52fa6 100644 --- a/rtgui/rawcacorrection.cc +++ b/rtgui/rawcacorrection.cc @@ -25,10 +25,10 @@ using namespace rtengine::procparams; RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROMATABERR_LABEL")) { - Gtk::Image* icaredL = Gtk::manage (new RTImage ("ajd-ca-red1.png")); - Gtk::Image* icaredR = Gtk::manage (new RTImage ("ajd-ca-red2.png")); - Gtk::Image* icablueL = Gtk::manage (new RTImage ("ajd-ca-blue1.png")); - Gtk::Image* icablueR = Gtk::manage (new RTImage ("ajd-ca-blue2.png")); + Gtk::Image* icaredL = Gtk::manage (new RTImage ("circle-red-cyan.png")); + Gtk::Image* icaredR = Gtk::manage (new RTImage ("circle-cyan-red.png")); + Gtk::Image* icablueL = Gtk::manage (new RTImage ("circle-blue-yellow.png")); + Gtk::Image* icablueR = Gtk::manage (new RTImage ("circle-yellow-blue.png")); caAutocorrect = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AUTO"), multiImage)); caAutocorrect->setCheckBoxListener (this); diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index ca6a28708..7a61d005f 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -698,20 +698,20 @@ Wavelet::Wavelet() : cbenabConn = cbenab->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::cbenabToggled) ); cbenab->set_tooltip_text (M("TP_WAVELET_CB_TOOLTIP")); - Gtk::Image* const iblueR = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* const iyelL = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* const imagL = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* const igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* const iblueR = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* const iyelL = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* const imagL = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* const igreenR = Gtk::manage (new RTImage ("circle-green.png")); - Gtk::Image* const iblueRm = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* const iyelLm = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* const imagLm = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* const igreenRm = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* const iblueRm = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* const iyelLm = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* const imagLm = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* const igreenRm = Gtk::manage (new RTImage ("circle-green.png")); - Gtk::Image* const iblueRh = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* const iyelLh = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* const imagLh = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* const igreenRh = Gtk::manage (new RTImage ("ajd-wb-green2.png")); + Gtk::Image* const iblueRh = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* const iyelLh = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* const imagLh = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* const igreenRh = Gtk::manage (new RTImage ("circle-green.png")); greenhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., igreenRh, imagLh)); bluehigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., iblueRh, iyelLh)); diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 1f2863635..f54236fcc 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -303,14 +303,14 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB pack_start (*spotbox, Gtk::PACK_SHRINK, 0); - Gtk::Image* itempL = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* itempR = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); - Gtk::Image* igreenL = Gtk::manage (new RTImage ("ajd-wb-green1.png")); - Gtk::Image* igreenR = Gtk::manage (new RTImage ("ajd-wb-green2.png")); - Gtk::Image* iblueredL = Gtk::manage (new RTImage ("ajd-wb-bluered1.png")); - Gtk::Image* iblueredR = Gtk::manage (new RTImage ("ajd-wb-bluered2.png")); - Gtk::Image* itempbiasL = Gtk::manage (new RTImage ("ajd-wb-temp1.png")); - Gtk::Image* itempbiasR = Gtk::manage (new RTImage ("ajd-wb-temp2.png")); + Gtk::Image* itempL = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* itempR = Gtk::manage (new RTImage ("circle-yellow.png")); + Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta.png")); + Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green.png")); + Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red.png")); + Gtk::Image* itempbiasL = Gtk::manage (new RTImage ("circle-blue.png")); + Gtk::Image* itempbiasR = Gtk::manage (new RTImage ("circle-yellow.png")); temp = Gtk::manage (new Adjuster (M("TP_WBALANCE_TEMPERATURE"), MINTEMP, MAXTEMP, 5, CENTERTEMP, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider)); green = Gtk::manage (new Adjuster (M("TP_WBALANCE_GREEN"), MINGREEN, MAXGREEN, 0.001, 1.0, igreenL, igreenR));