merge with dev

2019-08-17 18:08:59 +02:00
parent f35d1fc1f6 f7ec852e05
commit 02e58bc88e
130 changed files with 1149 additions and 1777 deletions
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -56,6 +56,7 @@ Glib::RefPtr<Gtk::CssProvider> fontcss;

 Preferences::Preferences (RTWindow *rtwindow)
    : Gtk::Dialog (M ("MAIN_BUTTON_PREFERENCES"), *rtwindow, true)
+    , regex(Glib::Regex::create (THEMEREGEXSTR, Glib::RegexCompileFlags::REGEX_CASELESS))
    , splash (nullptr)
    , rprofiles (nullptr)
    , iprofiles (nullptr)
@@ -63,7 +64,6 @@ Preferences::Preferences (RTWindow *rtwindow)
    , newFont (false)
    , newCPFont (false)
 {
-    regex = Glib::Regex::create (THEMEREGEXSTR, Glib::RegexCompileFlags::REGEX_CASELESS);

    moptions.copyFrom (&options);