merge with dev
This commit is contained in:
@@ -160,6 +160,8 @@ protected:
|
||||
rtengine::StagedImageProcessor* ipc;
|
||||
|
||||
std::vector<ToolPanel*> toolPanels;
|
||||
std::vector<FoldableToolPanel*> favorites;
|
||||
ToolVBox* favoritePanel;
|
||||
ToolVBox* exposurePanel;
|
||||
ToolVBox* detailsPanel;
|
||||
ToolVBox* colorPanel;
|
||||
@@ -169,6 +171,7 @@ protected:
|
||||
ToolVBox* locallabPanel;
|
||||
ToolBar* toolBar;
|
||||
|
||||
TextOrIcon* toiF;
|
||||
TextOrIcon* toiE;
|
||||
TextOrIcon* toiD;
|
||||
TextOrIcon* toiC;
|
||||
@@ -181,6 +184,7 @@ protected:
|
||||
Gtk::Image* imgPanelEnd[7];
|
||||
Gtk::VBox* vbPanelEnd[7];
|
||||
|
||||
Gtk::ScrolledWindow* favoritePanelSW;
|
||||
Gtk::ScrolledWindow* exposurePanelSW;
|
||||
Gtk::ScrolledWindow* detailsPanelSW;
|
||||
Gtk::ScrolledWindow* colorPanelSW;
|
||||
@@ -196,6 +200,7 @@ protected:
|
||||
void addPanel(Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
|
||||
void foldThemAll(GdkEventButton* event);
|
||||
void updateVScrollbars(bool hide);
|
||||
void addfavoritePanel (Gtk::Box* where, FoldableToolPanel* panel, int level = 1);
|
||||
void notebookPageChanged(Gtk::Widget* page, guint page_num);
|
||||
|
||||
private:
|
||||
|
Reference in New Issue
Block a user