GNOME.org
 

[libgda-uimm] Add DataProxyInfo, Form and RawForm.

commit fbf09dcf363f3005fbf5c02584eba97c6cddd37b
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Thu Feb 25 19:41:31 2010 -0500

    	Add DataProxyInfo, Form and RawForm.
    
    	* libgda-ui/libgda-uimm.h:
    	* libgda-ui/src/filelist.am:
    	* libgda-ui/src/dataproxyinfo.ccg:
    	* libgda-ui/src/dataproxyinfo.hg:
    	* libgda-ui/src/form.ccg:
    	* libgda-ui/src/form.hg:
    	* libgda-ui/src/rawform.ccg:
    	* libgda-ui/src/rawform.hg: Added new DataProxy, Form and RawForm
    	related classes.
    	* tools/m4/convert_libgda_uimm.m4: Added conversions for DataProxyInfo.

 ChangeLog                       |   15 ++++++++
 libgda-ui/libgda-uimm.h         |    3 ++
 libgda-ui/src/dataproxyinfo.ccg |   32 ++++++++++++++++++
 libgda-ui/src/dataproxyinfo.hg  |   60 +++++++++++++++++++++++++++++++++
 libgda-ui/src/filelist.am       |    5 ++-
 libgda-ui/src/form.ccg          |   31 +++++++++++++++++
 libgda-ui/src/form.hg           |   69 +++++++++++++++++++++++++++++++++++++++
 libgda-ui/src/rawform.ccg       |   31 +++++++++++++++++
 libgda-ui/src/rawform.hg        |   57 ++++++++++++++++++++++++++++++++
 tools/m4/convert_libgda_uimm.m4 |    7 +++-
 10 files changed, 308 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 691be80..c5f04e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-25  José Alburquerque  <jaalburqu svn gnome org>
+
+	Add DataProxyInfo, Form and RawForm.
+
+	* libgda-ui/libgda-uimm.h:
+	* libgda-ui/src/filelist.am:
+	* libgda-ui/src/dataproxyinfo.ccg:
+	* libgda-ui/src/dataproxyinfo.hg:
+	* libgda-ui/src/form.ccg:
+	* libgda-ui/src/form.hg:
+	* libgda-ui/src/rawform.ccg:
+	* libgda-ui/src/rawform.hg: Added new DataProxy, Form and RawForm
+	related classes.
+	* tools/m4/convert_libgda_uimm.m4: Added conversions for DataProxyInfo.
+
 2010-02-24  José Alburquerque  <jaalburqu svn gnome org>
 
 	Add BasicForm class.
diff --git a/libgda-ui/libgda-uimm.h b/libgda-ui/libgda-uimm.h
index b5f3237..ade6bb0 100644
--- a/libgda-ui/libgda-uimm.h
+++ b/libgda-ui/libgda-uimm.h
@@ -23,8 +23,11 @@
 #include <basicform.h>
 #include <combo.h>
 #include <dataproxy.h>
+#include <dataproxyinfo.h>
 #include <dataselector.h>
+#include <form.h>
 #include <login.h>
 #include <providerselector.h>
+#include <rawform.h>
 
 #endif /* _LIBGDA_UIMM_H */
diff --git a/libgda-ui/src/dataproxyinfo.ccg b/libgda-ui/src/dataproxyinfo.ccg
new file mode 100644
index 0000000..290c046
--- /dev/null
+++ b/libgda-ui/src/dataproxyinfo.ccg
@@ -0,0 +1,32 @@
+/* dataproxyinfo.cc
+ * 
+ * Copyright (c) 2010 libgda-uimm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <libgda-ui/gdaui-data-proxy-info.h>
+#include <libgda-ui/gdaui-enum-types.h>
+#include <libgda-uimm/dataproxy.h>
+
+namespace Gnome
+{
+
+namespace GdaUI
+{
+
+} /* namespace GdaUI */
+
+} /* namespace Gnome */
diff --git a/libgda-ui/src/dataproxyinfo.hg b/libgda-ui/src/dataproxyinfo.hg
new file mode 100644
index 0000000..723416a
--- /dev/null
+++ b/libgda-ui/src/dataproxyinfo.hg
@@ -0,0 +1,60 @@
+/* dataproxyinfo.h
+ *
+ * Copyright (c) 2010 libgda-uimm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gtkmm/box.h>
+
+_DEFS(libgda-uimm,libgda_ui)
+_PINCLUDE(gtkmm/private/box_p.h)
+
+namespace Gnome
+{
+
+namespace GdaUI
+{
+
+_WRAP_ENUM(DataProxyInfoFlag, GdauiDataProxyInfoFlag)
+
+class DataProxy;
+
+/** DataProxyInfo - Shows information and actions about a DataProxy  widget.
+ * The DataProxyInfo widget is a container widget which, depending on how it
+ * is configured:
+ *
+ *   - Proposes action buttons to change the currently displayed row, add new
+ *   row, ...
+ *   - Displays information about the number of rows in a DataProxy.
+ */
+class DataProxyInfo :
+  public Gtk::HBox
+{
+  _CLASS_GTKOBJECT(DataProxyInfo, GdauiDataProxyInfo, GDAUI_DATA_PROXY_INFO, Gtk::HBox, GtkHBox)
+
+public:
+  _WRAP_METHOD_DOCS_ONLY(gdaui_data_proxy_info_new)
+  _WRAP_CTOR(DataProxyInfo(const Glib::RefPtr<DataProxy>& proxy,
+    DataProxyInfoFlag flags), gdaui_data_proxy_info_new)
+
+public:
+  _WRAP_PROPERTY("data-proxy", Glib::RefPtr<DataProxy>)
+  _WRAP_PROPERTY("flags", DataProxyInfoFlag)
+};
+
+} // namespace GdaUI
+
+} // namespace Gnome
diff --git a/libgda-ui/src/filelist.am b/libgda-ui/src/filelist.am
index 7a4a73f..091699b 100644
--- a/libgda-ui/src/filelist.am
+++ b/libgda-ui/src/filelist.am
@@ -12,9 +12,12 @@ files_hg =                              \
         basicform.hg                    \
         combo.hg                        \
         dataproxy.hg                    \
+        dataproxyinfo.hg                \
         dataselector.hg                 \
+        form.hg                         \
         login.hg                        \
-        providerselector.hg
+        providerselector.hg             \
+        rawform.hg
 
 
 files_ccg = $(files_hg:.hg=.ccg)
