X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fdialog.h;h=dac38d9b84be984f7e6f5fe7539c9defb5718546;hb=0ae4329330f964c0e5af3742e365d71bb7d607fd;hp=0147eb2cddffae9df6c5ca32e9c333f7087726e2;hpb=fea0d2e6575b21945c4800805d66e43a2247ded5;p=xonotic%2Fnetradiant.git

diff --git a/radiant/dialog.h b/radiant/dialog.h
index 0147eb2c..dac38d9b 100644
--- a/radiant/dialog.h
+++ b/radiant/dialog.h
@@ -45,110 +45,145 @@ class CallbackDialogData;
 
 typedef std::list<DLG_DATA*> DialogDataList;
 
-class Dialog
-{
-ui::Window m_window;
-DialogDataList m_data;
+class Dialog {
+	ui::Window m_window;
+	DialogDataList m_data;
 public:
-ModalDialog m_modal;
-ui::Window m_parent;
+	ModalDialog m_modal;
+	ui::Window m_parent;
+
+	Dialog();
 
-Dialog();
-virtual ~Dialog();
+	virtual ~Dialog();
 
 /*!
    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, 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);
+	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::VBox addSpacer(ui::VBox vbox, int size);
+
+	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, Property<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, Property<int> const &cb);
+	void AddDialogData(ui::ToggleButton object, bool &data);
 
-    void AddTextEntryData(struct _GtkEntry &object, Property<const char *> const &cb);
+	void AddDialogData(ui::RadioButton object, int &data);
 
-    void AddIntEntryData(struct _GtkEntry &object, Property<int> const &cb);
+	void AddDialogData(ui::Entry object, CopiedString &data);
 
-    void AddSizeEntryData(struct _GtkEntry &object, Property<std::size_t> const &cb);
+	void AddDialogData(ui::Entry object, int &data);
 
-    void AddFloatEntryData(struct _GtkEntry &object, Property<float> const &cb);
+	void AddDialogData(ui::Entry object, std::size_t &data);
 
-    void AddFloatSpinnerData(struct _GtkSpinButton &object, Property<float> const &cb);
+	void AddDialogData(ui::Entry object, float &data);
 
-    void AddIntSpinnerData(struct _GtkSpinButton &object, Property<int> const &cb);
+	void AddDialogData(ui::SpinButton object, float &data);
 
-    void AddIntAdjustmentData(struct _GtkAdjustment &object, Property<int> const &cb);
+	void AddDialogData(ui::SpinButton object, int &data);
 
-    void AddIntComboData(struct _GtkComboBox &object, Property<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