glom r1530 - in trunk: . glom/utility_widgets

[jhs svn gnome org]

Author: jhs
Date: Mon Apr  7 16:50:39 2008
New Revision: 1530
URL: http://svn.gnome.org/viewvc/glom?rev=1530&view=rev

Log:
2008-04-07  Johannes Schmid  <johannes schmid openismus com>

	* glom/utility_widgets/flowtable.cc:
	Really comitted last change (was in conflict)

Modified:
   trunk/ChangeLog
   trunk/glom/utility_widgets/flowtable.cc

Modified: trunk/glom/utility_widgets/flowtable.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable.cc	(original)
+++ trunk/glom/utility_widgets/flowtable.cc	Mon Apr  7 16:50:39 2008
@@ -19,14 +19,7 @@
  */
  
 #include "flowtable.h"
-#include "dragbutton.h"
-#include "entryglom.h"
-#include "labelglom.h"
-#include "buttonglom.h"
-#include "imageglom.h"
 #include "layoutwidgetbase.h"
-#include "placeholder-glom.h"
-#include "eggtoolpalette/eggtoolpalette.h"
 #include <gtk/gtkwidget.h>
 #include <gdk/gdktypes.h>
 #include <iostream>
@@ -290,11 +283,6 @@
   // rather annoying, though I don't see another possibility at the moment. armin.
   Glib::ObjectBase("Glom_FlowTable"),
 #endif // !defined(GLIBMM_VFUNCS_ENABLED) || !defined(GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED)
-
-#ifndef GLOM_ENABLE_CLIENT_ONLY
-  m_current_dnd_item(0),
-  m_dnd_in_progress(false),
-#endif // !GLOM_ENABLE_CLIENT_ONLY
   m_columns_count(1),
   m_padding(0),
   m_design_mode(false)
@@ -331,10 +319,6 @@
 
   set_flags(Gtk::NO_WINDOW);
   set_redraw_on_allocate(false);
-  std::list<Gtk::TargetEntry> drag_targets;
-  Gtk::TargetEntry drag_target(egg_tool_palette_get_drag_target_item());
-  drag_targets.push_back(drag_target);
-  drag_dest_set(drag_targets);
 }
 
 FlowTable::~FlowTable()
@@ -432,44 +416,7 @@
 
 void FlowTable::setup_dnd (Gtk::Widget& child)
 {
-  if (dynamic_cast<PlaceholderGlom*>(&child) ||
-      dynamic_cast<FlowTable*>(&child))
-    return;
-  
-  // Call this method recursive for all (real) children
-  Gtk::Container* container = dynamic_cast<Gtk::Container*>(&child);
-  if (container)
-  {
-    typedef Glib::ListHandle<Gtk::Widget*>::const_iterator CI;
-    Glib::ListHandle<Gtk::Widget*> children = container->get_children();
-    for (CI cur_child = children.begin(); cur_child != children.end();
-         ++cur_child)
-    {
-      setup_dnd (*(*cur_child));
-    }
-  }
-  if (!(child.get_flags() & Gtk::NO_WINDOW))
-  {
-    std::list<Gtk::TargetEntry> new_targets;
-    new_targets.push_back(Gtk::TargetEntry(egg_tool_palette_get_drag_target_item()));
-    Glib::RefPtr<Gtk::TargetList> targets =
-      child.drag_dest_get_target_list ();
-    // The widget has already a default drag destination - add more targets
-    if (targets)
-    {
-      targets->add (new_targets);
-      child.drag_dest_set_target_list (targets);
-    }
-    else
-      child.drag_dest_set(new_targets, Gtk::DEST_DEFAULT_ALL,
-                          Gdk::ACTION_COPY | Gdk::ACTION_MOVE);
-              
-    // It's important to connect this one BEFORE
-    child.signal_drag_motion().connect (sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTable::on_child_drag_motion), &child),
-                                        false);
-    child.signal_drag_data_received().connect (sigc::bind<Gtk::Widget*>(sigc::mem_fun (*this, &FlowTable::on_child_drag_data_received), &child));
-    child.signal_drag_leave().connect (sigc::mem_fun (*this, &FlowTable::on_child_drag_leave));
-  }
+  // override this when you need drag and drop support
 }
 
 void FlowTable::set_columns_count(guint value)
