Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5910 → Rev 5911

/branches/Version13x/Scribus/scribus/icons/Makefile.am
27,8 → 27,6
22/draw-arrow-forward.png \
16/draw-arrow-up.png \
22/draw-arrow-up.png \
16/draw-bezier-curves.png \
22/draw-bezier-curves.png \
16/draw-cross.png \
22/draw-cross.png \
16/draw-donut.png \
44,6 → 42,8
22/draw-halfcircle3.png \
16/draw-halfcircle4.png \
22/draw-halfcircle4.png \
16/draw-path.png \
22/draw-path.png \
16/draw-polygon.png \
22/draw-polygon.png \
16/draw-polyline.png \
249,8 → 249,6
$(INSTALL_DATA) $(srcdir)/22/draw-arrow-forward.png $(prefix)/share/scribus/icons/22/draw-arrow-forward.png
$(INSTALL_DATA) $(srcdir)/16/draw-arrow-up.png $(prefix)/share/scribus/icons/16/draw-arrow-up.png
$(INSTALL_DATA) $(srcdir)/22/draw-arrow-up.png $(prefix)/share/scribus/icons/22/draw-arrow-up.png
$(INSTALL_DATA) $(srcdir)/16/draw-bezier-curves.png $(prefix)/share/scribus/icons/16/draw-bezier-curves.png
$(INSTALL_DATA) $(srcdir)/22/draw-bezier-curves.png $(prefix)/share/scribus/icons/22/draw-bezier-curves.png
$(INSTALL_DATA) $(srcdir)/16/draw-donut.png $(prefix)/share/scribus/icons/16/draw-donut.png
$(INSTALL_DATA) $(srcdir)/16/draw-cross.png $(prefix)/share/scribus/icons/16/draw-cross.png
$(INSTALL_DATA) $(srcdir)/22/draw-cross.png $(prefix)/share/scribus/icons/22/draw-cross.png
265,6 → 263,8
$(INSTALL_DATA) $(srcdir)/22/draw-halfcircle3.png $(prefix)/share/scribus/icons/22/draw-halfcircle3.png
$(INSTALL_DATA) $(srcdir)/16/draw-halfcircle4.png $(prefix)/share/scribus/icons/16/draw-halfcircle4.png
$(INSTALL_DATA) $(srcdir)/22/draw-halfcircle4.png $(prefix)/share/scribus/icons/22/draw-halfcircle4.png
$(INSTALL_DATA) $(srcdir)/16/draw-path.png $(prefix)/share/scribus/icons/16/draw-path.png
$(INSTALL_DATA) $(srcdir)/22/draw-path.png $(prefix)/share/scribus/icons/22/draw-path.png
$(INSTALL_DATA) $(srcdir)/16/draw-polygon.png $(prefix)/share/scribus/icons/16/draw-polygon.png
$(INSTALL_DATA) $(srcdir)/22/draw-polygon.png $(prefix)/share/scribus/icons/22/draw-polygon.png
$(INSTALL_DATA) $(srcdir)/16/draw-polyline.png $(prefix)/share/scribus/icons/16/draw-polyline.png
651,8 → 651,6
-rm -f $(prefix)/share/scribus/icons/22/draw-arrow-forward.png
-rm -f $(prefix)/share/scribus/icons/16/draw-arrow-up.png
-rm -f $(prefix)/share/scribus/icons/22/draw-arrow-up.png
-rm -f $(prefix)/share/scribus/icons/16/draw-bezier-curves.png
-rm -f $(prefix)/share/scribus/icons/22/draw-bezier-curves.png
-rm -f $(prefix)/share/scribus/icons/16/draw-cross.png
-rm -f $(prefix)/share/scribus/icons/22/draw-cross.png
-rm -f $(prefix)/share/scribus/icons/16/draw-ellipse.png
665,6 → 663,8
-rm -f $(prefix)/share/scribus/icons/22/draw-halfcircle3.png
-rm -f $(prefix)/share/scribus/icons/16/draw-halfcircle4.png
-rm -f $(prefix)/share/scribus/icons/22/draw-halfcircle4.png
-rm -f $(prefix)/share/scribus/icons/16/draw-path.png
-rm -f $(prefix)/share/scribus/icons/22/draw-path.png
-rm -f $(prefix)/share/scribus/icons/16/draw-polygon.png
-rm -f $(prefix)/share/scribus/icons/22/draw-polygon.png
-rm -f $(prefix)/share/scribus/icons/22/draw-polyline.png
/branches/Version13x/Scribus/scribus/icons/16/draw-path.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/22/draw-path.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Version13x/Scribus/scribus/icons/22/draw-path.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/CMakeLists.txt
===================================================================
--- Version13x/Scribus/scribus/icons/CMakeLists.txt (revision 5910)
+++ Version13x/Scribus/scribus/icons/CMakeLists.txt (revision 5911)
@@ -318,7 +318,6 @@
16/draw-arrow-down.png
16/draw-arrow-forward.png
16/draw-arrow-up.png
-16/draw-bezier-curves.png
16/draw-cross.png
16/draw-donut.png
16/draw-ellipse.png
@@ -326,6 +325,7 @@
16/draw-halfcircle2.png
16/draw-halfcircle3.png
16/draw-halfcircle4.png
+16/draw-path.png
16/draw-polygon.png
16/draw-rectangle.png
16/draw-square-inverted-corners.png
@@ -386,7 +386,6 @@
22/draw-arrow-down.png
22/draw-arrow-forward.png
22/draw-arrow-up.png
-22/draw-bezier-curves.png
22/draw-cross.png
22/draw-ellipse.png
22/draw-freehand.png
@@ -394,6 +393,7 @@
22/draw-halfcircle2.png
22/draw-halfcircle3.png
22/draw-halfcircle4.png
+22/draw-path.png
22/draw-polygon.png
22/draw-polyline.png
22/draw-rectangle.png
Index: Version13x/Scribus/scribus/actionmanager.cpp
===================================================================
--- Version13x/Scribus/scribus/actionmanager.cpp (revision 5910)
+++ Version13x/Scribus/scribus/actionmanager.cpp (revision 5911)
@@ -632,7 +632,7 @@
name="toolsInsertLine";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Stift16.xpm"), loadIcon("Stift.xpm")), "", defKeys[name], mainWindow, name, modeDrawLine));
name="toolsInsertBezier";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/draw-bezier-curves.png"), loadIcon("22/draw-bezier-curves.png")), "", defKeys[name], mainWindow, name, modeDrawBezierLine));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/draw-path.png"), loadIcon("22/draw-path.png")), "", defKeys[name], mainWindow, name, modeDrawBezierLine));
name="toolsInsertFreehandLine";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("22/draw-freehand.png"), loadIcon("22/draw-freehand.png")), "", defKeys[name], mainWindow, name, modeDrawFreehandLine));
name="toolsRotate";