diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-07-30 02:51:28 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-07-30 02:51:28 +0000 |
| commit | 7aab446af9e2eb34ce50c8ef0ec58710fac49396 (patch) | |
| tree | 910753b30ab6691d4f5ace840252596217460dd1 /src/widgets | |
| parent | Merge from trunk. (diff) | |
| download | inkscape-7aab446af9e2eb34ce50c8ef0ec58710fac49396.tar.gz inkscape-7aab446af9e2eb34ce50c8ef0ec58710fac49396.zip | |
Cleanup.
(bzr r12380.1.52)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/measure-toolbar.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 6 |
2 files changed, 0 insertions, 11 deletions
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 |