merge with dev

This commit is contained in:
Desmis
2017-03-12 16:53:50 +01:00
70 changed files with 2305 additions and 488 deletions

View File

@@ -24,6 +24,7 @@
#include "options.h"
#include <vector>
#include "rtwindow.h"
#include "dynamicprofilepanel.h"
class Preferences : public Gtk::Dialog, public ProfileStoreListener
{
@@ -204,6 +205,8 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::CheckButton* ckbHideTPVScrollbar;
Gtk::CheckButton* ckbUseIconNoText;
DynamicProfilePanel *dynProfilePanel;
Glib::ustring storedValueRaw;
Glib::ustring storedValueImg;
@@ -242,6 +245,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
Gtk::Widget* getBatchProcPanel ();
Gtk::Widget* getPerformancePanel ();
Gtk::Widget* getSoundPanel ();
Gtk::Widget* getDynProfilePanel ();
public:
explicit Preferences (RTWindow *rtwindow);