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

Fix macOS external editor app chooser popping up

Browse Source
This commit is contained in:
Lawrence Lee 2023-08-04 22:32:39 -07:00
parent a626bdae3e
commit 7ad414aa63
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/editorpanel.cc
View File

@ -2030,7 +2030,7 @@ bool EditorPanel::idle_saveImage (ProgressConnector<rtengine::IImagefloat*> *pc,
msgd.run (); msgd.run ();
saveimgas->set_sensitive (true); saveimgas->set_sensitive (true);
send_to_external->set_sensitive(true); send_to_external->set_sensitive(send_to_external->getEntryCount());
isProcessing = false; isProcessing = false;
} }
@ -2058,7 +2058,7 @@ bool EditorPanel::idle_imageSaved (ProgressConnector<int> *pc, rtengine::IImagef
} }
saveimgas->set_sensitive (true); saveimgas->set_sensitive (true);
send_to_external->set_sensitive(true); send_to_external->set_sensitive(send_to_external->getEntryCount());
parent->setProgressStr (""); parent->setProgressStr ("");
parent->setProgress (0.); parent->setProgress (0.);
@ -2390,7 +2390,7 @@ bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *p
Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); Gtk::MessageDialog msgd (*parent, msg_, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
msgd.run (); msgd.run ();
saveimgas->set_sensitive (true); saveimgas->set_sensitive (true);
send_to_external->set_sensitive(true); send_to_external->set_sensitive(send_to_external->getEntryCount());
} }
return false; return false;
@ -2411,7 +2411,7 @@ bool EditorPanel::idle_sentToGimp (ProgressConnector<int> *pc, rtengine::IImagef
if ((!img && Glib::file_test(filename, Glib::FILE_TEST_IS_REGULAR)) || (img && !errore)) { if ((!img && Glib::file_test(filename, Glib::FILE_TEST_IS_REGULAR)) || (img && !errore)) {
saveimgas->set_sensitive (true); saveimgas->set_sensitive (true);
send_to_external->set_sensitive(true); send_to_external->set_sensitive(send_to_external->getEntryCount());
parent->setProgressStr (""); parent->setProgressStr ("");
parent->setProgress (0.); parent->setProgress (0.);
bool success = false; bool success = false;
@ -2790,6 +2790,7 @@ void EditorPanel::updateExternalEditorWidget(int selectedIndex, const std::vecto
#ifndef __APPLE__ #ifndef __APPLE__
send_to_external->addEntry("palette-brush.png", M("GENERAL_OTHER"), &send_to_external_radio_group); send_to_external->addEntry("palette-brush.png", M("GENERAL_OTHER"), &send_to_external_radio_group);
#endif #endif
send_to_external->set_sensitive(send_to_external->getEntryCount());
send_to_external->setSelected(selectedIndex); send_to_external->setSelected(selectedIndex);
send_to_external->show(); send_to_external->show();
} }

7
rtgui/preferences.cc
View File

@ -1755,7 +1755,12 @@ void Preferences::storePreferences()
const std::vector<ExternalEditorPreferences::EditorInfo> &editors = externalEditors->getEditors(); const std::vector<ExternalEditorPreferences::EditorInfo> &editors = externalEditors->getEditors();
moptions.externalEditors.resize(editors.size()); moptions.externalEditors.resize(editors.size());
moptions.externalEditorIndex = -1; moptions.externalEditorIndex =
#ifdef __APPLE__
editors.empty() ? -1 : 0;
#else
-1;
#endif
for (unsigned i = 0; i < editors.size(); i++) { for (unsigned i = 0; i < editors.size(); i++) {
moptions.externalEditors[i] = (ExternalEditor( moptions.externalEditors[i] = (ExternalEditor(
editors[i].name, editors[i].command, editors[i].native_command, editors[i].icon_serialized)); editors[i].name, editors[i].command, editors[i].native_command, editors[i].icon_serialized));