Connector tool: make connectors avoid the convex hull of shapes.

(bzr r8857.1.2)

15 files changed, 278 insertions, 83 deletions

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index fd1b07394..fac5bad80 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -71,6 +71,8 @@ ink_common_sources +=		\
 	ui/dialog/panel-dialog.h		\
 	ui/dialog/print.cpp			\
 	ui/dialog/print.h			\
+	ui/dialog/print-colors-preview-dialog.cpp		\
+	ui/dialog/print-colors-preview-dialog.h		\
 	ui/dialog/scriptdialog.cpp		\
 	ui/dialog/scriptdialog.h		\
 	ui/dialog/spray-option.cpp		\
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 7f853bedc..2116d46c3 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -41,6 +41,7 @@
 #include "ui/dialog/floating-behavior.h"
 #include "ui/dialog/dock-behavior.h"
 #include "ui/dialog/spray-option.h"
+#include "ui/dialog/print-colors-preview-dialog.h"
 #include "preferences.h"
 
 #ifdef ENABLE_SVG_FONTS
@@ -102,6 +103,7 @@ DialogManager::DialogManager() {
         registerFactory("LivePathEffect",      &create<LivePathEffectEditor, FloatingBehavior>);
         registerFactory("Memory",              &create<Memory,               FloatingBehavior>);
         registerFactory("Messages",            &create<Messages,             FloatingBehavior>);
+        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       FloatingBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         FloatingBehavior>);
 #ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       FloatingBehavior>);
@@ -129,6 +131,7 @@ DialogManager::DialogManager() {
         registerFactory("LivePathEffect",      &create<LivePathEffectEditor, DockBehavior>);
         registerFactory("Memory",              &create<Memory,               DockBehavior>);
         registerFactory("Messages",            &create<Messages,             DockBehavior>);
+        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         DockBehavior>);
 #ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 7e31b874a..982fb3415 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -414,7 +414,8 @@ static void sanitizeName( Glib::ustring& str )
     }
 }
 
-void DocumentProperties::linkSelectedProfile()
+void
+DocumentProperties::linkSelectedProfile()
 {
 //store this profile in the SVG document (create <color-profile> element in the XML)
     // TODO remove use of 'active' desktop
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index c7f505046..1345ffe55 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -4,7 +4,7 @@
 /* Authors:
  *   Nicholas Bishop <nicholasbishop@gmail.org>
  *   Rodrigo Kumpera <kumpera@gmail.com>
- *   Felipe C. da S. Sanches <felipe.sanches@gmail.com>
+ *   Felipe C. da S. Sanches <juca@members.fsf.org>
  *
  * Copyright (C) 2007 Authors
  *
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index b217f8695..90516063c 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -741,6 +741,11 @@ void InkscapePreferences::initPageFilters()
     _page_filters.add_line(true, "", _show_filters_info_box, "",
                         _("Show icons and descriptions for the filter primitives available at the filter effects dialog."));
 
+    /* threaded blur */ //related comments/widgets/functions should be renamed and option should be moved elsewhere when inkscape is fully multi-threaded
+    _filter_multi_threaded.init("/options/threading/numthreads", 1.0, 8.0, 1.0, 2.0, 4.0, true, false);
+    _page_filters.add_line( false, _("Number of Threads:"), _filter_multi_threaded, _("(requires restart)"),
+                           _("Configure number of processors/threads to use with rendering of gaussian blur."), false);
+
     this->AddPage(_page_filters, _("Filters"), PREFS_PAGE_FILTERS);
 }
 
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 705e7a352..16e62df59 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -171,6 +171,7 @@ protected:
     PrefRadioButton _blur_quality_best, _blur_quality_better, _blur_quality_normal, _blur_quality_worse, _blur_quality_worst;
     PrefRadioButton _filter_quality_best, _filter_quality_better, _filter_quality_normal, _filter_quality_worse, _filter_quality_worst;
     PrefCheckButton _show_filters_info_box;
