Update to experimental r13402

(bzr r13090.1.82)

3 files changed, 98 insertions, 40 deletions

diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 8e0d085a4..c58df864c 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -219,25 +219,27 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   Gtk::Label* spacer = Gtk::manage(new Gtk::Label(""));
   tools->pack_start(* Gtk::manage(spacer));
 
-  in_sizes = 2; // Default 32px
+  // Pack size (controls display area)
+  pack_size = 2; // Default 32px
   button = Gtk::manage(new Gtk::Button());
   button->add(*Gtk::manage(Glib::wrap(
-      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-bigger")))) );
-  button->set_tooltip_text(_("Make Icons bigger by zooming in."));
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("pack-more")))) );
+  button->set_tooltip_text(_("Display more icons in row."));
   button->set_relief( Gtk::RELIEF_NONE );
   button->set_focus_on_click( false );
-  button->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::zoomin));
+  button->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::packmore));
   tools->pack_start(* button, Gtk::PACK_SHRINK);
 
   button = Gtk::manage(new Gtk::Button());
   button->add(*Gtk::manage(Glib::wrap(
-      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-smaller")))) );
-  button->set_tooltip_text(_("Make Icons smaller by zooming out."));
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("pack-less")))) );
+  button->set_tooltip_text(_("Display fewer icons in row."));
   button->set_relief( Gtk::RELIEF_NONE );
   button->set_focus_on_click( false );
-  button->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::zoomout));
+  button->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::packless));
   tools->pack_start(* button, Gtk::PACK_SHRINK);
 
+  // Toggle scale to fit on/off
   fitSymbol = Gtk::manage(new Gtk::ToggleButton());
   fitSymbol->add(*Gtk::manage(Glib::wrap(
       sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-fit")))) );
@@ -248,6 +250,28 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   fitSymbol->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::rebuild));
   tools->pack_start(* fitSymbol, Gtk::PACK_SHRINK);
 
+  // Render size (scales symbols within display area)
+  scale_factor = 0; // Default 1:1 * pack_size/pack_size default
+  zoomOut = Gtk::manage(new Gtk::Button());
+  zoomOut->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-smaller")))) );
+  zoomOut->set_tooltip_text(_("Make symbols smaller by zooming out."));
+  zoomOut->set_relief( Gtk::RELIEF_NONE );
+  zoomOut->set_focus_on_click( false );
+  zoomOut->set_sensitive( false );
+  zoomOut->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::zoomout));
+  tools->pack_start(* zoomOut, Gtk::PACK_SHRINK);
+
+  zoomIn = Gtk::manage(new Gtk::Button());
+  zoomIn->add(*Gtk::manage(Glib::wrap(
+      sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("symbol-bigger")))) );
+  zoomIn->set_tooltip_text(_("Make symbols bigger by zooming in."));
+  zoomIn->set_relief( Gtk::RELIEF_NONE );
+  zoomIn->set_focus_on_click( false );
+  zoomIn->set_sensitive( false );
+  zoomIn->signal_clicked().connect(sigc::mem_fun(*this, &SymbolsDialog::zoomin));
+  tools->pack_start(* zoomIn, Gtk::PACK_SHRINK);
+
   ++row;
 
   /**********************************************************/
@@ -298,22 +322,44 @@ SymbolsDialog& SymbolsDialog::getInstance()
   return *new SymbolsDialog();
 }
 
