Merge branch 'dev' into favorites-gui
This commit is contained in:
@@ -38,11 +38,15 @@ template<typename T>
|
||||
class array2D;
|
||||
}
|
||||
|
||||
using ExternalEditorChangedSignal = sigc::signal<void>;
|
||||
|
||||
class BatchQueueEntry;
|
||||
class EditorPanel;
|
||||
class FilePanel;
|
||||
class MyProgressBar;
|
||||
class Navigator;
|
||||
class PopUpButton;
|
||||
class RTAppChooserDialog;
|
||||
class Thumbnail;
|
||||
class ToolPanelCoordinator;
|
||||
|
||||
@@ -65,6 +69,7 @@ class EditorPanel final :
|
||||
public rtengine::NonCopyable
|
||||
{
|
||||
public:
|
||||
|
||||
explicit EditorPanel (FilePanel* filePanel = nullptr);
|
||||
~EditorPanel () override;
|
||||
|
||||
@@ -162,11 +167,17 @@ public:
|
||||
void tbBeforeLock_toggled();
|
||||
void saveAsPressed ();
|
||||
void queueImgPressed ();
|
||||
void sendToGimpPressed ();
|
||||
void sendToExternal();
|
||||
void sendToExternalChanged(int);
|
||||
void sendToExternalPressed();
|
||||
void openNextEditorImage ();
|
||||
void openPreviousEditorImage ();
|
||||
void syncFileBrowser ();
|
||||
|
||||
// Signals.
|
||||
ExternalEditorChangedSignal * getExternalEditorChangedSignal();
|
||||
void setExternalEditorChangedSignal(ExternalEditorChangedSignal *signal);
|
||||
|
||||
void tbTopPanel_1_visible (bool visible);
|
||||
bool CheckSidePanelsVisibility();
|
||||
void tbShowHideSidePanels_managestate();
|
||||
@@ -182,6 +193,7 @@ public:
|
||||
{
|
||||
return isProcessing;
|
||||
}
|
||||
void updateExternalEditorWidget(int selectedIndex, const std::vector<ExternalEditor> &editors);
|
||||
void updateProfiles (const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC);
|
||||
void updateTPVScrollbar (bool hide);
|
||||
void updateHistogramPosition (int oldPosition, int newPosition);
|
||||
@@ -203,6 +215,9 @@ private:
|
||||
bool idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *pc, Glib::ustring fname);
|
||||
bool idle_sentToGimp (ProgressConnector<int> *pc, rtengine::IImagefloat* img, Glib::ustring filename);
|
||||
void histogramProfile_toggled ();
|
||||
RTAppChooserDialog *getAppChooserDialog();
|
||||
void onAppChooserDialogResponse(int resposneId);
|
||||
void updateExternalEditorSelection();
|
||||
|
||||
|
||||
Glib::ustring lastSaveAsFileName;
|
||||
@@ -232,10 +247,18 @@ private:
|
||||
|
||||
Gtk::Button* queueimg;
|
||||
Gtk::Button* saveimgas;
|
||||
Gtk::Button* sendtogimp;
|
||||
PopUpButton* send_to_external;
|
||||
Gtk::Button* navSync;
|
||||
Gtk::Button* navNext;
|
||||
Gtk::Button* navPrev;
|
||||
Glib::RefPtr<Gio::AppInfo> external_editor_info;
|
||||
std::unique_ptr<RTAppChooserDialog> app_chooser_dialog;
|
||||
ExternalEditorChangedSignal *externalEditorChangedSignal;
|
||||
sigc::connection externalEditorChangedSignalConnection;
|
||||
|
||||
rtengine::InitialImage *cached_exported_image;
|
||||
rtengine::procparams::ProcParams cached_exported_pparams;
|
||||
Glib::ustring cached_exported_filename;
|
||||
|
||||
class ColorManagementToolbar;
|
||||
std::unique_ptr<ColorManagementToolbar> colorMgmtToolBar;
|
||||
|
Reference in New Issue
Block a user