Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 9541 → Rev 9542

/branches/Version13x/Scribus/scribus/icons/Makefile.am
29,6 → 29,7
16/color-fill.png \
16/color-stroke.png \
22/combobox.png \
16/color-picker.png \
22/color-picker.png \
16/distribute-horizontal-center.png \
16/distribute-horizontal-equal.png \
82,6 → 83,7
22/draw-donut.png \
16/draw-ellipse.png \
22/draw-ellipse.png \
16/draw-freehand.png \
22/draw-freehand.png \
22/draw-freehand.png \
16/draw-halfcircle1.png \
186,12 → 188,15
16/page-simple.png \
32/page-simple.png \
22/pdf-annotations.png \
16/pointer.png \
22/pointer.png \
16/preflight-verifier.png \
22/preflight-verifier.png \
16/story-editor.png \
22/story-editor.png \
16/text-frame-link.png \
22/text-frame-link.png \
16/text-frame-unlink.png \
22/text-frame-unlink.png \
16/measure.png \
22/measure.png \
305,6 → 310,7
$(INSTALL_DATA) $(srcdir)/22/close.png $(prefix)/share/scribus/icons/22/close.png
$(INSTALL_DATA) $(srcdir)/colorpicker.png $(prefix)/share/scribus/icons/colorpicker.png
$(INSTALL_DATA) $(srcdir)/colorpickercursor.png $(prefix)/share/scribus/icons/colorpickercursor.png
$(INSTALL_DATA) $(srcdir)/16/color-picker.png $(prefix)/share/scribus/icons/16/color-picker.png
$(INSTALL_DATA) $(srcdir)/22/color-picker.png $(prefix)/share/scribus/icons/22/color-picker.png
$(INSTALL_DATA) $(srcdir)/16/color-fill.png $(prefix)/share/scribus/icons/16/color-fill.png
$(INSTALL_DATA) $(srcdir)/16/color-stroke.png $(prefix)/share/scribus/icons/16/color-stroke.png
545,6 → 551,7
$(INSTALL_DATA) $(srcdir)/penciladd.png $(prefix)/share/scribus/icons/penciladd.png
$(INSTALL_DATA) $(srcdir)/pencilsub.png $(prefix)/share/scribus/icons/pencilsub.png
$(INSTALL_DATA) $(srcdir)/plugins.png $(prefix)/share/scribus/icons/plugins.png
$(INSTALL_DATA) $(srcdir)/16/pointer.png $(prefix)/share/scribus/icons/16/pointer.png
$(INSTALL_DATA) $(srcdir)/22/pointer.png $(prefix)/share/scribus/icons/22/pointer.png
$(INSTALL_DATA) $(srcdir)/PolyCut.png $(prefix)/share/scribus/icons/PolyCut.png
$(INSTALL_DATA) $(srcdir)/16/preflight-verifier.png $(prefix)/share/scribus/icons/16/preflight-verifier.png
594,7 → 601,9
$(INSTALL_DATA) $(srcdir)/tab.png $(prefix)/share/scribus/icons/tab.png
$(INSTALL_DATA) $(srcdir)/tabtocindex.png $(prefix)/share/scribus/icons/tabtocindex.png
$(INSTALL_DATA) $(srcdir)/testfill.png $(prefix)/share/scribus/icons/testfill.png
$(INSTALL_DATA) $(srcdir)/16/text-frame-link.png $(prefix)/share/scribus/icons/16/text-frame-link.png
$(INSTALL_DATA) $(srcdir)/22/text-frame-link.png $(prefix)/share/scribus/icons/22/text-frame-link.png
$(INSTALL_DATA) $(srcdir)/16/text-frame-unlink.png $(prefix)/share/scribus/icons/16/text-frame-unlink.png
$(INSTALL_DATA) $(srcdir)/22/text-frame-unlink.png $(prefix)/share/scribus/icons/22/text-frame-unlink.png
$(INSTALL_DATA) $(srcdir)/textbase.png $(prefix)/share/scribus/icons/textbase.png
$(INSTALL_DATA) $(srcdir)/textkern.png $(prefix)/share/scribus/icons/textkern.png
720,7 → 729,8
-rm -f $(prefix)/share/scribus/icons/22/close.png
-rm -f $(prefix)/share/scribus/icons/colorpicker.png
-rm -f $(prefix)/share/scribus/icons/colorpickercursor.png
-rm -f $(prefix)/share/scribus/icons/color-picker.png
-rm -f $(prefix)/share/scribus/icons/16/color-picker.png
-rm -f $(prefix)/share/scribus/icons/22/color-picker.png
-rm -f $(prefix)/share/scribus/icons/16/color-fill.png
-rm -f $(prefix)/share/scribus/icons/16/color-stroke.png
-rm -f $(prefix)/share/scribus/icons/22/combobox.png
967,6 → 977,7
-rm -f $(prefix)/share/scribus/icons/penciladd.png
-rm -f $(prefix)/share/scribus/icons/pencilsub.png
-rm -f $(prefix)/share/scribus/icons/plugins.png
-rm -f $(prefix)/share/scribus/icons/16/pointer.png
-rm -f $(prefix)/share/scribus/icons/22/pointer.png
-rm -f $(prefix)/share/scribus/icons/PolyCut.png
-rm -f $(prefix)/share/scribus/icons/16/preflight-verifier.png
1013,7 → 1024,9
-rm -f $(prefix)/share/scribus/icons/tab.png
-rm -f $(prefix)/share/scribus/icons/tabtocindex.png
-rm -f $(prefix)/share/scribus/icons/testfill.png
-rm -f $(prefix)/share/scribus/icons/16/text-frame-link.png
-rm -f $(prefix)/share/scribus/icons/22/text-frame-link.png
-rm -f $(prefix)/share/scribus/icons/16/text-frame-unlink.png
-rm -f $(prefix)/share/scribus/icons/22/text-frame-unlink.png
-rm -f $(prefix)/share/scribus/icons/textbase.png
-rm -f $(prefix)/share/scribus/icons/textkern.png
/branches/Version13x/Scribus/scribus/icons/16/color-picker.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: branches/Version13x/Scribus/scribus/icons/16/text-frame-link.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/16/text-frame-link.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/16/text-frame-unlink.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/16/text-frame-unlink.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/16/pointer.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/16/pointer.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/16/draw-freehand.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/16/draw-freehand.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/CMakeLists.txt
===================================================================
--- branches/Version13x/Scribus/scribus/icons/CMakeLists.txt (revision 9541)
+++ branches/Version13x/Scribus/scribus/icons/CMakeLists.txt (revision 9542)
@@ -262,6 +262,7 @@
16/draw-cross.png
16/draw-donut.png
16/draw-ellipse.png
+16/draw-freehand.png
16/draw-halfcircle1.png
16/draw-halfcircle2.png
16/draw-halfcircle3.png
@@ -316,6 +317,7 @@
16/page-4fold.png
16/page-doublesided.png
16/page-simple.png
+16/pointer.png
16/preflight-verifier.png
16/show-object.png
16/story-editor.png
@@ -325,6 +327,8 @@
16/stroke-join-bevel.png
16/stroke-join-miter.png
16/stroke-join-round.png
+16/text-frame-link.png
+16/text-frame-unlink.png
16/transform-rotate.png
16/zoom.png
16/zoom-in.png
Index: branches/Version13x/Scribus/scribus/actionmanager.cpp
===================================================================
--- branches/Version13x/Scribus/scribus/actionmanager.cpp (revision 9541)
+++ branches/Version13x/Scribus/scribus/actionmanager.cpp (revision 9542)
@@ -649,7 +649,7 @@
//toolbar only items
name="toolsSelect";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("22/pointer.png"), loadIcon("22/pointer.png")), "", defKeys[name], mainWindow, name, modeNormal));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/pointer.png"), loadIcon("22/pointer.png")), "", defKeys[name], mainWindow, name, modeNormal));
name="toolsInsertTextFrame";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/insert-text-frame.png"), loadIcon("22/insert-text-frame.png")), "", defKeys[name], mainWindow, name, modeDrawText));
name="toolsInsertImageFrame";
@@ -665,9 +665,9 @@
name="toolsInsertBezier";
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));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/draw-freehand.png"), loadIcon("22/draw-freehand.png")), "", defKeys[name], mainWindow, name, modeDrawFreehandLine));
name="toolsRotate";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("22/transform-rotate.png"), loadIcon("22/transform-rotate.png")), "", defKeys[name], mainWindow, name, modeRotation));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/transform-rotate.png"), loadIcon("22/transform-rotate.png")), "", defKeys[name], mainWindow, name, modeRotation));
name="toolsZoom";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/zoom.png"), loadIcon("22/zoom.png")), "", defKeys[name], mainWindow, name, modeMagnifier));
name="toolsZoomIn";
@@ -679,11 +679,11 @@
name="toolsEditWithStoryEditor";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/story-editor.png"), loadIcon("22/story-editor.png")), "", defKeys[name], mainWindow, name, modeStoryEditor));
name="toolsLinkTextFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("22/text-frame-link.png"), loadIcon("22/text-frame-link.png")), "", defKeys[name], mainWindow, name, modeLinkFrames));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/text-frame-link.png"), loadIcon("22/text-frame-link.png")), "", defKeys[name], mainWindow, name, modeLinkFrames));
name="toolsUnlinkTextFrame";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("22/text-frame-unlink.png"), loadIcon("22/text-frame-unlink.png")), "", defKeys[name], mainWindow, name, modeUnlinkFrames));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/text-frame-unlink.png"), loadIcon("22/text-frame-unlink.png")), "", defKeys[name], mainWindow, name, modeUnlinkFrames));
name="toolsEyeDropper";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("22/color-picker.png"), loadIcon("22/color-picker.png")), "", defKeys[name], mainWindow, name, modeEyeDropper));
+ scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/color-picker.png"), loadIcon("22/color-picker.png")), "", defKeys[name], mainWindow, name, modeEyeDropper));
name="toolsCopyProperties";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("wizard.png"), loadIcon("wizard.png")), "", defKeys[name], mainWindow, name, modeCopyProperties));