liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix whitespace/formatting

Browse Source
This commit is contained in:
xiota 2024-06-10 13:46:17 +00:00
parent 29f4f37cdb
commit 8503d5323e
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtgui/options.cc
View File

@ -580,8 +580,8 @@ void Options::setDefaults()
rtSettings.darkFramesPath = ""; rtSettings.darkFramesPath = "";
rtSettings.flatFieldsPath = ""; rtSettings.flatFieldsPath = "";
rtSettings.cameraProfilesPath = ""; rtSettings.cameraProfilesPath = "";
rtSettings.lensProfilesPath = ""; rtSettings.lensProfilesPath = "";
#ifdef _WIN32 #ifdef _WIN32
const gchar* sysRoot = g_getenv("SystemRoot"); // Returns e.g. "c:\Windows" const gchar* sysRoot = g_getenv("SystemRoot"); // Returns e.g. "c:\Windows"
@ -673,8 +673,8 @@ void Options::setDefaults()
lastIccDir = rtSettings.iccDirectory; lastIccDir = rtSettings.iccDirectory;
lastDarkframeDir = rtSettings.darkFramesPath; lastDarkframeDir = rtSettings.darkFramesPath;
lastFlatfieldDir = rtSettings.flatFieldsPath; lastFlatfieldDir = rtSettings.flatFieldsPath;
lastCameraProfilesDir = rtSettings.cameraProfilesPath; lastCameraProfilesDir = rtSettings.cameraProfilesPath;
lastLensProfilesDir = rtSettings.lensProfilesPath; lastLensProfilesDir = rtSettings.lensProfilesPath;
// rtSettings.bw_complementary = true; // rtSettings.bw_complementary = true;
// There is no reasonable default for curves. We can still suppose that they will take place // There is no reasonable default for curves. We can still suppose that they will take place
// in a subdirectory of the user's own ProcParams presets, i.e. in a subdirectory // in a subdirectory of the user's own ProcParams presets, i.e. in a subdirectory
@ -816,7 +816,7 @@ void Options::readFromFile(Glib::ustring fname)
rtSettings.cameraProfilesPath = keyFile.get_string("General", "CameraProfilesPath"); rtSettings.cameraProfilesPath = keyFile.get_string("General", "CameraProfilesPath");
} }
if (keyFile.has_key("General", "LensProfilesPath")) { if (keyFile.has_key("General", "LensProfilesPath")) {
rtSettings.lensProfilesPath = keyFile.get_string("General", "LensProfilesPath"); rtSettings.lensProfilesPath = keyFile.get_string("General", "LensProfilesPath");
} }
@ -2424,8 +2424,8 @@ void Options::saveToFile(Glib::ustring fname)
keyFile.set_string("General", "Version", RTVERSION); keyFile.set_string("General", "Version", RTVERSION);
keyFile.set_string("General", "DarkFramesPath", rtSettings.darkFramesPath); keyFile.set_string("General", "DarkFramesPath", rtSettings.darkFramesPath);
keyFile.set_string("General", "FlatFieldsPath", rtSettings.flatFieldsPath); keyFile.set_string("General", "FlatFieldsPath", rtSettings.flatFieldsPath);
keyFile.set_string("General", "CameraProfilesPath", rtSettings.cameraProfilesPath); keyFile.set_string("General", "CameraProfilesPath", rtSettings.cameraProfilesPath);
keyFile.set_string("General", "LensProfilesPath", rtSettings.lensProfilesPath); keyFile.set_string("General", "LensProfilesPath", rtSettings.lensProfilesPath);
keyFile.set_boolean("General", "Verbose", rtSettings.verbose); keyFile.set_boolean("General", "Verbose", rtSettings.verbose);
keyFile.set_integer("General", "Cropsleep", rtSettings.cropsleep); keyFile.set_integer("General", "Cropsleep", rtSettings.cropsleep);
keyFile.set_double("General", "Reduchigh", rtSettings.reduchigh); keyFile.set_double("General", "Reduchigh", rtSettings.reduchigh);

4
rtgui/options.h
View File

@ -472,8 +472,8 @@ public:
Glib::ustring lastIccDir; Glib::ustring lastIccDir;
Glib::ustring lastDarkframeDir; Glib::ustring lastDarkframeDir;
Glib::ustring lastFlatfieldDir; Glib::ustring lastFlatfieldDir;
Glib::ustring lastCameraProfilesDir; Glib::ustring lastCameraProfilesDir;
Glib::ustring lastLensProfilesDir; Glib::ustring lastLensProfilesDir;
Glib::ustring lastRgbCurvesDir; Glib::ustring lastRgbCurvesDir;
Glib::ustring lastLabCurvesDir; Glib::ustring lastLabCurvesDir;
Glib::ustring lastRetinexDir; Glib::ustring lastRetinexDir;

7
rtgui/preferences.cc
View File

@ -656,7 +656,7 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
Gtk::Grid* dirgrid = Gtk::manage(new Gtk::Grid()); Gtk::Grid* dirgrid = Gtk::manage(new Gtk::Grid());
setExpandAlignProperties(dirgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER); setExpandAlignProperties(dirgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
// Dark Frames Dir // Dark Frames Dir
Gtk::Label *dfLab = Gtk::manage(new Gtk::Label(M("PREFERENCES_DIRDARKFRAMES") + ":")); Gtk::Label *dfLab = Gtk::manage(new Gtk::Label(M("PREFERENCES_DIRDARKFRAMES") + ":"));
setExpandAlignProperties(dfLab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties(dfLab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
darkFrameDir = Gtk::manage(new MyFileChooserButton(M("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER)); darkFrameDir = Gtk::manage(new MyFileChooserButton(M("PREFERENCES_DIRDARKFRAMES"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
@ -705,7 +705,7 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
dirgrid->attach_next_to(*cameraProfilesDirLabel, *clutsDirLabel, Gtk::POS_BOTTOM, 1, 1); dirgrid->attach_next_to(*cameraProfilesDirLabel, *clutsDirLabel, Gtk::POS_BOTTOM, 1, 1);
dirgrid->attach_next_to(*cameraProfilesDir, *cameraProfilesDirLabel, Gtk::POS_RIGHT, 1, 1); dirgrid->attach_next_to(*cameraProfilesDir, *cameraProfilesDirLabel, Gtk::POS_RIGHT, 1, 1);
//Lens Profiles Dir //Lens Profiles Dir
Gtk::Label *lensProfilesDirLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_LENSPROFILESDIR") + ":")); Gtk::Label *lensProfilesDirLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_LENSPROFILESDIR") + ":"));
lensProfilesDirLabel->set_tooltip_text(M("PREFERENCES_LENSPROFILESDIR_TOOLTIP")); lensProfilesDirLabel->set_tooltip_text(M("PREFERENCES_LENSPROFILESDIR_TOOLTIP"));
setExpandAlignProperties(lensProfilesDirLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER); setExpandAlignProperties(lensProfilesDirLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
@ -2673,10 +2673,11 @@ void Preferences::addExtPressed()
Gtk::TreeNodeChildren c = extensionModel->children(); Gtk::TreeNodeChildren c = extensionModel->children();
for (size_t i = 0; i < c.size(); i++) for (size_t i = 0; i < c.size(); i++) {
if (c[i][extensionColumns.ext] == extension->get_text()) { if (c[i][extensionColumns.ext] == extension->get_text()) {
return; return;
} }
}
Gtk::TreeRow row = * (extensionModel->append()); Gtk::TreeRow row = * (extensionModel->append());