Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 9181 → Rev 9182

/branches/Version13x/Scribus/scribus/icons/shear_down.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/shear_up.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/shear_up.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/shear_right.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/shear_right.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/shear_left.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/shear_left.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/Version135x/Scribus/scribus/icons/Makefile.am
===================================================================
--- branches/Version135x/Scribus/scribus/icons/Makefile.am (revision 9181)
+++ branches/Version135x/Scribus/scribus/icons/Makefile.am (revision 9182)
@@ -1,4 +1,4 @@
-EXTRA_DIST = DrawFreeLine.png printer.png cmsOn.png cmsOff.png group.png ungroup.png configure.png previewOn.png previewOff.png curvelinear.png curvebezier.png curve.png invert.png viewmag1.png viewmagout.png viewmagin.png register.png cmyk.png rgb.png spot.png alert.png mover.png above.png below.png firstline.png leftindent.png rightindent.png shade.png linespacing.png linespacing2.png textbase.png textscaleh.png textkern.png textscalev.png wordsOnly.png shadow.png AllCaps.png DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png shortwords.png font_otf16.png font_truetype16.png font_subst16.png font_type1_16.png font_otf.png font_truetype.png font_type1.png acroread.png checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png externaltools.png tools.png guides.png font.png typography.png screen.png dist.png dist22.png tab.png view.png Kreuz.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Stift16.xpm Stift.xpm Unlock.xpm AppIcon2.png AppIcon.png LupeZ.xpm LupeZm.xpm DragPix.xpm Rotieren2.png HandC.xpm scribus_logo.png exit.png doc.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm Winkel.xpm acrobat.png scribusicon.png spline16.png spline.png triangle.png beziertool.png beziertool16.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png irreg.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png penciladd.png pencilsub.png outlined.png NoPrint.png unlock.png locked.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png scribusdoc.png scribusdoc16.png documentinfo.png documentinfo32.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png \
+EXTRA_DIST = DrawFreeLine.png printer.png cmsOn.png cmsOff.png group.png ungroup.png configure.png previewOn.png previewOff.png curvelinear.png curvebezier.png curve.png invert.png viewmag1.png viewmagout.png viewmagin.png register.png cmyk.png rgb.png spot.png alert.png mover.png above.png below.png firstline.png leftindent.png rightindent.png shade.png linespacing.png linespacing2.png textbase.png textscaleh.png textkern.png textscalev.png wordsOnly.png shadow.png AllCaps.png DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png shortwords.png font_otf16.png font_truetype16.png font_subst16.png font_type1_16.png font_otf.png font_truetype.png font_type1.png acroread.png checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png externaltools.png tools.png guides.png font.png typography.png screen.png dist.png dist22.png tab.png view.png Kreuz.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Stift16.xpm Stift.xpm Unlock.xpm AppIcon2.png AppIcon.png LupeZ.xpm LupeZm.xpm DragPix.xpm Rotieren2.png HandC.xpm scribus_logo.png exit.png doc.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm Winkel.xpm acrobat.png scribusicon.png spline16.png spline.png triangle.png beziertool.png beziertool16.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png irreg.png ok.png ok22.png Revers.png hmirror.png vmirror.png Splash.png penciladd.png pencilsub.png outlined.png NoPrint.png unlock.png locked.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png scribusdoc.png scribusdoc16.png documentinfo.png documentinfo32.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png \
u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png u_fill.png u_shade.png u_lock.png u_unlock.png u_create.png u_delete.png u_fliph.png u_flipv.png u_cut.png u_transp.png u_line.png u_arrow.png u_font.png u_svg.png u_eps.png u_scale_image.png u_shape.png u_enableprint.png u_disableprint.png \
docattributes.png tabtocindex.png colorpicker.png colorpickercursor.png wizard.png flow-bounding.png flow-contour.png flow-frame.png flow-none.png\
vpl.png noicon.xpm clear_right.png layer-outline.png\
@@ -560,10 +560,6 @@
$(INSTALL_DATA) $(srcdir)/scribusicon.png $(prefix)/share/scribus/icons/scribusicon.png
$(INSTALL_DATA) $(srcdir)/scribus_logo.png $(prefix)/share/scribus/icons/scribus_logo.png
$(INSTALL_DATA) $(srcdir)/shadow.png $(prefix)/share/scribus/icons/shadow.png
- $(INSTALL_DATA) $(srcdir)/shear_down.png $(prefix)/share/scribus/icons/shear_down.png
- $(INSTALL_DATA) $(srcdir)/shear_left.png $(prefix)/share/scribus/icons/shear_left.png
- $(INSTALL_DATA) $(srcdir)/shear_right.png $(prefix)/share/scribus/icons/shear_right.png
- $(INSTALL_DATA) $(srcdir)/shear_up.png $(prefix)/share/scribus/icons/shear_up.png
$(INSTALL_DATA) $(srcdir)/shortwords.png $(prefix)/share/scribus/icons/shortwords.png
$(INSTALL_DATA) $(srcdir)/16/show-object.png $(prefix)/share/scribus/icons/16/show-object.png
$(INSTALL_DATA) $(srcdir)/Spacing.xpm $(prefix)/share/scribus/icons/Spacing.xpm
@@ -598,6 +594,10 @@
$(INSTALL_DATA) $(srcdir)/tools.png $(prefix)/share/scribus/icons/tools.png
$(INSTALL_DATA) $(srcdir)/16/transform-rotate.png $(prefix)/share/scribus/icons/16/transform-rotate.png
$(INSTALL_DATA) $(srcdir)/22/transform-rotate.png $(prefix)/share/scribus/icons/22/transform-rotate.png
+ $(INSTALL_DATA) $(srcdir)/22/transform-shear-down.png $(prefix)/share/scribus/icons/22/transform-shear-down.png
+ $(INSTALL_DATA) $(srcdir)/22/transform-shear-left.png $(prefix)/share/scribus/icons/22/transform-shear-left.png
+ $(INSTALL_DATA) $(srcdir)/22/transform-shear-right.png $(prefix)/share/scribus/icons/22/transform-shear-right.png
+ $(INSTALL_DATA) $(srcdir)/22/transform-shear-up.png $(prefix)/share/scribus/icons/22/transform-shear-up.png
$(INSTALL_DATA) $(srcdir)/trashcan.png $(prefix)/share/scribus/icons/trashcan.png
$(INSTALL_DATA) $(srcdir)/trashcan2.png $(prefix)/share/scribus/icons/trashcan2.png
$(INSTALL_DATA) $(srcdir)/triangle.png $(prefix)/share/scribus/icons/triangle.png
@@ -977,10 +977,6 @@
-rm -f $(prefix)/share/scribus/icons/scribusicon.png
-rm -f $(prefix)/share/scribus/icons/scribus_logo.png
-rm -f $(prefix)/share/scribus/icons/shadow.png
- -rm -f $(prefix)/share/scribus/icons/shear_down.png
- -rm -f $(prefix)/share/scribus/icons/shear_left.png
- -rm -f $(prefix)/share/scribus/icons/shear_right.png
- -rm -f $(prefix)/share/scribus/icons/shear_up.png
-rm -f $(prefix)/share/scribus/icons/shortwords.png
-rm -f $(prefix)/share/scribus/icons/16/show-object.png
-rm -f $(prefix)/share/scribus/icons/Spacing.xpm
@@ -1013,6 +1009,10 @@
-rm -f $(prefix)/share/scribus/icons/tools.png
-rm -f $(prefix)/share/scribus/icons/16/transform-rotate.png
-rm -f $(prefix)/share/scribus/icons/22/transform-rotate.png
+ -rm -f $(prefix)/share/scribus/icons/22/transform-shear-down.png
+ -rm -f $(prefix)/share/scribus/icons/22/transform-shear-left.png
+ -rm -f $(prefix)/share/scribus/icons/22/transform-shear-right.png
+ -rm -f $(prefix)/share/scribus/icons/22/transform-shear-up.png
-rm -f $(prefix)/share/scribus/icons/trashcan.png
-rm -f $(prefix)/share/scribus/icons/trashcan2.png
-rm -f $(prefix)/share/scribus/icons/triangle.png
Index: branches/Version135x/Scribus/scribus/icons/22/transform-shear-up.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version135x/Scribus/scribus/icons/22/transform-shear-up.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version135x/Scribus/scribus/icons/22/transform-shear-down.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version135x/Scribus/scribus/icons/22/transform-shear-down.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version135x/Scribus/scribus/icons/22/transform-shear-right.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version135x/Scribus/scribus/icons/22/transform-shear-right.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version135x/Scribus/scribus/icons/22/transform-shear-left.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version135x/Scribus/scribus/icons/22/transform-shear-left.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version135x/Scribus/scribus/icons/CMakeLists.txt
===================================================================
--- branches/Version135x/Scribus/scribus/icons/CMakeLists.txt (revision 9181)
+++ branches/Version135x/Scribus/scribus/icons/CMakeLists.txt (revision 9182)
@@ -15,7 +15,6 @@
AllCaps.png
AppIcon2.png
AppIcon.png
-back.png
below.png
BevelJoin.png
BezierClose.png
@@ -22,7 +21,6 @@
beziertool16.png
beziertool.png
blend.png
-bottom.png
ButtCap.png
checkdoc.png
clear_right.png
@@ -48,7 +46,6 @@
document2.png
documentinfo32.png
documentinfo.png
-down.png
DragPix.xpm
DrawFrame.xpm
DrawFreeLine.png
@@ -63,7 +60,6 @@
externaltools.png
find16.png
find.png
-finish.png
firstline.png
flow-bounding.png
flow-contour.png
@@ -77,7 +73,6 @@
font_truetype.png
font_type1_16.png
font_type1.png
-forward.png
framenoresize.png
frameresize.png
goto.png
@@ -153,10 +148,6 @@
scribus_logo.png
shade.png
shadow.png
-shear_down.png
-shear_left.png
-shear_right.png
-shear_up.png
shortwords.png
Spacing.xpm
spiral.png
@@ -166,7 +157,6 @@
Split.png
spot.png
SquareCap.png
-start.png
Stift16.xpm
Stift.xpm
Strike.xpm
@@ -179,7 +169,6 @@
textscalev.png
Tief.xpm
tools.png
-top.png
trashcan2.png
trashcan.png
triangle.png
@@ -208,7 +197,6 @@
unlock.png
Unlock.xpm
Unter.xpm
-up.png
u_redo16.png
u_redo.png
u_resize.png
@@ -442,6 +430,10 @@
22/text-frame-link.png
22/text-frame-unlink.png
22/transform-rotate.png
+22/transform-shear-down.png
+22/transform-shear-left.png
+22/transform-shear-right.png
+22/transform-shear-up.png
22/zoom.png
22/zoom-in.png
22/zoom-original.png
Index: branches/Version135x/Scribus/scribus/frameedit.cpp
===================================================================
--- branches/Version135x/Scribus/scribus/frameedit.cpp (revision 9181)
+++ branches/Version135x/Scribus/scribus/frameedit.cpp (revision 9182)
@@ -103,25 +103,25 @@
gridLayout->addWidget(PolyMirrorV, 2, 3, 1, 1);
PolyShearL = new QToolButton(this);
- PolyShearL->setIcon(QIcon(loadIcon("shear_left.png")));
+ PolyShearL->setIcon(QIcon(loadIcon("22/transform-shear-left.png")));
PolyShearL->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
PolyShearL->setAutoRepeat(true);
gridLayout->addWidget(PolyShearL, 3, 0, 1, 1);
PolyShearR = new QToolButton(this);
- PolyShearR->setIcon(QIcon(loadIcon("shear_right.png")));
+ PolyShearR->setIcon(QIcon(loadIcon("22/transform-shear-right.png")));
PolyShearR->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
PolyShearR->setAutoRepeat(true);
gridLayout->addWidget(PolyShearR, 3, 1, 1, 1);
PolyShearU = new QToolButton(this);
- PolyShearU->setIcon(QIcon(loadIcon("shear_up.png")));
+ PolyShearU->setIcon(QIcon(loadIcon("22/transform-shear-up.png")));
PolyShearU->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
PolyShearU->setAutoRepeat(true);
gridLayout->addWidget(PolyShearU, 3, 2, 1, 1);
PolyShearD = new QToolButton(this);
- PolyShearD->setIcon(QIcon(loadIcon("shear_down.png")));
+ PolyShearD->setIcon(QIcon(loadIcon("22/transform-shear-down.png")));
PolyShearD->setSizePolicy(QSizePolicy(static_cast<QSizePolicy::Policy>(3), static_cast<QSizePolicy::Policy>(3)));
PolyShearD->setAutoRepeat(true);
gridLayout->addWidget(PolyShearD, 3, 3, 1, 1);