+    PrefSpinButton  _filter_multi_threaded;
 
     PrefCheckButton _trans_scale_stroke, _trans_scale_corner, _trans_gradient,_trans_pattern;
     PrefRadioButton _trans_optimized, _trans_preserved;
diff --git a/src/ui/dialog/print-colors-preview-dialog.cpp b/src/ui/dialog/print-colors-preview-dialog.cpp
new file mode 100644
index 000000000..f4d83c271
--- /dev/null
+++ b/src/ui/dialog/print-colors-preview-dialog.cpp
@@ -0,0 +1,100 @@
+/** @file
+ * @brief Print Colors Preview dialog - implementation
+ */
+/* Authors:
+ *   Felipe C. da S. Sanches <juca@members.fsf.org>
+ *
+ * Copyright (C) 2009 Authors
+ * Released under GNU GPLv2 (or later).  Read the file 'COPYING' for more information.
+ */
+
+#include "desktop.h"
+#include "print-colors-preview-dialog.h"
+#include "preferences.h"
+#include <glibmm/i18n.h>
+
+namespace Inkscape {
+namespace UI {
+namespace Dialog {
+
+//Yes, I know we shouldn't hardcode CMYK. This class needs to be refactored
+// in order to accomodate spot colors and color components defined using 
+// ICC colors. --Juca
+
+void PrintColorsPreviewDialog::toggle_cyan(){
+  Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+  prefs->setBool("/options/printcolorspreview/cyan", cyan->get_active());
+
+  SPDesktop *desktop = getDesktop();
+  desktop->setDisplayModePrintColorsPreview();
+}
+
+void PrintColorsPreviewDialog::toggle_magenta(){
+  Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+  prefs->setBool("/options/printcolorspreview/magenta", magenta->get_active());
+
+  SPDesktop *desktop = getDesktop();
+  desktop->setDisplayModePrintColorsPreview();
+}
+
+void PrintColorsPreviewDialog::toggle_yellow(){
+  Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+  prefs->setBool("/options/printcolorspreview/yellow", yellow->get_active());
+
+  SPDesktop *desktop = getDesktop();
+  desktop->setDisplayModePrintColorsPreview();
+}
+
+void PrintColorsPreviewDialog::toggle_black(){
+  Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+  prefs->setBool("/options/printcolorspreview/black", black->get_active());
+
+  SPDesktop *desktop = getDesktop();
+  desktop->setDisplayModePrintColorsPreview();
+}
+
+PrintColorsPreviewDialog::PrintColorsPreviewDialog()
+ : UI::Widget::Panel("", "/dialogs/printcolorspreview", SP_VERB_DIALOG_PRINT_COLORS_PREVIEW)
+{
+    Gtk::VBox* vbox = Gtk::manage(new Gtk::VBox());
+
+    cyan = new Gtk::ToggleButton(_("Cyan"));
+    vbox->pack_start( *cyan, false, false );
+//    tips.set_tip((*cyan), _("Render cyan separation"));
+    cyan->signal_clicked().connect( sigc::mem_fun(*this, &PrintColorsPreviewDialog::toggle_cyan) );
+
+    magenta = new Gtk::ToggleButton(_("Magenta"));
+    vbox->pack_start( *magenta, false, false );
+//    tips.set_tip((*magenta), _("Render magenta separation"));
+    magenta->signal_clicked().connect( sigc::mem_fun(*this, &PrintColorsPreviewDialog::toggle_magenta) );
+
+    yellow = new Gtk::ToggleButton(_("Yellow"));
+    vbox->pack_start( *yellow, false, false );
+//    tips.set_tip((*yellow), _("Render yellow separation"));
+    yellow->signal_clicked().connect( sigc::mem_fun(*this, &PrintColorsPreviewDialog::toggle_yellow) );
+
+    black = new Gtk::ToggleButton(_("Black"));
+    vbox->pack_start( *black, false, false );
+//    tips.set_tip((*black), _("Render black separation"));
+    black->signal_clicked().connect( sigc::mem_fun(*this, &PrintColorsPreviewDialog::toggle_black) );
+
+    gint val;
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    val = prefs->getBool("/options/printcolorspreview/cyan");
+    cyan->set_active( val != 0 );
+    val = prefs->getBool("/options/printcolorspreview/magenta");
+    magenta->set_active( val != 0 );
+    val = prefs->getBool("/options/printcolorspreview/yellow");
+    yellow->set_active( val != 0 );
+    val = prefs->getBool("/options/printcolorspreview/black");
+    black->set_active( val != 0 );
+
+    _getContents()->add(*vbox);
+    _getContents()->show_all();
+}
+
+PrintColorsPreviewDialog::~PrintColorsPreviewDialog(){}
+
+} // namespace Dialog
+} // namespace UI
+} // namespace Inkscape
diff --git a/src/ui/dialog/print-colors-preview-dialog.h b/src/ui/dialog/print-colors-preview-dialog.h
new file mode 100644
index 000000000..246908556
--- /dev/null
+++ b/src/ui/dialog/print-colors-preview-dialog.h
@@ -0,0 +1,48 @@
+/** @file
+ * @brief Print Colors Preview dialog
+ */
+/* Authors:
+ *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
+ *
+ * Copyright (C) 2009 Authors
+ * Released under GNU GPLv2 (or later).  Read the file 'COPYING' for more information.
+ */
+
+#ifndef INKSCAPE_UI_DIALOG_PRINT_COLORS_PREVIEW_H
+#define INKSCAPE_UI_DIALOG_PRINT_COLORS_PREVIEW_H
+
+#include "ui/widget/panel.h"
+#include "verbs.h"
+
+#include <gtkmm.h>
+#include <gtkmm/box.h>
+
+namespace Inkscape {
+namespace UI {
+namespace Dialog {
+
+class PrintColorsPreviewDialog : public UI::Widget::Panel {
+public:
+    PrintColorsPreviewDialog();
+    ~PrintColorsPreviewDialog();
+
+    static PrintColorsPreviewDialog &getInstance()
+    { return *new PrintColorsPreviewDialog(); }
+
+private:
+    void toggle_cyan();
+    void toggle_magenta();
+    void toggle_yellow();
+    void toggle_black();
+
+    Gtk::ToggleButton* cyan;
+    Gtk::ToggleButton* magenta;
+    Gtk::ToggleButton* yellow;
+    Gtk::ToggleButton* black;
+};
+
+} // namespace Dialog
+} // namespace UI
+} // namespace Inkscape
+
+#endif //#ifndef INKSCAPE_UI_PRINT_COLORS_PREVIEW_H
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index f9db265d6..60cab06a2 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -31,11 +31,15 @@
 
 
 
