merged trunk

(bzr r14059.1.21)

7 files changed, 35 insertions, 13 deletions

diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index c381ed755..b04e8ecc1 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -1672,10 +1672,10 @@ void DocumentProperties::onDocUnitChange()
 
 
     Inkscape::XML::Node *repr = getDesktop()->getNamedView()->getRepr();
-    Inkscape::Util::Unit const *old_doc_unit = unit_table.getUnit("px");
+    /*Inkscape::Util::Unit const *old_doc_unit = unit_table.getUnit("px");
     if(repr->attribute("inkscape:document-units")) {
         old_doc_unit = unit_table.getUnit(repr->attribute("inkscape:document-units"));
-    }
+    }*/
     Inkscape::Util::Unit const *doc_unit = _rum_deflt.getUnit();
 
     // Set document unit
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index f81519ed1..1ff9e4a1b 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -8,6 +8,7 @@
  *   Felipe C. da S. Sanches <juca@members.fsf.org>
  *   Jon A. Cruz <jon@joncruz.org>
  *   Abhishek Sharma
+ *   insaner
  *
  * Copyright (C) 2007 Authors
  *
@@ -1360,8 +1361,15 @@ FilterEffectsDialog::FilterModifier::FilterModifier(FilterEffectsDialog& d)
     ((Gtk::CellRendererText*)_list.get_column(1)->get_first_cell())->
         signal_edited().connect(sigc::mem_fun(*this, &FilterEffectsDialog::FilterModifier::on_name_edited));
 
+    _list.append_column("#", _columns.count);
+    _list.get_column(2)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
+    _list.get_column(2)->set_expand(false);
+
     sw->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
     _list.get_column(1)->set_resizable(true);
+    _list.get_column(1)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE);
+    _list.get_column(1)->set_expand(true);
+    
     _list.set_reorderable(true);
     _list.enable_model_drag_dest (Gdk::ACTION_MOVE);
 
@@ -1494,6 +1502,7 @@ void FilterEffectsDialog::FilterModifier::update_selection(Selection *sel)
             (*iter)[_columns.sel] = 0;
         }
     }
+    update_counts();
 }
 
 void FilterEffectsDialog::FilterModifier::on_filter_selection_changed()
@@ -1565,6 +1574,15 @@ void FilterEffectsDialog::FilterModifier::on_selection_toggled(const Glib::ustri
     }
 }
 
+
+void FilterEffectsDialog::FilterModifier::update_counts()
+{    
+    for(Gtk::TreeModel::iterator i = _model->children().begin(); i != _model->children().end(); ++i) {
+        SPFilter* f = SP_FILTER((*i)[_columns.filter]);
+        (*i)[_columns.count] = f->getRefCount();
+        }
+}
+
 /* Add all filters in the document to the combobox.
    Keeps the same selection if possible, otherwise selects the first element */
 void FilterEffectsDialog::FilterModifier::update_filters()
