merge with Dev

This commit is contained in:
Desmis
2017-08-19 08:17:43 +02:00
55 changed files with 2270 additions and 1197 deletions

View File

@@ -122,9 +122,9 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::SpinButton* panFactor;
Gtk::CheckButton* rememberZoomPanCheckbutton;
Gtk::ComboBoxText* view;
Gtk::ComboBoxText* grey;
Gtk::ComboBoxText* greySc;
// Gtk::ComboBoxText* view;
// Gtk::ComboBoxText* grey;
// Gtk::ComboBoxText* greySc;
Gtk::ComboBoxText* dnv;
Gtk::ComboBoxText* dnti;
Gtk::ComboBoxText* dnaut;