diff --git a/rtdata/languages/default b/rtdata/languages/default
index d3e40cb19..5e0a5e0cb 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -900,6 +900,8 @@ MAIN_TAB_ADVANCED;Advanced
MAIN_TAB_ADVANCED_TOOLTIP;Shortcut: Alt-w
MAIN_TAB_COLOR;Color
MAIN_TAB_COLOR_TOOLTIP;Shortcut: Alt-c
+MAIN_TAB_CUSTOM;Custom
+MAIN_TAB_CUSTOM_TOOLTIP;Shortcut: none
MAIN_TAB_DETAIL;Detail
MAIN_TAB_DETAIL_TOOLTIP;Shortcut: Alt-d
MAIN_TAB_DEVELOP; Batch Edit
diff --git a/rtgui/options.cc b/rtgui/options.cc
index c1494a085..a388ccb3e 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -399,6 +399,7 @@ void Options::setDefaults()
autoSaveTpOpen = true;
//crvOpen.clear ();
parseExtensions.clear();
+ userTools.clear();
parseExtensionsEnabled.clear();
parsedExtensions.clear();
renameUseTemplates = false;
@@ -1069,6 +1070,10 @@ void Options::readFromFile(Glib::ustring fname)
}
if (keyFile.has_group("GUI")) {
+ if (keyFile.has_key("GUI", "UserTools")) {
+ userTools = keyFile.get_string_list("GUI", "UserTools");
+ }
+
if (keyFile.has_key("GUI", "WindowWidth")) {
windowWidth = keyFile.get_integer("GUI", "WindowWidth");
}
@@ -1967,6 +1972,8 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_string("Profiles", "CustomProfileBuilderPath", CPBPath);
keyFile.set_integer("Profiles", "CustomProfileBuilderKeys", CPBKeys);
+ Glib::ArrayHandle pusert = userTools;
+ keyFile.set_string_list("GUI", "UserTools", pusert);
keyFile.set_integer("GUI", "WindowWidth", windowWidth);
keyFile.set_integer("GUI", "WindowHeight", windowHeight);
keyFile.set_integer("GUI", "WindowX", windowX);
diff --git a/rtgui/options.h b/rtgui/options.h
index 47ced982d..a97c1f165 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -375,6 +375,7 @@ public:
int fastexport_resize_height;
bool fastexport_use_fast_pipeline;
+ std::vector userTools;
// Dialog settings
Glib::ustring lastIccDir;
Glib::ustring lastDarkframeDir;
diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h
index 39abd03fa..fbe87f5f0 100644
--- a/rtgui/toolpanel.h
+++ b/rtgui/toolpanel.h
@@ -131,6 +131,9 @@ public:
this->batchMode = batchMode;
}
+ virtual Glib::ustring getToolName () {
+ return toolName;
+ }
};
class FoldableToolPanel : public ToolPanel
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index bf155b1d6..3ea638569 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -31,6 +31,7 @@ using namespace rtengine::procparams;
ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChanged (false), editDataProvider (nullptr)
{
+ userPanel = Gtk::manage (new ToolVBox ());
exposurePanel = Gtk::manage (new ToolVBox ());
detailsPanel = Gtk::manage (new ToolVBox ());
colorPanel = Gtk::manage (new ToolVBox ());
@@ -100,66 +101,70 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan
// Valeurs par dfaut:
// Best -> low ISO
// Medium -> High ISO
+ userTools.resize(options.userTools.size());
- addPanel (colorPanel, whitebalance);
- addPanel (exposurePanel, toneCurve);
- addPanel (colorPanel, vibrance);
- addPanel (colorPanel, chmixer);
- addPanel (colorPanel, blackwhite);
- addPanel (exposurePanel, shadowshighlights);
- addPanel (detailsPanel, sharpening);
- addPanel (detailsPanel, localContrast);
- addPanel (detailsPanel, sharpenEdge);
- addPanel (detailsPanel, sharpenMicro);
- addPanel (colorPanel, hsvequalizer);
- addPanel (colorPanel, filmSimulation);
- addPanel (colorPanel, softlight);
- addPanel (colorPanel, rgbcurves);
- addPanel (colorPanel, colortoning);
- addPanel (exposurePanel, epd);
- addPanel (exposurePanel, fattal);
- addPanel (advancedPanel, retinex);
- addPanel (exposurePanel, pcvignette);
- addPanel (exposurePanel, gradient);
- addPanel (exposurePanel, lcurve);
- addPanel (advancedPanel, colorappearance);
- addPanel (detailsPanel, impulsedenoise);
- addPanel (detailsPanel, dirpyrdenoise);
- addPanel (detailsPanel, defringe);
- addPanel (detailsPanel, dirpyrequalizer);
- addPanel (detailsPanel, dehaze);
- addPanel (advancedPanel, wavelet);
- addPanel (transformPanel, crop);
- addPanel (transformPanel, resize);
+ addUserPanel (colorPanel, whitebalance);
+ addUserPanel (exposurePanel, toneCurve);
+ addUserPanel (colorPanel, vibrance);
+ addUserPanel (colorPanel, chmixer);
+ addUserPanel (colorPanel, blackwhite);
+ addUserPanel (exposurePanel, shadowshighlights);
+ addUserPanel (detailsPanel, sharpening);
+ addUserPanel (detailsPanel, localContrast);
+ addUserPanel (detailsPanel, sharpenEdge);
+ addUserPanel (detailsPanel, sharpenMicro);
+ addUserPanel (colorPanel, hsvequalizer);
+ addUserPanel (colorPanel, filmSimulation);
+ addUserPanel (colorPanel, softlight);
+ addUserPanel (colorPanel, rgbcurves);
+ addUserPanel (colorPanel, colortoning);
+ addUserPanel (exposurePanel, epd);
+ addUserPanel (exposurePanel, fattal);
+ addUserPanel (advancedPanel, retinex);
+ addUserPanel (exposurePanel, pcvignette);
+ addUserPanel (exposurePanel, gradient);
+ addUserPanel (exposurePanel, lcurve);
+ addUserPanel (advancedPanel, colorappearance);
+ addUserPanel (detailsPanel, impulsedenoise);
+ addUserPanel (detailsPanel, dirpyrdenoise);
+ addUserPanel (detailsPanel, defringe);
+ addUserPanel (detailsPanel, dirpyrequalizer);
+ addUserPanel (detailsPanel, dehaze);
+ addUserPanel (advancedPanel, wavelet);
+ addUserPanel (transformPanel, crop);
+ addUserPanel (transformPanel, resize);
addPanel (resize->getPackBox(), prsharpening, 2);
- addPanel (transformPanel, lensgeom);
+ addUserPanel (transformPanel, lensgeom);
addPanel (lensgeom->getPackBox(), rotate, 2);
addPanel (lensgeom->getPackBox(), perspective, 2);
addPanel (lensgeom->getPackBox(), lensProf, 2);
addPanel (lensgeom->getPackBox(), distortion, 2);
addPanel (lensgeom->getPackBox(), cacorrection, 2);
addPanel (lensgeom->getPackBox(), vignetting, 2);
- addPanel (colorPanel, icm);
- addPanel (rawPanel, sensorbayer);
+ addUserPanel (colorPanel, icm);
+ addUserPanel (rawPanel, sensorbayer);
addPanel (sensorbayer->getPackBox(), bayerprocess, 2);
addPanel (sensorbayer->getPackBox(), bayerrawexposure, 2);
addPanel (sensorbayer->getPackBox(), bayerpreprocess, 2);
addPanel (sensorbayer->getPackBox(), rawcacorrection, 2);
- addPanel (rawPanel, sensorxtrans);
+ addUserPanel (rawPanel, sensorxtrans);
addPanel (sensorxtrans->getPackBox(), xtransprocess, 2);
addPanel (sensorxtrans->getPackBox(), xtransrawexposure, 2);
- addPanel (rawPanel, rawexposure);
- addPanel (rawPanel, preprocess);
- addPanel (rawPanel, darkframe);
- addPanel (rawPanel, flatfield);
+ addUserPanel (rawPanel, rawexposure);
+ addUserPanel (rawPanel, preprocess);
+ addUserPanel (rawPanel, darkframe);
+ addUserPanel (rawPanel, flatfield);
+ for(auto it = userTools.begin(); it != userTools.end(); ++it) {
+ addPanel(userPanel, *it);
+ }
toolPanels.push_back (coarse);
toolPanels.push_back(metadata);
toolPanelNotebook = new Gtk::Notebook ();
toolPanelNotebook->set_name ("ToolPanelNotebook");
-
+ userPanelSW = Gtk::manage (new MyScrolledWindow ());
exposurePanelSW = Gtk::manage (new MyScrolledWindow ());
detailsPanelSW = Gtk::manage (new MyScrolledWindow ());
colorPanelSW = Gtk::manage (new MyScrolledWindow ());
@@ -169,7 +174,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan
updateVScrollbars (options.hideTPVScrollbar);
// load panel endings
- for (int i = 0; i < 6; i++) {
+ for (int i = 0; i < 7; i++) {
vbPanelEnd[i] = Gtk::manage (new Gtk::VBox ());
imgPanelEnd[i] = Gtk::manage (new RTImage ("ornament1.png"));
imgPanelEnd[i]->show ();
@@ -177,30 +182,35 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan
vbPanelEnd[i]->show_all();
}
+ userPanelSW->add (*userPanel);
+ userPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
+ userPanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4);
+
exposurePanelSW->add (*exposurePanel);
exposurePanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
- exposurePanel->pack_start (*vbPanelEnd[0], Gtk::PACK_SHRINK, 4);
+ exposurePanel->pack_start (*vbPanelEnd[1], Gtk::PACK_SHRINK, 4);
detailsPanelSW->add (*detailsPanel);
detailsPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
- detailsPanel->pack_start (*vbPanelEnd[1], Gtk::PACK_SHRINK, 4);
+ detailsPanel->pack_start (*vbPanelEnd[2], Gtk::PACK_SHRINK, 4);
colorPanelSW->add (*colorPanel);
colorPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
- colorPanel->pack_start (*vbPanelEnd[2], Gtk::PACK_SHRINK, 4);
+ colorPanel->pack_start (*vbPanelEnd[3], Gtk::PACK_SHRINK, 4);
advancedPanelSW->add (*advancedPanel);
advancedPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
- advancedPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0);
+ advancedPanel->pack_start (*vbPanelEnd[6], Gtk::PACK_SHRINK, 0);
transformPanelSW->add (*transformPanel);
transformPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
- transformPanel->pack_start (*vbPanelEnd[3], Gtk::PACK_SHRINK, 4);
+ transformPanel->pack_start (*vbPanelEnd[4], Gtk::PACK_SHRINK, 4);
rawPanelSW->add (*rawPanel);
rawPanel->pack_start (*Gtk::manage (new Gtk::HSeparator), Gtk::PACK_SHRINK, 0);
- rawPanel->pack_start (*vbPanelEnd[4], Gtk::PACK_SHRINK, 0);
+ rawPanel->pack_start (*vbPanelEnd[5], Gtk::PACK_SHRINK, 0);
+ toiU = Gtk::manage (new TextOrIcon ("wb-sun.png", M ("MAIN_TAB_CUSTOM"), M ("MAIN_TAB_CUSTOM_TOOLTIP")));
toiE = Gtk::manage (new TextOrIcon ("exposure.png", M ("MAIN_TAB_EXPOSURE"), M ("MAIN_TAB_EXPOSURE_TOOLTIP")));
toiD = Gtk::manage (new TextOrIcon ("detail.png", M ("MAIN_TAB_DETAIL"), M ("MAIN_TAB_DETAIL_TOOLTIP")));
toiC = Gtk::manage (new TextOrIcon ("color-circles.png", M ("MAIN_TAB_COLOR"), M ("MAIN_TAB_COLOR_TOOLTIP")));
@@ -209,6 +219,7 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), hasChan
toiR = Gtk::manage (new TextOrIcon ("bayer.png", M ("MAIN_TAB_RAW"), M ("MAIN_TAB_RAW_TOOLTIP")));
toiM = Gtk::manage (new TextOrIcon ("metadata.png", M ("MAIN_TAB_METADATA"), M ("MAIN_TAB_METADATA_TOOLTIP")));
+ toolPanelNotebook->append_page (*userPanelSW, *toiU);
toolPanelNotebook->append_page (*exposurePanelSW, *toiE);
toolPanelNotebook->append_page (*detailsPanelSW, *toiD);
toolPanelNotebook->append_page (*colorPanelSW, *toiC);
@@ -251,6 +262,18 @@ void ToolPanelCoordinator::addPanel (Gtk::Box* where, FoldableToolPanel* panel,
toolPanels.push_back (panel);
}
+void ToolPanelCoordinator::addUserPanel (Gtk::Box* where, FoldableToolPanel* panel)
+{
+ auto name = panel->getToolName();
+ auto it = std::find(options.userTools.begin(), options.userTools.end(), name);
+ if (it != options.userTools.end()) {
+ int index = std::distance(options.userTools.begin(), it);
+ userTools[index] = panel;
+ } else {
+ addPanel(where, panel);
+ }
+}
+
ToolPanelCoordinator::~ToolPanelCoordinator ()
{
idle_register.destroy();
@@ -893,6 +916,7 @@ void ToolPanelCoordinator::updateVScrollbars (bool hide)
{
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC;
+ userPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
exposurePanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
detailsPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
colorPanelSW->set_policy (Gtk::POLICY_AUTOMATIC, policy);
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index 437e4055a..76a3cdd1c 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -158,6 +158,8 @@ protected:
rtengine::StagedImageProcessor* ipc;
std::vector toolPanels;
+ std::vector userTools;
+ ToolVBox* userPanel;
ToolVBox* exposurePanel;
ToolVBox* detailsPanel;
ToolVBox* colorPanel;
@@ -166,6 +168,7 @@ protected:
ToolVBox* advancedPanel;
ToolBar* toolBar;
+ TextOrIcon* toiU;
TextOrIcon* toiE;
TextOrIcon* toiD;
TextOrIcon* toiC;
@@ -174,9 +177,10 @@ protected:
TextOrIcon* toiM;
TextOrIcon* toiW;
- Gtk::Image* imgPanelEnd[6];
- Gtk::VBox* vbPanelEnd[6];
+ Gtk::Image* imgPanelEnd[7];
+ Gtk::VBox* vbPanelEnd[7];
+ Gtk::ScrolledWindow* userPanelSW;
Gtk::ScrolledWindow* exposurePanelSW;
Gtk::ScrolledWindow* detailsPanelSW;
Gtk::ScrolledWindow* colorPanelSW;
@@ -191,6 +195,7 @@ protected:
void addPanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
void foldThemAll (GdkEventButton* event);
void updateVScrollbars (bool hide);
+ void addUserPanel (Gtk::Box* where, FoldableToolPanel* panel);
private:
EditDataProvider *editDataProvider;