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

Merge with 'Beep6581/dev'

Browse Source
This commit is contained in:
Pandagrapher
2023-09-05 09:48:43 +02:00
parent d8c0b521ab 7c73da7723
commit 990e9c70a5
91 changed files with 1524 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/preferences.cc
View File

@@ -130,7 +130,7 @@ Preferences::Preferences(RTWindow *rtwindow)
nb->append_page(*getBatchProcPanel(), M("PREFERENCES_BATCH_PROCESSING"));
nb->append_page(*getPerformancePanel(), M("PREFERENCES_TAB_PERFORMANCE"));
// Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__)
#if defined(_WIN32) || defined(__linux__)
nb->append_page(*getSoundsPanel(), M("PREFERENCES_TAB_SOUND"));
#endif
nb->set_current_page(0);
@@ -1964,7 +1964,7 @@ void Preferences::storePreferences()
moptions.rtSettings.thumbnail_inspector_mode = static_cast<rtengine::Settings::ThumbnailInspectorMode>(thumbnailInspectorMode->get_active_row_number());
// Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__)
#if defined(_WIN32) || defined(__linux__)
moptions.sndEnable = ckbSndEnable->get_active();
moptions.sndBatchQueueDone = txtSndBatchQueueDone->get_text();
moptions.sndLngEditProcDone = txtSndLngEditProcDone->get_text();
@@ -2221,7 +2221,7 @@ void Preferences::fillPreferences()
chOverwriteOutputFile->set_active(moptions.overwriteOutputFile);
// Sounds only on Windows and Linux
#if defined(WIN32) || defined(__linux__)
#if defined(_WIN32) || defined(__linux__)
ckbSndEnable->set_active(moptions.sndEnable);
txtSndBatchQueueDone->set_text(moptions.sndBatchQueueDone);
txtSndLngEditProcDone->set_text(moptions.sndLngEditProcDone);