Merge branch 'dev' into metadata-exiv2
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
class ExternalEditorPreferences;
|
||||
class RTWindow;
|
||||
class Splash;
|
||||
class ToolLocationPreference;
|
||||
|
||||
class Preferences final :
|
||||
public Gtk::Dialog,
|
||||
@@ -249,6 +250,8 @@ class Preferences final :
|
||||
bool newFont;
|
||||
bool newCPFont;
|
||||
|
||||
ToolLocationPreference *toolLocationPreference;
|
||||
|
||||
void fillPreferences ();
|
||||
void storePreferences ();
|
||||
void parseDir (Glib::ustring dirname, std::vector<Glib::ustring>& items, Glib::ustring ext);
|
||||
@@ -274,6 +277,7 @@ class Preferences final :
|
||||
|
||||
Gtk::ScrolledWindow *swGeneral;
|
||||
Gtk::ScrolledWindow *swImageProcessing;
|
||||
Gtk::ScrolledWindow *swFavorites;
|
||||
Gtk::ScrolledWindow *swDynamicProfile;
|
||||
Gtk::ScrolledWindow *swFileBrowser;
|
||||
Gtk::ScrolledWindow *swColorMan;
|
||||
@@ -283,6 +287,7 @@ class Preferences final :
|
||||
|
||||
Gtk::Widget *getGeneralPanel();
|
||||
Gtk::Widget *getImageProcessingPanel();
|
||||
Gtk::Widget *getFavoritesPanel();
|
||||
Gtk::Widget *getDynamicProfilePanel();
|
||||
Gtk::Widget *getFileBrowserPanel();
|
||||
Gtk::Widget *getColorManPanel();
|
||||
|
Reference in New Issue
Block a user