-static void
-draw_page (GtkPrintOperation *operation,
-           GtkPrintContext   *context,
-           gint               /*page_nr*/,
-           gpointer           user_data)
+static void draw_page(
+#ifdef WIN32
+                      GtkPrintOperation *operation,
+#else
+                      GtkPrintOperation *,
+#endif
+                      GtkPrintContext   *context,
+                      gint               /*page_nr*/,
+                      gpointer           user_data)
 {
     struct workaround_gtkmm *junk = (struct workaround_gtkmm*)user_data;
     //printf("%s %d\n",__FUNCTION__, page_nr);
diff --git a/src/ui/dialog/spray-option.cpp b/src/ui/dialog/spray-option.cpp
index 8bfe455fa..a9e037381 100644
--- a/src/ui/dialog/spray-option.cpp
+++ b/src/ui/dialog/spray-option.cpp
@@ -14,11 +14,11 @@
 #include "graphlayout/graphlayout.h"
 #include "inkscape.h"
 #include "macros.h"
-#include "node-context.h" 
+#include "node-context.h"
 #include "preferences.h"
 #include "removeoverlap/removeoverlap.h"
 #include "selection.h"
-#include "shape-editor.h" 
+#include "shape-editor.h"
 #include "sp-flowtext.h"
 #include "sp-item-transform.h"
 #include "sp-text.h"
@@ -43,21 +43,22 @@ namespace Dialog {
 class Action {
 public:
     Action(const Glib::ustring &id,
-           const Glib::ustring &tiptext,
-           guint row, guint column,
+           const Glib::ustring &/*tiptext*/,
+           guint /*row*/,
+           guint /*column*/,
            Gtk::Table &parent,
-           Gtk::Tooltips &tooltips,
+           Gtk::Tooltips &/*tooltips*/,
            SprayOptionClass &dialog):
         _dialog(dialog),
         _id(id),
         _parent(parent) {}
-    
+
     virtual ~Action(){}
     virtual void on_button_click(){}
     SprayOptionClass &_dialog;
-    
+
 private :
-    
+
     Glib::ustring _id;
     Gtk::Table &_parent;
 };
@@ -85,7 +86,7 @@ public:
             dialog._Table().set_col_spacings(3);
 
             double increm = ((double)_max - (double)_min)/10;
-            double val_ini = ((double)_max + (double)_min)/2;            
+            double val_ini = ((double)_max + (double)_min)/2;
             _Gap.set_digits(1);
             _Gap.set_size_request(60, -1);
             _Gap.set_increments(increm , 0);
@@ -102,14 +103,14 @@ public:
 
     virtual void on_button_click(){
         if (!_dialog.getDesktop()) return;
-              
+
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        
+
         prefs->setDouble(_pref_path, SP_VERB_CONTEXT_SPRAY);
-       
+
         double const Gap = _Gap.get_value();
-        
-         
+
+
         prefs->setDouble(_pref_path, Gap);
 
         sp_document_done(sp_desktop_document(_dialog.getDesktop()), SP_VERB_CONTEXT_SPRAY,
@@ -117,7 +118,7 @@ public:
     }
 
 
-};    
+};
 
 class ActionF : public Action {
 private:
@@ -143,7 +144,7 @@ public:
         {
             dialog.F_Table().set_col_spacings(3);
 
-            _Label.set_label(id);            
+            _Label.set_label(id);
 
             _Gap1.set_digits(1);
             _Gap1.set_size_request(60, -1);
@@ -152,7 +153,7 @@ public:
             _Gap1.set_value(1);
             dialog.tooltips().set_tip(_Gap1,
                                   _("Minimum"));
-        
+
             _Label1.set_label(Q_("Min"));
 
             _Gap2.set_digits(1);
@@ -162,11 +163,11 @@ public:
             _Gap2.set_value(1);
             dialog.tooltips().set_tip(_Gap2,
                                   _("Maximum"));
-        
+
             _Label2.set_label(_("Max:"));
-            
+
             _Gap1.signal_changed().connect(sigc::mem_fun(*this, &ActionF::on_button_click));
-            _Gap2.signal_changed().connect(sigc::mem_fun(*this, &ActionF::on_button_click)); 
+            _Gap2.signal_changed().connect(sigc::mem_fun(*this, &ActionF::on_button_click));
 
             dialog.F_Table().attach(_Label, column, column+1, row, row+1, Gtk::FILL, Gtk::FILL);
             dialog.F_Table().attach(_Label1, column+1, column+2, row, row+1, Gtk::FILL, Gtk::FILL);
@@ -178,15 +179,15 @@ public:
 
     virtual void on_button_click(){
         if (!_dialog.getDesktop()) return;
-              
+
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        
+
         prefs->setDouble(_pref1_path, SP_VERB_CONTEXT_SPRAY);
         prefs->setDouble(_pref2_path, SP_VERB_CONTEXT_SPRAY);
-       
+
         double const Gap1 = _Gap1.get_value();
         double const Gap2 = _Gap2.get_value();
-                 
+
         prefs->setDouble(_pref1_path, Gap1);
         prefs->setDouble(_pref2_path, Gap2);
 
@@ -195,21 +196,21 @@ public:
     }
 
 
-};    
+};
 
 
 
 void SprayOptionClass::combo_action() {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     cout<<"combo.get_active_row_number = "<<_combo.get_active_row_number()<<endl;
-        
+
     int const distrib = _combo.get_active_row_number();
-                 
+
     prefs->setInt("/tools/spray/distribution", distrib);
-       
+
 
     sp_document_done(sp_desktop_document(this->getDesktop()), SP_VERB_CONTEXT_SPRAY,
-                         _("Remove overlaps"));    
+                         _("Remove overlaps"));
 
 }
 
