Commit 2e762843 authored by Kris De Gussem's avatar Kris De Gussem Committed by Kris De Gussem

UI fixes (punctuation, units, accelerator keys) (a. o. Bug #560751 )

(bzr r9851)
parent 60f41507
......@@ -80,7 +80,7 @@
<_item value="edg">Edges</_item>
<_item value="vtx">Vertices</_item>
</param>
<param name="back" type="boolean" _gui-text="Draw back-facing polygons:">0</param>
<param name="back" type="boolean" _gui-text="Draw back-facing polygons">0</param>
<param name="z_sort" type="enum" _gui-text="Z-sort faces by:">
<_item value="max">Maximum</_item>
<_item value="min">Minimum</_item>
......
......@@ -156,7 +156,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
gtk_widget_show(w);
gtk_menu_append(GTK_MENU(m), w);
/* Set Clip */
w = gtk_menu_item_new_with_mnemonic(_("Set Clip"));
w = gtk_menu_item_new_with_mnemonic(_("Set _Clip"));
gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_set_clip), item);
if ((item && item->mask_ref && item->mask_ref->getObject()) || (item->clip_ref && item->clip_ref->getObject())) {
......@@ -167,7 +167,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
gtk_widget_show(w);
gtk_menu_append(GTK_MENU(m), w);
/* Release Clip */
w = gtk_menu_item_new_with_mnemonic(_("Release Clip"));
w = gtk_menu_item_new_with_mnemonic(_("Release C_lip"));
gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop);
gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_release_clip), item);
if (item && item->clip_ref && item->clip_ref->getObject()) {
......
......@@ -23,7 +23,7 @@ namespace Widget {
SimpleFilterModifier::SimpleFilterModifier(int flags)
: _lb_blend(_("_Blend mode:")),
_lb_blur(_("B_lur:"), Gtk::ALIGN_LEFT),
_lb_blur(_("Blur:"), Gtk::ALIGN_LEFT),
_blend(BlendModeConverter, SP_ATTR_INVALID, false),
_blur(0, 0, 100, 1, 0.01, 1)
{
......
......@@ -59,7 +59,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
_opacity_tag(Glib::ustring(history_prefix) + ":opacity"),
_opacity_vbox(false, 0),
_opacity_label_box(false, 0),
_opacity_label(_("Opacity, %"), 0.0, 1.0, true),
_opacity_label(_("Opacity (%):"), 0.0, 1.0, true),
_opacity_adjustment(100.0, 0.0, 100.0, 1.0, 1.0, 0.0),
_opacity_hscale(_opacity_adjustment),
_opacity_spin_button(_opacity_adjustment, 0.01, 1),
......
......@@ -1030,8 +1030,8 @@ SelectedStyle::update()
case QUERY_STYLE_SINGLE:
case QUERY_STYLE_MULTIPLE_AVERAGED:
case QUERY_STYLE_MULTIPLE_SAME:
_tooltips.set_tip(_opacity_place, _("Opacity, %"));
_tooltips.set_tip(_opacity_sb, _("Opacity, %"));
_tooltips.set_tip(_opacity_place, _("Opacity (%)"));
_tooltips.set_tip(_opacity_sb, _("Opacity (%)"));
if (_opacity_blocked) break;
_opacity_blocked = true;
_opacity_sb.set_sensitive(true);
......
......@@ -217,12 +217,12 @@ void getThings( DWORD space, gchar const**& namers, gchar const**& tippies, guin
//
{"_Y", "C_b", "C_r", "", "", ""},
{"_Y", "_x", "y", "", "", ""},
{_("_R"), _("_G"), _("_B"), "", "", ""},
{_("_G"), "", "", "", "", ""},
{_("_H"), _("_S"), "_V", "", "", ""},
{_("_H"), _("_L"), _("_S"), "", "", ""},
{_("_C"), _("_M"), _("_Y"), _("_K"), "", ""},
{_("_C"), _("_M"), _("_Y"), "", "", ""},
{_("_R:"), _("_G:"), _("_B:"), "", "", ""},
{_("_G:"), "", "", "", "", ""},
{_("_H:"), _("_S:"), "_V:", "", "", ""},
{_("_H:"), _("_L:"), _("_S:"), "", "", ""},
{_("_C:"), _("_M:"), _("_Y:"), _("_K:"), "", ""},
{_("_C:"), _("_M:"), _("_Y:"), "", "", ""},
};
static gchar const *tips[][6] = {
......@@ -377,7 +377,7 @@ void ColorICCSelector::init()
}
/* Label */
_label = gtk_label_new_with_mnemonic (_("_A"));
_label = gtk_label_new_with_mnemonic (_("_A:"));
gtk_misc_set_alignment (GTK_MISC (_label), 1.0, 0.5);
gtk_widget_show (_label);
gtk_table_attach (GTK_TABLE (t), _label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD);
......
......@@ -401,16 +401,16 @@ void ColorScales::setMode(SPColorScalesMode mode)
switch (mode) {
case SP_COLOR_SCALES_MODE_RGB:
_setRangeLimit(255.0);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_R"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_R:"));
gtk_tooltips_set_tip (_tt, _s[0], _("Red"), NULL);
gtk_tooltips_set_tip (_tt, _b[0], _("Red"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_G"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_G:"));
gtk_tooltips_set_tip (_tt, _s[1], _("Green"), NULL);
gtk_tooltips_set_tip (_tt, _b[1], _("Green"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_B"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_B:"));
gtk_tooltips_set_tip (_tt, _s[2], _("Blue"), NULL);
gtk_tooltips_set_tip (_tt, _b[2], _("Blue"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
gtk_tooltips_set_tip (_tt, _s[3], _("Alpha (opacity)"), NULL);
gtk_tooltips_set_tip (_tt, _b[3], _("Alpha (opacity)"), NULL);
sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), NULL);
......@@ -427,16 +427,16 @@ void ColorScales::setMode(SPColorScalesMode mode)
break;
case SP_COLOR_SCALES_MODE_HSV:
_setRangeLimit(255.0);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_H"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_H:"));
gtk_tooltips_set_tip (_tt, _s[0], _("Hue"), NULL);
gtk_tooltips_set_tip (_tt, _b[0], _("Hue"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_S"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_S:"));
gtk_tooltips_set_tip (_tt, _s[1], _("Saturation"), NULL);
gtk_tooltips_set_tip (_tt, _b[1], _("Saturation"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_L"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_L:"));
gtk_tooltips_set_tip (_tt, _s[2], _("Lightness"), NULL);
gtk_tooltips_set_tip (_tt, _b[2], _("Lightness"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
gtk_tooltips_set_tip (_tt, _s[3], _("Alpha (opacity)"), NULL);
gtk_tooltips_set_tip (_tt, _b[3], _("Alpha (opacity)"), NULL);
sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar*)sp_color_scales_hue_map ());
......@@ -455,19 +455,19 @@ void ColorScales::setMode(SPColorScalesMode mode)
break;
case SP_COLOR_SCALES_MODE_CMYK:
_setRangeLimit(100.0);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_C"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[0]), _("_C:"));
gtk_tooltips_set_tip (_tt, _s[0], _("Cyan"), NULL);
gtk_tooltips_set_tip (_tt, _b[0], _("Cyan"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_M"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[1]), _("_M:"));
gtk_tooltips_set_tip (_tt, _s[1], _("Magenta"), NULL);
gtk_tooltips_set_tip (_tt, _b[1], _("Magenta"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_Y"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[2]), _("_Y:"));
gtk_tooltips_set_tip (_tt, _s[2], _("Yellow"), NULL);
gtk_tooltips_set_tip (_tt, _b[2], _("Yellow"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_K"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_K:"));
gtk_tooltips_set_tip (_tt, _s[3], _("Black"), NULL);
gtk_tooltips_set_tip (_tt, _b[3], _("Black"), NULL);
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[4]), _("_A"));
gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[4]), _("_A:"));
gtk_tooltips_set_tip (_tt, _s[4], _("Alpha (opacity)"), NULL);
gtk_tooltips_set_tip (_tt, _b[4], _("Alpha (opacity)"), NULL);
sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), NULL);
......
......@@ -132,7 +132,7 @@ void ColorWheelSelector::init()
row++;
/* Label */
_label = gtk_label_new_with_mnemonic (_("_A"));
_label = gtk_label_new_with_mnemonic (_("_A:"));
gtk_misc_set_alignment (GTK_MISC (_label), 1.0, 0.5);
gtk_widget_show (_label);
gtk_table_attach (GTK_TABLE (t), _label, 0, 1, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment