Add favorites customizer to preferences UI
This commit is contained in:
Lawrence Lee
parent
a1bbede061
commit
0f894656a0
@ -1891,6 +1891,7 @@ PREFERENCES_STARTUPIMDIR;Image Directory at Startup
|
||||
PREFERENCES_TAB_BROWSER;File Browser
|
||||
PREFERENCES_TAB_COLORMGR;Color Management
|
||||
PREFERENCES_TAB_DYNAMICPROFILE;Dynamic Profile Rules
|
||||
PREFERENCES_TAB_FAVORITES;Favorites
|
||||
PREFERENCES_TAB_GENERAL;General
|
||||
PREFERENCES_TAB_IMPROC;Image Processing
|
||||
PREFERENCES_TAB_PERFORMANCE;Performance
|
||||
@ -1899,6 +1900,10 @@ PREFERENCES_THUMBNAIL_INSPECTOR_JPEG;Embedded JPEG preview
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_MODE;Image to show
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_RAW;Neutral raw rendering
|
||||
PREFERENCES_THUMBNAIL_INSPECTOR_RAW_IF_NO_JPEG_FULLSIZE;Embedded JPEG if fullsize, neutral raw otherwise
|
||||
PREFERENCES_TOOLPANEL_AVAILABLETOOLS;Available Tools
|
||||
PREFERENCES_TOOLPANEL_FAVORITE;Favorite
|
||||
PREFERENCES_TOOLPANEL_FAVORITESPANEL;Favorites Panel
|
||||
PREFERENCES_TOOLPANEL_TOOL;Tool
|
||||
PREFERENCES_TP_LABEL;Tool panel:
|
||||
PREFERENCES_TP_VSCROLLBAR;Hide vertical scrollbar
|
||||
PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
|
||||
|
||||
@ -160,6 +160,7 @@ set(NONCLISOURCEFILES
|
||||
thumbnail.cc
|
||||
tonecurve.cc
|
||||
toolbar.cc
|
||||
toollocationpref.cc
|
||||
toolpanel.cc
|
||||
toolpanelcoord.cc
|
||||
vibrance.cc
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
#include <sstream>
|
||||
#include "rtimage.h"
|
||||
#include "rtwindow.h"
|
||||
#include "toollocationpref.h"
|
||||
#ifdef _OPENMP
|
||||
#include <omp.h>
|
||||
#endif
|
||||
@ -65,6 +66,7 @@ Preferences::Preferences(RTWindow *rtwindow)
|
||||
, parent(rtwindow)
|
||||
, newFont(false)
|
||||
, newCPFont(false)
|
||||
, toolLocationPreference(nullptr)
|
||||
{
|
||||
|
||||
moptions.copyFrom(&options);
|
||||
@ -102,6 +104,7 @@ Preferences::Preferences(RTWindow *rtwindow)
|
||||
|
||||
nb->append_page(*getGeneralPanel(), M("PREFERENCES_TAB_GENERAL"));
|
||||
nb->append_page(*getImageProcessingPanel(), M("PREFERENCES_TAB_IMPROC"));
|
||||
nb->append_page(*getFavoritesPanel(), M("PREFERENCES_TAB_FAVORITES"));
|
||||
nb->append_page(*getDynamicProfilePanel(), M("PREFERENCES_TAB_DYNAMICPROFILE"));
|
||||
nb->append_page(*getFileBrowserPanel(), M("PREFERENCES_TAB_BROWSER"));
|
||||
nb->append_page(*getColorManPanel(), M("PREFERENCES_TAB_COLORMGR"));
|
||||
@ -492,6 +495,13 @@ void Preferences::behSetRadioToggled(const Glib::ustring& path)
|
||||
behAddSetRadioToggled(path, false);
|
||||
}
|
||||
|
||||
Gtk::Widget *Preferences::getFavoritesPanel()
|
||||
{
|
||||
if (!toolLocationPreference) {
|
||||
toolLocationPreference = Gtk::make_managed<ToolLocationPreference>(moptions);
|
||||
}
|
||||
return toolLocationPreference;
|
||||
}
|
||||
|
||||
Gtk::Widget *Preferences::getDynamicProfilePanel()
|
||||
{
|
||||
@ -1938,6 +1948,8 @@ void Preferences::storePreferences()
|
||||
|
||||
moptions.cropGuides = Options::CropGuidesMode(cropGuidesCombo->get_active_row_number());
|
||||
moptions.cropAutoFit = cropAutoFitCB->get_active();
|
||||
|
||||
toolLocationPreference->updateOptions();
|
||||
}
|
||||
|
||||
void Preferences::fillPreferences()
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
|
||||
class RTWindow;
|
||||
class Splash;
|
||||
class ToolLocationPreference;
|
||||
|
||||
class Preferences final :
|
||||
public Gtk::Dialog,
|
||||
@ -244,6 +245,8 @@ class Preferences final :
|
||||
bool newFont;
|
||||
bool newCPFont;
|
||||
|
||||
ToolLocationPreference *toolLocationPreference;
|
||||
|
||||
void fillPreferences ();
|
||||
void storePreferences ();
|
||||
void parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& items, Glib::ustring ext);
|
||||
@ -278,6 +281,7 @@ class Preferences final :
|
||||
|
||||
Gtk::Widget *getGeneralPanel();
|
||||
Gtk::Widget *getImageProcessingPanel();
|
||||
Gtk::Widget *getFavoritesPanel();
|
||||
Gtk::Widget *getDynamicProfilePanel();
|
||||
Gtk::Widget *getFileBrowserPanel();
|
||||
Gtk::Widget *getColorManPanel();
|
||||
|
||||
596
rtgui/toollocationpref.cc
Normal file
596
rtgui/toollocationpref.cc
Normal file
@ -0,0 +1,596 @@
|
||||
/*
|
||||
* This file is part of RawTherapee.
|
||||
*
|
||||
* Copyright (c) 2021 Lawrence Lee
|
||||
*
|
||||
* RawTherapee is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* RawTherapee is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <unordered_set>
|
||||
|
||||
#include "guiutils.h"
|
||||
#include "options.h"
|
||||
#include "toollocationpref.h"
|
||||
#include "toolpanelcoord.h"
|
||||
|
||||
using Tool = ToolPanelCoordinator::Tool;
|
||||
|
||||
std::string getToolName(Tool tool)
|
||||
{
|
||||
switch (tool) {
|
||||
case Tool::TONE_CURVE:
|
||||
return "tonecurve";
|
||||
case Tool::SHADOWS_HIGHLIGHTS:
|
||||
return "shadowshighlights";
|
||||
case Tool::IMPULSE_DENOISE:
|
||||
return "impulsedenoise";
|
||||
case Tool::DEFRINGE_TOOL:
|
||||
return "defringe";
|
||||
case Tool::SPOT:
|
||||
return "spot";
|
||||
case Tool::DIR_PYR_DENOISE:
|
||||
return "dirpyrdenoise";
|
||||
case Tool::EPD:
|
||||
return "epd";
|
||||
case Tool::SHARPENING_TOOL:
|
||||
return "sharpening";
|
||||
case Tool::LOCAL_CONTRAST:
|
||||
return "localcontrast";
|
||||
case Tool::SHARPEN_EDGE:
|
||||
return "sharpenedge";
|
||||
case Tool::SHARPEN_MICRO:
|
||||
return "sharpenmicro";
|
||||
case Tool::L_CURVE:
|
||||
return "labcurves";
|
||||
case Tool::RGB_CURVES:
|
||||
return "rgbcurves";
|
||||
case Tool::COLOR_TONING:
|
||||
return "colortoning";
|
||||
case Tool::LENS_GEOM:
|
||||
return "lensgeom";
|
||||
case Tool::LENS_PROF:
|
||||
return "lensprof";
|
||||
case Tool::DISTORTION:
|
||||
return "distortion";
|
||||
case Tool::ROTATE:
|
||||
return "rotate";
|
||||
case Tool::VIBRANCE:
|
||||
return "vibrance";
|
||||
case Tool::COLOR_APPEARANCE:
|
||||
return "colorappearance";
|
||||
case Tool::WHITE_BALANCE:
|
||||
return "whitebalance";
|
||||
case Tool::VIGNETTING:
|
||||
return "vignetting";
|
||||
case Tool::RETINEX_TOOL:
|
||||
return "retinex";
|
||||
case Tool::GRADIENT:
|
||||
return "gradient";
|
||||
case Tool::LOCALLAB:
|
||||
return "locallab";
|
||||
case Tool::PC_VIGNETTE:
|
||||
return "pcvignette";
|
||||
case Tool::PERSPECTIVE:
|
||||
return "perspective";
|
||||
case Tool::CA_CORRECTION:
|
||||
return "cacorrection";
|
||||
case Tool::CH_MIXER:
|
||||
return "chmixer";
|
||||
case Tool::BLACK_WHITE:
|
||||
return "blackwhite";
|
||||
case Tool::RESIZE_TOOL:
|
||||
return "resize";
|
||||
case Tool::PR_SHARPENING:
|
||||
return "prsharpening";
|
||||
case Tool::CROP_TOOL:
|
||||
return "crop";
|
||||
case Tool::ICM:
|
||||
return "icm";
|
||||
case Tool::WAVELET:
|
||||
return "wavelet";
|
||||
case Tool::DIR_PYR_EQUALIZER:
|
||||
return "dirpyrdenoise";
|
||||
case Tool::HSV_EQUALIZER:
|
||||
return "hsvequalizer";
|
||||
case Tool::FILM_SIMULATION:
|
||||
return "filmsimulation";
|
||||
case Tool::SOFT_LIGHT:
|
||||
return "softlight";
|
||||
case Tool::DEHAZE:
|
||||
return "dehaze";
|
||||
case Tool::SENSOR_BAYER:
|
||||
return "sensorbayer";
|
||||
case Tool::SENSOR_XTRANS:
|
||||
return "sensorxtrans";
|
||||
case Tool::BAYER_PROCESS:
|
||||
return "bayerprocess";
|
||||
case Tool::XTRANS_PROCESS:
|
||||
return "xtransprocess";
|
||||
case Tool::BAYER_PREPROCESS:
|
||||
return "bayerpreprocess";
|
||||
case Tool::PREPROCESS:
|
||||
return "preprocess";
|
||||
case Tool::DARKFRAME_TOOL:
|
||||
return "darkframe";
|
||||
case Tool::FLATFIELD_TOOL:
|
||||
return "flatfield";
|
||||
case Tool::RAW_CA_CORRECTION:
|
||||
return "rawcacorrection";
|
||||
case Tool::RAW_EXPOSURE:
|
||||
return "rawexposure";
|
||||
case Tool::PREPROCESS_WB:
|
||||
return "preprocesswb";
|
||||
case Tool::BAYER_RAW_EXPOSURE:
|
||||
return "bayerrawexposure";
|
||||
case Tool::XTRANS_RAW_EXPOSURE:
|
||||
return "xtransrawexposure";
|
||||
case Tool::FATTAL:
|
||||
return "fattal";
|
||||
case Tool::FILM_NEGATIVE:
|
||||
return "filmnegative";
|
||||
case Tool::PD_SHARPENING:
|
||||
return "capturesharpening";
|
||||
};
|
||||
return "";
|
||||
};
|
||||
|
||||
class FavoritesColumns : public Gtk::TreeModelColumnRecord
|
||||
{
|
||||
public:
|
||||
Gtk::TreeModelColumn<Glib::ustring> toolName;
|
||||
Gtk::TreeModelColumn<Tool> tool;
|
||||
|
||||
FavoritesColumns()
|
||||
{
|
||||
add(toolName);
|
||||
add(tool);
|
||||
}
|
||||
};
|
||||
|
||||
class ToolListColumns : public Gtk::TreeModelColumnRecord
|
||||
{
|
||||
public:
|
||||
Gtk::TreeModelColumn<Glib::ustring> toolName;
|
||||
Gtk::TreeModelColumn<Tool> tool;
|
||||
Gtk::TreeModelColumn<bool> isFavorite;
|
||||
Gtk::TreeModelColumn<bool> isEditable;
|
||||
|
||||
ToolListColumns()
|
||||
{
|
||||
add(toolName);
|
||||
add(tool);
|
||||
add(isFavorite);
|
||||
add(isEditable);
|
||||
}
|
||||
};
|
||||
|
||||
struct ToolLocationPreference::Impl {
|
||||
static std::unordered_map<std::string, Tool> toolNamesReverseMap;
|
||||
|
||||
Options &options;
|
||||
|
||||
// Tool list.
|
||||
ToolListColumns toolListColumns;
|
||||
Glib::RefPtr<Gtk::TreeStore> toolListModelPtr;
|
||||
Gtk::CellRendererToggle toolListCellRendererFavorite;
|
||||
Gtk::CellRendererText toolListCellRendererToolName;
|
||||
Gtk::TreeViewColumn toolListViewColumnFavorite;
|
||||
Gtk::TreeViewColumn toolListViewColumnToolName;
|
||||
Gtk::TreeView *toolListViewPtr;
|
||||
|
||||
// Favorites list.
|
||||
FavoritesColumns favoritesColumns;
|
||||
Glib::RefPtr<Gtk::ListStore> favoritesModelPtr;
|
||||
Gtk::CellRendererText favoritesCellRendererToolName;
|
||||
Gtk::TreeViewColumn favoritesViewColumnToolName;
|
||||
Gtk::TreeView *favoritesViewPtr;
|
||||
|
||||
explicit Impl(Options &options);
|
||||
|
||||
void addToolListRowGroup(
|
||||
const std::vector<ToolPanelCoordinator::ToolTree> &tools,
|
||||
const Gtk::TreeIter &parentRowIter,
|
||||
const std::unordered_set<Tool> &favorites);
|
||||
void favoriteToggled(const Glib::ustring &row_path);
|
||||
Tool getToolFromName(const std::string &name) const;
|
||||
void initFavoritesRows(const std::vector<Tool> &favorites);
|
||||
void initToolListRows(const std::vector<Tool> &favorites);
|
||||
std::vector<Tool> toolNamesToTools(
|
||||
const std::vector<Glib::ustring> &tool_names) const;
|
||||
void updateOptions();
|
||||
};
|
||||
|
||||
std::unordered_map<std::string, Tool>
|
||||
ToolLocationPreference::Impl::toolNamesReverseMap;
|
||||
|
||||
Glib::ustring getToolPanelTitleKey(ToolPanelCoordinator::Panel panel)
|
||||
{
|
||||
switch (panel) {
|
||||
case ToolPanelCoordinator::Panel::FAVORITE:
|
||||
return "MAIN_TAB_FAVORITES";
|
||||
case ToolPanelCoordinator::Panel::EXPOSURE:
|
||||
return "MAIN_TAB_EXPOSURE";
|
||||
case ToolPanelCoordinator::Panel::DETAILS:
|
||||
return "MAIN_TAB_DETAIL";
|
||||
case ToolPanelCoordinator::Panel::COLOR:
|
||||
return "MAIN_TAB_COLOR";
|
||||
case ToolPanelCoordinator::Panel::ADVANCED:
|
||||
return "MAIN_TAB_ADVANCED";
|
||||
case ToolPanelCoordinator::Panel::LOCALLAB:
|
||||
return "MAIN_TAB_LOCALLAB";
|
||||
case ToolPanelCoordinator::Panel::TRANSFORM_PANEL:
|
||||
return "MAIN_TAB_TRANSFORM";
|
||||
case ToolPanelCoordinator::Panel::RAW:
|
||||
return "MAIN_TAB_RAW";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
Glib::ustring getToolTitleKey(Tool tool)
|
||||
{
|
||||
using Tool = Tool;
|
||||
switch (tool) {
|
||||
case Tool::TONE_CURVE:
|
||||
return "TP_EXPOSURE_LABEL";
|
||||
case Tool::SHADOWS_HIGHLIGHTS:
|
||||
return "TP_SHADOWSHLIGHTS_LABEL";
|
||||
case Tool::IMPULSE_DENOISE:
|
||||
return "TP_IMPULSEDENOISE_LABEL";
|
||||
case Tool::DEFRINGE_TOOL:
|
||||
return "TP_DEFRINGE_LABEL";
|
||||
case Tool::SPOT:
|
||||
return "TP_SPOT_LABEL";
|
||||
case Tool::DIR_PYR_DENOISE:
|
||||
return "TP_DIRPYRDENOISE_LABEL";
|
||||
case Tool::EPD:
|
||||
return "TP_EPD_LABEL";
|
||||
case Tool::SHARPENING_TOOL:
|
||||
return "TP_SHARPENING_LABEL";
|
||||
case Tool::LOCAL_CONTRAST:
|
||||
return "TP_LOCALCONTRAST_LABEL";
|
||||
case Tool::SHARPEN_EDGE:
|
||||
return "TP_SHARPENEDGE_LABEL";
|
||||
case Tool::SHARPEN_MICRO:
|
||||
return "TP_SHARPENMICRO_LABEL";
|
||||
case Tool::L_CURVE:
|
||||
return "TP_LABCURVE_LABEL";
|
||||
case Tool::RGB_CURVES:
|
||||
return "TP_RGBCURVES_LABEL";
|
||||
case Tool::COLOR_TONING:
|
||||
return "TP_COLORTONING_LABEL";
|
||||
case Tool::LENS_GEOM:
|
||||
return "TP_LENSGEOM_LABEL";
|
||||
case Tool::LENS_PROF:
|
||||
return "TP_LENSPROFILE_LABEL";
|
||||
case Tool::DISTORTION:
|
||||
return "TP_DISTORTION_LABEL";
|
||||
case Tool::ROTATE:
|
||||
return "TP_ROTATE_LABEL";
|
||||
case Tool::VIBRANCE:
|
||||
return "TP_VIBRANCE_LABEL";
|
||||
case Tool::COLOR_APPEARANCE:
|
||||
return "TP_COLORAPP_LABEL";
|
||||
case Tool::WHITE_BALANCE:
|
||||
return "TP_WBALANCE_LABEL";
|
||||
case Tool::VIGNETTING:
|
||||
return "TP_VIGNETTING_LABEL";
|
||||
case Tool::RETINEX_TOOL:
|
||||
return "TP_RETINEX_LABEL";
|
||||
case Tool::GRADIENT:
|
||||
return "TP_GRADIENT_LABEL";
|
||||
case Tool::LOCALLAB:
|
||||
return "TP_LOCALLAB_LABEL";
|
||||
case Tool::PC_VIGNETTE:
|
||||
return "TP_PCVIGNETTE_LABEL";
|
||||
case Tool::PERSPECTIVE:
|
||||
return "TP_PERSPECTIVE_LABEL";
|
||||
case Tool::CA_CORRECTION:
|
||||
return "TP_CACORRECTION_LABEL";
|
||||
case Tool::CH_MIXER:
|
||||
return "TP_CHMIXER_LABEL";
|
||||
case Tool::BLACK_WHITE:
|
||||
return "TP_BWMIX_LABEL";
|
||||
case Tool::RESIZE_TOOL:
|
||||
return "TP_RESIZE_LABEL";
|
||||
case Tool::PR_SHARPENING:
|
||||
return "TP_PRSHARPENING_LABEL";
|
||||
case Tool::CROP_TOOL:
|
||||
return "TP_CROP_LABEL";
|
||||
case Tool::ICM:
|
||||
return "TP_ICM_LABEL";
|
||||
case Tool::WAVELET:
|
||||
return "TP_WAVELET_LABEL";
|
||||
case Tool::DIR_PYR_EQUALIZER:
|
||||
return "TP_DIRPYRDENOISE_LABEL";
|
||||
case Tool::HSV_EQUALIZER:
|
||||
return "TP_HSVEQUALIZER_LABEL";
|
||||
case Tool::FILM_SIMULATION:
|
||||
return "TP_FILMSIMULATION_LABEL";
|
||||
case Tool::SOFT_LIGHT:
|
||||
return "TP_SOFTLIGHT_LABEL";
|
||||
case Tool::DEHAZE:
|
||||
return "TP_DEHAZE_LABEL";
|
||||
case Tool::SENSOR_BAYER:
|
||||
return "TP_RAW_SENSOR_BAYER_LABEL";
|
||||
case Tool::SENSOR_XTRANS:
|
||||
return "TP_RAW_SENSOR_XTRANS_LABEL";
|
||||
case Tool::BAYER_PROCESS:
|
||||
return "TP_RAW_LABEL";
|
||||
case Tool::XTRANS_PROCESS:
|
||||
return "TP_RAW_LABEL";
|
||||
case Tool::BAYER_PREPROCESS:
|
||||
return "TP_PREPROCESS_LABEL";
|
||||
case Tool::PREPROCESS:
|
||||
return "TP_PREPROCESS_LABEL";
|
||||
case Tool::DARKFRAME_TOOL:
|
||||
return "TP_DARKFRAME_LABEL";
|
||||
case Tool::FLATFIELD_TOOL:
|
||||
return "TP_FLATFIELD_LABEL";
|
||||
case Tool::RAW_CA_CORRECTION:
|
||||
return "TP_RAWCACORR_LABEL";
|
||||
case Tool::RAW_EXPOSURE:
|
||||
return "TP_EXPOS_WHITEPOINT_LABEL";
|
||||
case Tool::PREPROCESS_WB:
|
||||
return "TP_PREPROCWB_LABEL";
|
||||
case Tool::BAYER_RAW_EXPOSURE:
|
||||
return "TP_EXPOS_BLACKPOINT_LABEL";
|
||||
case Tool::XTRANS_RAW_EXPOSURE:
|
||||
return "TP_EXPOS_BLACKPOINT_LABEL";
|
||||
case Tool::FATTAL:
|
||||
return "TP_TM_FATTAL_LABEL";
|
||||
case Tool::FILM_NEGATIVE:
|
||||
return "TP_FILMNEGATIVE_LABEL";
|
||||
case Tool::PD_SHARPENING:
|
||||
return "TP_PDSHARPENING_LABEL";
|
||||
};
|
||||
return "";
|
||||
}
|
||||
|
||||
ToolLocationPreference::Impl::Impl(Options &options) :
|
||||
options(options),
|
||||
|
||||
toolListModelPtr(Gtk::TreeStore::create(toolListColumns)),
|
||||
toolListViewColumnFavorite(
|
||||
Gtk::TreeViewColumn(M("PREFERENCES_TOOLPANEL_FAVORITE"))),
|
||||
toolListViewColumnToolName(
|
||||
Gtk::TreeViewColumn(M("PREFERENCES_TOOLPANEL_TOOL"))),
|
||||
toolListViewPtr(Gtk::make_managed<Gtk::TreeView>()),
|
||||
|
||||
favoritesModelPtr(Gtk::ListStore::create(favoritesColumns)),
|
||||
favoritesViewColumnToolName(
|
||||
Gtk::TreeViewColumn(M("PREFERENCES_TOOLPANEL_TOOL"))),
|
||||
favoritesViewPtr(Gtk::make_managed<Gtk::TreeView>())
|
||||
{
|
||||
const std::vector<Tool> favorites = toolNamesToTools(options.favorites);
|
||||
|
||||
// Tool list.
|
||||
toolListViewPtr->set_model(toolListModelPtr);
|
||||
toolListViewPtr->append_column(toolListViewColumnToolName);
|
||||
toolListViewColumnToolName.pack_start(toolListCellRendererToolName);
|
||||
toolListViewColumnToolName.set_expand();
|
||||
toolListViewColumnToolName.set_renderer(
|
||||
toolListCellRendererToolName, toolListColumns.toolName);
|
||||
toolListViewPtr->append_column(toolListViewColumnFavorite);
|
||||
toolListViewColumnFavorite.pack_start(toolListCellRendererFavorite);
|
||||
toolListViewColumnFavorite.set_expand(false);
|
||||
toolListViewColumnFavorite.set_renderer(
|
||||
toolListCellRendererFavorite, toolListColumns.isFavorite);
|
||||
toolListViewColumnFavorite.add_attribute(
|
||||
toolListCellRendererFavorite, "visible", toolListColumns.isEditable);
|
||||
toolListCellRendererFavorite.signal_toggled().connect(
|
||||
sigc::mem_fun(*this, &ToolLocationPreference::Impl::favoriteToggled));
|
||||
initToolListRows(favorites);
|
||||
toolListViewPtr->expand_all();
|
||||
|
||||
// Favorites list.
|
||||
favoritesViewPtr->set_model(favoritesModelPtr);
|
||||
favoritesViewPtr->append_column(favoritesViewColumnToolName);
|
||||
favoritesViewPtr->set_reorderable(true);
|
||||
favoritesViewColumnToolName.pack_start(favoritesCellRendererToolName);
|
||||
favoritesViewColumnToolName.set_renderer(
|
||||
favoritesCellRendererToolName, favoritesColumns.toolName);
|
||||
initFavoritesRows(favorites);
|
||||
}
|
||||
|
||||
void ToolLocationPreference::Impl::favoriteToggled(const Glib::ustring &row_path)
|
||||
{
|
||||
auto row_iter = toolListModelPtr->get_iter(row_path);
|
||||
const bool is_favorite = !row_iter->get_value(toolListColumns.isFavorite);
|
||||
const Tool tool = row_iter->get_value(toolListColumns.tool);
|
||||
|
||||
// Update favorite column in the tool list.
|
||||
row_iter->set_value(toolListColumns.isFavorite, is_favorite);
|
||||
|
||||
// Update the favorites list.
|
||||
if (is_favorite) {
|
||||
// Add to favorites list.
|
||||
auto new_favorite_row_iter = favoritesModelPtr->append();
|
||||
new_favorite_row_iter->set_value(
|
||||
favoritesColumns.toolName,
|
||||
M(getToolTitleKey(tool)));
|
||||
new_favorite_row_iter->set_value(favoritesColumns.tool, tool);
|
||||
} else {
|
||||
// Remove from favorites list.
|
||||
const auto favorites_rows = favoritesModelPtr->children();
|
||||
auto row = favorites_rows.begin();
|
||||
while (
|
||||
row != favorites_rows.end() &&
|
||||
row->get_value(favoritesColumns.tool) != tool) {
|
||||
row++;
|
||||
}
|
||||
if (row != favorites_rows.end()) {
|
||||
favoritesModelPtr->erase(row);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Tool ToolLocationPreference::Impl::getToolFromName(const std::string &name) const
|
||||
{
|
||||
if (toolNamesReverseMap.empty()) {
|
||||
// Create the name to tool mapping.
|
||||
|
||||
const auto panels = ToolPanelCoordinator::getDefaultToolLayout();
|
||||
std::vector<const ToolPanelCoordinator::ToolTree *> unprocessed_tool_trees;
|
||||
|
||||
// Get the root tools from each panel.
|
||||
for (const auto &panel_tools : panels) {
|
||||
for (const auto &tool : panel_tools.second) {
|
||||
unprocessed_tool_trees.push_back(&tool);
|
||||
}
|
||||
}
|
||||
|
||||
// Process all the tools, including their children.
|
||||
while (unprocessed_tool_trees.size() > 0) {
|
||||
const ToolPanelCoordinator::ToolTree *tool_tree =
|
||||
unprocessed_tool_trees.back();
|
||||
unprocessed_tool_trees.pop_back();
|
||||
toolNamesReverseMap[getToolName(tool_tree->id)] = tool_tree->id;
|
||||
for (const auto &child_tree : tool_tree->children) {
|
||||
unprocessed_tool_trees.push_back(&child_tree);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return toolNamesReverseMap.at(name);
|
||||
}
|
||||
|
||||
void ToolLocationPreference::Impl::initFavoritesRows(
|
||||
const std::vector<Tool> &favorites)
|
||||
{
|
||||
for (const auto tool : favorites) {
|
||||
auto favorite_row_iter = favoritesModelPtr->append();
|
||||
favorite_row_iter->set_value(
|
||||
favoritesColumns.toolName,
|
||||
M(getToolTitleKey(tool)));
|
||||
favorite_row_iter->set_value(favoritesColumns.tool, tool);
|
||||
}
|
||||
}
|
||||
|
||||
void ToolLocationPreference::Impl::addToolListRowGroup(
|
||||
const std::vector<ToolPanelCoordinator::ToolTree> &tools,
|
||||
const Gtk::TreeIter &parentRowIter,
|
||||
const std::unordered_set<Tool> &favorites)
|
||||
{
|
||||
for (const ToolPanelCoordinator::ToolTree &tool : tools) {
|
||||
auto tool_row_iter = toolListModelPtr->append(parentRowIter->children());
|
||||
tool_row_iter->set_value(
|
||||
toolListColumns.toolName,
|
||||
M(getToolTitleKey(tool.id)));
|
||||
tool_row_iter->set_value(toolListColumns.tool, tool.id);
|
||||
tool_row_iter->set_value(
|
||||
toolListColumns.isFavorite,
|
||||
favorites.count(tool.id) > 0);
|
||||
tool_row_iter->set_value(
|
||||
toolListColumns.isEditable,
|
||||
ToolPanelCoordinator::isFavoritable(tool.id));
|
||||
addToolListRowGroup(tool.children, tool_row_iter, favorites);
|
||||
}
|
||||
};
|
||||
|
||||
void ToolLocationPreference::Impl::initToolListRows(const std::vector<Tool> &favorites)
|
||||
{
|
||||
const auto panel_tools = ToolPanelCoordinator::getDefaultToolLayout();
|
||||
std::unordered_set<Tool> favorites_set;
|
||||
|
||||
for (const auto &tool : favorites) {
|
||||
favorites_set.insert(tool);
|
||||
}
|
||||
|
||||
for (const auto panel : {
|
||||
ToolPanelCoordinator::Panel::EXPOSURE,
|
||||
ToolPanelCoordinator::Panel::DETAILS,
|
||||
ToolPanelCoordinator::Panel::COLOR,
|
||||
ToolPanelCoordinator::Panel::ADVANCED,
|
||||
ToolPanelCoordinator::Panel::LOCALLAB,
|
||||
ToolPanelCoordinator::Panel::TRANSFORM_PANEL,
|
||||
ToolPanelCoordinator::Panel::RAW,
|
||||
}) {
|
||||
auto tool_group_iter = toolListModelPtr->append();
|
||||
tool_group_iter->set_value(
|
||||
toolListColumns.toolName,
|
||||
M(getToolPanelTitleKey(panel)));
|
||||
addToolListRowGroup(panel_tools.at(panel), tool_group_iter, favorites_set);
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<Tool> ToolLocationPreference::Impl::toolNamesToTools(
|
||||
const std::vector<Glib::ustring> &tool_names) const
|
||||
{
|
||||
std::vector<Tool> tool_set;
|
||||
|
||||
for (auto &&tool_name : tool_names) {
|
||||
Tool tool;
|
||||
try {
|
||||
tool = getToolFromName(tool_name);
|
||||
} catch (const std::exception &e) {
|
||||
continue;
|
||||
}
|
||||
tool_set.push_back(tool);
|
||||
}
|
||||
|
||||
return tool_set;
|
||||
}
|
||||
|
||||
void ToolLocationPreference::Impl::updateOptions()
|
||||
{
|
||||
const auto favorites_rows = favoritesModelPtr->children();
|
||||
options.favorites.resize(favorites_rows.size());
|
||||
for (unsigned i = 0; i < favorites_rows.size(); i++) {
|
||||
const Tool tool = favorites_rows[i].get_value(favoritesColumns.tool);
|
||||
options.favorites[i] = getToolName(tool);
|
||||
}
|
||||
}
|
||||
|
||||
ToolLocationPreference::ToolLocationPreference(Options &options) :
|
||||
impl(new Impl(options))
|
||||
{
|
||||
// Layout grid.
|
||||
Gtk::Grid *layout_grid = Gtk::make_managed<Gtk::Grid>();
|
||||
layout_grid->set_column_spacing(4);
|
||||
layout_grid->set_row_spacing(4);
|
||||
add(*layout_grid);
|
||||
|
||||
// Tool list.
|
||||
Gtk::Frame *tool_list_frame = Gtk::make_managed<Gtk::Frame>(
|
||||
M("PREFERENCES_TOOLPANEL_AVAILABLETOOLS"));
|
||||
Gtk::ScrolledWindow *tool_list_scrolled_window =
|
||||
Gtk::make_managed<Gtk::ScrolledWindow>();
|
||||
tool_list_scrolled_window->property_hscrollbar_policy() =
|
||||
Gtk::PolicyType::POLICY_NEVER;
|
||||
layout_grid->attach_next_to(*tool_list_frame, Gtk::PositionType::POS_RIGHT);
|
||||
tool_list_frame->add(*tool_list_scrolled_window);
|
||||
tool_list_scrolled_window->add(*impl->toolListViewPtr);
|
||||
impl->toolListViewPtr->set_hscroll_policy(Gtk::ScrollablePolicy::SCROLL_MINIMUM);
|
||||
setExpandAlignProperties(
|
||||
tool_list_frame, false, true, Gtk::ALIGN_START, Gtk::ALIGN_FILL);
|
||||
|
||||
// Favorites list.
|
||||
Gtk::Frame *favorites_frame = Gtk::make_managed<Gtk::Frame>(
|
||||
M("PREFERENCES_TOOLPANEL_FAVORITESPANEL"));
|
||||
Gtk::ScrolledWindow *favorites_list_scrolled_window =
|
||||
Gtk::make_managed<Gtk::ScrolledWindow>();
|
||||
favorites_list_scrolled_window->property_hscrollbar_policy() =
|
||||
Gtk::PolicyType::POLICY_NEVER;
|
||||
layout_grid->attach_next_to(*favorites_frame, Gtk::PositionType::POS_RIGHT);
|
||||
favorites_frame->add(*favorites_list_scrolled_window);
|
||||
favorites_list_scrolled_window->add(*impl->favoritesViewPtr);
|
||||
setExpandAlignProperties(
|
||||
favorites_frame, false, true, Gtk::ALIGN_START, Gtk::ALIGN_FILL);
|
||||
|
||||
this->show_all();
|
||||
}
|
||||
|
||||
void ToolLocationPreference::updateOptions()
|
||||
{
|
||||
impl->updateOptions();
|
||||
}
|
||||
34
rtgui/toollocationpref.h
Normal file
34
rtgui/toollocationpref.h
Normal file
@ -0,0 +1,34 @@
|
||||
/*
|
||||
* This file is part of RawTherapee.
|
||||
*
|
||||
* Copyright (c) 2021 Lawrence Lee
|
||||
*
|
||||
* RawTherapee is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* RawTherapee is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <gtkmm/box.h>
|
||||
|
||||
class Options;
|
||||
|
||||
class ToolLocationPreference : public Gtk::Box
|
||||
{
|
||||
private:
|
||||
struct Impl;
|
||||
std::unique_ptr<Impl> impl;
|
||||
|
||||
public:
|
||||
explicit ToolLocationPreference(Options &options);
|
||||
void updateOptions();
|
||||
};
|
||||
@ -32,6 +32,241 @@
|
||||
|
||||
using namespace rtengine::procparams;
|
||||
|
||||
using Tool = ToolPanelCoordinator::Tool;
|
||||
using ToolTree = struct ToolPanelCoordinator::ToolTree;
|
||||
|
||||
const std::vector<ToolTree> EXPOSURE_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::TONE_CURVE,
|
||||
},
|
||||
{
|
||||
.id = Tool::SHADOWS_HIGHLIGHTS,
|
||||
},
|
||||
{
|
||||
.id = Tool::EPD,
|
||||
},
|
||||
{
|
||||
.id = Tool::FATTAL,
|
||||
},
|
||||
{
|
||||
.id = Tool::PC_VIGNETTE,
|
||||
},
|
||||
{
|
||||
.id = Tool::GRADIENT,
|
||||
},
|
||||
{
|
||||
.id = Tool::L_CURVE,
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<ToolTree> DETAILS_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::SPOT,
|
||||
},
|
||||
{
|
||||
.id = Tool::SHARPENING_TOOL,
|
||||
},
|
||||
{
|
||||
.id = Tool::LOCAL_CONTRAST,
|
||||
},
|
||||
{
|
||||
.id = Tool::SHARPEN_EDGE,
|
||||
},
|
||||
{
|
||||
.id = Tool::SHARPEN_MICRO,
|
||||
},
|
||||
{
|
||||
.id = Tool::IMPULSE_DENOISE,
|
||||
},
|
||||
{
|
||||
.id = Tool::DIR_PYR_DENOISE,
|
||||
},
|
||||
{
|
||||
.id = Tool::DEFRINGE_TOOL,
|
||||
},
|
||||
{
|
||||
.id = Tool::DIR_PYR_EQUALIZER,
|
||||
},
|
||||
{
|
||||
.id = Tool::DEHAZE,
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<ToolTree> COLOR_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::WHITE_BALANCE,
|
||||
},
|
||||
{
|
||||
.id = Tool::VIBRANCE,
|
||||
},
|
||||
{
|
||||
.id = Tool::CH_MIXER,
|
||||
},
|
||||
{
|
||||
.id = Tool::BLACK_WHITE,
|
||||
},
|
||||
{
|
||||
.id = Tool::HSV_EQUALIZER,
|
||||
},
|
||||
{
|
||||
.id = Tool::FILM_SIMULATION,
|
||||
},
|
||||
{
|
||||
.id = Tool::FILM_NEGATIVE,
|
||||
},
|
||||
{
|
||||
.id = Tool::SOFT_LIGHT,
|
||||
},
|
||||
{
|
||||
.id = Tool::RGB_CURVES,
|
||||
},
|
||||
{
|
||||
.id = Tool::COLOR_TONING,
|
||||
},
|
||||
{
|
||||
.id = Tool::ICM,
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<ToolTree> ADVANCED_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::RETINEX_TOOL,
|
||||
},
|
||||
{
|
||||
.id = Tool::COLOR_APPEARANCE,
|
||||
},
|
||||
{
|
||||
.id = Tool::WAVELET,
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<ToolTree> LOCALLAB_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::LOCALLAB,
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<ToolTree> TRANSFORM_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::CROP_TOOL,
|
||||
},
|
||||
{
|
||||
.id = Tool::RESIZE_TOOL,
|
||||
.children = {
|
||||
{
|
||||
.id = Tool::PR_SHARPENING,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
.id = Tool::LENS_GEOM,
|
||||
.children = {
|
||||
{
|
||||
.id = Tool::ROTATE,
|
||||
},
|
||||
{
|
||||
.id = Tool::PERSPECTIVE,
|
||||
},
|
||||
{
|
||||
.id = Tool::LENS_PROF,
|
||||
},
|
||||
{
|
||||
.id = Tool::DISTORTION,
|
||||
},
|
||||
{
|
||||
.id = Tool::CA_CORRECTION,
|
||||
},
|
||||
{
|
||||
.id = Tool::VIGNETTING,
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const std::vector<ToolTree> RAW_PANEL_TOOLS = {
|
||||
{
|
||||
.id = Tool::SENSOR_BAYER,
|
||||
.children = {
|
||||
{
|
||||
{
|
||||
.id = Tool::BAYER_PROCESS,
|
||||
},
|
||||
{
|
||||
.id = Tool::BAYER_RAW_EXPOSURE,
|
||||
},
|
||||
{
|
||||
.id = Tool::BAYER_PREPROCESS,
|
||||
},
|
||||
{
|
||||
.id = Tool::RAW_CA_CORRECTION,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
.id = Tool::SENSOR_XTRANS,
|
||||
.children = {
|
||||
{
|
||||
{
|
||||
.id = Tool::XTRANS_PROCESS,
|
||||
},
|
||||
{
|
||||
.id = Tool::XTRANS_RAW_EXPOSURE,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
.id = Tool::RAW_EXPOSURE,
|
||||
},
|
||||
{
|
||||
.id = Tool::PREPROCESS_WB,
|
||||
},
|
||||
{
|
||||
.id = Tool::PREPROCESS,
|
||||
},
|
||||
{
|
||||
.id = Tool::DARKFRAME_TOOL,
|
||||
},
|
||||
{
|
||||
.id = Tool::FLATFIELD_TOOL,
|
||||
},
|
||||
{
|
||||
.id = Tool::PD_SHARPENING,
|
||||
},
|
||||
};
|
||||
|
||||
const std::unordered_map<ToolPanelCoordinator::Panel, const std::vector<ToolTree>> PANEL_TOOLS = {
|
||||
{
|
||||
ToolPanelCoordinator::Panel::EXPOSURE,
|
||||
EXPOSURE_PANEL_TOOLS
|
||||
},
|
||||
{
|
||||
ToolPanelCoordinator::Panel::DETAILS,
|
||||
DETAILS_PANEL_TOOLS
|
||||
},
|
||||
{
|
||||
ToolPanelCoordinator::Panel::COLOR,
|
||||
COLOR_PANEL_TOOLS
|
||||
},
|
||||
{
|
||||
ToolPanelCoordinator::Panel::ADVANCED,
|
||||
ADVANCED_PANEL_TOOLS
|
||||
},
|
||||
{
|
||||
ToolPanelCoordinator::Panel::LOCALLAB,
|
||||
LOCALLAB_PANEL_TOOLS
|
||||
},
|
||||
{
|
||||
ToolPanelCoordinator::Panel::TRANSFORM_PANEL,
|
||||
TRANSFORM_PANEL_TOOLS
|
||||
},
|
||||
{
|
||||
ToolPanelCoordinator::Panel::RAW,
|
||||
RAW_PANEL_TOOLS
|
||||
},
|
||||
};
|
||||
|
||||
ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favoritePanelSW(nullptr), hasChanged (false), editDataProvider (nullptr), photoLoadedOnce(false)
|
||||
{
|
||||
|
||||
@ -288,6 +523,21 @@ ToolPanelCoordinator::ToolPanelCoordinator (bool batch) : ipc (nullptr), favorit
|
||||
prevPage = toolPanelNotebook->get_nth_page(0);
|
||||
}
|
||||
|
||||
const std::unordered_map<ToolPanelCoordinator::Panel, const std::vector<ToolTree>> ToolPanelCoordinator::getDefaultToolLayout()
|
||||
{
|
||||
return PANEL_TOOLS;
|
||||
}
|
||||
|
||||
bool ToolPanelCoordinator::isFavoritable(Tool tool)
|
||||
{
|
||||
switch (tool) {
|
||||
case Tool::PR_SHARPENING:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void ToolPanelCoordinator::notebookPageChanged(Gtk::Widget* page, guint page_num)
|
||||
{
|
||||
// Locallab spot curves are set visible if at least one photo has been loaded (to avoid
|
||||
|
||||
@ -223,12 +223,90 @@ private:
|
||||
Gtk::Widget* prevPage;
|
||||
|
||||
public:
|
||||
enum class Panel {
|
||||
FAVORITE,
|
||||
EXPOSURE,
|
||||
DETAILS,
|
||||
COLOR,
|
||||
ADVANCED,
|
||||
LOCALLAB,
|
||||
TRANSFORM_PANEL,
|
||||
RAW,
|
||||
};
|
||||
|
||||
enum class Tool {
|
||||
TONE_CURVE,
|
||||
SHADOWS_HIGHLIGHTS,
|
||||
IMPULSE_DENOISE,
|
||||
DEFRINGE_TOOL,
|
||||
SPOT,
|
||||
DIR_PYR_DENOISE,
|
||||
EPD,
|
||||
SHARPENING_TOOL,
|
||||
LOCAL_CONTRAST,
|
||||
SHARPEN_EDGE,
|
||||
SHARPEN_MICRO,
|
||||
L_CURVE,
|
||||
RGB_CURVES,
|
||||
COLOR_TONING,
|
||||
LENS_GEOM,
|
||||
LENS_PROF,
|
||||
DISTORTION,
|
||||
ROTATE,
|
||||
VIBRANCE,
|
||||
COLOR_APPEARANCE,
|
||||
WHITE_BALANCE,
|
||||
VIGNETTING,
|
||||
RETINEX_TOOL,
|
||||
GRADIENT,
|
||||
LOCALLAB,
|
||||
PC_VIGNETTE,
|
||||
PERSPECTIVE,
|
||||
CA_CORRECTION,
|
||||
CH_MIXER,
|
||||
BLACK_WHITE,
|
||||
RESIZE_TOOL,
|
||||
PR_SHARPENING,
|
||||
CROP_TOOL,
|
||||
ICM,
|
||||
WAVELET,
|
||||
DIR_PYR_EQUALIZER,
|
||||
HSV_EQUALIZER,
|
||||
FILM_SIMULATION,
|
||||
SOFT_LIGHT,
|
||||
DEHAZE,
|
||||
SENSOR_BAYER,
|
||||
SENSOR_XTRANS,
|
||||
BAYER_PROCESS,
|
||||
XTRANS_PROCESS,
|
||||
BAYER_PREPROCESS,
|
||||
PREPROCESS,
|
||||
DARKFRAME_TOOL,
|
||||
FLATFIELD_TOOL,
|
||||
RAW_CA_CORRECTION,
|
||||
RAW_EXPOSURE,
|
||||
PREPROCESS_WB,
|
||||
BAYER_RAW_EXPOSURE,
|
||||
XTRANS_RAW_EXPOSURE,
|
||||
FATTAL,
|
||||
FILM_NEGATIVE,
|
||||
PD_SHARPENING,
|
||||
};
|
||||
|
||||
struct ToolTree {
|
||||
Tool id;
|
||||
std::vector<ToolTree> children;
|
||||
};
|
||||
|
||||
CoarsePanel* coarse;
|
||||
Gtk::Notebook* toolPanelNotebook;
|
||||
|
||||
ToolPanelCoordinator(bool batch = false);
|
||||
~ToolPanelCoordinator () override;
|
||||
|
||||
static const std::unordered_map<Panel, const std::vector<ToolTree>> getDefaultToolLayout();
|
||||
static bool isFavoritable(Tool tool);
|
||||
|
||||
bool getChangedState()
|
||||
{
|
||||
return hasChanged;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user