@@ -217,11 +218,9 @@ void SprayOptionClass::combo_action() {
 
 
 void SprayOptionClass::action() {
-    int r=1;    
-    for (list<Action *>::iterator it = _actionList.begin();
-         it != _actionList.end();
-         it ++)
+    for (list<Action *>::iterator it = _actionList.begin(); it != _actionList.end(); ++it) {
         (*it)->on_button_click();
+    }
     combo_action();
 }
 
@@ -242,24 +241,41 @@ void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selecti
 
 SprayOptionClass::SprayOptionClass()
     : UI::Widget::Panel ("", "/dialogs/spray", SP_VERB_DIALOG_SPRAY_OPTION),
-      _distributionFrame(_("Distribution")),
-      _Frame(_("Cursor Options")),
-      _FFrame(_("Random Options")),
+      _actionList(),
+      _distributionFrame(Q_("sprayOptions|Distribution")),
+      _Frame(Q_("sprayOptions|Cursor Options")),
+      _FFrame(Q_("sprayOptions|Random Options")),
+      _distributionTable(),
       _gaussianTable(1, 5, false),
       _ETable(3,2,false),
       _FTable(2,5,false),
-      _unifLabel(_("Uniform")),
-      _gaussLabel(_("Gaussian   ")),
-      _anchorLabel(_("Distribution : "))
-      
+      _anchorBox(),
+      _unifBox(),
+      _gaussianBox(),
+      _HBox(),
+      _FHBox(),
+      _BoutonBox(),
+      _distributionBox(),
+      _VBox(),
+      _FVBox(),
+      _ActionBox(),
+      _anchorLabel(Q_("sprayOptions|Distribution:")),
+      _unifLabel(Q_("sprayOptions|Uniform")),
+      _gaussLabel(Q_("sprayOptions|Gaussian")),
+      _Label(),
+      _FLabel(),
+      _unif(),
+      _gauss(),
+      _combo(),
+      _tooltips()
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     //ComboBoxText
 
-    _combo.append_text(_("Uniforme"));
-    _combo.append_text(_("Gaussienne"));
-    
+    _combo.append_text(Q_("sprayOptions|Uniform"));
+    _combo.append_text(Q_("sprayOptions|Gaussian"));
+
     _combo.set_active(prefs->getInt("/tools/spray/distribution", 1));
     _combo.signal_changed().connect(sigc::mem_fun(*this, &SprayOptionClass::combo_action));
 
@@ -274,19 +290,19 @@ SprayOptionClass::SprayOptionClass()
 
 
     //Hbox Random
-    addFButton(_("Scale : ") ,_("Applique un facteur d'échelle"), 0, 0, "/tools/spray/scale_min","/tools/spray/scale_max");
-    addFButton(_("Rotation : ") ,_("Fait tourner"), 1, 0, "/tools/spray/rot_min","/tools/spray/rot_max");
+    addFButton(Q_("sprayOptions|Scale:") ,_("Apply a scale factor"), 0, 0, "/tools/spray/scale_min","/tools/spray/scale_max");
+    addFButton(Q_("sprayOptions|Rotation:") ,_("Apply rotation"), 1, 0, "/tools/spray/rot_min","/tools/spray/rot_max");
     _FHBox.pack_start(_FLabel);
     _FHBox.pack_start(_FTable);
 
     //Implementation dans la Vbox Cursor
     _FVBox.pack_start(_FHBox);
-    _FFrame.add(_FVBox);    
+    _FFrame.add(_FVBox);
 
     //Hbox Cursor
-    addEButton(_("Ratio : ") ,_("Excentricité de l'ellipse"), 0, 0, 0, 1,"/tools/spray/ratio");
-    addEButton(_("Angle : ") ,_("Angle de l'ellipse"), 1, 0, 0, 5,"/tools/spray/tilt");
-    addEButton(_("Width : ") ,_("Taille de l'ellipse"), 2, 0, 0, 1,"/tools/spray/width");
+    addEButton(Q_("sprayOptions|Ratio:") ,_("Eccentricity of the ellipse"), 0, 0, 0, 1,"/tools/spray/ratio");
+    addEButton(Q_("sprayOptions|Angle:") ,_("Angle of the ellipse"), 1, 0, 0, 5,"/tools/spray/tilt");
+    addEButton(Q_("sprayOptions|Width:") ,_("Size of the ellipse"), 2, 0, 0, 1,"/tools/spray/width");
     _HBox.pack_start(_Label);
     _HBox.pack_start(_ETable);
 
@@ -297,26 +313,26 @@ SprayOptionClass::SprayOptionClass()
     Gtk::Box *contents = _getContents();
     contents->set_spacing(4);
 
-    
-    
 
-    
+
+
+
 
     // Crée dans l'ordre suivant les différentes Frames (cadres de réglages)
 
     contents->pack_start(_distributionFrame, true, true);
-    contents->pack_start(_FFrame, true, true);    
+    contents->pack_start(_FFrame, true, true);
     contents->pack_start(_Frame, true, true);
-    
-    
+
+
 
     // Connect to the global selection change, to invalidate cached randomize_bbox
     g_signal_connect (G_OBJECT (INKSCAPE), "change_selection", G_CALLBACK (on_selection_changed), this);
     randomize_bbox = Geom::OptRect();
 
     show_all_children();
-    
-    
+
+
 
 }
 
