merge with dev

This commit is contained in:
Desmis
2019-11-28 06:50:05 +01:00
75 changed files with 181 additions and 213 deletions

View File

@@ -22,7 +22,6 @@
#include <gtkmm.h>
#include "adjuster.h"
#include "dynamicprofilepanel.h"
#include "options.h"
#include "../rtengine/profilestore.h"
@@ -252,7 +251,7 @@ class Preferences :
void switchFontTo (const Glib::ustring &newFontFamily, const int newFontSize);
bool splashClosed (GdkEventAny* event);
int getThemeRowNumber (Glib::ustring& longThemeFName);
int getThemeRowNumber (const Glib::ustring& longThemeFName);
void appendBehavList (Gtk::TreeModel::iterator& parent, Glib::ustring label, int id, bool set);