[glom: 1/4] Fixed minor compiler warnings and removed some virtuals.
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Subject: [glom: 1/4] Fixed minor compiler warnings and removed some virtuals.
- Date: Thu, 7 May 2009 18:08:23 -0400 (EDT)
commit 632fdbf6a0ff25340c06dc498ffae5d1302e1004
Author: Murray Cumming <murrayc murrayc com>
Date: Thu May 7 18:35:58 2009 +0200
Fixed minor compiler warnings and removed some virtuals.
* glom/mode_data/flowtablewithfields.h: Made methods non-virtual where
the virtual is unnecessary and misleading.
* glom/utility_widgets/adddel/eggcolumnchooser/: Removed.
* several: Fixed minor compiler warnings.
---
ChangeLog | 10 +
glom/Makefile.am | 1 -
glom/application.cc | 6 +-
glom/libglom/Makefile.am | 2 +-
glom/libglom/connectionpool_backends/backend.cc | 2 +-
.../connectionpool_backends/postgres_self.cc | 4 +-
glom/libglom/connectionpool_backends/sqlite.cc | 30 +-
glom/libglom/data_structure/glomconversions.h | 2 +-
glom/mode_data/dialog_layout_calendar_related.cc | 1 -
glom/mode_data/flowtablewithfields.cc | 6 +-
glom/mode_data/flowtablewithfields.h | 50 +-
glom/utility_widgets/adddel/Makefile.am | 4 +-
glom/utility_widgets/adddel/adddel.cc | 10 -
glom/utility_widgets/adddel/adddel.h | 1 -
.../adddel/eggcolumnchooser/Makefile.am | 7 -
.../eggcolumnchooser/eggcolumnchooserdialog.c | 347 ------------
.../eggcolumnchooser/eggcolumnchooserdialog.h | 70 ---
.../adddel/eggcolumnchooser/eggcolumnmodel.c | 580 --------------------
.../adddel/eggcolumnchooser/eggcolumnmodel.h | 80 ---
glom/utility_widgets/db_adddel/db_adddel.cc | 7 +-
.../utility_widgets/db_adddel/glom_db_treemodel.cc | 6 +-
glom/utility_widgets/flowtable.cc | 4 +-
glom/utility_widgets/flowtable_dnd.h | 6 +-
glom/utility_widgets/imageglom.cc | 6 +-
glom/utility_widgets/placeholder-glom.cc | 3 +-
po/Makefile.in.in | 4 +-
26 files changed, 88 insertions(+), 1161 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9fd2d39..238e8aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-07 Murray Cumming <murrayc murrayc-x61>
+
+ Fixed minor compiler warnings and removed some virtuals.
+
+ * glom/mode_data/flowtablewithfields.h: Made methods non-virtual where
+ the virtual is unnecessary and misleading.
+
+ * glom/utility_widgets/adddel/eggcolumnchooser/: Removed.
+ * several: Fixed minor compiler warnings.
+
2009-05-05 Armin Burgmeier <armin arbur net>
* glom/libglom/sharedptr.h: Added operator!=.
diff --git a/glom/Makefile.am b/glom/Makefile.am
index ea78b27..763e60b 100644
--- a/glom/Makefile.am
+++ b/glom/Makefile.am
@@ -84,7 +84,6 @@ glom_LDADD += bakery/libbakery_app.a \
navigation/libnavigation.a \
utility_widgets/libutility_widgets.a \
utility_widgets/adddel/libutility_widgets_adddel.a \
- utility_widgets/adddel/eggcolumnchooser/libutility_widgets_adddel_eggcolumnchooserdialog.a \
utility_widgets/db_adddel/libutility_widgets_db_adddel.a \
utility_widgets/canvas/libutility_widgets_canvas.a \
utility_widgets/cellrendererlist/libutility_widgets_cellrendererlist.a \
diff --git a/glom/application.cc b/glom/application.cc
index eb005b1..fee7798 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -1687,7 +1687,7 @@ void App_Glom::fill_menu_tables()
if(m_refNavTablesActionGroup)
{
m_refUIManager->remove_action_group(m_refNavTablesActionGroup);
- m_refNavTablesActionGroup.clear();
+ m_refNavTablesActionGroup.reset();
}
m_refNavTablesActionGroup = Gtk::ActionGroup::create("NavTablesActions");
@@ -1776,7 +1776,7 @@ void App_Glom::fill_menu_reports(const Glib::ustring& table_name)
if(m_refNavReportsActionGroup)
{
m_refUIManager->remove_action_group(m_refNavReportsActionGroup);
- m_refNavReportsActionGroup.clear();
+ m_refNavReportsActionGroup.reset();
}
m_refNavReportsActionGroup = Gtk::ActionGroup::create("NavReportsActions");
@@ -1874,7 +1874,7 @@ void App_Glom::fill_menu_print_layouts(const Glib::ustring& table_name)
if(m_refNavPrintLayoutsActionGroup)
{
m_refUIManager->remove_action_group(m_refNavPrintLayoutsActionGroup);
- m_refNavPrintLayoutsActionGroup.clear();
+ m_refNavPrintLayoutsActionGroup.reset();
}
m_refNavPrintLayoutsActionGroup = Gtk::ActionGroup::create("NavPrintLayoutsActions");
diff --git a/glom/libglom/Makefile.am b/glom/libglom/Makefile.am
index 09bdac5..3cab848 100644
--- a/glom/libglom/Makefile.am
+++ b/glom/libglom/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(LIBGLOM_CFLAGS) $(GLOM_WARNI
-DGLOM_ICON_DIR=\""$(glom_icon_dir)"\"
# These are installed, for use by other applications/utilties:
-h_sources_public = libglom_config.h \
+h_sources_public = libglom_config.h \
init.h \
sharedptr.h \
standard_table_prefs_fields.h \
diff --git a/glom/libglom/connectionpool_backends/backend.cc b/glom/libglom/connectionpool_backends/backend.cc
index 36d10f4..1c5b08b 100644
--- a/glom/libglom/connectionpool_backends/backend.cc
+++ b/glom/libglom/connectionpool_backends/backend.cc
@@ -59,7 +59,7 @@ void Backend::cleanup(const SlotProgress& /* slot_progress */)
{
}
-bool Backend::set_network_shared(const SlotProgress& slot_progress, bool /* network_shared */)
+bool Backend::set_network_shared(const SlotProgress& /* slot_progress */, bool /* network_shared */)
{
return true; //Success at doing nothing.
}
diff --git a/glom/libglom/connectionpool_backends/postgres_self.cc b/glom/libglom/connectionpool_backends/postgres_self.cc
index 792c7ef..ea58c06 100644
--- a/glom/libglom/connectionpool_backends/postgres_self.cc
+++ b/glom/libglom/connectionpool_backends/postgres_self.cc
@@ -411,8 +411,10 @@ void PostgresSelfHosted::cleanup(const SlotProgress& slot_progress)
m_port = 0;
}
-bool PostgresSelfHosted::set_network_shared(const SlotProgress& slot_progress, bool network_shared)
+bool PostgresSelfHosted::set_network_shared(const SlotProgress& /* slot_progress */, bool network_shared)
{
+ //TODO: Use slot_progress, while doing async IO for create_text_file().
+
m_network_shared = network_shared;
const std::string dbdir_uri = m_self_hosting_data_uri;
diff --git a/glom/libglom/connectionpool_backends/sqlite.cc b/glom/libglom/connectionpool_backends/sqlite.cc
index 0f76e94..59236c6 100644
--- a/glom/libglom/connectionpool_backends/sqlite.cc
+++ b/glom/libglom/connectionpool_backends/sqlite.cc
@@ -124,12 +124,12 @@ bool Sqlite::create_database(const Glib::ustring& database_name, const Glib::ust
bool Sqlite::add_column_to_server_operation(const Glib::RefPtr<Gnome::Gda::ServerOperation>& operation, GdaMetaTableColumn* column, unsigned int i, std::auto_ptr<Glib::Error>& error)
{
- Glib::ustring name_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_NAME/%1", i);
- Glib::ustring type_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_TYPE/%1", i);
- Glib::ustring pkey_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_PKEY/%1", i);
- Glib::ustring nnul_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_NNUL/%1", i);
+ const Glib::ustring name_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_NAME/%1", i);
+ const Glib::ustring type_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_TYPE/%1", i);
+ const Glib::ustring pkey_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_PKEY/%1", i);
+ const Glib::ustring nnul_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_NNUL/%1", i);
// TODO: Find out whether the column is unique.
- Glib::ustring default_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_DEFAULT/%1", i);
+ const Glib::ustring default_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_DEFAULT/%1", i);
if(!set_server_operation_value(operation, name_path, column->column_name, error)) return false;
if(!set_server_operation_value(operation, type_path, column->column_type, error)) return false;
@@ -137,19 +137,21 @@ bool Sqlite::add_column_to_server_operation(const Glib::RefPtr<Gnome::Gda::Serve
if(!set_server_operation_value(operation, nnul_path, !column->nullok ? "TRUE" : "FALSE", error)) return false;
if(column->default_value)
+ {
if(!set_server_operation_value(operation, default_path, column->default_value, error))
return false;
-
+ }
+
return true;
}
bool Sqlite::add_column_to_server_operation(const Glib::RefPtr<Gnome::Gda::ServerOperation>& operation, const sharedptr<const Field>& column, unsigned int i, std::auto_ptr<Glib::Error>& error)
{
- Glib::ustring name_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_NAME/%1", i);
- Glib::ustring type_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_TYPE/%1", i);
- Glib::ustring pkey_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_PKEY/%1", i);
- Glib::ustring unique_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_UNIQUE/%1", i);
- Glib::ustring default_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_DEFAULT/%1", i);
+ const Glib::ustring name_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_NAME/%1", i);
+ const Glib::ustring type_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_TYPE/%1", i);
+ const Glib::ustring pkey_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_PKEY/%1", i);
+ const Glib::ustring unique_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_UNIQUE/%1", i);
+ const Glib::ustring default_path = Glib::ustring::compose("/FIELDS_A/@COLUMN_DEFAULT/%1", i);
if(!set_server_operation_value(operation, name_path, column->get_name(), error)) return false;
if(!set_server_operation_value(operation, type_path, column->get_sql_type(), error)) return false;
@@ -167,10 +169,12 @@ bool Sqlite::recreate_table(const Glib::RefPtr<Gnome::Gda::Connection>& connecti
Glib::RefPtr<Gnome::Gda::MetaStore> store = connection->get_meta_store();
Glib::RefPtr<Gnome::Gda::MetaStruct> metastruct = Gnome::Gda::MetaStruct::create(store, Gnome::Gda::META_STRUCT_FEATURE_NONE);
GdaMetaDbObject* object = metastruct->complement(Gnome::Gda::META_DB_TABLE, Gnome::Gda::Value(), Gnome::Gda::Value(), Gnome::Gda::Value(table_name));
- if(!object) return false;
+ if(!object)
+ return false;
Glib::RefPtr<Gnome::Gda::ServerOperation> operation = create_server_operation(connection->get_provider(), connection, Gnome::Gda::SERVER_OPERATION_CREATE_TABLE, error);
- if(!operation) return false;
+ if(!operation)
+ return false;
if(!set_server_operation_value(operation, "/TABLE_DEF_P/TABLE_NAME", TEMPORARY_TABLE_NAME, error)) return false;
diff --git a/glom/libglom/data_structure/glomconversions.h b/glom/libglom/data_structure/glomconversions.h
index 2a22ca1..c1d632d 100644
--- a/glom/libglom/data_structure/glomconversions.h
+++ b/glom/libglom/data_structure/glomconversions.h
@@ -45,7 +45,7 @@ namespace Conversions
Glib::ustring format_date(const tm& tm_data);
Glib::ustring format_date(const tm& tm_data, const std::locale& locale, bool iso_format = false);
- Gnome::Gda::Value parse_value(double number);
+ Gnome::Gda::Value parse_value(double number);
Gnome::Gda::Value parse_value(Field::glom_field_type glom_type, const Glib::ustring& text, bool& success, bool iso_format = false);
Gnome::Gda::Value parse_value(Field::glom_field_type glom_type, const Glib::ustring& text, const NumericFormat& numeric_format, bool& success, bool iso_format = false);
diff --git a/glom/mode_data/dialog_layout_calendar_related.cc b/glom/mode_data/dialog_layout_calendar_related.cc
index 3049fc9..a8ff694 100644
--- a/glom/mode_data/dialog_layout_calendar_related.cc
+++ b/glom/mode_data/dialog_layout_calendar_related.cc
@@ -292,7 +292,6 @@ void Dialog_Layout_Calendar_Related::save_to_document()
sharedptr<Relationship> rel, rel_related;
rel = m_combo_navigation_specify->get_selected_relationship(rel_related);
- bool specify_main = (!rel && !rel_related);
sharedptr<UsesRelationship> uses_rel = sharedptr<UsesRelationship>::create();
uses_rel->set_relationship(rel);
uses_rel->set_related_relationship(rel_related);
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 93fa18a..3551402 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -1213,6 +1213,7 @@ void FlowTableWithFields::on_dnd_add_layout_item_field(LayoutWidgetBase* above)
realize();
return;
}
+
sharedptr<LayoutItem> item = sharedptr<LayoutItem>::cast_dynamic(layout_item_field);
dnd_add_to_layout_group (item, above);
@@ -1303,10 +1304,9 @@ void FlowTableWithFields::on_dnd_add_layout_item_image(LayoutWidgetBase* above)
signal_layout_changed().emit();
}
-void FlowTableWithFields::on_dnd_add_layout_item (LayoutWidgetBase* above,
- sharedptr<LayoutItem>& item)
+void FlowTableWithFields::on_dnd_add_layout_item(LayoutWidgetBase* above, sharedptr<LayoutItem>& item)
{
- dnd_add_to_layout_group (item, above);
+ dnd_add_to_layout_group(item, above);
// Don't do this here - it's done in the drag_end handler
// signal_layout_changed().emit();
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index d7af426..bd26224 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -72,22 +72,27 @@ public:
* @param layoutitem_field The layout item that describes this field,
* @param table_name The table on which this layout appears.
*/
- virtual void add_field(const sharedptr<LayoutItem_Field>& layoutitem_field, const Glib::ustring& table_name);
- virtual void remove_field(const Glib::ustring& id);
+ void add_field(const sharedptr<LayoutItem_Field>& layoutitem_field, const Glib::ustring& table_name);
+
+ void remove_field(const Glib::ustring& id);
typedef std::map<int, Field> type_map_field_sequence;
//virtual void add_group(const Glib::ustring& group_name, const Glib::ustring& group_title, const type_map_field_sequence& fields);
- virtual void add_layout_item(const sharedptr<LayoutItem>& item);
- virtual void add_layout_group(const sharedptr<LayoutGroup>& group);
+ void add_layout_item(const sharedptr<LayoutItem>& item);
+ void add_layout_group(const sharedptr<LayoutGroup>& group);
+
+ void set_field_editable(const sharedptr<const LayoutItem_Field>& field, bool editable = true);
- virtual void set_field_editable(const sharedptr<const LayoutItem_Field>& field, bool editable = true);
+ Gnome::Gda::Value get_field_value(const sharedptr<const LayoutItem_Field>& field) const;
- virtual Gnome::Gda::Value get_field_value(const sharedptr<const LayoutItem_Field>& field) const;
- //virtual Gnome::Gda::Value get_field_value(const Glib::ustring& id) const;
- virtual void set_field_value(const sharedptr<const LayoutItem_Field>& field, const Gnome::Gda::Value& value);
- //virtual void set_field_value(const Glib::ustring& id, const Gnome::Gda::Value& value);
- virtual void set_other_field_value(const sharedptr<const LayoutItem_Field>& field, const Gnome::Gda::Value& value);
+ /** Set the displayed @a value in any instances of the specified @a field.
+ */
+ void set_field_value(const sharedptr<const LayoutItem_Field>& field, const Gnome::Gda::Value& value);
+
+ /** Set the displayed @a value in any instances of the field other than the specified @a layout_field.
+ */
+ void set_other_field_value(const sharedptr<const LayoutItem_Field>& layout_field, const Gnome::Gda::Value& value);
typedef std::list<Gtk::Widget*> type_list_widgets;
typedef std::list<const Gtk::Widget*> type_list_const_widgets;
@@ -209,25 +214,26 @@ private:
void add_layout_portal_at_position(const sharedptr<LayoutItem_Portal>& portal, const type_list_layoutwidgets::iterator& add_before);
#ifndef GLOM_ENABLE_CLIENT_ONLY
+
virtual void on_dnd_add_placeholder(LayoutWidgetBase* above);
virtual void on_dnd_remove_placeholder();
// Methods for the different layout object
- virtual void on_dnd_add_layout_item_field (LayoutWidgetBase* above);
+ virtual void on_dnd_add_layout_item_field(LayoutWidgetBase* above);
virtual void on_dnd_add_layout_group(LayoutWidgetBase* above);
- virtual void on_dnd_add_layout_item_button (LayoutWidgetBase* above);
- virtual void on_dnd_add_layout_item_text (LayoutWidgetBase* above);
- virtual void on_dnd_add_layout_item_image (LayoutWidgetBase* above);
- virtual void on_dnd_add_layout_notebook (LayoutWidgetBase* above);
- virtual void on_dnd_add_layout_portal (LayoutWidgetBase* above);
- virtual void on_dnd_add_layout_item (LayoutWidgetBase* above,
- sharedptr<LayoutItem>& item);
+ virtual void on_dnd_add_layout_item_button(LayoutWidgetBase* above);
+ virtual void on_dnd_add_layout_item_text(LayoutWidgetBase* above);
+ virtual void on_dnd_add_layout_item_image(LayoutWidgetBase* above);
+ virtual void on_dnd_add_layout_notebook(LayoutWidgetBase* above);
+ virtual void on_dnd_add_layout_portal(LayoutWidgetBase* above);
+
+ //TODO: Why isn't this a const sharedptr&?
+ virtual void on_dnd_add_layout_item(LayoutWidgetBase* above, sharedptr<LayoutItem>& item);
- sharedptr<LayoutItem_Portal> get_portal_relationship ();
+ sharedptr<LayoutItem_Portal> get_portal_relationship();
+
void dnd_notify_failed_drop();
- bool dnd_add_to_layout_group (sharedptr<LayoutItem>& item,
- LayoutWidgetBase* layoutwidget,
- bool ignore_error = false);
+ bool dnd_add_to_layout_group(sharedptr<LayoutItem>& item, LayoutWidgetBase* layoutwidget, bool ignore_error = false);
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/utility_widgets/adddel/Makefile.am b/glom/utility_widgets/adddel/Makefile.am
index fc204d4..4862079 100644
--- a/glom/utility_widgets/adddel/Makefile.am
+++ b/glom/utility_widgets/adddel/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = eggcolumnchooser
+SUBDIRS =
AM_CPPFLAGS = -I top_srcdir@/ -I top_srcdir@/glom $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
@@ -6,4 +6,4 @@ noinst_LIBRARIES = libutility_widgets_adddel.a
libutility_widgets_adddel_a_SOURCES = adddel.cc adddel.h adddel_withbuttons.cc adddel_withbuttons.h \
treeviewcolumn_glom.cc treeviewcolumn_glom.h
-libutility_widgets_adddel_a_LIBADD = eggcolumnchooser/libutility_widgets_adddel_eggcolumnchooserdialog.a
+libutility_widgets_adddel_a_LIBADD =
diff --git a/glom/utility_widgets/adddel/adddel.cc b/glom/utility_widgets/adddel/adddel.cc
index 15d632e..70fd7c0 100644
--- a/glom/utility_widgets/adddel/adddel.cc
+++ b/glom/utility_widgets/adddel/adddel.cc
@@ -36,8 +36,6 @@
#include <hildonmm/note.h>
#endif // GLOM_ENABLE_MAEMO
-#include "eggcolumnchooser/eggcolumnchooserdialog.h"
-
namespace Glom
{
@@ -211,14 +209,6 @@ AddDel::on_MenuPopup_activate_Edit()
}
}
-void AddDel::on_MenuPopup_activate_ChooseColumns()
-{
- GtkDialog* pDialog = GTK_DIALOG( egg_column_chooser_dialog_new(m_TreeView.gobj()) );
- gtk_widget_show_all( GTK_WIDGET(pDialog) );
- gtk_dialog_run(pDialog); //It will delete itself. The C API is funny like that.
- pDialog = 0;
-}
-
void AddDel::on_MenuPopup_activate_Delete()
{
finish_editing();
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index 933744e..ef8e900 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -239,7 +239,6 @@ protected:
void on_MenuPopup_activate_Edit();
void on_MenuPopup_activate_Delete();
- void on_MenuPopup_activate_ChooseColumns();
void on_treeview_button_press_event(GdkEventButton* event);
diff --git a/glom/utility_widgets/adddel/eggcolumnchooser/Makefile.am b/glom/utility_widgets/adddel/eggcolumnchooser/Makefile.am
deleted file mode 100644
index 77df432..0000000
--- a/glom/utility_widgets/adddel/eggcolumnchooser/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AM_CPPFLAGS = -I top_srcdir@/ $(GLOM_CFLAGS) $(GLOM_WARNING_FLAGS)
-
-noinst_LIBRARIES = libutility_widgets_adddel_eggcolumnchooserdialog.a
-libutility_widgets_adddel_eggcolumnchooserdialog_a_SOURCES = eggcolumnchooserdialog.h eggcolumnchooserdialog.c \
- eggcolumnmodel.h eggcolumnmodel.c
-
-
diff --git a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c b/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c
deleted file mode 100644
index ae25b0e..0000000
--- a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* egg-column-chooser-dialog.c
- * Copyright (C) 2001 Anders Carlsson
- *
- * 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 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "eggcolumnchooserdialog.h"
-
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
-
-#include "eggcolumnmodel.h"
-
-static void egg_column_chooser_dialog_class_init (EggColumnChooserDialogClass *klass);
-static void egg_column_chooser_dialog_init (EggColumnChooserDialog *dialog);
-
-static GtkDialogClass *parent_class = NULL;
-
-GType
-egg_column_chooser_dialog_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type) {
- static const GTypeInfo object_info = {
- sizeof (EggColumnChooserDialogClass),
- NULL,
- NULL,
- (GClassInitFunc) egg_column_chooser_dialog_class_init,
- NULL,
- NULL,
- sizeof (EggColumnChooserDialog),
- 0,
- (GInstanceInitFunc) egg_column_chooser_dialog_init,
- 0
- };
-
- object_type = g_type_register_static (GTK_TYPE_DIALOG, "EggColumnChooserDialog", &object_info, (GTypeFlags)0);
-
- }
-
- return object_type;
-}
-
-static void
-update_button_states (EggColumnChooserDialog *dialog, GtkTreeIter *iter)
-{
- if (egg_column_model_get_column_visible (dialog->column_model, iter)) {
- gtk_widget_set_sensitive (dialog->hide_button, TRUE);
- gtk_widget_set_sensitive (dialog->show_button, FALSE);
- }
- else {
- gtk_widget_set_sensitive (dialog->hide_button, FALSE);
- gtk_widget_set_sensitive (dialog->show_button, TRUE);
- }
-
- if (egg_column_model_is_column_first (dialog->column_model, iter)) {
- gtk_widget_set_sensitive (dialog->move_up_button, FALSE);
- }
- else {
- gtk_widget_set_sensitive (dialog->move_up_button, TRUE);
- }
-
- if (egg_column_model_is_column_last (dialog->column_model, iter)) {
- gtk_widget_set_sensitive (dialog->move_down_button, FALSE);
- }
- else {
- gtk_widget_set_sensitive (dialog->move_down_button, TRUE);
- }
-
-}
-
-static void
-selection_changed (GtkTreeSelection *selection, EggColumnChooserDialog *dialog)
-{
- GtkTreeIter iter;
-
- gtk_tree_selection_get_selected (selection, NULL, &iter);
-
- update_button_states (dialog, &iter);
-}
-
-static void
-visible_toggled (GtkCellRendererToggle *cell, gchar *path_str, EggColumnChooserDialog *dialog)
-{
- GtkTreePath *path;
- GtkTreeIter iter;
- GValue value = {0, {{0}}};
- GtkTreeModel *model = GTK_TREE_MODEL (dialog->column_model);
-
- path = gtk_tree_path_new_from_string (path_str);
- gtk_tree_model_get_iter (model, &iter, path);
-
- gtk_tree_model_get_value (model,
- &iter,
- 0,
- &value);
-
- egg_column_model_set_column_visible (dialog->column_model, &iter, !g_value_get_boolean (&value));
-
- gtk_tree_path_free (path);
- update_button_states (dialog, &iter);
-}
-
-static void
-show_button_clicked (GtkWidget *button, EggColumnChooserDialog *dialog)
-{
- GtkTreeIter iter;
-
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &iter);
-
- egg_column_model_set_column_visible (dialog->column_model, &iter, TRUE);
-
- update_button_states (dialog, &iter);
-}
-
-static void
-hide_button_clicked (GtkWidget *button, EggColumnChooserDialog *dialog)
-{
- GtkTreeIter iter;
-
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &iter);
-
- egg_column_model_set_column_visible (dialog->column_model, &iter, FALSE);
-
- update_button_states (dialog, &iter);
-}
-
-static void
-move_down_button_clicked (GtkWidget *button, EggColumnChooserDialog *dialog)
-{
- GtkTreeIter iter;
-
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &iter);
-
- egg_column_model_move_down_column (dialog->column_model, &iter);
-
- /* We need to do this again since the model structure has changed */
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &iter);
- update_button_states (dialog, &iter);
-}
-
-static void
-move_up_button_clicked (GtkWidget *button, EggColumnChooserDialog *dialog)
-{
- GtkTreeIter iter;
-
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &iter);
-
- egg_column_model_move_up_column (dialog->column_model, &iter);
-
- /* We need to do this again since the model structure has changed */
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &iter);
- update_button_states (dialog, &iter);
-}
-
-static void
-egg_column_chooser_dialog_finalize (GObject *object)
-{
- EggColumnChooserDialog *dialog;
-
- dialog = EGG_COLUMN_CHOOSER_DIALOG (object);
-
- g_object_unref (G_OBJECT (dialog->column_model));
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-egg_column_chooser_dialog_response (GtkDialog *dialog, gint response_id)
-{
- gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-egg_column_chooser_dialog_class_init (EggColumnChooserDialogClass *klass)
-{
- GObjectClass *object_class;
- GtkDialogClass *dialog_class;
-
- object_class = (GObjectClass *)klass;
- dialog_class = (GtkDialogClass *)klass;
-
- parent_class = (GtkDialogClass *)g_type_class_peek_parent (klass);
-
- object_class->finalize = egg_column_chooser_dialog_finalize;
-
- dialog_class->response = egg_column_chooser_dialog_response;
-}
-
-static void
-egg_column_chooser_dialog_init (EggColumnChooserDialog *dialog)
-{
- GtkWidget *hbox, *vbox, *vbox2, *label, *button;
- GtkWidget *scrolled_window;
- GtkTreeSelection *selection;
- GtkCellRenderer *toggle_renderer;
-
- gtk_window_set_title (GTK_WINDOW (dialog), "Columns");
-
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE);
-
- vbox = gtk_vbox_new (FALSE, 12);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
-
- label = gtk_label_new ("Check the columns that you would like to be visible in this view. "
- "Use the Move Up and Move Down buttons to reorder the columns "
- "however you like.");
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 8);
-
-
- hbox = gtk_hbox_new (FALSE, 12);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE, TRUE, 0);
-
- dialog->tree_view = gtk_tree_view_new ();
- g_object_set_data (G_OBJECT (dialog->tree_view), "foo-data", GINT_TO_POINTER (TRUE));
- gtk_tree_view_set_reorderable (GTK_TREE_VIEW (dialog->tree_view), TRUE);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
- g_signal_connect (G_OBJECT (selection), "changed",
- G_CALLBACK (selection_changed), dialog);
-
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->tree_view), FALSE);
- gtk_container_add (GTK_CONTAINER (scrolled_window), dialog->tree_view);
-
- toggle_renderer = (GtkCellRenderer *)g_object_new (GTK_TYPE_CELL_RENDERER_TOGGLE,
- "activatable", TRUE,
- NULL);
- g_signal_connect (G_OBJECT (toggle_renderer), "toggled",
- G_CALLBACK (visible_toggled), dialog);
-
- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view),
- -1, NULL,
- toggle_renderer,
- "active", 0,
- NULL);
-
- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (dialog->tree_view),
- -1, NULL,
- gtk_cell_renderer_text_new (),
- "text", 1,
- NULL);
-
- vbox2 = gtk_vbox_new (FALSE, 8);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-
- dialog->move_up_button = gtk_button_new_with_mnemonic ("Move _Up");
- g_signal_connect (G_OBJECT (dialog->move_up_button), "clicked",
- G_CALLBACK (move_up_button_clicked), dialog);
- gtk_box_pack_start (GTK_BOX (vbox2), dialog->move_up_button, FALSE, FALSE, 0);
-
- dialog->move_down_button = gtk_button_new_with_mnemonic ("Move _Down");
- g_signal_connect (G_OBJECT (dialog->move_down_button), "clicked",
- G_CALLBACK (move_down_button_clicked), dialog);
- gtk_box_pack_start (GTK_BOX (vbox2), dialog->move_down_button, FALSE, FALSE, 0);
-
- dialog->show_button = gtk_button_new_with_mnemonic ("_Show");
- g_signal_connect (G_OBJECT (dialog->show_button), "clicked",
- G_CALLBACK (show_button_clicked), dialog);
-
- gtk_box_pack_start (GTK_BOX (vbox2), dialog->show_button, FALSE, FALSE, 0);
-
- dialog->hide_button = gtk_button_new_with_mnemonic ("_Hide");
- g_signal_connect (G_OBJECT (dialog->hide_button), "clicked",
- G_CALLBACK (hide_button_clicked), dialog);
- gtk_box_pack_start (GTK_BOX (vbox2), dialog->hide_button, FALSE, FALSE, 0);
-
- button = gtk_button_new_with_label ("Reset");
- gtk_widget_set_sensitive (button, FALSE);
- gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
-
-}
-
-static void
-rows_reordered (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, gint *new_order, EggColumnChooserDialog *dialog)
-{
- GtkTreeIter my_iter;
-
- gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), NULL, &my_iter);
- update_button_states (dialog, &my_iter);
-}
-
-static void
-egg_column_chooser_dialog_construct (EggColumnChooserDialog *dialog, GtkTreeView *tree_view)
-{
- dialog->column_model = egg_column_model_new (tree_view);
- g_signal_connect_after (G_OBJECT (dialog->column_model), "rows_reordered",
- G_CALLBACK (rows_reordered), dialog);
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->tree_view), GTK_TREE_MODEL (dialog->column_model));
-
-}
-
-GtkWidget *
-egg_column_chooser_dialog_new (GtkTreeView *tree_view)
-{
- EggColumnChooserDialog *dialog;
- GtkTreePath *path;
-
- dialog = (EggColumnChooserDialog *)g_object_new (EGG_TYPE_COLUMN_CHOOSER_DIALOG, NULL);
-
- egg_column_chooser_dialog_construct (dialog, tree_view);
-
- /* Select the first element in the list */
- path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, 0);
- gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view)), path);
- gtk_tree_path_free (path);
-
- return GTK_WIDGET (dialog);
-}
diff --git a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h b/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h
deleted file mode 100644
index 1399242..0000000
--- a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnchooserdialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mp-column-chooser-dialog.c
- * Copyright (C) 2001 Anders Carlsson
- *
- * 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 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef __EGG_COLUMN_CHOOSER_DIALOG_H__
-#define __EGG_COLUMN_CHOOSER_DIALOG_H__
-
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-
-#include "eggcolumnmodel.h"
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_COLUMN_CHOOSER_DIALOG (egg_column_chooser_dialog_get_type ())
-#define EGG_COLUMN_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialog))
-#define EGG_COLUMN_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_COLUMN_CHOOSER_DIALOG, EggColumnChooserDialogClass))
-#define EGG_IS_COLUMN_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
-#define EGG_IS_COLUMN_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG))
-#define EGG_COLUMN_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_COLUMN_CHOOSER_DIALOG, GanttViewClass))
-
-typedef struct _EggColumnChooserDialog EggColumnChooserDialog;
-typedef struct _EggColumnChooserDialogClass EggColumnChooserDialogClass;
-
-
-struct _EggColumnChooserDialog {
- GtkDialog parent_instance;
-
- EggColumnModel *column_model;
-
- GtkWidget *show_button;
- GtkWidget *hide_button;
-
- GtkWidget *move_down_button;
- GtkWidget *move_up_button;
-
- GtkWidget *tree_view;
-};
-
-struct _EggColumnChooserDialogClass {
- GtkDialogClass parent_class;
-};
-
-GType egg_column_chooser_get_type (void);
-GtkWidget *egg_column_chooser_new (GtkTreeView *tree_view);
-
-GType egg_column_chooser_dialog_get_type (void);
-GtkWidget *egg_column_chooser_dialog_new (GtkTreeView *tree_view);
-
-G_END_DECLS
-
-#endif /* __EGG_COLUMN_CHOOSER_DIALOG_H__ */
diff --git a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnmodel.c b/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnmodel.c
deleted file mode 100644
index cb45452..0000000
--- a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnmodel.c
+++ /dev/null
@@ -1,580 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* egg-column-model.c
- * Copyright (C) 2001 Anders Carlsson, Jonathan Blanford
- *
- * 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 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "eggcolumnmodel.h"
-
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
-
-static void update_columns (GtkTreeView *tree_view, EggColumnModel *column_model);
-
-
-enum
-{
- COLUMN_VISIBLE,
- COLUMN_NAME,
- COLUMN_OBJECT,
- N_COLUMNS
-};
-
-
-
-static GObjectClass *parent_class = NULL;
-
-
-static gint
-egg_column_model_get_n_columns (GtkTreeModel *tree_model)
-{
- return N_COLUMNS;
-}
-
-static GType
-egg_column_model_get_column_type (GtkTreeModel *tree_model,
- gint index)
-{
- switch (index)
- {
- case COLUMN_VISIBLE:
- return G_TYPE_BOOLEAN;
- case COLUMN_NAME:
- return G_TYPE_STRING;
- case COLUMN_OBJECT:
- return GTK_TYPE_TREE_VIEW_COLUMN;
- default:
- return G_TYPE_INVALID;
- }
-}
-
-static gboolean
-egg_column_model_get_iter (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreePath *path)
-{
- EggColumnModel *column_model = (EggColumnModel *) tree_model;
- GList *list;
- gint i;
-
- i = gtk_tree_path_get_indices (path)[0];
- list = g_list_nth (column_model->columns, i);
-
- if (list == NULL)
- return FALSE;
-
- iter->stamp = column_model->stamp;
- iter->user_data = list;
-
- return TRUE;
-}
-
-static GtkTreePath *
-egg_column_model_get_path (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
-{
- EggColumnModel *column_model = (EggColumnModel *) tree_model;
- GtkTreePath *path;
- gint i = 0;
- GList *list;
-
- g_return_val_if_fail (EGG_IS_COLUMN_MODEL (tree_model), NULL);
- g_return_val_if_fail (iter->stamp == EGG_COLUMN_MODEL (tree_model)->stamp, NULL);
-
- for (list = column_model->columns; list; list = list->next)
- {
- if (list == (GList *)iter->user_data)
- break;
- i++;
- }
-
- if (list == NULL)
- return NULL;
-
- path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, i);
-
- return path;
-}
-
-
-static gboolean
-egg_column_model_iter_has_child (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
-{
- g_return_val_if_fail (EGG_IS_COLUMN_MODEL (tree_model), FALSE);
- g_return_val_if_fail (iter->stamp == EGG_COLUMN_MODEL (tree_model)->stamp, FALSE);
-
- return FALSE;
-}
-
-static void
-egg_column_model_get_value (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gint column,
- GValue *value)
-{
- GtkTreeViewColumn *view_column;
-
- g_return_if_fail (EGG_IS_COLUMN_MODEL (tree_model));
- g_return_if_fail (column < N_COLUMNS);
- g_return_if_fail (column >= 0);
- g_return_if_fail (iter->stamp == EGG_COLUMN_MODEL (tree_model)->stamp);
-
- view_column = GTK_TREE_VIEW_COLUMN (((GList *)iter->user_data)->data);
- switch (column)
- {
- case COLUMN_VISIBLE:
- g_value_init (value, G_TYPE_BOOLEAN);
- g_value_set_boolean (value, gtk_tree_view_column_get_visible (view_column));
- break;
- case COLUMN_NAME:
- g_value_init (value, G_TYPE_STRING);
- g_value_set_string (value, gtk_tree_view_column_get_title (view_column));
- break;
- case COLUMN_OBJECT:
- g_value_init (value, GTK_TYPE_TREE_VIEW_COLUMN);
- g_value_set_object (value, view_column);
- break;
- default:
- g_assert_not_reached ();
- break;
- }
-
-}
-
-static gboolean
-egg_column_model_iter_next (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
-{
- EggColumnModel *column_model;
-
- g_return_val_if_fail (EGG_IS_COLUMN_MODEL (tree_model), FALSE);
- g_return_val_if_fail (iter->stamp == EGG_COLUMN_MODEL (tree_model)->stamp, FALSE);
-
- column_model = EGG_COLUMN_MODEL (tree_model);
-
- iter->user_data = ((GList *)iter->user_data)->next;
-
- return (iter->user_data != NULL);
-}
-
-static gint
-egg_column_model_iter_n_children (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
-{
- g_return_val_if_fail (EGG_IS_COLUMN_MODEL (tree_model), 0);
-
- if (iter)
- {
- g_return_val_if_fail (iter->stamp == EGG_COLUMN_MODEL (tree_model)->stamp, 0);
- return 0;
- }
-
- return g_list_length (EGG_COLUMN_MODEL (tree_model)->columns);
-}
-
-static gboolean
-egg_column_model_iter_nth_child (GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkTreeIter *parent,
- gint n)
-{
- EggColumnModel *column_model;
-
- g_return_val_if_fail (EGG_IS_COLUMN_MODEL (tree_model), FALSE);
-
- column_model = EGG_COLUMN_MODEL (tree_model);
- if (parent)
- {
- g_return_val_if_fail (parent->stamp == EGG_COLUMN_MODEL (tree_model)->stamp, FALSE);
- return FALSE;
- }
-
- iter->user_data = g_list_nth ((GList *)column_model->columns, n);
-
- if (iter->user_data == NULL)
- return FALSE;
-
- iter->stamp = column_model->stamp;
- return TRUE;
-
-}
-
-static void
-egg_column_model_tree_model_init (GtkTreeModelIface *iface)
-{
- iface->get_n_columns = egg_column_model_get_n_columns;
- iface->get_column_type = egg_column_model_get_column_type;
- iface->get_iter = egg_column_model_get_iter;
- iface->get_path = egg_column_model_get_path;
- iface->get_value = egg_column_model_get_value;
- iface->iter_has_child = egg_column_model_iter_has_child;
- iface->iter_next = egg_column_model_iter_next;
- iface->iter_nth_child = egg_column_model_iter_nth_child;
- iface->iter_n_children = egg_column_model_iter_n_children;
-}
-
-static gboolean
-egg_column_model_drag_data_get (GtkTreeDragSource *drag_source, GtkTreePath *path, GtkSelectionData *selection_data)
-{
-#if 0
- if (gtk_selection_data_set_tree_row (selection_data,
- GTK_TREE_MODEL (drag_source),
- path)) {
- return TRUE;
- }
- else {
- }
-#endif
- return FALSE;
-}
-
-static gboolean
-egg_column_model_drag_data_delete (GtkTreeDragSource *drag_source, GtkTreePath *path)
-{
- return FALSE;
-}
-
-static void
-egg_column_model_drag_source_init (GtkTreeDragSourceIface *iface)
-{
- iface->drag_data_get = egg_column_model_drag_data_get;
- iface->drag_data_delete = egg_column_model_drag_data_delete;
-}
-
-static gboolean
-egg_column_model_row_drop_possible (GtkTreeDragDest *drag_dest,
- GtkTreePath *dest_path,
- GtkSelectionData *selection_data)
-{
- gint *indices;
-
- g_return_val_if_fail (EGG_IS_COLUMN_MODEL (drag_dest), FALSE);
-
- if (gtk_tree_path_get_depth (dest_path) != 1)
- return FALSE;
-
- indices = gtk_tree_path_get_indices (dest_path);
-
- if (indices[0] <= g_list_length (((EggColumnModel *)drag_dest)->columns))
- return TRUE;
- else
- return FALSE;
-}
-
-static void
-egg_column_model_drag_dest_init (GtkTreeDragDestIface *iface)
-{
- iface->row_drop_possible = egg_column_model_row_drop_possible;
-}
-
-static void
-egg_column_model_init (EggColumnModel *model)
-{
- do
- {
- model->stamp = g_random_int ();
- }
- while (model->stamp == 0);
-}
-
-static void
-egg_column_model_finalize (GObject *object)
-{
- EggColumnModel *model;
-
- model = (EggColumnModel *)object;
-
- g_list_free (model->columns);
-
- g_signal_handlers_disconnect_by_func (G_OBJECT (model->tree_view), (void*)update_columns, model);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-egg_column_model_class_init (EggColumnModelClass *klass)
-{
- GObjectClass *object_class;
-
- object_class = (GObjectClass *)klass;
-
- parent_class = (GObjectClass *)g_type_class_peek_parent (klass);
-
- object_class->finalize = egg_column_model_finalize;
-}
-
-GType
-egg_column_model_get_type (void)
-{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info =
- {
- sizeof (EggColumnModelClass),
- NULL,
- NULL,
- (GClassInitFunc) egg_column_model_class_init,
- NULL,
- NULL,
- sizeof (EggColumnModel),
- 0,
- (GInstanceInitFunc) egg_column_model_init,
- };
-
- static const GInterfaceInfo tree_model_info =
- {
- (GInterfaceInitFunc) egg_column_model_tree_model_init,
- NULL,
- NULL
- };
-
- static const GInterfaceInfo drag_source_info =
- {
- (GInterfaceInitFunc) egg_column_model_drag_source_init,
- NULL,
- NULL
- };
-
- static const GInterfaceInfo drag_dest_info =
- {
- (GInterfaceInitFunc) egg_column_model_drag_dest_init,
- NULL,
- NULL
- };
-
- object_type = g_type_register_static (G_TYPE_OBJECT, "EggColumnModel", &object_info, (GTypeFlags)0);
- g_type_add_interface_static (object_type,
- GTK_TYPE_TREE_MODEL,
- &tree_model_info);
- g_type_add_interface_static (object_type,
- GTK_TYPE_TREE_DRAG_SOURCE,
- &drag_source_info);
- g_type_add_interface_static (object_type,
- GTK_TYPE_TREE_DRAG_DEST,
- &drag_dest_info);
- }
-
- return object_type;
-}
-
-static void
-update_columns (GtkTreeView *tree_view,
- EggColumnModel *column_model)
-{
- GList *old_columns = column_model->columns;
- gint old_length, length;
- GList *a, *b;
-
- column_model->columns = gtk_tree_view_get_columns (column_model->tree_view);
-
- /* As the view tells us one change at a time, we can do this hack. */
- length = g_list_length (column_model->columns);
- old_length = g_list_length (old_columns);
-
- if (length != old_length)
- {
- GtkTreePath *path;
- gint i = 0;
-
- /* Find out where they differ */
- for (a = old_columns, b = column_model->columns; a && b; a = a->next, b = b->next) {
- if (a->data != b->data)
- break;
- i++;
- }
-
- path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, i);
-
- if (length < old_length)
- {
- column_model->stamp++;
- gtk_tree_model_row_deleted (GTK_TREE_MODEL (column_model), path);
- }
- else
- {
- GtkTreeIter iter;
-
- iter.stamp = column_model->stamp;
- iter.user_data = b;
- gtk_tree_model_row_inserted (GTK_TREE_MODEL (column_model), path, &iter);
- }
-
- gtk_tree_path_free (path);
- }
- else
- {
- gint i;
- gint m = 0, n = 1;
- gint *new_order;
- GtkTreePath *path;
-
- new_order = g_new (int, length);
- a = old_columns; b = column_model->columns;
-
- while (a->data == b->data) {
- a = a->next;
- b = b->next;
-
- if (a == NULL)
- return;
- m++;
- }
-
- if (a->next->data == b->data)
- {
- b = b->next;
- while (b->data != a->data)
- {
- b = b->next;
- n++;
- }
- for (i = 0; i < m; i++)
- new_order[i] = i;
- for (i = m; i < m+n; i++)
- new_order[i] = i+1;
- new_order[i] = m;
- for (i = m + n +1; i < length; i++)
- new_order[i] = i;
- }
- else
- {
- a = a->next;
- while (a->data != b->data)
- {
- a = a->next;
- n++;
- }
- for (i = 0; i < m; i++)
- new_order[i] = i;
- new_order[m] = m+n;
- for (i = m+1; i < m + n+ 1; i++)
- new_order[i] = i - 1;
- for (i = m + n + 1; i < length; i++)
- new_order[i] = i;
- }
-
- path = gtk_tree_path_new ();
- gtk_tree_model_rows_reordered (GTK_TREE_MODEL (column_model),
- path,
- NULL,
- new_order);
- gtk_tree_path_free (path);
- g_free (new_order);
- }
-
- if (old_columns)
- g_list_free (old_columns);
-}
-
-EggColumnModel *
-egg_column_model_new (GtkTreeView *tree_view)
-{
- EggColumnModel *model;
-
- model = (EggColumnModel *)g_object_new (egg_column_model_get_type (), NULL);
-
- model->tree_view = tree_view;
- model->columns = gtk_tree_view_get_columns (tree_view);
-
- g_signal_connect (G_OBJECT (tree_view), "columns_changed",
- G_CALLBACK (update_columns), model);
-
- return model;
-}
-
-void
-egg_column_model_set_column_visible (EggColumnModel *model, GtkTreeIter *iter, gboolean visible)
-{
- GtkTreeViewColumn *column;
- GtkTreePath *path;
-
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), iter);
-
- column = (GtkTreeViewColumn *)((GList *)iter->user_data)->data;
-
- gtk_tree_view_column_set_visible (column, visible);
- gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, iter);
-
- gtk_tree_path_free (path);
-}
-
-gboolean
-egg_column_model_get_column_visible (EggColumnModel *model, GtkTreeIter *iter)
-{
- GtkTreeViewColumn *column;
-
- g_return_val_if_fail (model->stamp == iter->stamp, FALSE);
-
- column = (GtkTreeViewColumn *)((GList *)iter->user_data)->data;
-
- return gtk_tree_view_column_get_visible (column);
-}
-
-gboolean
-egg_column_model_is_column_first (EggColumnModel *model, GtkTreeIter *iter)
-{
- g_return_val_if_fail (model->stamp == iter->stamp, FALSE);
-
- return (((GList *)iter->user_data)->prev == NULL);
-}
-
-gboolean
-egg_column_model_is_column_last (EggColumnModel *model, GtkTreeIter *iter)
-{
- g_return_val_if_fail (model->stamp == iter->stamp, FALSE);
-
- return (((GList *)iter->user_data)->next == NULL);
-}
-
-void
-egg_column_model_move_down_column (EggColumnModel *model, GtkTreeIter *iter)
-{
- GtkTreeViewColumn *column, *base_column;
- GList *node;
-
- g_return_if_fail (model->stamp == iter->stamp);
- g_return_if_fail (((GList *)iter->user_data)->next != NULL);
-
- node = (GList *)iter->user_data;
-
- column = (GtkTreeViewColumn *)node->data;
- base_column = (GtkTreeViewColumn *)node->next->data;
-
- gtk_tree_view_move_column_after (model->tree_view, column, base_column);
-}
-
-void
-egg_column_model_move_up_column (EggColumnModel *model, GtkTreeIter *iter)
-{
- GtkTreeViewColumn *column, *base_column;
- GList *node;
-
- g_return_if_fail (model->stamp == iter->stamp);
- g_return_if_fail (((GList *)iter->user_data)->prev != NULL);
-
- node = (GList *)iter->user_data;
-
- column = (GtkTreeViewColumn *)node->prev->data;
- base_column = (GtkTreeViewColumn *)node->data;
-
- gtk_tree_view_move_column_after (model->tree_view, column, base_column);
-}
diff --git a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnmodel.h b/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnmodel.h
deleted file mode 100644
index 39fd305..0000000
--- a/glom/utility_widgets/adddel/eggcolumnchooser/eggcolumnmodel.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mp-column-model.h
- * Copyright (C) 2001 Anders Carlsson, Jonathan Blanford
- *
- * 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 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EGG_COLUMN_MODEL_H__
-#define __EGG_COLUMN_MODEL_H__
-
-#include <gtk/gtktreeview.h>
-
-G_BEGIN_DECLS
-
-#define EGG_TYPE_COLUMN_MODEL (egg_column_model_get_type ())
-#define EGG_COLUMN_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_COLUMN_MODEL, EggColumnModel))
-#define EGG_COLUMN_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_COLUMN_MODEL, EggColumnModelClass))
-#define EGG_IS_COLUMN_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_COLUMN_MODEL))
-#define EGG_IS_COLUMN_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_COLUMN_MODEL))
-#define EGG_COLUMN_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_COLUMN_MODEL, EggColumnModelClass))
-
-typedef struct _EggColumnModel EggColumnModel;
-typedef struct _EggColumnModelClass EggColumnModelClass;
-
-struct _EggColumnModel
-{
- GObject parent_instance;
-
- /*< private >*/
- gint stamp;
- GList *columns;
- GtkTreeView *tree_view;
-};
-
-struct _EggColumnModelClass
-{
- GObjectClass parent_class;
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
-};
-
-
-GType egg_column_model_get_type (void);
-EggColumnModel *egg_column_model_new (GtkTreeView *tree_view);
-
-void egg_column_model_set_column_visible (EggColumnModel *model,
- GtkTreeIter *iter,
- gboolean visible);
-gboolean egg_column_model_get_column_visible (EggColumnModel *model,
- GtkTreeIter *iter);
-gboolean egg_column_model_is_column_first (EggColumnModel *model,
- GtkTreeIter *iter);
-gboolean egg_column_model_is_column_last (EggColumnModel *model,
- GtkTreeIter *iter);
-void egg_column_model_move_down_column (EggColumnModel *model,
- GtkTreeIter *iter);
-void egg_column_model_move_up_column (EggColumnModel *model,
- GtkTreeIter *iter);
-
-
-G_END_DECLS
-
-#endif /* __EGG_COLUMN_MODEL_H__ */
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index 940a199..324809b 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -832,7 +832,7 @@ void DbAddDel::construct_specified_columns()
{
//std::cout << "debug: DbAddDel::construct_specified_columns(): showing hint model: m_find_mode=" << m_find_mode << std::endl;
- m_refListStore.clear();
+ m_refListStore.reset();
if(m_table_name.empty())
m_TreeView.set_model(m_refListStore); // clear old model from treeview
else
@@ -932,7 +932,10 @@ void DbAddDel::construct_specified_columns()
m_treeviewcolumn_button->pack_start(*pCellButton);
- int x_offset, y_offset, width, height;
+ int x_offset = 0;
+ int y_offset = 0;
+ int width = 0;
+ int height = 0;
pCellButton->get_size(m_TreeView, x_offset, y_offset, width, height);
m_treeviewcolumn_button->set_sizing(Gtk::TREE_VIEW_COLUMN_FIXED); //Need by fixed-height mode.
diff --git a/glom/utility_widgets/db_adddel/glom_db_treemodel.cc b/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
index 75ca1f8..d825de0 100644
--- a/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
+++ b/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
@@ -541,19 +541,19 @@ bool DbTreeModel::refresh_from_database(const FoundSet& found_set)
catch(const Glib::Exception& ex)
{
std::cerr << "DbTreeModel::refresh_from_database(): Glib::Exception caught." << std::endl;
- m_gda_datamodel.clear(); //So that it is 0, so we can handle it below.
+ m_gda_datamodel.reset(); //So that it is 0, so we can handle it below.
}
catch(const std::exception& ex)
{
std::cerr << "DbTreeModel::refresh_from_database(): std::exception caught." << std::endl;
- m_gda_datamodel.clear(); //So that it is 0, so we can handle it below.
+ m_gda_datamodel.reset(); //So that it is 0, so we can handle it below.
}
#else
std::auto_ptr<Glib::Error> error;
m_gda_datamodel = m_connection->get_gda_connection()->statement_execute_select(stmt, set, error);
if(error.get())
{
- m_gda_datamodel.clear(); //So that it is 0, so we can handle it below.
+ m_gda_datamodel.reset(); //So that it is 0, so we can handle it below.
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
diff --git a/glom/utility_widgets/flowtable.cc b/glom/utility_widgets/flowtable.cc
index 63d9455..9b788b2 100644
--- a/glom/utility_widgets/flowtable.cc
+++ b/glom/utility_widgets/flowtable.cc
@@ -1095,8 +1095,8 @@ void FlowTable::on_realize()
void FlowTable::on_unrealize()
{
- m_refGdkWindow.clear();
- m_refGC.clear();
+ m_refGdkWindow.reset();
+ m_refGC.reset();
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
Gtk::Container::on_unrealize();
diff --git a/glom/utility_widgets/flowtable_dnd.h b/glom/utility_widgets/flowtable_dnd.h
index 250864e..96d018d 100644
--- a/glom/utility_widgets/flowtable_dnd.h
+++ b/glom/utility_widgets/flowtable_dnd.h
@@ -71,9 +71,9 @@ private:
virtual void on_dnd_add_layout_item_image(LayoutWidgetBase* above) = 0;
virtual void on_dnd_add_layout_notebook(LayoutWidgetBase* above) = 0;
virtual void on_dnd_add_layout_portal(LayoutWidgetBase* above) = 0;
- virtual void on_dnd_add_layout_item(LayoutWidgetBase* above,
- sharedptr<LayoutItem>& item) = 0;
-
+ virtual void on_dnd_add_layout_item(LayoutWidgetBase* above, sharedptr<LayoutItem>& item) = 0;
+
+
virtual void on_dnd_add_placeholder(LayoutWidgetBase* above) = 0;
virtual void on_dnd_remove_placeholder() = 0;
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 384a7f9..1cb0700 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -471,7 +471,7 @@ void ImageGlom::on_clipboard_clear()
if(m_read_only)
return;
- m_pixbuf_clipboard.clear();
+ m_pixbuf_clipboard.reset();
}
void ImageGlom::on_menupopup_activate_copy()
@@ -482,7 +482,7 @@ void ImageGlom::on_menupopup_activate_copy()
m_pixbuf_clipboard = m_pixbuf_original->copy(); //TODO: Get it from the DB, when we stop storing the original here instead of just the preview.
}
else
- m_pixbuf_clipboard.clear();
+ m_pixbuf_clipboard.reset();
Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
@@ -530,7 +530,7 @@ void ImageGlom::on_menupopup_activate_clear()
if(m_read_only)
return;
- m_pixbuf_original.clear();
+ m_pixbuf_original.reset();
m_image.set(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_DIALOG);
signal_edited().emit();
}
diff --git a/glom/utility_widgets/placeholder-glom.cc b/glom/utility_widgets/placeholder-glom.cc
index 1d28021..32579fa 100644
--- a/glom/utility_widgets/placeholder-glom.cc
+++ b/glom/utility_widgets/placeholder-glom.cc
@@ -125,7 +125,7 @@ void PlaceholderGlom::on_realize()
void PlaceholderGlom::on_unrealize()
{
- m_refGdkWindow.clear();
+ m_refGdkWindow.reset();
Gtk::Widget::on_unrealize();
}
@@ -134,7 +134,6 @@ bool PlaceholderGlom::on_expose_event(GdkEventExpose* event)
{
if(m_refGdkWindow)
{
-
Cairo::RefPtr<Cairo::Context> cr = m_refGdkWindow->create_cairo_context();
if(event)
{
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 57ef267..c7e8302 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -21,7 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SHELL = /bin/sh
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
