Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 5265 → Rev 5266

/branches/Version13x/Scribus/scribus/icons/Makefile.am
5,7 → 5,6
16/close.png \
22/close.png \
22/color-picker.png \
22/draw-freehand.png \
16/document-new.png \
22/document-new.png \
16/document-open.png \
18,6 → 17,25
22/document-save.png \
16/document-save-as.png \
22/document-save-as.png \
22/draw-arrow-back.png \
22/draw-arrow-down.png \
22/draw-arrow-forward.png \
22/draw-arrow-up.png \
16/draw-bezier-curves.png \
22/draw-bezier-curves.png \
22/draw-cross.png \
16/draw-ellipse.png \
22/draw-ellipse.png \
22/draw-freehand.png \
16/draw-polygon.png \
22/draw-polygon.png \
16/draw-polyline.png \
22/draw-polyline.png \
16/draw-rectangle.png \
22/draw-rectangle.png \
16/draw-star.png \
22/draw-star.png \
22/draw-triangle.png \
16/edit-copy.png \
22/edit-copy.png \
16/edit-cut.png \
178,7 → 196,20
$(INSTALL_DATA) $(srcdir)/documentinfo.png $(prefix)/share/scribus/icons/documentinfo.png
$(INSTALL_DATA) $(srcdir)/documentinfo32.png $(prefix)/share/scribus/icons/documentinfo32.png
$(INSTALL_DATA) $(srcdir)/down.png $(prefix)/share/scribus/icons/down.png
$(INSTALL_DATA) $(srcdir)/22/draw-arrow-back.png $(prefix)/share/scribus/icons/22/draw-arrow-back.png
$(INSTALL_DATA) $(srcdir)/22/draw-arrow-down.png $(prefix)/share/scribus/icons/22/draw-arrow-down.png
$(INSTALL_DATA) $(srcdir)/22/draw-arrow-forward.png $(prefix)/share/scribus/icons/22/draw-arrow-forward.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)/22/draw-cross.png $(prefix)/share/scribus/icons/22/draw-cross.png
$(INSTALL_DATA) $(srcdir)/22/draw-ellipse.png $(prefix)/share/scribus/icons/22/draw-ellipse.png
$(INSTALL_DATA) $(srcdir)/22/draw-freehand.png $(prefix)/share/scribus/icons/22/draw-freehand.png
$(INSTALL_DATA) $(srcdir)/22/draw-polygon.png $(prefix)/share/scribus/icons/22/draw-polygon.png
$(INSTALL_DATA) $(srcdir)/22/draw-polyline.png $(prefix)/share/scribus/icons/22/draw-polyline.png
$(INSTALL_DATA) $(srcdir)/22/draw-rectangle.png $(prefix)/share/scribus/icons/22/draw-rectangle.png
$(INSTALL_DATA) $(srcdir)/22/draw-star.png $(prefix)/share/scribus/icons/22/draw-star.png
$(INSTALL_DATA) $(srcdir)/22/draw-triangle.png $(prefix)/share/scribus/icons/22/draw-triangle.png
$(INSTALL_DATA) $(srcdir)/DragPix.xpm $(prefix)/share/scribus/icons/DragPix.xpm
$(INSTALL_DATA) $(srcdir)/DrawFrame.xpm $(prefix)/share/scribus/icons/DrawFrame.xpm
$(INSTALL_DATA) $(srcdir)/DrawImageFrame.xpm $(prefix)/share/scribus/icons/DrawImageFrame.xpm
518,7 → 549,20
-rm -f $(prefix)/share/scribus/icons/documentinfo.png
-rm -f $(prefix)/share/scribus/icons/documentinfo32.png
-rm -f $(prefix)/share/scribus/icons/down.png
-rm -f $(prefix)/share/scribus/icons/22/draw-arrow-back.png
-rm -f $(prefix)/share/scribus/icons/22/draw-arrow-down.png
-rm -f $(prefix)/share/scribus/icons/22/draw-arrow-forward.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/22/draw-cross.png
-rm -f $(prefix)/share/scribus/icons/22/draw-ellipse.png
-rm -f $(prefix)/share/scribus/icons/22/draw-freehand.png
-rm -f $(prefix)/share/scribus/icons/22/draw-polygon.png
-rm -f $(prefix)/share/scribus/icons/22/draw-polyline.png
-rm -f $(prefix)/share/scribus/icons/22/draw-rectangle.png
-rm -f $(prefix)/share/scribus/icons/22/draw-star.png
-rm -f $(prefix)/share/scribus/icons/22/draw-triangle.png
-rm -f $(prefix)/share/scribus/icons/DragPix.xpm
-rm -f $(prefix)/share/scribus/icons/DrawFrame.xpm
-rm -f $(prefix)/share/scribus/icons/DrawImageFrame.xpm
/branches/Version13x/Scribus/scribus/icons/CMakeLists.txt
310,6 → 310,7
16/document-properties.png
16/document-save.png
16/document-save-as.png
22/draw-bezier-curves.png
16/edit-copy.png
16/edit-cut.png
16/edit-find-replace.png
348,7 → 349,19
22/document-properties.png
22/document-save.png
22/document-save-as.png
22/draw-arrow-back.png
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
22/draw-polygon.png
22/draw-polyline.png
22/draw-rectangle.png
22/draw-star.png
22/draw-triangle.png
22/edit-copy.png
22/edit-cut.png
22/edit-find-replace.png
/branches/Version13x/Scribus/scribus/actionmanager.cpp
605,11 → 605,11
name="toolsInsertShape";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(), "", defKeys[name], mainWindow, name, modeDrawShapes));
name="toolsInsertPolygon";
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("spline16.png"), loadIcon("spline.png")), "", defKeys[name], mainWindow, name, modeDrawRegularPolygon));
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/draw-polygon.png"), loadIcon("22/draw-polygon.png")), "", defKeys[name], mainWindow, name, modeDrawRegularPolygon));
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("beziertool16.png"), loadIcon("beziertool.png")), "", defKeys[name], mainWindow, name, modeDrawBezierLine));
scrActions->insert(name, new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("16/draw-bezier-curve.png"), loadIcon("22/draw-bezier-curve.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";
/branches/Version13x/Scribus/scribus/autoformbuttongroup.cpp
15,6 → 15,7
#include "autoformbuttongroup.moc"
#include "fpointarray.h"
#include "scpainter.h"
#include "util.h"
 
AutoformButtonGroup::AutoformButtonGroup( QWidget* parent ) : QButtonGroup( parent, "autoformbuttongroup" )
{
268,6 → 269,28
 
QPixmap AutoformButtonGroup::getIconPixmap(int nr)
{
if (nr<8)
{
switch(nr)
{
case 0:
return loadIcon("22/draw-rectangle.png");
case 1:
return loadIcon("22/draw-ellipse.png");
case 2:
return loadIcon("22/draw-triangle.png");
case 3:
return loadIcon("22/draw-cross.png");
case 4:
return loadIcon("22/draw-arrow-back.png");
case 5:
return loadIcon("22/draw-arrow-forward.png");
case 6:
return loadIcon("22/draw-arrow-up.png");
case 7:
return loadIcon("22/draw-arrow-down.png");
}
}
int count = 0;
double* AutoShapes;
FPointArray Path;