Cleanup.

(bzr r12380.1.52)

7 files changed, 17 insertions, 24 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index e831bcf69..b592d2527 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -112,6 +112,7 @@ set(ui_SRC
 	widget/text.cpp
 	widget/tolerance-slider.cpp
 	widget/unit-menu.cpp
+	widget/unit-tracker.cpp
 
 	view/view.cpp
 	view/view-widget.cpp
@@ -240,6 +241,7 @@ set(ui_SRC
 	widget/text.h
 	widget/tolerance-slider.h
 	widget/unit-menu.h
+	widget/unit-tracker.h
 
 	view/edit-widget-interface.h
 	view/view-widget.h
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 9a7b19c35..2de387364 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -230,7 +230,7 @@ void GuidelinePropertiesDialog::_setup() {
     _unit_menu.setUnitType(UNIT_TYPE_LINEAR);
     _unit_menu.setUnit("px");
     if (_desktop->namedview->doc_units) {
-        //_unit_menu.setUnit( sp_unit_get_abbreviation(_desktop->namedview->doc_units) );
+        _unit_menu.setUnit( _desktop->namedview->doc_units->abbr );
     }
     _spin_angle.setUnit(_angle_unit_status);
 
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index f6392cfd8..b15ab2823 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -313,9 +313,9 @@ PageSizer::PageSizer(Registry & _wr)
     SPNamedView *nv = sp_desktop_namedview(dt);
     _wr.setUpdating (true);
     if (nv->units) {
-        //_dimensionUnits.setUnit(nv->units);
+        _dimensionUnits.setUnit(nv->units->abbr);
     } else if (nv->doc_units) {
-        //_dimensionUnits.setUnit(nv->doc_units);
+        _dimensionUnits.setUnit(nv->doc_units->abbr);
     }
     _wr.setUpdating (false);
     
diff --git a/src/util/units.cpp b/src/util/units.cpp
index f40e33c67..7f60eb391 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -132,7 +132,6 @@ int Unit::defaultDigits() const
     return factor_digits;
 }
 
-/** Checks if a unit is compatible with the specified unit. */
 bool Unit::compatibleWith(const Unit &u) const
 {
     // Percentages
@@ -154,19 +153,16 @@ bool Unit::compatibleWith(const Glib::ustring u) const
     return compatibleWith(unit_table.getUnit(u));
 }
 
-/** Check if units are equal. */
 bool operator== (const Unit &u1, const Unit &u2)
 {
     return (u1.type == u2.type && u1.name.compare(u2.name) == 0);
 }
 
-/** Check if units are not equal. */ 
 bool operator!= (const Unit &u1, const Unit &u2)
 {
     return !(u1 == u2);
 }
 
-/** Temporary - get SVG unit. */
 int Unit::svgUnit() const
 {
     if (!abbr.compare("px"))
@@ -355,7 +351,6 @@ void UnitParser::on_end_element(Ctx &ctx, Glib::ustring const &name)
     }
 }
 
-/** Initialize a quantity. */
 Quantity::Quantity(double q, const Unit &u)
 {
     unit = new Unit(u);
@@ -368,7 +363,6 @@ Quantity::Quantity(double q, const Glib::ustring u)
     quantity = q;
 }
 
-/** Checks if a quantity is compatible with the specified unit. */
 bool Quantity::compatibleWith(const Unit &u) const
 {
     return unit->compatibleWith(u);
@@ -379,7 +373,6 @@ bool Quantity::compatibleWith(const Glib::ustring u) const
     return compatibleWith(unit_table.getUnit(u));
 }
 
-/** Return the quantity's value in the specified unit. */
 double Quantity::value(const Unit &u) const
 {
     return convert(quantity, *unit, u);
@@ -390,7 +383,6 @@ double Quantity::value(const Glib::ustring u) const
     return value(unit_table.getUnit(u));
 }
 
-/** Return a printable string of the value in the specified unit. */
 Glib::ustring Quantity::string(const Unit &u) const {
     return Glib::ustring::format(std::fixed, std::setprecision(2), value(u)) + " " + unit->abbr;
 }
@@ -402,7 +394,6 @@ Glib::ustring Quantity::string() const {
     return string(*unit);
 }
 
-/** Convert distances. */
 double Quantity::convert(const double from_dist, const Unit &from, const Unit &to)
 {
     // Percentage
diff --git a/src/util/units.h b/src/util/units.h
index 79b62be60..c30fa24b3 100644
--- a/src/util/units.h
+++ b/src/util/units.h
@@ -65,6 +65,7 @@ class Unit {
      */
     int            defaultDigits() const;
 
+    /** Checks if a unit is compatible with the specified unit. */
     bool           compatibleWith(const Unit &u) const;
     bool           compatibleWith(const Glib::ustring) const;
 
@@ -75,10 +76,12 @@ class Unit {
     Glib::ustring  abbr;
     Glib::ustring  description;
     
+    /** Check if units are equal. */
     friend bool operator== (const Unit &u1, const Unit &u2);
+    /** Check if units are not equal. */ 
     friend bool operator!= (const Unit &u1, const Unit &u2);
     
-    // temporary
+    /** Get SVG unit. */
     int svgUnit() const;
 };
 
@@ -87,16 +90,24 @@ public:
     const Unit *unit;
     double quantity;
     
+    /** Initialize a quantity. */
     Quantity(double q, const Unit &u);          // constructor
     Quantity(double q, const Glib::ustring u);  // constructor
+    
+    /** Checks if a quantity is compatible with the specified unit. */
     bool compatibleWith(const Unit &u) const;
     bool compatibleWith(const Glib::ustring u) const;
+    
+    /** Return the quantity's value in the specified unit. */
     double value(const Unit &u) const;
     double value(const Glib::ustring u) const;
+    
+    /** Return a printable string of the value in the specified unit. */
     Glib::ustring string(const Unit &u) const;
     Glib::ustring string(const Glib::ustring u) const;
     Glib::ustring string() const;
     
+    /** Convert distances. */
     static double convert(const double from_dist, const Unit &from, const Unit &to);
     static double convert(const double from_dist, const Glib::ustring from, const Unit &to);
     static double convert(const double from_dist, const Unit &from, const Glib::ustring to);
diff --git a/src/widgets/measure-toolbar.cpp b/src/widgets/measure-toolbar.cpp
index d51a81457..53ed2d275 100644
--- a/src/widgets/measure-toolbar.cpp
+++ b/src/widgets/measure-toolbar.cpp
@@ -93,9 +93,6 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     tracker->setActiveUnitByAbbr(prefs->getString("/tools/measure/unit").c_str());
     
-    //tracker->setUnitType(UNIT_TYPE_LINEAR);
-    //tracker->setUnit("px");
-    
     g_object_set_data( holder, "tracker", tracker );
 
     EgeAdjustmentAction *eact = 0;
@@ -125,10 +122,8 @@ void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainActions, G
     // units menu
     {
         GtkAction* act = tracker->createAction( "MeasureUnitsAction", _("Units:"), _("The units to be used for the measurements") );
-        //EgeOutputAction* act = ege_output_action_new( "MeasureUnitsAction", _("Units:"), _("The units to be used for the measurements"), 0 );
         g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(measure_unit_changed), holder );
         gtk_action_group_add_action( mainActions, act );
-        //gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
     }
 } // end of sp_measure_toolbox_prep()
 
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index a7bd25b2c..7554f4faf 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -1213,12 +1213,6 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
 
-    // Is this used?
-    /*UnitTracker* tracker = new UnitTracker( SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE );
-    //tracker->setActiveUnit( sp_desktop_namedview(desktop)->doc_units );
-    tracker->setActiveUnit(&sp_unit_get_by_id(SP_UNIT_PX));
-    g_object_set_data( holder, "tracker", tracker );*/
-
     /* Font family */
     {
         // Font list