@@ -1145,238 +1092,6 @@
 #endif
 }
 
-#ifndef GLOM_ENABLE_CLIENT_ONLY
-bool FlowTable::on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y, guint time)
-{
-  // The drag position is relativ to the toplevel GdkWindow and not to
-  // the widget position. We fix this here to match the widget position
-  x += get_allocation().get_x();
-  y += get_allocation().get_y();
-  
-  m_current_dnd_item = dnd_get_item(x, y);  
-  LayoutWidgetBase* above = dnd_find_datawidget();
-  
-  // above might be 0 here...
-  on_dnd_add_placeholder(above);
-  change_dnd_status(true);
-  return false;
-}
-
-void FlowTable::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& drag_context, int drag_x, int drag_y, const Gtk::SelectionData& selection_data, guint, guint time)
-{
-  Gtk::Widget* palette = drag_get_source_widget (drag_context);
-  while (palette && !EGG_IS_TOOL_PALETTE (palette->gobj()))
-    palette = palette->get_parent();
-  if (palette)
-  {
-    GtkWidget* tool_item = egg_tool_palette_get_drag_item (EGG_TOOL_PALETTE (palette->gobj()), selection_data.gobj());
-    LayoutWidgetBase::enumType type = 
-      static_cast<LayoutWidgetBase::enumType>(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tool_item), "glom-type")));
-    on_dnd_remove_placeholder();
-    LayoutWidgetBase* above = dnd_find_datawidget ();
-    switch (type)
-    {
-      case LayoutWidgetBase::TYPE_FIELD:
-        on_dnd_add_layout_item_field(above);
-        break;
-      case LayoutWidgetBase::TYPE_BUTTON:
-        on_dnd_add_layout_item_button(above);
-        break;
-      case LayoutWidgetBase::TYPE_TEXT:
-        on_dnd_add_layout_item_text(above);
-        break;
-      case LayoutWidgetBase::TYPE_GROUP:
-        on_dnd_add_layout_group(above);
-        break;
-      case LayoutWidgetBase::TYPE_NOTEBOOK:
-        on_dnd_add_layout_notebook(above);
-        break;
-      default:
-        std::cerr << "Unknown drop type: " << type << std::endl;
-    }
-  }
-  change_dnd_status(false);
-}
-
-void FlowTable::on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& drag_context, guint time)
-{
-  dnd_remove_placeholder_idle();
-  change_dnd_status(false);
-}
-
-// Calculate the nearest FlowTableItem below the current drag position
-FlowTable::FlowTableItem*
-FlowTable::dnd_get_item(int drag_x, int drag_y)
-{ 
-  int column_width;
-  get_column_height (0, m_children.size(), column_width);
-  int column = 0;
-  
-  if (column_width != 0)
-    column = drag_x / column_width;
-  
-  for (std::vector<FlowTableItem>::iterator cur_item = m_children.begin(); cur_item != m_children.end(); 
-       cur_item++)
-  {
-    Gdk::Rectangle rect = cur_item->m_first->get_allocation();
-    if (cur_item->m_second)
-    {
-      Gdk::Rectangle second_rect = cur_item->m_second->get_allocation();
-      rect.set_height (MAX (rect.get_height(), second_rect.get_height()));
-      rect.set_width (rect.get_width() + m_padding + second_rect.get_width());
-    }
-    
-    int cur_column = rect.get_x() / column_width;
-    
-    if (cur_column != column)
-    {
-      continue;  
-    }
-    
-    // Allow dragging at the end
-    if (cur_item == --m_children.end())
-    {
-      if (drag_y > (rect.get_y() + rect.get_height() / 2) &&
-          drag_y < (rect.get_y() + rect.get_height()))
-      {
-        return 0;
-      }
-    }
-    
-    if (drag_y < (rect.get_y() + rect.get_height()))
-    {
-      return &(*cur_item);
-    }
-  }
-  
-  return 0;
-}
-
-void FlowTable::change_dnd_status(bool active)
-{
-  m_dnd_in_progress = active;
-}
-
-LayoutWidgetBase* FlowTable::dnd_find_datawidget()
-{
-  // Test if we have a datawidget below which we want to add
-  LayoutWidgetBase* above = 0;
-  if(m_current_dnd_item)
-  {
-    if(m_current_dnd_item->m_first)
-    {
-      Gtk::Alignment* alignment = dynamic_cast <Gtk::Alignment*>(m_current_dnd_item->m_first);
-      if (alignment)
-      {
-        above = dynamic_cast<LayoutWidgetBase*>(alignment->get_child());
-      }
-    }
-    if(!above && m_current_dnd_item->m_first)
-      above = dynamic_cast<LayoutWidgetBase*>(m_current_dnd_item->m_first);
-    if(!above && m_current_dnd_item->m_second)
-    {
-      above = dynamic_cast<LayoutWidgetBase*>(m_current_dnd_item->m_second);
-      // Special case for labels
-      if (!above)
-      {       
-        Gtk::Alignment* alignment = dynamic_cast <Gtk::Alignment*>(m_current_dnd_item->m_second);
-        if (alignment)
-        {
-          above = dynamic_cast<LayoutWidgetBase*>(alignment->get_child());
-        }
-      } 
-    }
-  }
-  return above;
-}
-
-bool FlowTable::on_child_drag_motion(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y, guint time,
-                                     Gtk::Widget* child)
-{
-  type_vecChildren::iterator cur_child;
-  for (cur_child = m_children.begin(); cur_child != m_children.end(); cur_child++)
-  {
-    // The widget was added directly to the FlowTable
-    if (cur_child->m_first == child || 
-        cur_child->m_second == child)
-    {
-      break;
-    }
-    // The parent of the widget was added to the FlowTable
-    else if (cur_child->m_first == child->get_parent() ||
-             cur_child->m_second == child->get_parent())
-    {
-      break;
-    }
-    Gtk::Bin* bin = dynamic_cast<Gtk::Bin*>(cur_child->m_second);
-    // The widget was added inside a Gtk::EventBox
-    if (bin)
-    {
-      if (bin->get_child() == child ||
-          bin->get_child() == child->get_parent())
-        break;
-    }
-  }
-  if (cur_child != m_children.end())
-    m_current_dnd_item = &(*cur_child);
-  else
-    m_current_dnd_item = 0;
-  
-  // Allow dragging at-the-end
-  if (cur_child == --m_children.end())
-  {
-    Gdk::Rectangle rect = child->get_allocation();
-    if (y > (rect.get_y() + rect.get_height() / 2) &&
-        y < (rect.get_y() + rect.get_height()))
-    {
-        m_current_dnd_item = 0; // means end
-    }
-  }
-  on_dnd_remove_placeholder ();
-  
-  LayoutWidgetBase* above = dnd_find_datawidget();
-  
-  // above might be 0 here...
-  on_dnd_add_placeholder(above);
-  change_dnd_status(true);
-  return false;
-}
-
-void FlowTable::on_child_drag_leave(const Glib::RefPtr<Gdk::DragContext>& drag_context, guint time)
-{
-  dnd_remove_placeholder_idle();
-}
-
-void FlowTable::on_child_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y, 
-                                            const Gtk::SelectionData& selection_data, guint info, guint time,
-                                            Gtk::Widget* child)
-{
-  on_drag_data_received (drag_context, x, y, selection_data, info, time);
-}
-
-/* This is a hack. The problem is that when you move the mouse down to the last
- item, the item gets the "drag-motion" signal but in the same moment, the placeholder
- is removed and the mouse pointer is no longer over the widget. Thus, it gets
- a "drag-leave" signal and it's impossible to drop an item at the end. Doing 
- the removal of the placeholder in an idle handler fixes it. */
-
-void FlowTable::dnd_remove_placeholder_idle()
-{
-  static sigc::connection connection;
-  if (connection)
-    connection.disconnect();
-  Glib::signal_idle().connect( sigc::mem_fun(*this, &FlowTable::dnd_remove_placeholder_real) );
-}
-
-bool FlowTable::dnd_remove_placeholder_real()
-{
-  on_dnd_remove_placeholder();
-  queue_draw();
-  return false; // remove from idle source
-}
-
-#endif // !GLOM_ENABLE_CLIENT_ONLY
-
 } //namespace Glom