diff --git a/libgda-ui/src/form.ccg b/libgda-ui/src/form.ccg
new file mode 100644
index 0000000..c381c8b
--- /dev/null
+++ b/libgda-ui/src/form.ccg
@@ -0,0 +1,31 @@
+/* form.cc
+ * 
+ * Copyright (c) 2010 libgda-uimm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <libgda-ui/gdaui-form.h>
+#include <libgdamm/datamodel.h>
+
+namespace Gnome
+{
+
+namespace GdaUI
+{
+
+} /* namespace GdaUI */
+
+} /* namespace Gnome */
diff --git a/libgda-ui/src/form.hg b/libgda-ui/src/form.hg
new file mode 100644
index 0000000..d45e5de
--- /dev/null
+++ b/libgda-ui/src/form.hg
@@ -0,0 +1,69 @@
+/* form.h
+ *
+ * Copyright (c) 2010 libgda-uimm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gtkmm/box.h>
+#include <libgda-uimm/dataproxy.h>
+#include <libgda-uimm/dataselector.h>
+#include <libgda-uimm/dataproxyinfo.h>
+
+_DEFS(libgda-uimm,libgda_ui)
+_PINCLUDE(gtkmm/private/box_p.h)
+
+namespace Gnome
+{
+
+// Gnome::Gda class forward declarations.
+namespace Gda
+{
+
+class DataModel;
+
+}
+
+namespace GdaUI
+{
+
+class RawForm;
+
+/** Form - Form widget to manipulate data in a Gnome::Gda::DataModel, with
+ * decorations.
+ */
+class Form :
+  public Gtk::VBox,
+  public DataSelector,
+  public DataProxy
+{
+  _CLASS_GTKOBJECT(Form, GdauiForm, GDAUI_FORM, Gtk::VBox, GtkVBox)
+  _IMPLEMENTS_INTERFACE(DataSelector)
+  _IMPLEMENTS_INTERFACE(DataProxy)
+
+public:
+  _WRAP_METHOD_DOCS_ONLY(gdaui_form_new)
+  _WRAP_CTOR(Form(const Glib::RefPtr<Gnome::Gda::DataModel>& model), gdaui_form_new)
+
+public:
+  _WRAP_PROPERTY("info", DataProxyInfo*)
+  _WRAP_PROPERTY("info-flags", DataProxyInfoFlag)
+  _WRAP_PROPERTY("model", Glib::RefPtr<Gnome::Gda::DataModel>)
+  _WRAP_PROPERTY("raw-form", RawForm*)
+};
+
+} // namespace GdaUI
+
+} // namespace Gnome
diff --git a/libgda-ui/src/rawform.ccg b/libgda-ui/src/rawform.ccg
new file mode 100644
index 0000000..01a3f53
--- /dev/null
+++ b/libgda-ui/src/rawform.ccg
@@ -0,0 +1,31 @@
+/* rawform.cc
+ * 
+ * Copyright (c) 2010 libgda-uimm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <libgda-ui/gdaui-raw-form.h>
+#include <libgdamm/datamodel.h>
+
+namespace Gnome
+{
+
+namespace GdaUI
+{
+
+} /* namespace GdaUI */
+
+} /* namespace Gnome */
diff --git a/libgda-ui/src/rawform.hg b/libgda-ui/src/rawform.hg
new file mode 100644
index 0000000..0c2993d
--- /dev/null
+++ b/libgda-ui/src/rawform.hg
@@ -0,0 +1,57 @@
+/* rawform.h
+ *
+ * Copyright (c) 2010 libgda-uimm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <libgda-uimm/basicform.h>
+
+_DEFS(libgda-uimm,libgda_ui)
+_PINCLUDE(libgda-uimm/private/basicform_p.h)
+
+namespace Gnome
+{
+
+// Gnome::Gda class forward declarations.
+namespace Gda
+{
+
+class DataModel;
+
+}
+
+namespace GdaUI
+{
+
+/** RawForm - Form widget to manipulate data in a Gnome::Gda::DataModel, with
+ * decorations.
+ */
+class RawForm :
+  public BasicForm
+{
+  _CLASS_GTKOBJECT(RawForm, GdauiRawForm, GDAUI_RAW_FORM, BasicForm, GdauiBasicForm)
+
+public:
+  _WRAP_METHOD_DOCS_ONLY(gdaui_raw_form_new)
+  _WRAP_CTOR(RawForm(const Glib::RefPtr<Gnome::Gda::DataModel>& model), gdaui_raw_form_new)
+
+public:
+  _WRAP_PROPERTY("model", Glib::RefPtr<Gnome::Gda::DataModel>)
+};
+
+} // namespace GdaUI
+
+} // namespace Gnome
diff --git a/tools/m4/convert_libgda_uimm.m4 b/tools/m4/convert_libgda_uimm.m4
index 0da994d..be7523d 100644
--- a/tools/m4/convert_libgda_uimm.m4
+++ b/tools/m4/convert_libgda_uimm.m4
@@ -2,6 +2,7 @@ dnl Copyright (c) 2009 The libgda-uimm Development Team
 
 dnl Enums:
 _CONV_ENUM(Gdaui,Action)
+_CONV_ENUM(Gdaui,DataProxyInfoFlag)
 _CONV_ENUM(Gdaui,DataProxyWriteMode)
 _CONV_ENUM(Gdaui,LoginMode)
 
@@ -9,11 +10,15 @@ dnl ActionGroup:
 _CONVERSION(`GtkActionGroup*', `Glib::RefPtr<Gtk::ActionGroup>', `Glib::wrap($3)')
 _CONVERSION(`Glib::RefPtr<Gtk::ActionGroup>', `GtkActionGroup*', `Glib::unwrap($3)')
 
-dnl DataProxy:
+dnl Gnome::Gda::DataProxy:
 _CONVERSION(`GdaDataProxy*', `Glib::RefPtr<Gnome::Gda::DataProxy>', `Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Gnome::Gda::DataProxy>&', `GdaDataProxy*', `Glib::unwrap($3)')
 _CONVERSION(`Glib::RefPtr<Gnome::Gda::DataProxy>', `GdaDataProxy*', `Glib::unwrap($3)')
 
+dnl Gnome::Gdaui::DataProxy:
+_CONVERSION(`const Glib::RefPtr<DataProxy>&', `GdauiDataProxy*', `Glib::unwrap($3)')
+_CONVERSION(`GdauiDataProxy*', `Glib::RefPtr<DataProxy>', `Glib::wrap($3)')
+
 dnl DataModel:
 _CONVERSION(`const Glib::RefPtr<Gnome::Gda::DataModel>&', `GdaDataModel*', `Glib::unwrap($3)')
 _CONVERSION(`GdaDataModel*', `Glib::RefPtr<Gnome::Gda::DataModel>', `Glib::wrap($3)')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]