@@ -2419,7 +2437,7 @@ bool FilterEffectsDialog::PrimitiveList::on_motion_notify_event(GdkEventMotion*
     get_visible_rect(vis);
     int vis_x, vis_y;
     
-    int vis_x2, vis_y2;  // NOTE:  insaner added -- necessary to get the scrolling while dragging to work
+    int vis_x2, vis_y2;
     convert_widget_to_tree_coords(vis.get_x(), vis.get_y(), vis_x2, vis_y2);
     
     convert_tree_to_widget_coords(vis.get_x(), vis.get_y(), vis_x, vis_y);
@@ -2439,7 +2457,6 @@ bool FilterEffectsDialog::PrimitiveList::on_motion_notify_event(GdkEventMotion*
     else
         _autoscroll_y = 0;
 
-	    // NOTE:  insaner added -- necessary to get the scrolling while dragging to work
     double e2 = ( e->x - vis_x2/2);
     // horizontal scrolling 
     if(e2 < vis_x)
@@ -2752,20 +2769,22 @@ FilterEffectsDialog::FilterEffectsDialog()
     Gtk::ScrolledWindow* sw_infobox = Gtk::manage(new Gtk::ScrolledWindow);
     Gtk::HBox* infobox = Gtk::manage(new Gtk::HBox(/*homogeneous:*/false, /*spacing:*/4));
     Gtk::HBox* hb_prims = Gtk::manage(new Gtk::HBox);
+    Gtk::VBox* vb_prims = Gtk::manage(new Gtk::VBox);
 
     _getContents()->add(*hpaned);
     hpaned->pack1(_filter_modifier);
     hpaned->pack2(_primitive_box);
     _primitive_box.pack_start(*sw_prims);
-    _primitive_box.pack_start(*hb_prims, false, false);
     _primitive_box.pack_start(*sw_infobox, false, false);
     sw_prims->add(_primitive_list);
-    sw_infobox->add(*infobox);
+    sw_infobox->add(*vb_prims);
     infobox->pack_start(_infobox_icon, false, false);
     infobox->pack_start(_infobox_desc, false, false);
     _infobox_desc.set_line_wrap(true);
-    _infobox_desc.set_size_request(200, -1);
+    _infobox_desc.set_size_request(250, -1);
 
+    vb_prims->pack_start(*hb_prims);
+    vb_prims->pack_start(*infobox);
 
     hb_prims->pack_start(_add_primitive, false, false);
     hb_prims->pack_start(_add_primitive_type, false, false);
@@ -2781,7 +2800,7 @@ FilterEffectsDialog::FilterEffectsDialog()
     _add_primitive_type.signal_changed().connect(
         sigc::mem_fun(*this, &FilterEffectsDialog::update_primitive_infobox));
 
-    sw_prims->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);  /* NOTE: insaner -- SCROLL the connections panel thing!!! */
+    sw_prims->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
     sw_prims->set_shadow_type(Gtk::SHADOW_IN);
     sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
     
diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h
index 3fc19e7de..a067cd70c 100644
--- a/src/ui/dialog/filter-effects-dialog.h
+++ b/src/ui/dialog/filter-effects-dialog.h
@@ -4,6 +4,7 @@
 /* Authors:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
  *   Rodrigo Kumpera <kumpera@gmail.com>
+ *   insaner
  *
  * Copyright (C) 2007 Authors
  *
@@ -69,11 +70,13 @@ private:
                 add(filter);
                 add(label);
                 add(sel);
+                add(count);
             }
 
             Gtk::TreeModelColumn<SPFilter*> filter;
             Gtk::TreeModelColumn<Glib::ustring> label;
             Gtk::TreeModelColumn<int> sel;
+            Gtk::TreeModelColumn<int> count;
         };
 
         void setTargetDesktop(SPDesktop *desktop);
@@ -89,6 +92,7 @@ private:
         bool on_filter_move(const Glib::RefPtr<Gdk::DragContext>& /*context*/, int x, int y, guint /*time*/);
         void on_selection_toggled(const Glib::ustring&);
 
+        void update_counts();
         void update_filters();
         void filter_list_button_release(GdkEventButton*);
         void add_filter();
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 740acd989..55ef0c5bb 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -112,7 +112,7 @@ bool FloatingBehavior::_trans_timer (void) {
     }
 
     float goal, current;
-    goal = current = _d->get_opacity();
+    current = _d->get_opacity();
 
     if (_dialog_active.get_value()) {
         goal = _trans_focus;
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 4465d73a9..c44f66a4d 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -170,7 +170,6 @@ void GridArrangeTab::arrange()
 
     Inkscape::Selection *selection = desktop->getSelection();
     const std::vector<SPItem*> items = selection ? selection->itemList() : std::vector<SPItem*>();
-    cnt=0;
     for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
         SPItem *item = *i;
         Geom::OptRect b = item->documentVisualBounds();
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 7dc55c95c..77f120e1a 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -312,7 +312,7 @@ void IconPreviewPanel::setDesktop( SPDesktop* desktop )
         if ( this->desktop ) {
             docReplacedConn = this->desktop->connectDocumentReplaced(sigc::hide<0>(sigc::mem_fun(this, &IconPreviewPanel::setDocument)));
             if ( this->desktop->selection && Inkscape::Preferences::get()->getBool("/iconpreview/autoRefresh", true) ) {
-                selChangedConn = desktop->selection->connectChanged(sigc::hide(sigc::mem_fun(this, &IconPreviewPanel::queueRefresh)));
+                selChangedConn = this->desktop->selection->connectChanged(sigc::hide(sigc::mem_fun(this, &IconPreviewPanel::queueRefresh)));
             }
         }
     }
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index dfe211e94..fc21a30d4 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -467,14 +467,14 @@ void ObjectProperties::_labelChanged()
     gchar *id = g_strdup(_entry_id.get_text().c_str());
     g_strcanon(id, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.:", '_');
     if (strcmp(id, item->getId()) == 0) {
-        _label_id.set_markup_with_mnemonic(_("_ID:"));
+        _label_id.set_markup_with_mnemonic(_("_ID:") + Glib::ustring(" "));
     } else if (!*id || !isalnum (*id)) {
         _label_id.set_text(_("Id invalid! "));
     } else if (SP_ACTIVE_DOCUMENT->getObjectById(id) != NULL) {
         _label_id.set_text(_("Id exists! "));
     } else {
         SPException ex;
-        _label_id.set_markup_with_mnemonic(_("_ID:"));
+        _label_id.set_markup_with_mnemonic(_("_ID:") + Glib::ustring(" "));
         SP_EXCEPTION_INIT(&ex);
         item->setAttribute("id", id, &ex);
         DocumentUndo::done(SP_ACTIVE_DOCUMENT, SP_VERB_DIALOG_ITEM, _("Set object ID"));