#include <list>
#include <uilib/uilib.h>
+#include "property.h"
#include "generic/callback.h"
#include "gtkutil/dialog.h"
#include "generic/callback.h"
#include "string/string.h"
-template<class Self, class T = Self>
-struct impexp {
- static void Import(Self &self, T value) {
- self = value;
- }
-
- static void Export(Self &self, const Callback<void(T)> &importCallback) {
- importCallback(self);
- }
+struct DLG_DATA
+{
+ virtual ~DLG_DATA() = default;
+ virtual void release() = 0;
+ virtual void importData() const = 0;
+ virtual void exportData() const = 0;
};
-template<class Self, class T = Self>
-ImportExportCallback<T> mkImportExportCallback(Self &self) {
- return {
- ReferenceCaller<Self, void(T), impexp<Self, T>::Import>(self),
- ReferenceCaller<Self, void(const Callback<void(T)> &), impexp<Self, T>::Export>(self)
- };
-}
-#define BoolImport impexp<bool>::Import
-#define BoolExport impexp<bool>::Export
+template<typename FirstArgument>
+class CallbackDialogData;
-typedef ReferenceCaller<bool, void(const Callback<void(bool)> &), BoolExport> BoolExportCaller;
+typedef std::list<DLG_DATA*> DialogDataList;
-#define IntImport impexp<int>::Import
-#define IntExport impexp<int>::Export
+class Dialog {
+ ui::Window m_window;
+ DialogDataList m_data;
+public:
+ ModalDialog m_modal;
+ ui::Window m_parent;
-typedef ReferenceCaller<int, void(const Callback<void(int)> &), IntExport> IntExportCaller;
+ Dialog();
-#define SizeImport impexp<std::size_t>::Import
-#define SizeExport impexp<std::size_t>::Export
+ virtual ~Dialog();
+/*!
+ start modal dialog box
+ you need to use AddModalButton to select eIDOK eIDCANCEL buttons
+ */
+ EMessageBoxReturn DoModal();
-#define FloatImport impexp<float>::Import
-#define FloatExport impexp<float>::Export
+ void EndModal(EMessageBoxReturn code);
-typedef ReferenceCaller<float, void(const Callback<void(float)> &), FloatExport> FloatExportCaller;
+ virtual ui::Window BuildDialog() = 0;
-#define StringImport impexp<CopiedString, const char *>::Import
-#define StringExport impexp<CopiedString, const char *>::Export
+ virtual void exportData();
-template<>
-struct impexp<CopiedString, const char *> {
- static void Import(CopiedString &self, const char *value) {
- self = value;
- }
+ virtual void importData();
- static void Export(CopiedString &self, const Callback<void(const char *)> &importCallback) {
- importCallback(self.c_str());
- }
-};
+ virtual void PreModal() {};
-typedef ReferenceCaller<CopiedString, void(const Callback<void(const char *)> &), StringExport> StringExportCaller;
+ virtual void PostModal(EMessageBoxReturn code) {};
+ virtual void ShowDlg();
-struct DLG_DATA
-{
- virtual ~DLG_DATA() = default;
- virtual void release() = 0;
- virtual void importData() const = 0;
- virtual void exportData() const = 0;
-};
+ virtual void HideDlg();
+ void Create();
-template<typename FirstArgument>
-class CallbackDialogData;
+ void Destroy();
-typedef std::list<DLG_DATA*> DialogDataList;
+ ui::Window GetWidget() {
+ return m_window;
+ }
-class Dialog
-{
-ui::Window m_window;
-DialogDataList m_data;
-public:
-ModalDialog m_modal;
-ui::Window m_parent;
+ const ui::Window GetWidget() const {
+ return m_window;
+ }
-Dialog();
-virtual ~Dialog();
+ ui::VBox addSpacer(ui::VBox vbox, int size);
-/*!
- start modal dialog box
- you need to use AddModalButton to select eIDOK eIDCANCEL buttons
- */
-EMessageBoxReturn DoModal();
-void EndModal( EMessageBoxReturn code );
-virtual ui::Window BuildDialog() = 0;
-virtual void exportData();
-virtual void importData();
-virtual void PreModal() { };
-virtual void PostModal( EMessageBoxReturn code ) { };
-virtual void ShowDlg();
-virtual void HideDlg();
-void Create();
-void Destroy();
-ui::Window GetWidget(){
- return m_window;
-}
-const ui::Window GetWidget() const {
- return m_window;
-}
-
- ui::CheckButton addCheckBox(ui::VBox vbox, const char *name, const char *flag, ImportExportCallback<bool> const &cb);
-ui::CheckButton addCheckBox( ui::VBox vbox, const char* name, const char* flag, bool& data );
-
- void addCombo(ui::VBox vbox, const char *name, StringArrayRange values, ImportExportCallback<int> const &cb);
-void addCombo( ui::VBox vbox, const char* name, int& data, StringArrayRange values );
-void addSlider( ui::VBox vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment );
-
- void addRadio(ui::VBox vbox, const char *name, StringArrayRange names, ImportExportCallback<int> const &cb);
-void addRadio( ui::VBox vbox, const char* name, int& data, StringArrayRange names );
-
- void addRadioIcons(ui::VBox vbox, const char *name, StringArrayRange icons, ImportExportCallback<int> const &cb);
-void addRadioIcons( ui::VBox vbox, const char* name, int& data, StringArrayRange icons );
-
- ui::Widget addIntEntry(ui::VBox vbox, const char *name, ImportExportCallback<int> const &cb);
-ui::Widget addEntry( ui::VBox vbox, const char* name, int& data ){
- return addIntEntry(vbox, name, mkImportExportCallback(data));
-}
-
- ui::Widget addSizeEntry(ui::VBox vbox, const char *name, ImportExportCallback<std::size_t> const &cb);
-ui::Widget addEntry( ui::VBox vbox, const char* name, std::size_t& data ){
- return addSizeEntry(vbox, name, mkImportExportCallback(data));
-}
-
- ui::Widget addFloatEntry(ui::VBox vbox, const char *name, ImportExportCallback<float> const &cb);
-ui::Widget addEntry( ui::VBox vbox, const char* name, float& data ){
- return addFloatEntry(vbox, name, mkImportExportCallback(data));
-}
-
- ui::Widget
- addPathEntry(ui::VBox vbox, const char *name, bool browse_directory, ImportExportCallback<const char *> const &cb);
-ui::Widget addPathEntry( ui::VBox vbox, const char* name, CopiedString& data, bool directory );
-ui::SpinButton addSpinner( ui::VBox vbox, const char* name, int& data, double value, double lower, double upper );
-
- ui::SpinButton
- addSpinner(ui::VBox vbox, const char *name, double value, double lower, double upper, ImportExportCallback<int> const &cb);
-
- ui::SpinButton addSpinner(ui::VBox vbox, const char *name, double value, double lower, double upper,
- ImportExportCallback<float> const &cb);
+ ui::Label addLabel(ui::VBox vbox, const char *name, const char *text);
+
+ ui::CheckButton addCheckBox(ui::VBox vbox, const char *name, const char *flag, Property<bool> const &cb);
+
+ ui::CheckButton addCheckBox(ui::VBox vbox, const char *name, const char *flag, bool &data);
+
+ void addCombo(ui::VBox vbox, const char *name, StringArrayRange values, Property<int> const &cb);
+
+ void addCombo(ui::VBox vbox, const char *name, int &data, StringArrayRange values);
+
+ void addSlider(ui::VBox vbox, const char *name, int &data, gboolean draw_value, const char *low, const char *high,
+ double value, double lower, double upper, double step_increment, double page_increment);
+
+ void addRadio(ui::VBox vbox, const char *name, StringArrayRange names, Property<int> const &cb);
+
+ void addRadio(ui::VBox vbox, const char *name, int &data, StringArrayRange names);
+
+ void addRadioIcons(ui::VBox vbox, const char *name, StringArrayRange icons, Property<int> const &cb);
+
+ void addRadioIcons(ui::VBox vbox, const char *name, int &data, StringArrayRange icons);
+
+ ui::Widget addIntEntry(ui::VBox vbox, const char *name, Property<int> const &cb);
+
+ ui::Widget addEntry(ui::VBox vbox, const char *name, int &data) {
+ return addIntEntry(vbox, name, make_property(data));
+ }
+
+ ui::Widget addSizeEntry(ui::VBox vbox, const char *name, Property<std::size_t> const &cb);
+
+ ui::Widget addEntry(ui::VBox vbox, const char *name, std::size_t &data) {
+ return addSizeEntry(vbox, name, make_property(data));
+ }
+
+ ui::Widget addFloatEntry(ui::VBox vbox, const char *name, Property<float> const &cb);
+
+ ui::Widget addEntry(ui::VBox vbox, const char *name, float &data) {
+ return addFloatEntry(vbox, name, make_property(data));
+ }
+
+ ui::Widget addPathEntry(ui::VBox vbox, const char *name, bool browse_directory, Property<const char *> const &cb);
+
+ ui::Widget addPathEntry(ui::VBox vbox, const char *name, CopiedString &data, bool directory);
+
+ ui::SpinButton addSpinner(ui::VBox vbox, const char *name, int &data, double value, double lower, double upper);
+
+ ui::SpinButton
+ addSpinner(ui::VBox vbox, const char *name, double value, double lower, double upper, Property<int> const &cb);
+
+ ui::SpinButton
+ addSpinner(ui::VBox vbox, const char *name, double value, double lower, double upper, Property<float> const &cb);
protected:
- void AddBoolToggleData(struct _GtkToggleButton &object, ImportExportCallback<bool> const &cb);
+ void AddBoolToggleData(ui::ToggleButton object, Property<bool> const &cb);
+
+ void AddIntRadioData(ui::RadioButton object, Property<int> const &cb);
+
+ void AddTextEntryData(ui::Entry object, Property<const char *> const &cb);
+
+ void AddIntEntryData(ui::Entry object, Property<int> const &cb);
+
+ void AddSizeEntryData(ui::Entry object, Property<std::size_t> const &cb);
+
+ void AddFloatEntryData(ui::Entry object, Property<float> const &cb);
+
+ void AddFloatSpinnerData(ui::SpinButton object, Property<float> const &cb);
+
+ void AddIntSpinnerData(ui::SpinButton object, Property<int> const &cb);
+
+ void AddIntAdjustmentData(ui::Adjustment object, Property<int> const &cb);
+
+ void AddIntComboData(ui::ComboBox object, Property<int> const &cb);
- void AddIntRadioData(struct _GtkRadioButton &object, ImportExportCallback<int> const &cb);
+ void AddDialogData(ui::ToggleButton object, bool &data);
- void AddTextEntryData(struct _GtkEntry &object, ImportExportCallback<const char *> const &cb);
+ void AddDialogData(ui::RadioButton object, int &data);
- void AddIntEntryData(struct _GtkEntry &object, ImportExportCallback<int> const &cb);
+ void AddDialogData(ui::Entry object, CopiedString &data);
- void AddSizeEntryData(struct _GtkEntry &object, ImportExportCallback<std::size_t> const &cb);
+ void AddDialogData(ui::Entry object, int &data);
- void AddFloatEntryData(struct _GtkEntry &object, ImportExportCallback<float> const &cb);
+ void AddDialogData(ui::Entry object, std::size_t &data);
- void AddFloatSpinnerData(struct _GtkSpinButton &object, ImportExportCallback<float> const &cb);
+ void AddDialogData(ui::Entry object, float &data);
- void AddIntSpinnerData(struct _GtkSpinButton &object, ImportExportCallback<int> const &cb);
+ void AddDialogData(ui::SpinButton object, float &data);
- void AddIntAdjustmentData(struct _GtkAdjustment &object, ImportExportCallback<int> const &cb);
+ void AddDialogData(ui::SpinButton object, int &data);
- void AddIntComboData(struct _GtkComboBox &object, ImportExportCallback<int> const &cb);
+ void AddDialogData(ui::Adjustment object, int &data);
-void AddDialogData( struct _GtkToggleButton& object, bool& data );
-void AddDialogData( struct _GtkRadioButton& object, int& data );
-void AddDialogData( struct _GtkEntry& object, CopiedString& data );
-void AddDialogData( struct _GtkEntry& object, int& data );
-void AddDialogData( struct _GtkEntry& object, std::size_t& data );
-void AddDialogData( struct _GtkEntry& object, float& data );
-void AddDialogData( struct _GtkSpinButton& object, float& data );
-void AddDialogData( struct _GtkSpinButton& object, int& data );
-void AddDialogData( struct _GtkAdjustment& object, int& data );
-void AddDialogData( struct _GtkComboBox& object, int& data );
+ void AddDialogData(ui::ComboBox object, int &data);
};
#endif
projects / xonotic / netradiant.git / blobdiff