summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-11-07 23:18:24 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-11-07 23:18:24 +0000
commit26783ada6dd88c1f2df732707628bae6a4d68e42 (patch)
treec8b4302f6b365f6f4b57fccd1e5ce8f7100f3f39 /src
parentFix for scale bug pointed by Mc- (diff)
downloadinkscape-26783ada6dd88c1f2df732707628bae6a4d68e42.tar.gz
inkscape-26783ada6dd88c1f2df732707628bae6a4d68e42.zip
Fixes from review form Mc-
(bzr r14422.1.46)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/clonetiler.cpp6
-rw-r--r--src/ui/tools/spray-tool.cpp5
-rw-r--r--src/widgets/spray-toolbar.cpp6
3 files changed, 6 insertions, 11 deletions
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 1ea80e9f7..fd8afd4a3 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -785,11 +785,11 @@ CloneTiler::CloneTiler () :
#endif
gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
- b = gtk_check_button_new_with_label (_("Trace the drawing under the tiles/spray tool"));
+ b = gtk_check_button_new_with_label (_("Trace the drawing under the clones/sprayed items"));
g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
bool old = prefs->getBool(prefs_path + "dotrace");
gtk_toggle_button_set_active ((GtkToggleButton *) b, old);
- gtk_widget_set_tooltip_text (b, _("For each clone/ Sprayed item, pick a value from the drawing in that clone's or item spayed location and apply it"));
+ gtk_widget_set_tooltip_text (b, _("For each clone/sparayed item, pick a value from the drawing in its location and apply it"));
gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(b), "toggled",
@@ -998,7 +998,7 @@ CloneTiler::CloneTiler () :
gtk_widget_set_sensitive (vvb, prefs->getBool(prefs_path + "dotrace"));
}
}
- // Info
+
{
#if GTK_CHECK_VERSION(3,0,0)
GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, VB_MARGIN);
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index 6af30b5fc..17b82fe1d 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -331,7 +331,6 @@ static void sp_spray_extinput(SprayTool *tc, GdkEvent *event)
static double get_width(SprayTool *tc)
{
double pressure = (tc->usepressurewidth? tc->pressure / TC_DEFAULT_PRESSURE : 1);
- //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
return pressure * tc->width;
}
@@ -353,14 +352,12 @@ static double get_path_standard_deviation(SprayTool *tc)
static double get_population(SprayTool *tc)
{
double pressure = (tc->usepressurepopulation? tc->pressure / TC_DEFAULT_PRESSURE : 1);
- //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
return pressure * tc->population;
}
static double get_pressure(SprayTool *tc)
{
double pressure = tc->pressure / TC_DEFAULT_PRESSURE;
- //g_warning("Pressure, population: %f, %f", pressure, pressure * tc->population);
return pressure;
}
@@ -676,7 +673,7 @@ static bool fit_item(SPDesktop *desktop,
if (pick_to_presence) {
if (g_random_double_range (0, 1) > val) {
//Hidding the element is a way to retain original
- //behabiohur of tiled clones for presence option.
+ //behaviour of tiled clones for presence option.
sp_repr_css_set_property(css, "opacity", "0");
}
}
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index cfd3c6332..5e0d81964 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -424,8 +424,8 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
/* Picker */
{
InkToggleAction* act = ink_toggle_action_new( "SprayPickColorAction",
- _("Pick down. You can use trace clones dialog for avanced effects. In clone mode original fill or stroke colors must be unset"),
- _("Pick down. You can use trace clones dialog for avanced effects. In clone mode original fill or stroke colors must be unset"),
+ _("Pick color from the drawing. You can use clonetiler trace dialog for avanced effects. In clone mode original fill or stroke colors must be unset."),
+ _("Pick color from the drawing. You can use clonetiler trace dialog for avanced effects. In clone mode original fill or stroke colors must be unset."),
INKSCAPE_ICON("color-picker"),
secondarySize );
gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/picker", false) );
@@ -495,8 +495,6 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
secondarySize );
gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/nooverlap", false) );
g_object_set_data( holder, "nooverlap", act );
- //g_object_set_data (context_object, "holder", holder);
- //g_object_set_data (context_object, "desktop", desktop);
g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_nooverlap), holder) ;
gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
}