@@ -342,7 +358,7 @@ void SprayOptionClass::addEButton(const Glib::ustring &id,
                 const Glib::ustring &tiptext,
                 guint row, guint column,
                 guint min, guint max,
-                Glib::ustring const &pref_path) 
+                Glib::ustring const &pref_path)
 {
         _actionList.push_back( new ActionE(id, tiptext,row, column,*this,min ,max, pref_path ));
 }
@@ -351,7 +367,7 @@ void SprayOptionClass::addFButton(const Glib::ustring &id,
                 const Glib::ustring &tiptext,
                 guint row, guint column,
                 Glib::ustring const &pref1_path,
-                Glib::ustring const &pref2_path) 
+                Glib::ustring const &pref2_path)
 {
         _actionList.push_back( new ActionF(id, tiptext,row, column,*this,pref1_path, pref2_path ));
 }
diff --git a/src/ui/dialog/spray-option.h b/src/ui/dialog/spray-option.h
index 75dfe1e35..42090a120 100644
--- a/src/ui/dialog/spray-option.h
+++ b/src/ui/dialog/spray-option.h
@@ -33,11 +33,11 @@
 #include "graphlayout/graphlayout.h"
 #include "inkscape.h"
 #include "macros.h"
-#include "node-context.h" 
+#include "node-context.h"
 #include "preferences.h"
 #include "removeoverlap/removeoverlap.h"
 #include "selection.h"
