← Back to branch summary

~ubuntu-branches/ubuntu/precise/inkscape/precise-updates

« back to all changes in this revision

Viewing changes to src/widgets/select-toolbar.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/widgets/select-toolbar.cpp
390
390
void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder)
391
391
{
392
392
    Inkscape::UI::View::View *view = desktop;
393
 
    Inkscape::IconSize secondarySize = prefToSize("/toolbox/secondary", 1);
 
393
    Inkscape::IconSize secondarySize = Inkscape::UI::ToolboxFactory::prefToSize("/toolbox/secondary", 1);
394
394
    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
395
395
 
396
396
    GtkAction* act = 0;
457
457
 
458
458
    //TRANSLATORS: only translate "string" in "context|string".
459
459
    // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
460
 
    eact = create_adjustment_action( "XAction", _("select_toolbar|X position"), _("select_toolbar|X"), "X",
 
460
    eact = create_adjustment_action( "XAction", _("select toolbar|X position"), _("select toolbar|X"), "X",
461
461
                                     -1e6, GTK_WIDGET(desktop->canvas), tracker, spw,
462
462
                                     _("Horizontal coordinate of selection"), TRUE );
463
463
    gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) );
465
465
 
466
466
    //TRANSLATORS: only translate "string" in "context|string".
467
467
    // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
468
 
    eact = create_adjustment_action( "YAction", _("select_toolbar|Y position"), _("select_toolbar|Y"), "Y",
 
468
    eact = create_adjustment_action( "YAction", _("select toolbar|Y position"), _("select toolbar|Y"), "Y",
469
469
                                     -1e6, GTK_WIDGET(desktop->canvas), tracker, spw,
470
470
                                     _("Vertical coordinate of selection"), FALSE );
471
471
    gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) );
473
473
 
474
474
    //TRANSLATORS: only translate "string" in "context|string".
475
475
    // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
476
 
    eact = create_adjustment_action( "WidthAction", _("select_toolbar|Width"), _("select_toolbar|W"), "width",
 
476
    eact = create_adjustment_action( "WidthAction", _("select toolbar|Width"), _("select toolbar|W"), "width",
477
477
                                     1e-3, GTK_WIDGET(desktop->canvas), tracker, spw,
478
478
                                     _("Width of selection"), FALSE );
479
479
    gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) );
494
494
 
495
495
    //TRANSLATORS: only translate "string" in "context|string".
496
496
    // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
497
 
    eact = create_adjustment_action( "HeightAction", _("select_toolbar|Height"), _("select_toolbar|H"), "height",
 
497
    eact = create_adjustment_action( "HeightAction", _("select toolbar|Height"), _("select toolbar|H"), "height",
498
498
                                     1e-3, GTK_WIDGET(desktop->canvas), tracker, spw,
499
499
                                     _("Height of selection"), FALSE );
500
500
    gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) );