Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 7768 → Rev 7769

/branches/Version133x/Scribus/scribus/about.cpp
49,7 → 49,7
tabLayout1->setSpacing( 6 );
tabLayout1->setMargin( 15 );
pixmapLabel1 = new QLabel( tab, "PixmapLabel1" );
pixmapLabel1->setPixmap(loadIcon("scribus_logo.jpg"));
pixmapLabel1->setPixmap(loadIcon("scribus_logo.png"));
pixmapLabel1->setAlignment(Qt::AlignCenter);
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
/branches/Version133x/Scribus/scribus/icons/scribus_logo.jpg
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/Version133x/Scribus/scribus/icons/scribus_logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version133x/Scribus/scribus/icons/scribus_logo.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version133x/Scribus/scribus/icons/Makefile.am
===================================================================
--- branches/Version133x/Scribus/scribus/icons/Makefile.am (revision 7768)
+++ branches/Version133x/Scribus/scribus/icons/Makefile.am (revision 7769)
@@ -8,7 +8,7 @@
misc.png externaltools.png tools.png page.png guides.png font.png typography.png screen.png nftabout.xpm nftinfo.xpm \
dist.png dist22.png tab.png view.png Kreuz.xpm Bild.xpm Bild16.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm \
Rotieren.xpm Stift16.xpm Stift.xpm Text.xpm Text16.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm \
-DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm DragPix.xpm Rotieren2.png HandC.xpm scribus_logo.jpg \
+DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm DragPix.xpm Rotieren2.png HandC.xpm scribus_logo.png \
DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editcut22.png \
editdelete.png editdelete22.png editpaste.png exit.png doc.png image.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 FlipH.xpm FlipV.xpm Winkel.xpm \
@@ -223,7 +223,7 @@
$(INSTALL_DATA) $(srcdir)/scribusdoc16.png $(prefix)/share/scribus/icons/scribusdoc16.png
$(INSTALL_DATA) $(srcdir)/scribusicon.png $(prefix)/share/pixmaps/scribusicon.png
$(INSTALL_DATA) $(srcdir)/scribusicon.png $(prefix)/share/scribus/icons/scribusicon.png
- $(INSTALL_DATA) $(srcdir)/scribus_logo.jpg $(prefix)/share/scribus/icons/scribus_logo.jpg
+ $(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
@@ -497,7 +497,7 @@
-rm -f $(prefix)/share/scribus/icons/scribusdoc.png
-rm -f $(prefix)/share/scribus/icons/scribusdoc16.png
-rm -f $(prefix)/share/scribus/icons/scribusicon.png
- -rm -f $(prefix)/share/scribus/icons/scribus_logo.jpg
+ -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
Index: branches/Version133x/Scribus/scribus/icons/CMakeLists.txt
===================================================================
--- branches/Version133x/Scribus/scribus/icons/CMakeLists.txt (revision 7768)
+++ branches/Version133x/Scribus/scribus/icons/CMakeLists.txt (revision 7769)
@@ -203,7 +203,7 @@
scribusdoc16.png
scribusdoc.png
scribusicon.png
-scribus_logo.jpg
+scribus_logo.png
shade.png
shadow.png
shear_down.png