-#include "shape-editor.h" 
+#include "shape-editor.h"
 #include "sp-flowtext.h"
 #include "sp-item-transform.h"
 #include "sp-text.h"
@@ -71,19 +71,19 @@ private:
 
     SprayOptionClass(SprayOptionClass const &d);
     SprayOptionClass& operator=(SprayOptionClass const &d);
-    
+
 public:
     SprayOptionClass();
-    virtual ~SprayOptionClass();   
+    virtual ~SprayOptionClass();
     void test() {    cout<<"appel de test !!"<<endl;  }
     static SprayOptionClass &getInstance() { return *new SprayOptionClass(); }
 
-    
+
     Gtk::Table &_Table(){return _ETable;}
     Gtk::Table &F_Table(){return _FTable;}
     Gtk::Tooltips &tooltips(){return _tooltips;}
     void action();
-    void combo_action(); 
+    void combo_action();
     Geom::OptRect randomize_bbox;
 
     SprayOptionClass &get_SprayOptionClass();
@@ -97,17 +97,32 @@ protected:
                 const Glib::ustring &pref1_path, const Glib::ustring &pref2_path);
 
     std::list<Action *> _actionList;
-    Gtk::Frame _distributionFrame,  _Frame, _FFrame ;
-    Gtk::Table _distributionTable, _gaussianTable, _ETable, _FTable;
+    Gtk::Frame _distributionFrame;
+    Gtk::Frame _Frame;
+    Gtk::Frame _FFrame;
+    Gtk::Table _distributionTable;
+    Gtk::Table _gaussianTable;
+    Gtk::Table _ETable;
+    Gtk::Table _FTable;
     Gtk::HBox _anchorBox;
