summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-05-10 11:40:31 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-05-10 11:40:31 +0000
commit870dbb0348163f55263eb9dca601d525d53a8d79 (patch)
tree63ad837d271d8134f393aa587516e45cf4e6550b /src/ui
parentupdate to trunk (diff)
downloadinkscape-870dbb0348163f55263eb9dca601d525d53a8d79.tar.gz
inkscape-870dbb0348163f55263eb9dca601d525d53a8d79.zip
Working on Krzysztof review. Seems to be all fixed.
TODO: double check review and comment (bzr r13645.1.89)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/lpe-fillet-chamfer-properties.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
index 2b49d1952..f89668a4c 100644
--- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
+++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp
@@ -151,13 +151,13 @@ void FilletChamferPropertiesDialog::_apply()
double d_pos = _fillet_chamfer_position_numeric.get_value();
if (d_pos >= 0) {
if (_fillet_chamfer_type_fillet.get_active() == true) {
- _satellite.satelliteType = Geom::F;
+ _satellite.satellite_type = FILLET;
} else if (_fillet_chamfer_type_inverse_fillet.get_active() == true) {
- _satellite.satelliteType = Geom::IF;
+ _satellite.satellite_type = INVERSE_FILLET;
} else if (_fillet_chamfer_type_inverse_chamfer.get_active() == true) {
- _satellite.satelliteType = Geom::IC;
+ _satellite.satellite_type = INVERSE_CHAMFER;
} else {
- _satellite.satelliteType = Geom::C;
+ _satellite.satellite_type = CHAMFER;
}
if (_flexible) {
if (d_pos > 99.99999 || d_pos < 0) {
@@ -210,7 +210,7 @@ void FilletChamferPropertiesDialog::_setSatellite(Satellite satellite)
if(_use_distance) {
distance_or_radius = std::string(_("Knot distance"));
}
- if (satellite.isTime) {
+ if (satellite.is_time) {
position = _amount * 100;
_flexible = true;
_fillet_chamfer_position_label.set_label(_("Position (%):"));
@@ -222,13 +222,13 @@ void FilletChamferPropertiesDialog::_setSatellite(Satellite satellite)
}
_fillet_chamfer_position_numeric.set_value(position);
_fillet_chamfer_chamfer_subdivisions.set_value(satellite.steps);
- if (satellite.satelliteType == Geom::F) {
+ if (satellite.satellite_type == FILLET) {
_fillet_chamfer_type_fillet.set_active(true);
- } else if (satellite.satelliteType == Geom::IF) {
+ } else if (satellite.satellite_type == INVERSE_FILLET) {
_fillet_chamfer_type_inverse_fillet.set_active(true);
- } else if (satellite.satelliteType == Geom::C) {
+ } else if (satellite.satellite_type == CHAMFER) {
_fillet_chamfer_type_chamfer.set_active(true);
- } else if (satellite.satelliteType == Geom::IC) {
+ } else if (satellite.satellite_type == INVERSE_CHAMFER) {
_fillet_chamfer_type_inverse_chamfer.set_active(true);
}
_satellite = satellite;