glom r1486 - in trunk: . glom/mode_data glom/utility_widgets
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: glom r1486 - in trunk: . glom/mode_data glom/utility_widgets
- Date: Sun, 30 Mar 2008 12:29:20 +0100 (BST)
Author: jhs
Date: Sun Mar 30 12:29:20 2008
New Revision: 1486
URL: http://svn.gnome.org/viewvc/glom?rev=1486&view=rev
Log:
2008-03-30 Johannes Schmid <johannes schmid openismus com>
* glom/mode_data/flowtablewithfields.cc:
* glom/utility_widgets/flowtable.cc:
* glom/utility_widgets/labelglom.cc:
Fixed dropping on LabelGlom which was broken due to the EventBox
Modified:
trunk/ChangeLog
trunk/glom/mode_data/flowtablewithfields.cc
trunk/glom/utility_widgets/flowtable.cc
trunk/glom/utility_widgets/labelglom.cc
Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc (original)
+++ trunk/glom/mode_data/flowtablewithfields.cc Sun Mar 30 12:29:20 2008
@@ -545,7 +545,8 @@
title_label->set_layout_item (layoutitem_text, table_name);
title_label->show();
alignment_title->add(*title_label);
-
+ add_layoutwidgetbase (title_label, add_before);
+
Gtk::Widget* widget = dynamic_cast<Gtk::Widget*>(*add_before);
if (widget)
insert_before (*alignment_title, *alignment_label, *widget, false /* expand */);
@@ -576,9 +577,9 @@
m_list_layoutwidgets.insert(add_before, preview);
Gtk::Widget* widget = dynamic_cast<Gtk::Widget*>(*add_before);
if (widget)
- insert_before(*m_placeholder, *widget, true /* expand */);
+ insert_before(*m_placeholder, *widget, false /* expand */);
else
- add(*m_placeholder, true);
+ add(*m_placeholder, false);
}
void FlowTableWithFields::add_imageobject_at_position(const sharedptr<LayoutItem_Image>& layoutitem_image, const Glib::ustring& table_name , const type_list_layoutwidgets::iterator& add_before)
@@ -1194,7 +1195,8 @@
{
// create the text label
sharedptr<LayoutItem_Text> textobject = sharedptr<LayoutItem_Text>::create();
- textobject->set_title(_("Texttitle")); //Give the button a default title, so it is big enough, and so people see that they should change it.
+ textobject->set_name(_("text"));
+ textobject->set_text(_("New Text"));
sharedptr<LayoutItem> layout_item = sharedptr<LayoutItem>::cast_dynamic(textobject);
dnd_add_to_layout_group (layout_item, above);
Modified: trunk/glom/utility_widgets/flowtable.cc
==============================================================================
--- trunk/glom/utility_widgets/flowtable.cc (original)
+++ trunk/glom/utility_widgets/flowtable.cc Sun Mar 30 12:29:20 2008
@@ -264,7 +264,7 @@
m_expand_second(false)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- //flowtable->setup_dnd (*m_first);
+ flowtable->setup_dnd (*m_first);
#endif /* GLOM_ENABLE_CLIENT_ONLY */
}
@@ -275,7 +275,7 @@
m_expand_second(false)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- //flowtable->setup_dnd (*m_first);
+ flowtable->setup_dnd (*m_first);
flowtable->setup_dnd (*m_second);
#endif /* GLOM_ENABLE_CLIENT_ONLY */
}
@@ -438,8 +438,7 @@
// Call this method recursive for all (real) children
Gtk::Container* container = dynamic_cast<Gtk::Container*>(&child);
- Gtk::TextView* text_view = dynamic_cast<Gtk::TextView*>(&child);
- if (container && !text_view)
+ if (container)
{
typedef Glib::ListHandle<Gtk::Widget*>::const_iterator CI;
Glib::ListHandle<Gtk::Widget*> children = container->get_children();
@@ -448,7 +447,6 @@
{
setup_dnd (*(*cur_child));
}
- return;
}
if (!(child.get_flags() & Gtk::NO_WINDOW))
{
Modified: trunk/glom/utility_widgets/labelglom.cc
==============================================================================
--- trunk/glom/utility_widgets/labelglom.cc (original)
+++ trunk/glom/utility_widgets/labelglom.cc Sun Mar 30 12:29:20 2008
@@ -56,7 +56,8 @@
{
add(m_label);
m_label.show();
- set_events (Gdk::BUTTON_PRESS_MASK);
+ set_events (Gdk::ALL_EVENTS_MASK);
+ set_above_child();
m_refUtilDetails->set_visible(false);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]