-    Gtk::HBox _unifBox, _gaussianBox, _HBox, _FHBox, _BoutonBox;
-    Gtk::VBox _distributionBox,  _VBox, _FVBox, _ActionBox;
+    Gtk::HBox _unifBox;
+    Gtk::HBox _gaussianBox;
+    Gtk::HBox _HBox;
+    Gtk::HBox _FHBox;
+    Gtk::HBox _BoutonBox;
+    Gtk::VBox _distributionBox;
+    Gtk::VBox  _VBox;
+    Gtk::VBox _FVBox;
+    Gtk::VBox _ActionBox;
     Gtk::Label _anchorLabel;
-    Gtk::Label _unifLabel, _gaussLabel, _Label, _FLabel;
-    Gtk::CheckButton _unif, _gauss;
+    Gtk::Label _unifLabel;
+    Gtk::Label _gaussLabel;
+    Gtk::Label _Label;
+    Gtk::Label _FLabel;
+    Gtk::CheckButton _unif;
+    Gtk::CheckButton _gauss;
     Gtk::ComboBoxText _combo;
     Gtk::Tooltips _tooltips;
-
 };
 
 
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 5f86196b1..cb22e029b 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -2,7 +2,7 @@
  * @brief SVG Fonts dialog - implementation
  */
 /* Authors:
- *   Felipe C. da S. Sanches <felipe.sanches@gmail.com>
+ *   Felipe C. da S. Sanches <juca@members.fsf.org>
  *
  * Copyright (C) 2008 Authors
  * Released under GNU GPLv2 (or later).  Read the file 'COPYING' for more information.
diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h
index e6042ed42..e819187a1 100644
--- a/src/ui/dialog/svg-fonts-dialog.h
+++ b/src/ui/dialog/svg-fonts-dialog.h
@@ -2,7 +2,7 @@
  * @brief SVG Fonts dialog
  */
 /* Authors:
- *   Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
+ *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
  *
  * Copyright (C) 2008 Authors
  * Released under GNU GPLv2 (or later).  Read the file 'COPYING' for more information.
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 1f708e3de..450d4202d 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -47,7 +47,7 @@
 #include "display/nr-plain-stuff.h"
 #include "sp-gradient-reference.h"
 
-//#define USE_DOCUMENT_PALETTE 1
+#define USE_DOCUMENT_PALETTE 1
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index b610c1ee6..e3e73a51f 100644
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -3,7 +3,7 @@
  *
  * Author:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
- *   Felipe C. da S. Sanches <felipe.sanches@gmail.com>
+ *   Felipe C. da S. Sanches <juca@members.fsf.org>
  *
  * Copyright (C) 2007 Author
  *