/*
-Copyright (C) 1999-2006 Id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+ Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+ For a list of contributors, see the accompanying CONTRIBUTORS file.
-This file is part of GtkRadiant.
+ This file is part of GtkRadiant.
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ GtkRadiant is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ GtkRadiant is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+ You should have received a copy of the GNU General Public License
+ along with GtkRadiant; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
//
// Base dialog class, provides a way to run modal dialogs and
#include "dialog.h"
+#include <gtk/gtk.h>
+
#include "debugging/debugging.h"
#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkalignment.h>
-
#include "stream/stringstream.h"
#include "convert.h"
#include "gtkutil/dialog.h"
#include "gtkmisc.h"
-GtkEntry* DialogEntry_new()
+ui::Entry DialogEntry_new()
{
- GtkEntry* entry = GTK_ENTRY(gtk_entry_new());
- gtk_widget_show(GTK_WIDGET(entry));
- gtk_widget_set_size_request(GTK_WIDGET(entry), 64, -1);
- return entry;
+ auto entry = ui::Entry(ui::New);
+ entry.show();
+ entry.dimensions(64, -1);
+ return entry;
}
-class DialogEntryRow
-{
+class DialogEntryRow {
public:
- DialogEntryRow(GtkWidget* row, GtkEntry* entry) : m_row(row), m_entry(entry)
- {
- }
- GtkWidget* m_row;
- GtkEntry* m_entry;
+ DialogEntryRow(ui::Widget row, ui::Entry entry) : m_row(row), m_entry(entry)
+ {
+ }
+
+ ui::Widget m_row;
+ ui::Entry m_entry;
};
-DialogEntryRow DialogEntryRow_new(const char* name)
+DialogEntryRow DialogEntryRow_new(const char *name)
{
- GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
- gtk_widget_show(alignment);
+ auto alignment = ui::Alignment(0.0, 0.5, 0.0, 0.0);
+ alignment.show();
- GtkEntry* entry = DialogEntry_new();
- gtk_container_add(GTK_CONTAINER(alignment), GTK_WIDGET(entry));
+ auto entry = DialogEntry_new();
+ alignment.add(entry);
- return DialogEntryRow(GTK_WIDGET(DialogRow_new(name, alignment)), entry);
+ return DialogEntryRow(ui::Widget(DialogRow_new(name, alignment)), entry);
}
-GtkSpinButton* DialogSpinner_new(double value, double lower, double upper, int fraction)
+ui::SpinButton DialogSpinner_new(double value, double lower, double upper, int fraction)
{
- double step = 1.0 / double(fraction);
- unsigned int digits = 0;
- for(;fraction > 1; fraction /= 10)
- {
- ++digits;
- }
- GtkSpinButton* spin = GTK_SPIN_BUTTON(gtk_spin_button_new(GTK_ADJUSTMENT(gtk_adjustment_new(value, lower, upper, step, 10, 0)), step, digits));
- gtk_widget_show(GTK_WIDGET(spin));
- gtk_widget_set_size_request(GTK_WIDGET(spin), 64, -1);
- return spin;
+ double step = 1.0 / double(fraction);
+ unsigned int digits = 0;
+ for (; fraction > 1; fraction /= 10) {
+ ++digits;
+ }
+ auto spin = ui::SpinButton(ui::Adjustment(value, lower, upper, step, 10, 0), step, digits);
+ spin.show();
+ spin.dimensions(64, -1);
+ return spin;
}
-class DialogSpinnerRow
-{
+class DialogSpinnerRow {
public:
- DialogSpinnerRow(GtkWidget* row, GtkSpinButton* spin) : m_row(row), m_spin(spin)
- {
- }
- GtkWidget* m_row;
- GtkSpinButton* m_spin;
+ DialogSpinnerRow(ui::Widget row, ui::SpinButton spin) : m_row(row), m_spin(spin)
+ {
+ }
+
+ ui::Widget m_row;
+ ui::SpinButton m_spin;
};
-DialogSpinnerRow DialogSpinnerRow_new(const char* name, double value, double lower, double upper, int fraction)
+DialogSpinnerRow DialogSpinnerRow_new(const char *name, double value, double lower, double upper, int fraction)
{
- GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
- gtk_widget_show(alignment);
+ auto alignment = ui::Alignment(0.0, 0.5, 0.0, 0.0);
+ alignment.show();
- GtkSpinButton* spin = DialogSpinner_new(value, lower, upper, fraction);
- gtk_container_add(GTK_CONTAINER(alignment), GTK_WIDGET(spin));
+ auto spin = DialogSpinner_new(value, lower, upper, fraction);
+ alignment.add(spin);
- return DialogSpinnerRow(GTK_WIDGET(DialogRow_new(name, alignment)), spin);
+ return DialogSpinnerRow(ui::Widget(DialogRow_new(name, alignment)), spin);
}
+struct BoolToggle {
+ static void Export(const ui::ToggleButton &self, const Callback<void(bool)> &returnz)
+ {
+ returnz(self.active());
+ }
-template<
- typename Type_,
- typename Other_,
- void(*Import)(Type_&, Other_),
- void(*Export)(Type_&, const Callback1<Other_>&)
->
-class ImportExport
-{
-public:
- typedef Type_ Type;
- typedef Other_ Other;
+ static void Import(ui::ToggleButton &self, bool value)
+ {
+ self.active(value);
+ }
+};
- typedef ReferenceCaller1<Type, Other, Import> ImportCaller;
- typedef ReferenceCaller1<Type, const Callback1<Other>&, Export> ExportCaller;
+using BoolToggleImportExport = PropertyAdaptor<ui::ToggleButton, bool, BoolToggle>;
+
+struct IntEntry {
+ static void Export(const ui::Entry &self, const Callback<void(int)> &returnz)
+ {
+ returnz(atoi(gtk_entry_get_text(self)));
+ }
+
+ static void Import(ui::Entry &self, int value)
+ {
+ entry_set_int(self, value);
+ }
};
-typedef ImportExport<bool, bool, BoolImport, BoolExport> BoolImportExport;
-typedef ImportExport<int, int, IntImport, IntExport> IntImportExport;
-typedef ImportExport<std::size_t, std::size_t, SizeImport, SizeExport> SizeImportExport;
-typedef ImportExport<float, float, FloatImport, FloatExport> FloatImportExport;
-typedef ImportExport<CopiedString, const char*, StringImport, StringExport> StringImportExport;
+using IntEntryImportExport = PropertyAdaptor<ui::Entry, int, IntEntry>;
+struct IntRadio {
+ static void Export(const ui::RadioButton &self, const Callback<void(int)> &returnz)
+ {
+ returnz(radio_button_get_active(self));
+ }
+ static void Import(ui::RadioButton &self, int value)
+ {
+ radio_button_set_active(self, value);
+ }
+};
-void BoolToggleImport(GtkToggleButton& widget, bool value)
-{
- gtk_toggle_button_set_active(&widget, value);
-}
-void BoolToggleExport(GtkToggleButton& widget, const BoolImportCallback& importCallback)
-{
- importCallback(gtk_toggle_button_get_active(&widget) != FALSE);
-}
-typedef ImportExport<GtkToggleButton, bool, BoolToggleImport, BoolToggleExport> BoolToggleImportExport;
+using IntRadioImportExport = PropertyAdaptor<ui::RadioButton, int, IntRadio>;
+struct IntCombo {
+ static void Export(const ui::ComboBox &self, const Callback<void(int)> &returnz)
+ {
+ returnz(gtk_combo_box_get_active(self));
+ }
-void IntRadioImport(GtkRadioButton& widget, int index)
-{
- radio_button_set_active(&widget, index);
-}
-void IntRadioExport(GtkRadioButton& widget, const IntImportCallback& importCallback)
-{
- importCallback(radio_button_get_active(&widget));
-}
-typedef ImportExport<GtkRadioButton, int, IntRadioImport, IntRadioExport> IntRadioImportExport;
+ static void Import(ui::ComboBox &self, int value)
+ {
+ gtk_combo_box_set_active(self, value);
+ }
+};
-void TextEntryImport(GtkEntry& widget, const char* text)
-{
- gtk_entry_set_text(&widget, text);
-}
-void TextEntryExport(GtkEntry& widget, const StringImportCallback& importCallback)
-{
- importCallback(gtk_entry_get_text(&widget));
-}
-typedef ImportExport<GtkEntry, const char*, TextEntryImport, TextEntryExport> TextEntryImportExport;
+using IntComboImportExport = PropertyAdaptor<ui::ComboBox, int, IntCombo>;
+struct IntAdjustment {
+ static void Export(const ui::Adjustment &self, const Callback<void(int)> &returnz)
+ {
+ returnz(int(gtk_adjustment_get_value(self)));
+ }
-void IntEntryImport(GtkEntry& widget, int value)
-{
- entry_set_int(&widget, value);
-}
-void IntEntryExport(GtkEntry& widget, const IntImportCallback& importCallback)
-{
- importCallback(atoi(gtk_entry_get_text (&widget)));
-}
-typedef ImportExport<GtkEntry, int, IntEntryImport, IntEntryExport> IntEntryImportExport;
+ static void Import(ui::Adjustment &self, int value)
+ {
+ gtk_adjustment_set_value(self, value);
+ }
+};
+using IntAdjustmentImportExport = PropertyAdaptor<ui::Adjustment, int, IntAdjustment>;
-void SizeEntryImport(GtkEntry& widget, std::size_t value)
-{
- entry_set_int(&widget, int(value));
-}
-void SizeEntryExport(GtkEntry& widget, const SizeImportCallback& importCallback)
-{
- int value = atoi(gtk_entry_get_text(&widget));
- if(value < 0)
- {
- value = 0;
- }
- importCallback(value);
-}
-typedef ImportExport<GtkEntry, std::size_t, SizeEntryImport, SizeEntryExport> SizeEntryImportExport;
+struct IntSpinner {
+ static void Export(const ui::SpinButton &self, const Callback<void(int)> &returnz)
+ {
+ returnz(gtk_spin_button_get_value_as_int(self));
+ }
+ static void Import(ui::SpinButton &self, int value)
+ {
+ gtk_spin_button_set_value(self, value);
+ }
+};
-void FloatEntryImport(GtkEntry& widget, float value)
-{
- entry_set_float(&widget, value);
-}
-void FloatEntryExport(GtkEntry& widget, const FloatImportCallback& importCallback)
-{
- importCallback((float)atof(gtk_entry_get_text(&widget)));
-}
-typedef ImportExport<GtkEntry, float, FloatEntryImport, FloatEntryExport> FloatEntryImportExport;
+using IntSpinnerImportExport = PropertyAdaptor<ui::SpinButton, int, IntSpinner>;
+struct TextEntry {
+ static void Export(const ui::Entry &self, const Callback<void(const char *)> &returnz)
+ {
+ returnz(gtk_entry_get_text(self));
+ }
-void FloatSpinnerImport(GtkSpinButton& widget, float value)
-{
- gtk_spin_button_set_value(&widget, value);
-}
-void FloatSpinnerExport(GtkSpinButton& widget, const FloatImportCallback& importCallback)
-{
- importCallback(float(gtk_spin_button_get_value_as_float(&widget)));
-}
-typedef ImportExport<GtkSpinButton, float, FloatSpinnerImport, FloatSpinnerExport> FloatSpinnerImportExport;
+ static void Import(ui::Entry &self, const char *value)
+ {
+ self.text(value);
+ }
+};
+using TextEntryImportExport = PropertyAdaptor<ui::Entry, const char *, TextEntry>;
-void IntSpinnerImport(GtkSpinButton& widget, int value)
-{
- gtk_spin_button_set_value(&widget, value);
-}
-void IntSpinnerExport(GtkSpinButton& widget, const IntImportCallback& importCallback)
-{
- importCallback(gtk_spin_button_get_value_as_int(&widget));
-}
-typedef ImportExport<GtkSpinButton, int, IntSpinnerImport, IntSpinnerExport> IntSpinnerImportExport;
+struct SizeEntry {
+ static void Export(const ui::Entry &self, const Callback<void(std::size_t)> &returnz)
+ {
+ int value = atoi(gtk_entry_get_text(self));
+ if (value < 0) {
+ value = 0;
+ }
+ returnz(value);
+ }
+ static void Import(ui::Entry &self, std::size_t value)
+ {
+ entry_set_int(self, int(value));
+ }
+};
-void IntAdjustmentImport(GtkAdjustment& widget, int value)
-{
- gtk_adjustment_set_value(&widget, value);
-}
-void IntAdjustmentExport(GtkAdjustment& widget, const IntImportCallback& importCallback)
-{
- importCallback((int)gtk_adjustment_get_value(&widget));
-}
-typedef ImportExport<GtkAdjustment, int, IntAdjustmentImport, IntAdjustmentExport> IntAdjustmentImportExport;
+using SizeEntryImportExport = PropertyAdaptor<ui::Entry, std::size_t, SizeEntry>;
+struct FloatEntry {
+ static void Export(const ui::Entry &self, const Callback<void(float)> &returnz)
+ {
+ returnz(float(atof(gtk_entry_get_text(self))));
+ }
-void IntComboImport(GtkComboBox& widget, int value)
-{
- gtk_combo_box_set_active(&widget, value);
-}
-void IntComboExport(GtkComboBox& widget, const IntImportCallback& importCallback)
-{
- importCallback(gtk_combo_box_get_active(&widget));
-}
-typedef ImportExport<GtkComboBox, int, IntComboImport, IntComboExport> IntComboImportExport;
+ static void Import(ui::Entry &self, float value)
+ {
+ entry_set_float(self, value);
+ }
+};
+using FloatEntryImportExport = PropertyAdaptor<ui::Entry, float, FloatEntry>;
-template<typename FirstArgument>
-class CallbackDialogData : public DLG_DATA
-{
-public:
- typedef Callback1<FirstArgument> ImportCallback;
- typedef Callback1<const ImportCallback&> ExportCallback;
+struct FloatSpinner {
+ static void Export(const ui::SpinButton &self, const Callback<void(float)> &returnz)
+ {
+ returnz(float(gtk_spin_button_get_value(self)));
+ }
+
+ static void Import(ui::SpinButton &self, float value)
+ {
+ gtk_spin_button_set_value(self, value);
+ }
+};
-private:
- ImportCallback m_importWidget;
- ExportCallback m_exportWidget;
- ImportCallback m_importViewer;
- ExportCallback m_exportViewer;
+using FloatSpinnerImportExport = PropertyAdaptor<ui::SpinButton, float, FloatSpinner>;
+
+
+template<typename T>
+class CallbackDialogData : public DLG_DATA {
+ Property<T> m_pWidget;
+ Property<T> m_pData;
public:
- CallbackDialogData(const ImportCallback& importWidget, const ExportCallback& exportWidget, const ImportCallback& importViewer, const ExportCallback& exportViewer)
- : m_importWidget(importWidget), m_exportWidget(exportWidget), m_importViewer(importViewer), m_exportViewer(exportViewer)
- {
- }
- void release()
- {
- delete this;
- }
- void importData() const
- {
- m_exportViewer(m_importWidget);
- }
- void exportData() const
- {
- m_exportWidget(m_importViewer);
- }
+ CallbackDialogData(const Property<T> &pWidget, const Property<T> &pData)
+ : m_pWidget(pWidget), m_pData(pData)
+ {
+ }
+
+ void release()
+ {
+ delete this;
+ }
+
+ void importData() const
+ {
+ m_pData.get(m_pWidget.set);
+ }
+
+ void exportData() const
+ {
+ m_pWidget.get(m_pData.set);
+ }
};
-template<typename Widget, typename Viewer>
-class AddData
+template<class Widget>
+void AddDataCustom(DialogDataList &self, typename Widget::Type widget, Property<typename Widget::Other> const &property)
{
- DialogDataList& m_data;
-public:
- AddData(DialogDataList& data) : m_data(data)
- {
- }
- void apply(typename Widget::Type& widget, typename Viewer::Type& viewer) const
- {
- m_data.push_back(
- new CallbackDialogData<typename Widget::Other>(
- typename Widget::ImportCaller(widget),
- typename Widget::ExportCaller(widget),
- typename Viewer::ImportCaller(viewer),
- typename Viewer::ExportCaller(viewer)
- )
- );
- }
-};
+ using Self = typename Widget::Type;
+ using T = typename Widget::Other;
+ using native = typename std::remove_pointer<typename Self::native>::type;
+ struct Wrapper {
+ static void Export(const native &self, const Callback<void(T)> &returnz)
+ {
+ native *p = &const_cast<native &>(self);
+ auto widget = Self::from(p);
+ Widget::Get::thunk_(widget, returnz);
+ }
+
+ static void Import(native &self, T value)
+ {
+ native *p = &self;
+ auto widget = Self::from(p);
+ Widget::Set::thunk_(widget, value);
+ }
+ };
+ self.push_back(new CallbackDialogData<typename Widget::Other>(
+ make_property<PropertyAdaptor<native, T, Wrapper>>(*static_cast<native *>(widget)),
+ property
+ ));
+}
-template<typename Widget>
-class AddCustomData
+template<class Widget, class D>
+void AddData(DialogDataList &self, typename Widget::Type widget, D &data)
{
- DialogDataList& m_data;
-public:
- AddCustomData(DialogDataList& data) : m_data(data)
- {
- }
- void apply(
- typename Widget::Type& widget,
- const Callback1<typename Widget::Other>& importViewer,
- const Callback1<const Callback1<typename Widget::Other>&>& exportViewer
- ) const
- {
- m_data.push_back(
- new CallbackDialogData<typename Widget::Other>(
- typename Widget::ImportCaller(widget),
- typename Widget::ExportCaller(widget),
- importViewer,
- exportViewer
- )
- );
- }
-};
+ AddDataCustom<Widget>(self, widget, make_property<PropertyAdaptor<D, typename Widget::Other>>(data));
+}
// =============================================================================
// Dialog class
-Dialog::Dialog() : m_window(0), m_parent(0)
+Dialog::Dialog() : m_window(ui::null), m_parent(ui::null)
{
}
Dialog::~Dialog()
{
- for(DialogDataList::iterator i = m_data.begin(); i != m_data.end(); ++i)
- {
- (*i)->release();
- }
-
- ASSERT_MESSAGE(m_window == 0, "dialog window not destroyed");
+ for (DialogDataList::iterator i = m_data.begin(); i != m_data.end(); ++i) {
+ (*i)->release();
+ }
+
+ ASSERT_MESSAGE(!m_window, "dialog window not destroyed");
}
void Dialog::ShowDlg()
{
- ASSERT_MESSAGE(m_window != 0, "dialog was not constructed");
- importData();
- gtk_widget_show(GTK_WIDGET(m_window));
+ ASSERT_MESSAGE(m_window, "dialog was not constructed");
+ importData();
+ m_window.show();
}
void Dialog::HideDlg()
{
- ASSERT_MESSAGE(m_window != 0, "dialog was not constructed");
- exportData();
- gtk_widget_hide(GTK_WIDGET(m_window));
+ ASSERT_MESSAGE(m_window, "dialog was not constructed");
+ exportData();
+ m_window.hide();
}
-static gint delete_event_callback(GtkWidget *widget, GdkEvent* event, gpointer data)
+static gint delete_event_callback(ui::Widget widget, GdkEvent *event, gpointer data)
{
- reinterpret_cast<Dialog*>(data)->HideDlg();
- reinterpret_cast<Dialog*>(data)->EndModal(eIDCANCEL);
- return TRUE;
+ reinterpret_cast<Dialog *>( data )->HideDlg();
+ reinterpret_cast<Dialog *>( data )->EndModal(eIDCANCEL);
+ return TRUE;
}
void Dialog::Create()
{
- ASSERT_MESSAGE(m_window == 0, "dialog cannot be constructed");
+ ASSERT_MESSAGE(!m_window, "dialog cannot be constructed");
- m_window = BuildDialog();
- g_signal_connect(G_OBJECT(m_window), "delete_event", G_CALLBACK(delete_event_callback), this);
+ m_window = BuildDialog();
+ m_window.connect("delete_event", G_CALLBACK(delete_event_callback), this);
}
void Dialog::Destroy()
{
- ASSERT_MESSAGE(m_window != 0, "dialog cannot be destroyed");
+ ASSERT_MESSAGE(m_window, "dialog cannot be destroyed");
- gtk_widget_destroy(GTK_WIDGET(m_window));
- m_window = 0;
+ m_window.destroy();
+ m_window = ui::Window{ui::null};
}
-void Dialog::AddBoolToggleData(GtkToggleButton& widget, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer)
+void Dialog::AddBoolToggleData(ui::ToggleButton widget, Property<bool> const &cb)
{
- AddCustomData<BoolToggleImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<BoolToggleImportExport>(m_data, widget, cb);
}
-void Dialog::AddIntRadioData(GtkRadioButton& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::AddIntRadioData(ui::RadioButton widget, Property<int> const &cb)
{
- AddCustomData<IntRadioImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<IntRadioImportExport>(m_data, widget, cb);
}
-void Dialog::AddTextEntryData(GtkEntry& widget, const StringImportCallback& importViewer, const StringExportCallback& exportViewer)
+void Dialog::AddTextEntryData(ui::Entry widget, Property<const char *> const &cb)
{
- AddCustomData<TextEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<TextEntryImportExport>(m_data, widget, cb);
}
-void Dialog::AddIntEntryData(GtkEntry& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::AddIntEntryData(ui::Entry widget, Property<int> const &cb)
{
- AddCustomData<IntEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<IntEntryImportExport>(m_data, widget, cb);
}
-void Dialog::AddSizeEntryData(GtkEntry& widget, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer)
+void Dialog::AddSizeEntryData(ui::Entry widget, Property<std::size_t> const &cb)
{
- AddCustomData<SizeEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<SizeEntryImportExport>(m_data, widget, cb);
}
-void Dialog::AddFloatEntryData(GtkEntry& widget, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
+void Dialog::AddFloatEntryData(ui::Entry widget, Property<float> const &cb)
{
- AddCustomData<FloatEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<FloatEntryImportExport>(m_data, widget, cb);
}
-void Dialog::AddFloatSpinnerData(GtkSpinButton& widget, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
+void Dialog::AddFloatSpinnerData(ui::SpinButton widget, Property<float> const &cb)
{
- AddCustomData<FloatSpinnerImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<FloatSpinnerImportExport>(m_data, widget, cb);
}
-void Dialog::AddIntSpinnerData(GtkSpinButton& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::AddIntSpinnerData(ui::SpinButton widget, Property<int> const &cb)
{
- AddCustomData<IntSpinnerImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<IntSpinnerImportExport>(m_data, widget, cb);
}
-void Dialog::AddIntAdjustmentData(GtkAdjustment& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::AddIntAdjustmentData(ui::Adjustment widget, Property<int> const &cb)
{
- AddCustomData<IntAdjustmentImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<IntAdjustmentImportExport>(m_data, widget, cb);
}
-void Dialog::AddIntComboData(GtkComboBox& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::AddIntComboData(ui::ComboBox widget, Property<int> const &cb)
{
- AddCustomData<IntComboImportExport>(m_data).apply(widget, importViewer, exportViewer);
+ AddDataCustom<IntComboImportExport>(m_data, widget, cb);
}
-void Dialog::AddDialogData(GtkToggleButton& widget, bool& data)
+void Dialog::AddDialogData(ui::ToggleButton widget, bool &data)
{
- AddData<BoolToggleImportExport, BoolImportExport>(m_data).apply(widget, data);
+ AddData<BoolToggleImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkRadioButton& widget, int& data)
+
+void Dialog::AddDialogData(ui::RadioButton widget, int &data)
{
- AddData<IntRadioImportExport, IntImportExport>(m_data).apply(widget, data);
+ AddData<IntRadioImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkEntry& widget, CopiedString& data)
+
+void Dialog::AddDialogData(ui::Entry widget, CopiedString &data)
{
- AddData<TextEntryImportExport, StringImportExport>(m_data).apply(widget, data);
+ AddData<TextEntryImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkEntry& widget, int& data)
+
+void Dialog::AddDialogData(ui::Entry widget, int &data)
{
- AddData<IntEntryImportExport, IntImportExport>(m_data).apply(widget, data);
+ AddData<IntEntryImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkEntry& widget, std::size_t& data)
+
+void Dialog::AddDialogData(ui::Entry widget, std::size_t &data)
{
- AddData<SizeEntryImportExport, SizeImportExport>(m_data).apply(widget, data);
+ AddData<SizeEntryImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkEntry& widget, float& data)
+
+void Dialog::AddDialogData(ui::Entry widget, float &data)
{
- AddData<FloatEntryImportExport, FloatImportExport>(m_data).apply(widget, data);
+ AddData<FloatEntryImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkSpinButton& widget, float& data)
+
+void Dialog::AddDialogData(ui::SpinButton widget, float &data)
{
- AddData<FloatSpinnerImportExport, FloatImportExport>(m_data).apply(widget, data);
+ AddData<FloatSpinnerImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkSpinButton& widget, int& data)
+
+void Dialog::AddDialogData(ui::SpinButton widget, int &data)
{
- AddData<IntSpinnerImportExport, IntImportExport>(m_data).apply(widget, data);
+ AddData<IntSpinnerImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkAdjustment& widget, int& data)
+
+void Dialog::AddDialogData(ui::Adjustment widget, int &data)
{
- AddData<IntAdjustmentImportExport, IntImportExport>(m_data).apply(widget, data);
+ AddData<IntAdjustmentImportExport>(m_data, widget, data);
}
-void Dialog::AddDialogData(GtkComboBox& widget, int& data)
+
+void Dialog::AddDialogData(ui::ComboBox widget, int &data)
{
- AddData<IntComboImportExport, IntImportExport>(m_data).apply(widget, data);
+ AddData<IntComboImportExport>(m_data, widget, data);
}
void Dialog::exportData()
{
- for(DialogDataList::iterator i = m_data.begin(); i != m_data.end(); ++i)
- {
- (*i)->exportData();
- }
+ for (DialogDataList::iterator i = m_data.begin(); i != m_data.end(); ++i) {
+ (*i)->exportData();
+ }
}
void Dialog::importData()
{
- for(DialogDataList::iterator i = m_data.begin(); i != m_data.end(); ++i)
- {
- (*i)->importData();
- }
+ for (DialogDataList::iterator i = m_data.begin(); i != m_data.end(); ++i) {
+ (*i)->importData();
+ }
}
-void Dialog::EndModal (EMessageBoxReturn code)
+void Dialog::EndModal(EMessageBoxReturn code)
{
- m_modal.loop = 0;
- m_modal.ret = code;
+ m_modal.loop = 0;
+ m_modal.ret = code;
}
EMessageBoxReturn Dialog::DoModal()
{
- importData();
+ importData();
- PreModal();
+ PreModal();
- EMessageBoxReturn ret = modal_dialog_show(m_window, m_modal);
- ASSERT_NOTNULL(m_window);
- if(ret == eIDOK)
- {
- exportData();
- }
+ EMessageBoxReturn ret = modal_dialog_show(m_window, m_modal);
+ ASSERT_TRUE((bool) m_window);
+ if (ret == eIDOK) {
+ exportData();
+ }
- gtk_widget_hide(GTK_WIDGET(m_window));
+ m_window.hide();
- PostModal(m_modal.ret);
+ PostModal(m_modal.ret);
- return m_modal.ret;
+ return m_modal.ret;
}
-GtkWidget* Dialog::addCheckBox(GtkWidget* vbox, const char* name, const char* flag, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer)
+ui::CheckButton Dialog::addCheckBox(ui::VBox vbox, const char *name, const char *flag, Property<bool> const &cb)
{
- GtkWidget* check = gtk_check_button_new_with_label(flag);
- gtk_widget_show(check);
- AddBoolToggleData(*GTK_TOGGLE_BUTTON(check), importViewer, exportViewer);
+ auto check = ui::CheckButton(flag);
+ check.show();
+ AddBoolToggleData(check, cb);
- DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(DialogRow_new(name, check)));
- return check;
+ DialogVBox_packRow(vbox, ui::Widget(DialogRow_new(name, check)));
+ return check;
}
-GtkWidget* Dialog::addCheckBox(GtkWidget* vbox, const char* name, const char* flag, bool& data)
+ui::CheckButton Dialog::addCheckBox(ui::VBox vbox, const char *name, const char *flag, bool &data)
{
- return addCheckBox(vbox, name, flag, BoolImportCaller(data), BoolExportCaller(data));
+ return addCheckBox(vbox, name, flag, make_property(data));
}
-void Dialog::addCombo(GtkWidget* vbox, const char* name, StringArrayRange values, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::addCombo(ui::VBox vbox, const char *name, StringArrayRange values, Property<int> const &cb)
{
- GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
- gtk_widget_show(alignment);
- {
- GtkWidget* combo = gtk_combo_box_new_text();
-
- for(StringArrayRange::Iterator i = values.first; i != values.last; ++i)
+ auto alignment = ui::Alignment(0.0, 0.5, 0.0, 0.0);
+ alignment.show();
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), *i);
- }
+ auto combo = ui::ComboBoxText(ui::New);
- AddIntComboData(*GTK_COMBO_BOX(combo), importViewer, exportViewer);
+ for (StringArrayRange::Iterator i = values.first; i != values.last; ++i) {
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), *i);
+ }
- gtk_widget_show (combo);
- gtk_container_add(GTK_CONTAINER(alignment), combo);
- }
+ AddIntComboData(combo, cb);
- GtkTable* row = DialogRow_new(name, alignment);
- DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
+ combo.show();
+ alignment.add(combo);
+ }
+
+ auto row = DialogRow_new(name, alignment);
+ DialogVBox_packRow(vbox, row);
}
-void Dialog::addCombo(GtkWidget* vbox, const char* name, int& data, StringArrayRange values)
+void Dialog::addCombo(ui::VBox vbox, const char *name, int &data, StringArrayRange values)
{
- addCombo(vbox, name, values, IntImportCaller(data), IntExportCaller(data));
+ addCombo(vbox, name, values, make_property(data));
}
-void Dialog::addSlider(GtkWidget* 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
+Dialog::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)
{
#if 0
- if(draw_value == FALSE)
- {
- GtkWidget* hbox2 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox2);
- gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(hbox2), FALSE, FALSE, 0);
- {
- GtkWidget* label = gtk_label_new (low);
- gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
- }
- {
- GtkWidget* label = gtk_label_new (high);
- gtk_widget_show (label);
- gtk_box_pack_end (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+ if ( draw_value == FALSE ) {
+ auto hbox2 = ui::HBox( FALSE, 0 );
+ hbox2.show();
+ vbox.pack_start( hbox2 , FALSE, FALSE, 0 );
+ {
+ ui::Widget label = ui::Label( low );
+ label.show();
+ hbox2.pack_start( label, FALSE, FALSE, 0 );
+ }
+ {
+ ui::Widget label = ui::Label( high );
+ label.show();
+ hbox2.pack_end(label, FALSE, FALSE, 0);
+ }
}
- }
#endif
- // adjustment
- GtkObject* adj = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, 0);
- AddIntAdjustmentData(*GTK_ADJUSTMENT(adj), IntImportCaller(data), IntExportCaller(data));
+ // adjustment
+ auto adj = ui::Adjustment(value, lower, upper, step_increment, page_increment, 0);
+ AddIntAdjustmentData(adj, make_property(data));
- // scale
- GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 1.0, 0.0);
- gtk_widget_show(alignment);
+ // scale
+ auto alignment = ui::Alignment(0.0, 0.5, 1.0, 0.0);
+ alignment.show();
- GtkWidget* scale = gtk_hscale_new(GTK_ADJUSTMENT(adj));
- gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_LEFT);
- gtk_widget_show(scale);
- gtk_container_add(GTK_CONTAINER(alignment), scale);
+ ui::Widget scale = ui::HScale(adj);
+ gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_LEFT);
+ scale.show();
+ alignment.add(scale);
- gtk_scale_set_draw_value(GTK_SCALE (scale), draw_value);
- gtk_scale_set_digits(GTK_SCALE (scale), 0);
+ gtk_scale_set_draw_value(GTK_SCALE(scale), draw_value);
+ gtk_scale_set_digits(GTK_SCALE(scale), 0);
- GtkTable* row = DialogRow_new(name, alignment);
- DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
+ auto row = DialogRow_new(name, alignment);
+ DialogVBox_packRow(vbox, row);
}
-
-void Dialog::addRadio(GtkWidget* vbox, const char* name, StringArrayRange names, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+
+void Dialog::addRadio(ui::VBox vbox, const char *name, StringArrayRange names, Property<int> const &cb)
{
- GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
- gtk_widget_show(alignment);
- {
- RadioHBox radioBox = RadioHBox_new(names);
- gtk_container_add(GTK_CONTAINER(alignment), GTK_WIDGET(radioBox.m_hbox));
- AddIntRadioData(*GTK_RADIO_BUTTON(radioBox.m_radio), importViewer, exportViewer);
- }
+ auto alignment = ui::Alignment(0.0, 0.5, 0.0, 0.0);
+ alignment.show();;
+ {
+ RadioHBox radioBox = RadioHBox_new(names);
+ alignment.add(radioBox.m_hbox);
+ AddIntRadioData(radioBox.m_radio, cb);
+ }
- GtkTable* row = DialogRow_new(name, alignment);
- DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
+ auto row = DialogRow_new(name, alignment);
+ DialogVBox_packRow(vbox, row);
}
-void Dialog::addRadio(GtkWidget* vbox, const char* name, int& data, StringArrayRange names)
+void Dialog::addRadio(ui::VBox vbox, const char *name, int &data, StringArrayRange names)
{
- addRadio(vbox, name, names, IntImportCaller(data), IntExportCaller(data));
+ addRadio(vbox, name, names, make_property(data));
}
-void Dialog::addRadioIcons(GtkWidget* vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+void Dialog::addRadioIcons(ui::VBox vbox, const char *name, StringArrayRange icons, Property<int> const &cb)
{
- GtkWidget* table = gtk_table_new (2, static_cast<guint>(icons.last - icons.first), FALSE);
- gtk_widget_show (table);
+ auto table = ui::Table(2, icons.last - icons.first, FALSE);
+ table.show();
- gtk_table_set_row_spacings (GTK_TABLE (table), 5);
- gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ gtk_table_set_row_spacings(table, 5);
+ gtk_table_set_col_spacings(table, 5);
- GSList* group = 0;
- GtkWidget* radio = 0;
- for(StringArrayRange::Iterator icon = icons.first; icon != icons.last; ++icon)
- {
- guint pos = static_cast<guint>(icon - icons.first);
- GtkImage* image = new_local_image(*icon);
- gtk_widget_show(GTK_WIDGET(image));
- gtk_table_attach(GTK_TABLE(table), GTK_WIDGET(image), pos, pos+1, 0, 1,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
+ GSList *group = 0;
+ ui::RadioButton radio{ui::null};
+ for (StringArrayRange::Iterator icon = icons.first; icon != icons.last; ++icon) {
+ guint pos = static_cast<guint>( icon - icons.first );
+ auto image = new_local_image(*icon);
+ image.show();
+ table.attach(image, {pos, pos + 1, 0, 1}, {0, 0});
- radio = gtk_radio_button_new(group);
- gtk_widget_show (radio);
- gtk_table_attach (GTK_TABLE (table), radio, pos, pos+1, 1, 2,
- (GtkAttachOptions) (0),
- (GtkAttachOptions) (0), 0, 0);
+ radio = ui::RadioButton::from(gtk_radio_button_new(group));
+ radio.show();
+ table.attach(radio, {pos, pos + 1, 1, 2}, {0, 0});
- group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio));
- }
+ group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio));
+ }
- AddIntRadioData(*GTK_RADIO_BUTTON(radio), importViewer, exportViewer);
+ AddIntRadioData(radio, cb);
- DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(DialogRow_new(name, table)));
+ DialogVBox_packRow(vbox, DialogRow_new(name, table));
}
-void Dialog::addRadioIcons(GtkWidget* vbox, const char* name, int& data, StringArrayRange icons)
+void Dialog::addRadioIcons(ui::VBox vbox, const char *name, int &data, StringArrayRange icons)
{
- addRadioIcons(vbox, name, icons, IntImportCaller(data), IntExportCaller(data));
+ addRadioIcons(vbox, name, icons, make_property(data));
}
-GtkWidget* Dialog::addIntEntry(GtkWidget* vbox, const char* name, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+ui::Widget Dialog::addIntEntry(ui::VBox vbox, const char *name, Property<int> const &cb)
{
- DialogEntryRow row(DialogEntryRow_new(name));
- AddIntEntryData(*row.m_entry, importViewer, exportViewer);
- DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
- return row.m_row;
+ DialogEntryRow row(DialogEntryRow_new(name));
+ AddIntEntryData(row.m_entry, cb);
+ DialogVBox_packRow(vbox, row.m_row);
+ return row.m_row;
}
-GtkWidget* Dialog::addSizeEntry(GtkWidget* vbox, const char* name, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer)
+ui::Widget Dialog::addSizeEntry(ui::VBox vbox, const char *name, Property<std::size_t> const &cb)
{
- DialogEntryRow row(DialogEntryRow_new(name));
- AddSizeEntryData(*row.m_entry, importViewer, exportViewer);
- DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
- return row.m_row;
+ DialogEntryRow row(DialogEntryRow_new(name));
+ AddSizeEntryData(row.m_entry, cb);
+ DialogVBox_packRow(vbox, row.m_row);
+ return row.m_row;
}
-GtkWidget* Dialog::addFloatEntry(GtkWidget* vbox, const char* name, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
+ui::Widget Dialog::addFloatEntry(ui::VBox vbox, const char *name, Property<float> const &cb)
{
- DialogEntryRow row(DialogEntryRow_new(name));
- AddFloatEntryData(*row.m_entry, importViewer, exportViewer);
- DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
- return row.m_row;
+ DialogEntryRow row(DialogEntryRow_new(name));
+ AddFloatEntryData(row.m_entry, cb);
+ DialogVBox_packRow(vbox, row.m_row);
+ return row.m_row;
}
-GtkWidget* Dialog::addPathEntry(GtkWidget* vbox, const char* name, bool browse_directory, const StringImportCallback& importViewer, const StringExportCallback& exportViewer)
+ui::Widget
+Dialog::addPathEntry(ui::VBox vbox, const char *name, bool browse_directory, Property<const char *> const &cb)
{
- PathEntry pathEntry = PathEntry_new();
- g_signal_connect(G_OBJECT(pathEntry.m_button), "clicked", G_CALLBACK(browse_directory ? button_clicked_entry_browse_directory : button_clicked_entry_browse_file), pathEntry.m_entry);
+ PathEntry pathEntry = PathEntry_new();
+ pathEntry.m_button.connect("clicked", G_CALLBACK(
+ browse_directory ? button_clicked_entry_browse_directory : button_clicked_entry_browse_file),
+ pathEntry.m_entry);
- AddTextEntryData(*GTK_ENTRY(pathEntry.m_entry), importViewer, exportViewer);
+ AddTextEntryData(pathEntry.m_entry, cb);
- GtkTable* row = DialogRow_new(name, GTK_WIDGET(pathEntry.m_frame));
- DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
+ auto row = DialogRow_new(name, ui::Widget(pathEntry.m_frame));
+ DialogVBox_packRow(vbox, row);
- return GTK_WIDGET(row);
+ return row;
}
-GtkWidget* Dialog::addPathEntry(GtkWidget* vbox, const char* name, CopiedString& data, bool browse_directory)
+ui::Widget Dialog::addPathEntry(ui::VBox vbox, const char *name, CopiedString &data, bool browse_directory)
{
- return addPathEntry(vbox, name, browse_directory, StringImportCallback(StringImportCaller(data)), StringExportCallback(StringExportCaller(data)));
+ return addPathEntry(vbox, name, browse_directory, make_property<CopiedString, const char *>(data));
}
-GtkWidget* Dialog::addSpinner(GtkWidget* vbox, const char* name, double value, double lower, double upper, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
+ui::SpinButton
+Dialog::addSpinner(ui::VBox vbox, const char *name, double value, double lower, double upper, Property<int> const &cb)
{
- DialogSpinnerRow row(DialogSpinnerRow_new(name, value, lower, upper, 1));
- AddIntSpinnerData(*row.m_spin, importViewer, exportViewer);
- DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
- return row.m_row;
+ DialogSpinnerRow row(DialogSpinnerRow_new(name, value, lower, upper, 1));
+ AddIntSpinnerData(row.m_spin, cb);
+ DialogVBox_packRow(vbox, row.m_row);
+ return row.m_spin;
}
-GtkWidget* Dialog::addSpinner(GtkWidget* vbox, const char* name, int& data, double value, double lower, double upper)
+ui::SpinButton Dialog::addSpinner(ui::VBox vbox, const char *name, int &data, double value, double lower, double upper)
{
- return addSpinner(vbox, name, value, lower, upper, IntImportCallback(IntImportCaller(data)), IntExportCallback(IntExportCaller(data)));
+ return addSpinner(vbox, name, value, lower, upper, make_property(data));
}
-GtkWidget* Dialog::addSpinner(GtkWidget* vbox, const char* name, double value, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
+ui::SpinButton
+Dialog::addSpinner(ui::VBox vbox, const char *name, double value, double lower, double upper, Property<float> const &cb)
{
- DialogSpinnerRow row(DialogSpinnerRow_new(name, value, lower, upper, 10));
- AddFloatSpinnerData(*row.m_spin, importViewer, exportViewer);
- DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
- return row.m_row;
+ DialogSpinnerRow row(DialogSpinnerRow_new(name, value, lower, upper, 10));
+ AddFloatSpinnerData(row.m_spin, cb);
+ DialogVBox_packRow(vbox, row.m_row);
+ return row.m_spin;
}
projects / xonotic / netradiant.git / blobdiff