]> git.xonotic.org Git - xonotic/netradiant.git/blobdiff - radiant/dialog.cpp
q3map2: bump MAX_OS_PATH to 4096
[xonotic/netradiant.git] / radiant / dialog.cpp
index e57dae78d25e3d767fb0f134c478f924bc959b77..3fdcaee49bce90519f6254a00c0e2cfebeca2514 100644 (file)
@@ -1,23 +1,23 @@
 /*
-Copyright (C) 1999-2006 Id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   Copyright (C) 1999-2007 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
@@ -26,715 +26,270 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // Leonardo Zide (leo@lokigames.com)
 //
 
-#include "dialog.h"
-
-#include "debugging/debugging.h"
-
-
-#include "mainframe.h"
-
+#include "stdafx.h"
+#include <gtk/gtk.h>
 #include <stdlib.h>
+#include <stdio.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 "gtkutil/button.h"
-#include "gtkutil/entry.h"
-#include "gtkutil/image.h"
-
-#include "gtkmisc.h"
-
-
-GtkEntry* 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;
-}
-
-class DialogEntryRow
-{
-public:
-  DialogEntryRow(GtkWidget* row, GtkEntry* entry) : m_row(row), m_entry(entry)
-  {
-  }
-  GtkWidget* m_row;
-  GtkEntry* m_entry;
-};
-
-DialogEntryRow DialogEntryRow_new(const char* name)
-{
-  GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
-  gtk_widget_show(alignment);
-
-  GtkEntry* entry = DialogEntry_new();
-  gtk_container_add(GTK_CONTAINER(alignment), GTK_WIDGET(entry));
-
-  return DialogEntryRow(GTK_WIDGET(DialogRow_new(name, alignment)), entry);
-}
-
-
-GtkSpinButton* 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, 10)), step, digits)); 
-  gtk_widget_show(GTK_WIDGET(spin));
-  gtk_widget_set_size_request(GTK_WIDGET(spin), 64, -1);
-  return spin;
-}
-
-class DialogSpinnerRow
-{
-public:
-  DialogSpinnerRow(GtkWidget* row, GtkSpinButton* spin) : m_row(row), m_spin(spin)
-  {
-  }
-  GtkWidget* m_row;
-  GtkSpinButton* m_spin;
-};
-
-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);
-
-  GtkSpinButton* spin = DialogSpinner_new(value, lower, upper, fraction);
-  gtk_container_add(GTK_CONTAINER(alignment), GTK_WIDGET(spin));
-
-  return DialogSpinnerRow(GTK_WIDGET(DialogRow_new(name, alignment)), spin);
-}
-
-
-
-template<
-  typename Type_,
-  typename Other_,
-  void(*Import)(Type_&, Other_),
-  void(*Export)(Type_&, const Callback1<Other_>&)
->
-class ImportExport
-{
-public:
-  typedef Type_ Type;
-  typedef Other_ Other;
-
-  typedef ReferenceCaller1<Type, Other, Import> ImportCaller;
-  typedef ReferenceCaller1<Type, const Callback1<Other>&, Export> ExportCaller;
-};
-
-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;
-
-
-
-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;
-
-
-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;
-
-
-void TextEntryImport(GtkEntry& widget, const char* text)
-{
-  StringOutputStream value(64);
-  value << ConvertLocaleToUTF8(text);
-  gtk_entry_set_text(&widget, value.c_str());
-}
-void TextEntryExport(GtkEntry& widget, const StringImportCallback& importCallback)
-{
-  StringOutputStream value(64);
-  value << ConvertUTF8ToLocale(gtk_entry_get_text(&widget));
-  importCallback(value.c_str());
-}
-typedef ImportExport<GtkEntry, const char*, TextEntryImport, TextEntryExport> TextEntryImportExport;
-
-
-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;
-
-
-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;
-
-
-void FloatEntryImport(GtkEntry& widget, float value)
+typedef struct
 {
-  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;
-
-
-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;
-
-
-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;
-
-
-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;
-
-
-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;
-
-
-template<typename FirstArgument>
-class CallbackDialogData : public DLG_DATA
-{
-public:
-  typedef Callback1<FirstArgument> ImportCallback;
-  typedef Callback1<const ImportCallback&> ExportCallback;
-
-private:
-  ImportCallback m_importWidget;
-  ExportCallback m_exportWidget;
-  ImportCallback m_importViewer;
-  ExportCallback m_exportViewer;
-
-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);
-  }
-};
-
-template<typename Widget, typename Viewer>
-class AddData
-{
-  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)
-      )
-    );
-  }
-};
-
-template<typename Widget>
-class AddCustomData
-{
-  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
-      )
-    );
-  }
-};
+       GtkObject     *object;
+       void          *buffer;
+       DLG_DATA_TYPE type;
+} DLG_DATA;
 
 // =============================================================================
 // Dialog class
 
-Dialog::Dialog() : m_window(0), m_parent(0)
-{
-}
-
-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");
-}
-
-void Dialog::ShowDlg()
-{
-  ASSERT_MESSAGE(m_window != 0, "dialog was not constructed")
-  importData();
-  gtk_widget_show(GTK_WIDGET(m_window));
-}
-
-void Dialog::HideDlg()
-{
-  ASSERT_MESSAGE(m_window != 0, "dialog was not constructed")
-  exportData();
-  gtk_widget_hide(GTK_WIDGET(m_window));
-}
-
-static gint delete_event_callback(GtkWidget *widget, GdkEvent* event, gpointer data)
-{
-  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")
-
-  m_window = BuildDialog();
-  g_signal_connect(G_OBJECT(m_window), "delete_event", G_CALLBACK(delete_event_callback), this);
-}
-
-void Dialog::Destroy()
-{
-  ASSERT_MESSAGE(m_window != 0, "dialog cannot be destroyed");
-
-  gtk_widget_destroy(GTK_WIDGET(m_window));
-  m_window = 0;
-}
-
-
-void Dialog::AddBoolToggleData(GtkToggleButton& widget, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer)
-{
-  AddCustomData<BoolToggleImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddIntRadioData(GtkRadioButton& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  AddCustomData<IntRadioImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddTextEntryData(GtkEntry& widget, const StringImportCallback& importViewer, const StringExportCallback& exportViewer)
-{
-  AddCustomData<TextEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddIntEntryData(GtkEntry& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  AddCustomData<IntEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddSizeEntryData(GtkEntry& widget, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer)
-{
-  AddCustomData<SizeEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddFloatEntryData(GtkEntry& widget, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
-{
-  AddCustomData<FloatEntryImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddFloatSpinnerData(GtkSpinButton& widget, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
-{
-  AddCustomData<FloatSpinnerImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddIntSpinnerData(GtkSpinButton& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  AddCustomData<IntSpinnerImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddIntAdjustmentData(GtkAdjustment& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  AddCustomData<IntAdjustmentImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-void Dialog::AddIntComboData(GtkComboBox& widget, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  AddCustomData<IntComboImportExport>(m_data).apply(widget, importViewer, exportViewer);
-}
-
-
-void Dialog::AddDialogData(GtkToggleButton& widget, bool& data)
-{
-  AddData<BoolToggleImportExport, BoolImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkRadioButton& widget, int& data)
-{
-  AddData<IntRadioImportExport, IntImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkEntry& widget, CopiedString& data)
-{
-  AddData<TextEntryImportExport, StringImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkEntry& widget, int& data)
-{
-  AddData<IntEntryImportExport, IntImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkEntry& widget, std::size_t& data)
-{
-  AddData<SizeEntryImportExport, SizeImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkEntry& widget, float& data)
-{
-  AddData<FloatEntryImportExport, FloatImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkSpinButton& widget, float& data)
-{
-  AddData<FloatSpinnerImportExport, FloatImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkSpinButton& widget, int& data)
-{
-  AddData<IntSpinnerImportExport, IntImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkAdjustment& widget, int& data)
-{
-  AddData<IntAdjustmentImportExport, IntImportExport>(m_data).apply(widget, data);
-}
-void Dialog::AddDialogData(GtkComboBox& widget, int& data)
-{
-  AddData<IntComboImportExport, IntImportExport>(m_data).apply(widget, data);
-}
-
-void Dialog::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();
-  }
-}
-
-void Dialog::EndModal (EMessageBoxReturn code)
-{
-  m_modal.loop = 0;
-  m_modal.ret = code;
-}
-
-EMessageBoxReturn Dialog::DoModal()
-{
-  importData();
-
-  PreModal();
-
-  EMessageBoxReturn ret = modal_dialog_show(m_window, m_modal);
-  ASSERT_NOTNULL(m_window);
-  if(ret == eIDOK)
-  {
-    exportData();
-  }
-
-  gtk_widget_hide(GTK_WIDGET(m_window));
-
-  PostModal(m_modal.ret);
-
-  return m_modal.ret;
-}
-
-
-GtkWidget* Dialog::addCheckBox(GtkWidget* vbox, const char* name, const char* flag, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer)
-{
-  GtkWidget* check = gtk_check_button_new_with_label(flag);
-  gtk_widget_show(check);
-  AddBoolToggleData(*GTK_TOGGLE_BUTTON(check), importViewer, exportViewer);
-
-  DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(DialogRow_new(name, check)));
-  return check;
-}
-
-GtkWidget* Dialog::addCheckBox(GtkWidget* vbox, const char* name, const char* flag, bool& data)
-{
-  return addCheckBox(vbox, name, flag, BoolImportCaller(data), BoolExportCaller(data));
-}
-
-void Dialog::addCombo(GtkWidget* vbox, const char* name, StringArrayRange values, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  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)
-    {
-      gtk_combo_box_append_text(GTK_COMBO_BOX(combo), *i);
-    }
-
-    AddIntComboData(*GTK_COMBO_BOX(combo), importViewer, exportViewer);
-
-    gtk_widget_show (combo);
-    gtk_container_add(GTK_CONTAINER(alignment), combo);
-  }
-
-  GtkTable* row = DialogRow_new(name, alignment);
-  DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
-}
-
-void Dialog::addCombo(GtkWidget* vbox, const char* name, int& data, StringArrayRange values)
-{
-  addCombo(vbox, name, values, IntImportCaller(data), IntExportCaller(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, double page_size)
-{
-#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);
-    }
-  }
-#endif
-
-  // adjustment
-  GtkObject* adj = gtk_adjustment_new(value, lower, upper, step_increment, page_increment, page_size);
-  AddIntAdjustmentData(*GTK_ADJUSTMENT(adj), IntImportCaller(data), IntExportCaller(data));
-
-  // scale
-  GtkWidget* alignment = gtk_alignment_new(0.0, 0.5, 1.0, 0.0);
-  gtk_widget_show(alignment);
-
-  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);
-
-  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));
-}
-  
-void Dialog::addRadio(GtkWidget* vbox, const char* name, StringArrayRange names, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  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);
-  }
-
-  GtkTable* row = DialogRow_new(name, alignment);
-  DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
-}
-
-void Dialog::addRadio(GtkWidget* vbox, const char* name, int& data, StringArrayRange names)
-{
-  addRadio(vbox, name, names, IntImportCaller(data), IntExportCaller(data));
-}
-
-void Dialog::addRadioIcons(GtkWidget* vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  GtkWidget* table = gtk_table_new (2, static_cast<guint>(icons.last - icons.first), FALSE);
-  gtk_widget_show (table);
-
-  gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-  gtk_table_set_col_spacings (GTK_TABLE (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);
-
-    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);
-
-    group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio));
-  }
-
-  AddIntRadioData(*GTK_RADIO_BUTTON(radio), importViewer, exportViewer);
-
-  DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(DialogRow_new(name, table)));
-}
-
-void Dialog::addRadioIcons(GtkWidget* vbox, const char* name, int& data, StringArrayRange icons)
-{
-  addRadioIcons(vbox, name, icons, IntImportCaller(data), IntExportCaller(data));
-}
-
-GtkWidget* Dialog::addEntry(GtkWidget* vbox, const char* name, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  DialogEntryRow row(DialogEntryRow_new(name));
-  AddIntEntryData(*row.m_entry, importViewer, exportViewer);
-  DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
-  return row.m_row;
-}
-
-GtkWidget* Dialog::addEntry(GtkWidget* vbox, const char* name, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer)
-{
-  DialogEntryRow row(DialogEntryRow_new(name));
-  AddSizeEntryData(*row.m_entry, importViewer, exportViewer);
-  DialogVBox_packRow(GTK_VBOX(vbox), row.m_row);
-  return row.m_row;
-}
-
-GtkWidget* Dialog::addEntry(GtkWidget* vbox, const char* name, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
-{
-  DialogEntryRow row(DialogEntryRow_new(name));
-  AddFloatEntryData(*row.m_entry, importViewer, exportViewer);
-  DialogVBox_packRow(GTK_VBOX(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)
-{
-  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);
-
-  AddTextEntryData(*GTK_ENTRY(pathEntry.m_entry), importViewer, exportViewer);
-
-  GtkTable* row = DialogRow_new(name, GTK_WIDGET(pathEntry.m_frame));
-  DialogVBox_packRow(GTK_VBOX(vbox), GTK_WIDGET(row));
-
-  return GTK_WIDGET(row);
-}
-
-GtkWidget* Dialog::addPathEntry(GtkWidget* vbox, const char* name, CopiedString& data, bool browse_directory)
-{
-  return addPathEntry(vbox, name, browse_directory, StringImportCallback(StringImportCaller(data)), StringExportCallback(StringExportCaller(data))); 
-}
-
-GtkWidget* Dialog::addSpinner(GtkWidget* vbox, const char* name, double value, double lower, double upper, const IntImportCallback& importViewer, const IntExportCallback& exportViewer)
-{
-  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;
-}
-
-GtkWidget* Dialog::addSpinner(GtkWidget* 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)));
-}
-
-GtkWidget* Dialog::addSpinner(GtkWidget* vbox, const char* name, double value, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer)
-{
-  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;
+Dialog::Dialog (){
+       m_pDataList = (GSList*)NULL;
+       m_nReturn = IDCANCEL;
+       m_bNeedBuild = true;
+       m_nLoop = 0;
+}
+
+Dialog::~Dialog (){
+       while ( m_pDataList )
+       {
+               free( m_pDataList->data );
+               m_pDataList = g_slist_remove( m_pDataList, m_pDataList->data );
+       }
+
+       if ( m_pWidget != NULL ) {
+               gtk_widget_destroy( m_pWidget );
+       }
+}
+
+// i suspect that this is redundant - gtk manages to remember the data stored in its widgets across a hide/show
+void Dialog::ShowDlg(){
+       Create();
+       UpdateData( FALSE );
+       gtk_widget_show( m_pWidget );
+}
+
+void Dialog::HideDlg(){
+       UpdateData( TRUE );
+       gtk_widget_hide( m_pWidget );
+}
+
+static gint delete_event_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
+       reinterpret_cast<Dialog*>( data )->HideDlg();
+       reinterpret_cast<Dialog*>( data )->EndModal( IDCANCEL );
+       return TRUE;
+}
+
+void Dialog::Create(){
+       if ( m_bNeedBuild ) {
+               m_pWidget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+               gtk_signal_connect( GTK_OBJECT( m_pWidget ), "delete_event",
+                                                       GTK_SIGNAL_FUNC( delete_event_callback ), this );
+               gtk_signal_connect( GTK_OBJECT( m_pWidget ), "destroy",
+                                                       GTK_SIGNAL_FUNC( gtk_widget_destroy ), NULL );
+               g_object_set_data( G_OBJECT( m_pWidget ), "loop", &m_nLoop );
+               g_object_set_data( G_OBJECT( m_pWidget ), "ret", &m_nReturn );
+
+               BuildDialog();
+               m_bNeedBuild = false;
+       }
+}
+
+void Dialog::Destroy(){
+       if ( m_pWidget != NULL ) {
+               gtk_widget_destroy( m_pWidget );
+               m_pWidget = NULL;
+       }
+}
+
+void Dialog::AddDialogData( GtkObject *object, void *buf, DLG_DATA_TYPE type ){
+       DLG_DATA *data;
+
+       data = (DLG_DATA*)qmalloc( sizeof( DLG_DATA ) );
+       data->object = object;
+       data->buffer = buf;
+       data->type = type;
+
+       m_pDataList = g_slist_append( m_pDataList, data );
+}
+
+void Dialog::AddModalButton( GtkWidget *widget, int ret ) {
+       gtk_signal_connect( GTK_OBJECT( widget ), "clicked",
+                                               GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( ret ) );
+}
+
+void Dialog::UpdateData( bool retrieve ){
+       DLG_DATA *data;
+       GSList *lst;
+       char buf[32];
+
+       if ( retrieve ) {
+               for ( lst = m_pDataList; lst != NULL; lst = g_slist_next( lst ) )
+               {
+                       data = (DLG_DATA*)lst->data;
+
+                       switch ( data->type )
+                       {
+                       case DLG_CHECK_BOOL:
+                               *(bool*)data->buffer = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->object ) );
+                               break;
+                       case DLG_RADIO_INT:
+                       {
+                               GSList *radio = gtk_radio_button_group( GTK_RADIO_BUTTON( data->object ) );
+                               *(int*)data->buffer = g_slist_length( radio ) - 1;
+                               for (; radio; radio = g_slist_next( radio ) )
+                                       if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radio->data ) ) ) {
+                                               break;
+                                       }
+                                       else{
+                                               ( *(int*)data->buffer )--;
+                                       }
+                       } break;
+                       case DLG_ENTRY_TEXT:
+                       {
+                               const char *txt;
+                               Str* str;
+                               str = (Str*)data->buffer;
+                               txt = gtk_entry_get_text( GTK_ENTRY( data->object ) );
+                               *str = txt;
+                       } break;
+                       case DLG_ENTRY_FLOAT:
+                               *(float*)data->buffer = atof( gtk_entry_get_text( GTK_ENTRY( data->object ) ) );
+                               break;
+                       case DLG_ENTRY_INT:
+                               *(int*)data->buffer = atoi( gtk_entry_get_text( GTK_ENTRY( data->object ) ) );
+                               break;
+                       case DLG_SPIN_FLOAT:
+                               *(float*)data->buffer = gtk_spin_button_get_value_as_float( GTK_SPIN_BUTTON( data->object ) );
+                               break;
+                       case DLG_SPIN_INT:
+                               *(int*)data->buffer = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( data->object ) );
+                               break;
+                       case DLG_ADJ_INT:
+                               *(int*)data->buffer = (int) GTK_ADJUSTMENT( data->object )->value;
+                               break;
+                       case DLG_COMBO_INT:
+                       {
+                               GList *lst = GTK_LIST( GTK_COMBO( data->object )->list )->children;
+                               char *label;
+                               const char *entry;
+                               int i;
+
+                               *(int*)data->buffer = -1;
+                               entry = gtk_entry_get_text( GTK_ENTRY( GTK_COMBO( data->object )->entry ) );
+
+                               for ( i = 0; lst != NULL; lst = g_list_next( lst ) )
+                               {
+                                       gtk_label_get( GTK_LABEL( GTK_BIN( lst->data )->child ), &label );
+
+                                       if ( strcmp( label, entry ) == 0 ) {
+                                               *(int*)data->buffer = i;
+                                               break;
+                                       }
+                                       i++;
+                               }
+                       }
+                       break;
+                       case DLG_COMBO_BOX_INT: {
+                               *(int*)data->buffer = gtk_combo_box_get_active( GTK_COMBO_BOX( data->object ) );
+                       }
+                       break;
+
+                       }
+               }
+       }
+       else
+       {
+               for ( lst = m_pDataList; lst != NULL; lst = g_slist_next( lst ) )
+               {
+                       data = (DLG_DATA*)lst->data;
+
+                       switch ( data->type )
+                       {
+                       case DLG_CHECK_BOOL:
+                               gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( data->object ), *(bool*)data->buffer );
+                               break;
+                       case DLG_RADIO_INT:
+                       {
+                               GSList *radio = gtk_radio_button_group( GTK_RADIO_BUTTON( data->object ) );
+                               gpointer btn =  g_slist_nth_data( radio, g_slist_length( radio ) - ( *(int*)data->buffer ) - 1 );
+                               gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( btn ), TRUE );
+                       } break;
+                       case DLG_ENTRY_TEXT:
+                       {
+                               Str* str;
+                               str = (Str*)data->buffer;
+                               const char *txt = str->GetBuffer();
+                               gtk_entry_set_text( GTK_ENTRY( data->object ), txt );
+                       } break;
+                       case DLG_ENTRY_FLOAT:
+                               sprintf( buf, "%g", ( *(float*)data->buffer ) );
+                               gtk_entry_set_text( GTK_ENTRY( data->object ), buf );
+                               break;
+                       case DLG_ENTRY_INT:
+                               sprintf( buf, "%d", ( *(int*)data->buffer ) );
+                               gtk_entry_set_text( GTK_ENTRY( data->object ), buf );
+                               break;
+                       case DLG_SPIN_FLOAT:
+                               gtk_spin_button_set_value( GTK_SPIN_BUTTON( data->object ), ( *(float*)data->buffer ) );
+                               break;
+                       case DLG_SPIN_INT:
+                               gtk_spin_button_set_value( GTK_SPIN_BUTTON( data->object ), ( *(int*)data->buffer ) );
+                               break;
+                       case DLG_ADJ_INT:
+                               gtk_adjustment_set_value( GTK_ADJUSTMENT( data->object ), ( *(int*)data->buffer ) );
+                               break;
+                       case DLG_COMBO_INT: {
+                               GList *lst = GTK_LIST( GTK_COMBO( data->object )->list )->children;
+                               char *entry = NULL;
+
+                               if ( *(int*)data->buffer != -1 ) {
+                                       lst = g_list_nth( lst, *(int*)data->buffer );
+                                       if ( lst != NULL ) {
+                                               gtk_label_get( GTK_LABEL( GTK_BIN( lst->data )->child ), &entry );
+                                       }
+                               }
+                               if ( entry ) {
+                                       gtk_entry_set_text( GTK_ENTRY( GTK_COMBO( data->object )->entry ), entry );
+                               }
+                               else{
+                                       gtk_entry_set_text( GTK_ENTRY( GTK_COMBO( data->object )->entry ), "" );
+                               }
+                       }
+                       break;
+                       case DLG_COMBO_BOX_INT: {
+                               gtk_combo_box_set_active( GTK_COMBO_BOX( data->object ), *(int*)data->buffer );
+                       }
+                       break;
+                       }
+               }
+       }
+}
+
+void Dialog::EndModal( int code ) {
+       m_nLoop = 0;
+       m_nReturn = code;
+}
+
+int Dialog::DoModal(){
+       Create();
+       UpdateData( FALSE );
+
+       PreModal();
+
+       gtk_grab_add( m_pWidget );
+       gtk_widget_show( m_pWidget );
+
+       m_nLoop = 1;
+       while ( m_nLoop ) {
+               gtk_main_iteration();
+       }
+
+       if ( m_pWidget != NULL ) {
+               UpdateData( TRUE );
+
+               gtk_grab_remove( m_pWidget );
+               gtk_widget_hide( m_pWidget );
+       }
+       PostModal( m_nReturn );
+
+       return m_nReturn;
 }