Merge with b989fba4c24c34873648df6871da4d0d8cb0a6d1

This commit is contained in:
Hombre
2014-02-06 20:51:21 +01:00
parent d8e5bc8bd9
commit 6398f6bf66
86 changed files with 3159 additions and 2519 deletions

View File

@@ -44,6 +44,10 @@ class BlackWhite : public Gtk::VBox, public AdjusterListener, public FoldableToo
Gtk::HBox* autoHBox;
Gtk::Button* neutral;
Gtk::Label* RGBLabels;
MyComboBoxText* algo;
sigc::connection algoconn;
Gtk::Label* alLabel;
Gtk::HBox* algoHBox;
Adjuster *mixerRed;
Adjuster *mixerGreen;
@@ -126,9 +130,12 @@ class BlackWhite : public Gtk::VBox, public AdjusterListener, public FoldableToo
bool curveMode1Changed_ ();
void curveMode1Changed2 ();
bool curveMode1Changed2_ ();
void algoChanged ();
Glib::ustring getSettingString ();
Glib::ustring getFilterString ();
Glib::ustring getalgoString ();
};
#endif