~liampwhite/inkscape/inkscape

« back to all changes in this revision

Viewing changes to src/widgets/stroke-style.cpp

Committer: Jabiertxof
Date: 2014-03-30 22:08:13 UTC
mfrom: (13090.1.146 inkscape)
mto: (11950.1.339 bspline+spirolive) (13090.1.252 inkscape)
mto: This revision was merged to the branch mainline in revision 13163.
Revision ID: jtx@jtx.marker.es-20140330220813-2tx5soz31e38f7ic

update to trunk

files added:
src/ui/dialog/arrange-tab.h

src/ui/dialog/grid-arrange-tab.cpp

src/ui/dialog/grid-arrange-tab.h

src/ui/dialog/polar-arrange-tab.cpp

src/ui/dialog/polar-arrange-tab.h

src/ui/widget/anchor-selector.cpp

src/ui/widget/anchor-selector.h

files removed:
src/modifier-fns.h

files modified:
configure.ac

po/POTFILES.in

share/icons/icons.svg

share/icons/tango_icons.svg

share/keys/default.xml

share/keys/inkscape.xml

share/keys/macromedia-freehand-mx.xml

share/keys/right-handed-illustration.xml

share/keys/xara.xml

src/CMakeLists.txt

src/Makefile_insert

src/display/canvas-axonomgrid.cpp

src/display/canvas-grid.cpp

src/gradient-drag.cpp

src/gradient-drag.h

src/interface.cpp

src/io/inkjar.cpp

src/io/inkjar.h

src/knot-holder-entity.cpp

src/knot-holder-entity.h

src/knot.cpp

src/knot.h

src/knotholder.cpp

src/knotholder.h

src/libuemf/uemf.h

src/libuemf/uemf_endian.c

src/libuemf/upmf.c

src/libuemf/uwmf_endian.c

src/main.cpp

src/menus-skeleton.h

src/seltrans.cpp

src/seltrans.h

src/sp-guide.cpp

src/ui/CMakeLists.txt

src/ui/dialog/Makefile_insert

src/ui/dialog/dialog-manager.cpp

src/ui/dialog/dialog.cpp

src/ui/dialog/document-metadata.cpp

src/ui/dialog/document-properties.cpp

src/ui/dialog/fill-and-stroke.cpp

src/ui/dialog/guides.cpp

src/ui/dialog/guides.h

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/input.cpp

src/ui/dialog/layer-properties.cpp

src/ui/dialog/layers.cpp

src/ui/dialog/livepatheffect-editor.cpp

src/ui/dialog/new-from-template.cpp

src/ui/dialog/pixelartdialog.cpp

src/ui/dialog/swatches.cpp

src/ui/dialog/template-load-tab.cpp

src/ui/dialog/template-widget.cpp

src/ui/dialog/tile.cpp

src/ui/dialog/tile.h

src/ui/dialog/tracedialog.cpp

src/ui/previewholder.cpp

src/ui/tool/node.h

src/ui/tools/connector-tool.cpp

src/ui/tools/connector-tool.h

src/ui/tools/pencil-tool.cpp

src/ui/tools/pencil-tool.h

src/ui/tools/tool-base.cpp

src/ui/tools/tool-base.h

src/ui/widget/Makefile_insert

src/ui/widget/licensor.cpp

src/ui/widget/panel.cpp

src/ui/widget/registered-widget.cpp

src/ui/widget/tolerance-slider.cpp

src/util/unordered-containers.h

src/vanishing-point.cpp

src/vanishing-point.h

src/verbs.cpp

src/verbs.h

src/widgets/stroke-style.cpp

Show diffs side-by-side

added added

removed removed

src/widgets/stroke-style.cpp

114

show();

115

set_mode(false);

116

117

Gtk::Widget *px = manage(Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_LARGE_TOOLBAR, icon)));

117

Gtk::Widget *px = Gtk::manage(Glib::wrap(sp_icon_new(Inkscape::ICON_SIZE_LARGE_TOOLBAR, icon)));

118

g_assert(px != NULL);

119

px->show();

120

add(*px);

198

hb->pack_start(*widthSpin, false, false, 0);

199

unitSelector = new Inkscape::UI::Widget::UnitMenu();

200

unitSelector->setUnitType(Inkscape::Util::UNIT_TYPE_LINEAR);

201

Gtk::Widget *us = manage(unitSelector);

201

Gtk::Widget *us = Gtk::manage(unitSelector);

202

SPDesktop *desktop = SP_ACTIVE_DESKTOP;

203

204

unitSelector->addUnit(*unit_table.getUnit("%"));

328

// implement a set_mnemonic_source function in the

329

// SPDashSelector class, so that we do not have to

330

// expose any of the underlying widgets?

331

dashSelector = manage(new SPDashSelector);

331

dashSelector = Gtk::manage(new SPDashSelector);

332

333

dashSelector->show();

334

354

hb = spw_hbox(table, 1, 1, i);

355

i++;

356

357

startMarkerCombo = manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START));

357

startMarkerCombo = Gtk::manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START));

358

startMarkerCombo->set_tooltip_text(_("Start Markers are drawn on the first node of a path or shape"));

359

startMarkerConn = startMarkerCombo->signal_changed().connect(

360

sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(

363

364

hb->pack_start(*startMarkerCombo, true, true, 0);

365

366

midMarkerCombo = manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID));

366

midMarkerCombo = Gtk::manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID));

367

midMarkerCombo->set_tooltip_text(_("Mid Markers are drawn on every node of a path or shape except the first and last nodes"));

368

midMarkerConn = midMarkerCombo->signal_changed().connect(

369

sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(

372

373

hb->pack_start(*midMarkerCombo, true, true, 0);

374

375

endMarkerCombo = manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END));

375

endMarkerCombo = Gtk::manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END));

376

endMarkerCombo->set_tooltip_text(_("End Markers are drawn on the last node of a path or shape"));

377

endMarkerConn = endMarkerCombo->signal_changed().connect(

378

sigc::bind<MarkerComboBox *, StrokeStyle *, SPMarkerLoc>(

Older »