← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ui/widget/selected-style.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/ui/widget/selected-style.cpp
103
103
static Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop);
104
104
 
105
105
SelectedStyle::SelectedStyle(bool /*layout*/)
106
 
    : 
 
106
    :
107
107
      current_stroke_width(0),
108
108
 
109
109
      _desktop (NULL),
955
955
                    _paintserver_id[i] += ")";
956
956
 
957
957
                    if (SP_IS_LINEARGRADIENT (server)) {
958
 
                        SPGradient *vector = sp_gradient_get_vector(SP_GRADIENT(server), false);
 
958
                        SPGradient *vector = SP_GRADIENT(server)->getVector();
959
959
                        sp_gradient_image_set_gradient ((SPGradientImage *) _gradient_preview_l[i], vector);
960
960
                        place->add(_gradient_box_l[i]);
961
961
                        _tooltips.set_tip(*place, __lgradient[i]);
962
962
                        _mode[i] = SS_LGRADIENT;
963
963
                    } else if (SP_IS_RADIALGRADIENT (server)) {
964
 
                        SPGradient *vector = sp_gradient_get_vector(SP_GRADIENT(server), false);
 
964
                        SPGradient *vector = SP_GRADIENT(server)->getVector();
965
965
                        sp_gradient_image_set_gradient ((SPGradientImage *) _gradient_preview_r[i], vector);
966
966
                        place->add(_gradient_box_r[i]);
967
967
                        _tooltips.set_tip(*place, __rgradient[i]);
1165
1165
    undokey("ssrot1"),
1166
1166
    cr(0),
1167
1167
    cr_set(false)
1168
 
    
 
1168
 
1169
1169
{
1170
1170
}
1171
1171
 
1426
1426
 
1427
1427
Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop)
1428
1428
{
1429
 
    if (Dialog::PanelDialogBase *panel_dialog = 
 
1429
    if (Dialog::PanelDialogBase *panel_dialog =
1430
1430
        dynamic_cast<Dialog::PanelDialogBase *>(desktop->_dlg_mgr->getDialog("FillAndStroke"))) {
1431
1431
        try {
1432
 
            Dialog::FillAndStroke &fill_and_stroke = 
 
1432
            Dialog::FillAndStroke &fill_and_stroke =
1433
1433
                dynamic_cast<Dialog::FillAndStroke &>(panel_dialog->getPanel());
1434
1434
            return &fill_and_stroke;
1435
1435
        } catch (std::exception e) { }
1436
 
    }        
 
1436
    }
1437
1437
 
1438
1438
    return 0;
1439
1439
}