+void SymbolsDialog::packless() {
+  if(pack_size < 4) {
+      pack_size++;
+      rebuild();
+  }
+}
+
+void SymbolsDialog::packmore() {
+  if(pack_size > 0) {
+      pack_size--;
+      rebuild();
+  }
+}
+
 void SymbolsDialog::zoomin() {
-  if(in_sizes < 4) {
-      in_sizes++;
+  if(scale_factor < 4) {
+      scale_factor++;
       rebuild();
   }
 }
 
 void SymbolsDialog::zoomout() {
-  if(in_sizes > 0) {
-      in_sizes--;
+  if(scale_factor > -8) {
+      scale_factor--;
       rebuild();
   }
 }
 
 void SymbolsDialog::rebuild() {
 
+  if( fitSymbol->get_active() ) {
+    zoomIn->set_sensitive( false );
+    zoomOut->set_sensitive( false );
+  } else {
+    zoomIn->set_sensitive( true);
+    zoomOut->set_sensitive( true );
+  }
+
   store->clear();
   Glib::ustring symbolSetString = symbolSet->get_active_text();
 
@@ -613,6 +659,7 @@ GSList* SymbolsDialog::symbols_in_doc( SPDocument* symbolDocument ) {
 
   GSList *l = NULL;
   l = symbols_in_doc_recursive (symbolDocument->getRoot(), l );
+  l = g_slist_reverse( l );
   return l;
 }
 
@@ -756,7 +803,7 @@ SymbolsDialog::draw_symbol(SPObject *symbol)
   previewDocument->ensureUpToDate();
 
   SPItem *item = SP_ITEM(object_temp);
-  unsigned psize = SYMBOL_ICON_SIZES[in_sizes];
+  unsigned psize = SYMBOL_ICON_SIZES[pack_size];
 
   Glib::RefPtr<Gdk::Pixbuf> pixbuf(NULL);
   // We could use cache here, but it doesn't really work with the structure
@@ -778,6 +825,8 @@ SymbolsDialog::draw_symbol(SPObject *symbol)
 
     if( fitSymbol->get_active() )
         scale = psize / std::max(width, height);
+    else
+      scale = pow( 2.0, scale_factor/2.0 ) * psize / 32.0;
 
     pixbuf = Glib::wrap(render_pixbuf(renderDrawing, scale, *dbox, psize));
   }
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index 8021fb0c1..5dc1e3cad 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -65,6 +65,8 @@ private:
 
     static SymbolColumns *getColumns();
 
+    void packless();
+    void packmore();
     void zoomin();
     void zoomout();
     void rebuild();
@@ -95,13 +97,18 @@ private:
     std::map<Glib::ustring, SPDocument*> symbolSets;
 
     // Index into sizes which is selected
-    int in_sizes;
+    int pack_size;
+
+    // Scale factor
+    int scale_factor;
 
     Glib::RefPtr<Gtk::ListStore> store;
     Gtk::ComboBoxText* symbolSet;
     Gtk::IconView* iconView;
     Gtk::Button* addSymbol;
     Gtk::Button* removeSymbol;
+    Gtk::Button* zoomIn;
+    Gtk::Button* zoomOut;
     Gtk::ToggleButton* fitSymbol;
 
     void setTargetDesktop(SPDesktop *desktop);
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 386dc43e9..f8243fb7f 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -1556,12 +1556,11 @@ void PenTool::_bspline_spiro_start_anchor_off()
             //and we add it again with the recreation
             tmpCurve->append_continuous(lastSeg, 0.0625);
         }
-        if (this->sa->start) {
-            tmpCurve = tmpCurve->create_reverse();
-        }
-        this->overwriteCurve = tmpCurve;
     }
-
+    if (this->sa->start) {
+        tmpCurve = tmpCurve->create_reverse();
+    }
+    this->overwriteCurve = tmpCurve;
 }
 
 void PenTool::_bspline_spiro_motion(bool shift){
@@ -1645,7 +1644,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
         }
         reverse = true;
     } else if(this->sa){
-        tmpCurve = this->overwriteCurve;
+        tmpCurve = this->overwriteCurve->copy();
         if(!this->sa->start){
             tmpCurve = tmpCurve->create_reverse();
             reverse = true;
@@ -1665,7 +1664,7 @@ void PenTool::_bspline_spiro_end_anchor_on()
         lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
     }else{
         lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
-        lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
+        lastSeg->lineto(tmpCurve->last_segment()->finalPoint());
     }
     if( tmpCurve->get_segment_count() == 1){
         tmpCurve = lastSeg;
@@ -1702,7 +1701,7 @@ void PenTool::_bspline_spiro_end_anchor_off()
         }
         reverse = true;
     } else if(this->sa){
-        tmpCurve = this->overwriteCurve;
+        tmpCurve = this->overwriteCurve->copy();
         if(!this->sa->start){
             tmpCurve = tmpCurve->create_reverse();
             reverse = true;
@@ -1714,25 +1713,28 @@ void PenTool::_bspline_spiro_end_anchor_off()
     if(cubic){
         lastSeg->moveto((*cubic)[0]);
         lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-        if( tmpCurve->get_segment_count() == 1){
-            tmpCurve = lastSeg;
-        }else{
-            //we eliminate the last segment
-            tmpCurve->backspace();
-            //and we add it again with the recreation
-            tmpCurve->append_continuous(lastSeg, 0.0625);
-        }
-        if (reverse) {
-            tmpCurve = tmpCurve->create_reverse();
-        }
-        if( this->green_anchor && this->green_anchor->active )
-        {
-            this->green_curve->reset();
-            this->green_curve = tmpCurve;
-        }else{
-            this->overwriteCurve->reset();
-            this->overwriteCurve = tmpCurve;
-        }
+    }else{
+        lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
+        lastSeg->lineto(tmpCurve->last_segment()->finalPoint());
+    }
+    if( tmpCurve->get_segment_count() == 1){
+        tmpCurve = lastSeg;
+    }else{
+        //we eliminate the last segment
+        tmpCurve->backspace();
+        //and we add it again with the recreation
+        tmpCurve->append_continuous(lastSeg, 0.0625);
+    }
+    if (reverse) {
+        tmpCurve = tmpCurve->create_reverse();
+    }
+    if( this->green_anchor && this->green_anchor->active )
+    {
+        this->green_curve->reset();
+        this->green_curve = tmpCurve;
+    }else{
+        this->overwriteCurve->reset();
+        this->overwriteCurve = tmpCurve;
     }
 }