Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 307 → Rev 308

/trunk/Scribus/ChangeLogCVS
1,5 → 1,11
Changes since Version 1.1.7
 
10.06.2004
* bug #755: Collect for Output should ask confirmation
* bug #760: "icons" dir does not get copied by "make dist"
* feature #761: Right-click on graphics tablet triggers drag-and-drop
* feature #764: Enable transparent Gradients in PDF
 
08.06.2004
* bug #356: Margin Dialog not intuituve enough
* bug #721: add "current page" to print dialog
/trunk/Scribus/scribus/icons/Makefile.am
1,286 → 1,154
####### kdevelop will overwrite this part!!! (begin)##########
 
 
EXTRA_DIST = dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.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 acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.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 Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png
EXTRA_DIST = nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.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 acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.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 Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/nftinfo.xpm $(prefix)/share/scribus/icons/nftinfo.xpm
$(INSTALL_DATA) $(srcdir)/nftabout.xpm $(prefix)/share/scribus/icons/nftabout.xpm
$(INSTALL_DATA) $(srcdir)/dist.png $(prefix)/share/scribus/icons/dist.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/tab.png $(prefix)/share/scribus/icons/tab.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/view.png $(prefix)/share/scribus/icons/view.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/frame_table.png $(prefix)/share/scribus/icons/frame_table.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/testfill.png $(prefix)/share/scribus/icons/testfill.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/frameresize.png $(prefix)/share/scribus/icons/frameresize.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/framenoresize.png $(prefix)/share/scribus/icons/framenoresize.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/crop.png $(prefix)/share/scribus/icons/crop.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/expand.png $(prefix)/share/scribus/icons/expand.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/rotate_cw.png $(prefix)/share/scribus/icons/rotate_cw.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/rotate_ccw.png $(prefix)/share/scribus/icons/rotate_ccw.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Kreuz.xpm $(prefix)/share/scribus/icons/Kreuz.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Bild.xpm $(prefix)/share/scribus/icons/Bild.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Editm.xpm $(prefix)/share/scribus/icons/Editm.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Kreise.xpm $(prefix)/share/scribus/icons/Kreise.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Lock.xpm $(prefix)/share/scribus/icons/Lock.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Lupe.xpm $(prefix)/share/scribus/icons/Lupe.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Rechtecke.xpm $(prefix)/share/scribus/icons/Rechtecke.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Rotieren.xpm $(prefix)/share/scribus/icons/Rotieren.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Stift.xpm $(prefix)/share/scribus/icons/Stift.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Text.xpm $(prefix)/share/scribus/icons/Text.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Unlock.xpm $(prefix)/share/scribus/icons/Unlock.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiClos.xpm $(prefix)/share/scribus/icons/DateiClos.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiNeu.xpm $(prefix)/share/scribus/icons/DateiNeu.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiOpen.xpm $(prefix)/share/scribus/icons/DateiOpen.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiPrint.xpm $(prefix)/share/scribus/icons/DateiPrint.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiSave.xpm $(prefix)/share/scribus/icons/DateiSave.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/AppIcon2.png $(prefix)/share/scribus/icons/AppIcon2.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/AppIcon.png $(prefix)/share/scribus/icons/AppIcon.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/LupeZ.xpm $(prefix)/share/scribus/icons/LupeZ.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Gross.xpm $(prefix)/share/scribus/icons/Gross.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Klein.xpm $(prefix)/share/scribus/icons/Klein.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DragPix.xpm $(prefix)/share/scribus/icons/DragPix.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Rotieren2.xpm $(prefix)/share/scribus/icons/Rotieren2.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/HandC.xpm $(prefix)/share/scribus/icons/HandC.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/scribus_logo.jpg $(prefix)/share/scribus/icons/scribus_logo.jpg
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiClos16.png $(prefix)/share/scribus/icons/DateiClos16.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiNeu16.png $(prefix)/share/scribus/icons/DateiNeu16.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiOpen16.png $(prefix)/share/scribus/icons/DateiOpen16.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiPrint16.png $(prefix)/share/scribus/icons/DateiPrint16.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiSave16.png $(prefix)/share/scribus/icons/DateiSave16.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/editcopy.png $(prefix)/share/scribus/icons/editcopy.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/editcut.png $(prefix)/share/scribus/icons/editcut.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/editdelete.png $(prefix)/share/scribus/icons/editdelete.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/editpaste.png $(prefix)/share/scribus/icons/editpaste.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/exit.png $(prefix)/share/scribus/icons/exit.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/doc.png $(prefix)/share/scribus/icons/doc.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/image.png $(prefix)/share/scribus/icons/image.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/pdf.png $(prefix)/share/scribus/icons/pdf.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/postscript.png $(prefix)/share/scribus/icons/postscript.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/txt.png $(prefix)/share/scribus/icons/txt.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Zeichen.xpm $(prefix)/share/scribus/icons/Zeichen.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Hoch.xpm $(prefix)/share/scribus/icons/Hoch.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Kapital.xpm $(prefix)/share/scribus/icons/Kapital.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Strike.xpm $(prefix)/share/scribus/icons/Strike.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Tief.xpm $(prefix)/share/scribus/icons/Tief.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Unter.xpm $(prefix)/share/scribus/icons/Unter.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Kern.xpm $(prefix)/share/scribus/icons/Kern.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Spacing.xpm $(prefix)/share/scribus/icons/Spacing.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Corner.xpm $(prefix)/share/scribus/icons/Corner.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/FlipH.xpm $(prefix)/share/scribus/icons/FlipH.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/FlipV.xpm $(prefix)/share/scribus/icons/FlipV.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Winkel.xpm $(prefix)/share/scribus/icons/Winkel.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/acrobat.png $(prefix)/share/scribus/icons/acrobat.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/scribusicon.png $(prefix)/share/scribus/icons/scribusicon.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/text_block.png $(prefix)/share/scribus/icons/text_block.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/text_center.png $(prefix)/share/scribus/icons/text_center.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/text_left.png $(prefix)/share/scribus/icons/text_left.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/text_right.png $(prefix)/share/scribus/icons/text_right.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Text2.xpm $(prefix)/share/scribus/icons/Text2.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/spline.png $(prefix)/share/scribus/icons/spline.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/triangle.png $(prefix)/share/scribus/icons/triangle.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Stiftalt.xpm $(prefix)/share/scribus/icons/Stiftalt.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/beziertool.png $(prefix)/share/scribus/icons/beziertool.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/AddNode.png $(prefix)/share/scribus/icons/AddNode.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DeleteNode.png $(prefix)/share/scribus/icons/DeleteNode.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/MoveAsym.png $(prefix)/share/scribus/icons/MoveAsym.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/MoveKontrol.png $(prefix)/share/scribus/icons/MoveKontrol.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/MoveNode.png $(prefix)/share/scribus/icons/MoveNode.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/MoveSym.png $(prefix)/share/scribus/icons/MoveSym.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/BevelJoin.png $(prefix)/share/scribus/icons/BevelJoin.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/ButtCap.png $(prefix)/share/scribus/icons/ButtCap.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/MiterJoin.png $(prefix)/share/scribus/icons/MiterJoin.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/RoundJoin.png $(prefix)/share/scribus/icons/RoundJoin.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/SquareCap.png $(prefix)/share/scribus/icons/SquareCap.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/ResetNode.png $(prefix)/share/scribus/icons/ResetNode.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/RoundCap.png $(prefix)/share/scribus/icons/RoundCap.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Reset1Node.png $(prefix)/share/scribus/icons/Reset1Node.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/BezierClose.png $(prefix)/share/scribus/icons/BezierClose.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/PolyCut.png $(prefix)/share/scribus/icons/PolyCut.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/AddPoint.png $(prefix)/share/scribus/icons/AddPoint.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DelPoint.png $(prefix)/share/scribus/icons/DelPoint.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Split.png $(prefix)/share/scribus/icons/Split.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Deletelayer.png $(prefix)/share/scribus/icons/Deletelayer.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Layervisible.xpm $(prefix)/share/scribus/icons/Layervisible.xpm
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Lowerlayer.png $(prefix)/share/scribus/icons/Lowerlayer.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Newlayer.png $(prefix)/share/scribus/icons/Newlayer.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Raiselayer.png $(prefix)/share/scribus/icons/Raiselayer.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/checkbox.png $(prefix)/share/scribus/icons/checkbox.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/combobox.png $(prefix)/share/scribus/icons/combobox.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/listbox.png $(prefix)/share/scribus/icons/listbox.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/pushbutton.png $(prefix)/share/scribus/icons/pushbutton.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/textview.png $(prefix)/share/scribus/icons/textview.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/charset.png $(prefix)/share/scribus/icons/charset.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/goto.png $(prefix)/share/scribus/icons/goto.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/document2.png $(prefix)/share/scribus/icons/document2.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/trashcan.png $(prefix)/share/scribus/icons/trashcan.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/trashcan2.png $(prefix)/share/scribus/icons/trashcan2.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/gohome.png $(prefix)/share/scribus/icons/gohome.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/bottom.png $(prefix)/share/scribus/icons/bottom.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/down.png $(prefix)/share/scribus/icons/down.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/top.png $(prefix)/share/scribus/icons/top.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/up.png $(prefix)/share/scribus/icons/up.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/irreg.png $(prefix)/share/scribus/icons/irreg.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/text_force.png $(prefix)/share/scribus/icons/text_force.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/ok.png $(prefix)/share/scribus/icons/ok.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Revers.png $(prefix)/share/scribus/icons/Revers.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/vmirror.png $(prefix)/share/scribus/icons/vmirror.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/hmirror.png $(prefix)/share/scribus/icons/hmirror.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/shear_right.png $(prefix)/share/scribus/icons/shear_right.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/shear_left.png $(prefix)/share/scribus/icons/shear_left.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/shear_up.png $(prefix)/share/scribus/icons/shear_up.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/shear_down.png $(prefix)/share/scribus/icons/shear_down.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/Splash.png $(prefix)/share/scribus/icons/Splash.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/back.png $(prefix)/share/scribus/icons/back.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/finish.png $(prefix)/share/scribus/icons/finish.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/forward.png $(prefix)/share/scribus/icons/forward.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/start.png $(prefix)/share/scribus/icons/start.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/penciladd.png $(prefix)/share/scribus/icons/penciladd.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/pencilsub.png $(prefix)/share/scribus/icons/pencilsub.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/outlined.png $(prefix)/share/scribus/icons/outlined.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/fill.png $(prefix)/share/scribus/icons/fill.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/locked.png $(prefix)/share/scribus/icons/locked.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/unlock.png $(prefix)/share/scribus/icons/unlock.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/NoPrint.png $(prefix)/share/scribus/icons/NoPrint.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/scribusdoc.png $(prefix)/share/scribus/icons/scribusdoc.png
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/signature.png $(prefix)/share/scribus/icons/signature.png
 
 
uninstall-local:
-rm -f $(prefix)/share/scribus/icons/nftinfo.xpm
-rm -f $(prefix)/share/scribus/icons/nftabout.xpm
-rm -f $(prefix)/share/scribus/icons/Kreuz.xpm
-rm -f $(prefix)/share/scribus/icons/Bild.xpm
-rm -f $(prefix)/share/scribus/icons/Editm.xpm
/trunk/Scribus/scribus/icons/nftabout.xpm
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: trunk/Scribus/scribus/icons/nftinfo.xpm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/icons/nftinfo.xpm
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/Scribus/scribus/libabout/about.cpp
===================================================================
--- trunk/Scribus/scribus/libabout/about.cpp (revision 307)
+++ trunk/Scribus/scribus/libabout/about.cpp (revision 308)
@@ -56,7 +56,7 @@
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
- QString bu = tr("%1. %2 %3 ").arg("08").arg("June").arg("2004");
+ QString bu = tr("%1. %2 %3 ").arg("10").arg("June").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
Index: trunk/Scribus/scribus/scribus.cpp
===================================================================
--- trunk/Scribus/scribus/scribus.cpp (revision 307)
+++ trunk/Scribus/scribus/scribus.cpp (revision 308)
@@ -457,7 +457,7 @@
SetShortCut();
if (CMSavail)
{
- settingsMenu->insertItem( tr("Color Management..."), this , SLOT(SetCMSPrefs()));
+ settingsMenu->insertItem( tr("&Color Management..."), this , SLOT(SetCMSPrefs()));
ProfilesL::Iterator ip;
if ((Prefs.DCMSset.DefaultInputProfile == "") || (!InputProfiles.contains(Prefs.DCMSset.DefaultInputProfile)))
{
@@ -592,69 +592,69 @@
recentMenu = new QPopupMenu();
RecentDocs.clear();
fileMenu=new QPopupMenu();
- fid12 = fileMenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), this, SLOT(slotFileNew()), CTRL+Key_N);
- fid13 = fileMenu->insertItem(loadIcon("DateiOpen16.png"), tr("Open..."), this, SLOT(slotDocOpen()), CTRL+Key_O);
- fid14 = fileMenu->insertItem( tr("Recent Documents"), recentMenu);
+ fid12 = fileMenu->insertItem(loadIcon("DateiNeu16.png"), tr("&New"), this, SLOT(slotFileNew()), CTRL+Key_N);
+ fid13 = fileMenu->insertItem(loadIcon("DateiOpen16.png"), tr("&Open..."), this, SLOT(slotDocOpen()), CTRL+Key_O);
+ fid14 = fileMenu->insertItem( tr("Open &Recent"), recentMenu);
SetKeyEntry(0, tr("New"), fid12, CTRL+Key_N);
SetKeyEntry(1, tr("Open..."), fid13, CTRL+Key_O);
fileMenu->insertSeparator();
- fid1 = fileMenu->insertItem(loadIcon("DateiClos16.png"), tr("Close"), this, SLOT(slotFileClose()), CTRL+Key_W);
+ fid1 = fileMenu->insertItem(loadIcon("DateiClos16.png"), tr("&Close"), this, SLOT(slotFileClose()), CTRL+Key_W);
SetKeyEntry(2, tr("Close"), fid1, CTRL+Key_W);
fileMenu->setItemEnabled(fid1, 0);
MenuItemsFile.append(fid1);
- fid4 = fileMenu->insertItem(loadIcon("DateiSave16.png"), tr("Save"), this, SLOT(slotFileSave()), CTRL+Key_S);
+ fid4 = fileMenu->insertItem(loadIcon("DateiSave16.png"), tr("&Save"), this, SLOT(slotFileSave()), CTRL+Key_S);
SetKeyEntry(3, tr("Save"), fid4, CTRL+Key_S);
fileMenu->setItemEnabled(fid4, 0);
- fid5 = fileMenu->insertItem( tr("Save as..."), this, SLOT(slotFileSaveAs()));
+ fid5 = fileMenu->insertItem( tr("Save &As..."), this, SLOT(slotFileSaveAs()));
SetKeyEntry(4, tr("Save as..."), fid5, 0);
fileMenu->setItemEnabled(fid5, 0);
- fid52 = fileMenu->insertItem( tr("Revert to Saved"), this, SLOT(slotFileRevert()));
+ fid52 = fileMenu->insertItem( tr("Re&vert to Saved"), this, SLOT(slotFileRevert()));
fileMenu->setItemEnabled(fid52, 0);
- fid51 = fileMenu->insertItem( tr("Collect for Output..."), this, SLOT(Collect()));
+ fid51 = fileMenu->insertItem( tr("Collect for O&utput..."), this, SLOT(Collect()));
fileMenu->setItemEnabled(fid51, 0);
MenuItemsFile.append(fid51);
fileMenu->insertSeparator();
importMenu = new QPopupMenu();
- fid2 = importMenu->insertItem( tr("Get Text/Picture..."), this, SLOT(slotFileOpen()));
+ fid2 = importMenu->insertItem( tr("&Get Text/Picture..."), this, SLOT(slotFileOpen()));
importMenu->setItemEnabled(fid2, 0);
- fid2aa = importMenu->insertItem( tr("Append Text..."), this, SLOT(slotFileAppend()));
+ fid2aa = importMenu->insertItem( tr("Append &Text..."), this, SLOT(slotFileAppend()));
importMenu->setItemEnabled(fid2aa, 0);
- fid2a = importMenu->insertItem( tr("Insert Page..."), this, SLOT(slotDocMerge()));
+ fid2a = importMenu->insertItem( tr("Insert &Page..."), this, SLOT(slotDocMerge()));
importMenu->setItemEnabled(fid2a, 0);
- fileMenu->insertItem( tr("Import..."), importMenu);
+ fileMenu->insertItem( tr("&Import"), importMenu);
exportMenu = new QPopupMenu();
- fid3 = exportMenu->insertItem( tr("Save Text..."), this, SLOT(SaveText()));
+ fid3 = exportMenu->insertItem( tr("Save &Text..."), this, SLOT(SaveText()));
exportMenu->setItemEnabled(fid3, 0);
- fid8 = exportMenu->insertItem( tr("Save Page as EPS..."), this, SLOT(SaveAsEps()));
+ fid8 = exportMenu->insertItem( tr("Save Page as &EPS..."), this, SLOT(SaveAsEps()));
exportMenu->setItemEnabled(fid8, 0);
- fid10 = exportMenu->insertItem( tr("Save as PDF..."), this, SLOT(SaveAsPDF()));
+ fid10 = exportMenu->insertItem( tr("Save as P&DF..."), this, SLOT(SaveAsPDF()));
exportMenu->setItemEnabled(fid10, 0);
- fid11 = fileMenu->insertItem( tr("Export..."), exportMenu);
+ fid11 = fileMenu->insertItem( tr("&Export"), exportMenu);
fileMenu->setItemEnabled(fid11, 0);
fileMenu->insertSeparator();
- fid6 = fileMenu->insertItem( tr("Document Info..."), this, SLOT(InfoDoc()), CTRL+Key_I);
+ fid6 = fileMenu->insertItem( tr("Document &Info..."), this, SLOT(InfoDoc()), CTRL+Key_I);
fileMenu->setItemEnabled(fid6, 0);
MenuItemsFile.append(fid6);
SetKeyEntry(5, tr("Document Info..."), fid6, CTRL+Key_I);
- fid7 = fileMenu->insertItem( tr("Document Setup..."), this, SLOT(SetupDoc()));
+ fid7 = fileMenu->insertItem( tr("Document &Setup..."), this, SLOT(SetupDoc()));
fileMenu->setItemEnabled(fid7, 0);
MenuItemsFile.append(fid7);
SetKeyEntry(6, tr("Document Setup..."), fid7, 0);
- fid9 = fileMenu->insertItem(loadIcon("DateiPrint16.png"), tr("Print..."), this, SLOT(slotFilePrint()), CTRL+Key_P);
+ fid9 = fileMenu->insertItem(loadIcon("DateiPrint16.png"), tr("&Print..."), this, SLOT(slotFilePrint()), CTRL+Key_P);
fileMenu->setItemEnabled(fid9, 0);
MenuItemsFile.append(fid9);
SetKeyEntry(7, tr("Print..."), fid9, CTRL+Key_P);
fileMenu->insertSeparator();
- MenID = fileMenu->insertItem(loadIcon("exit.png"), tr("Quit"), this, SLOT(slotFileQuit()), CTRL+Key_Q);
+ MenID = fileMenu->insertItem(loadIcon("exit.png"), tr("&Quit"), this, SLOT(slotFileQuit()), CTRL+Key_Q);
SetKeyEntry(8, tr("Quit"), MenID, CTRL+Key_Q);
editMenu = new QPopupMenu();
- edUndo = editMenu->insertItem( tr("Undo"), this, SLOT(UnDoAction()), CTRL+Key_Z);
+ edUndo = editMenu->insertItem( tr("&Undo"), this, SLOT(UnDoAction()), CTRL+Key_Z);
editMenu->insertSeparator();
- edid1 = editMenu->insertItem(loadIcon("editcut.png"), tr("Cut"), this , SLOT(slotEditCut()), CTRL+Key_X);
- edid2 = editMenu->insertItem(loadIcon("editcopy.png"), tr("Copy"), this , SLOT(slotEditCopy()), CTRL+Key_C);
- edid3 = editMenu->insertItem(loadIcon("editpaste.png"), tr("Paste"), this , SLOT(slotEditPaste()), CTRL+Key_V);
- edid4 = editMenu->insertItem(loadIcon("editdelete.png"), tr("Clear"), this, SLOT(DeleteText()));
- edid5 = editMenu->insertItem( tr("Select all"), this, SLOT(SelectAll()), CTRL+Key_A);
+ edid1 = editMenu->insertItem(loadIcon("editcut.png"), tr("Cu&t"), this , SLOT(slotEditCut()), CTRL+Key_X);
+ edid2 = editMenu->insertItem(loadIcon("editcopy.png"), tr("&Copy"), this , SLOT(slotEditCopy()), CTRL+Key_C);
+ edid3 = editMenu->insertItem(loadIcon("editpaste.png"), tr("&Paste"), this , SLOT(slotEditPaste()), CTRL+Key_V);
+ edid4 = editMenu->insertItem(loadIcon("editdelete.png"), tr("C&lear"), this, SLOT(DeleteText()));
+ edid5 = editMenu->insertItem( tr("Select &All"), this, SLOT(SelectAll()), CTRL+Key_A);
SetKeyEntry(9, tr("Cut"), edid1, CTRL+Key_X);
SetKeyEntry(10, tr("Copy"), edid2, CTRL+Key_C);
SetKeyEntry(11, tr("Paste"), edid3, CTRL+Key_V);
@@ -661,16 +661,16 @@
SetKeyEntry(12, tr("Clear"), edid4, 0);
SetKeyEntry(13, tr("Select all"), edid5, CTRL+Key_A);
editMenu->insertSeparator();
- Sear = editMenu->insertItem( tr("Search/Replace..."), this, SLOT(SearchText()));
+ Sear = editMenu->insertItem( tr("&Search/Replace..."), this, SLOT(SearchText()));
editMenu->insertSeparator();
- MenID = editMenu->insertItem( tr("Colors..."), this , SLOT(slotEditColors()));
+ MenID = editMenu->insertItem( tr("C&olors..."), this , SLOT(slotEditColors()));
SetKeyEntry(14, tr("Colors..."), MenID, 0);
- edid6 = editMenu->insertItem( tr("Paragraph Styles..."), this , SLOT(slotEditStyles()));
- edid6a = editMenu->insertItem( tr("Line Styles..."), this , SLOT(slotEditLineStyles()));
+ edid6 = editMenu->insertItem( tr("&Paragraph Styles..."), this , SLOT(slotEditStyles()));
+ edid6a = editMenu->insertItem( tr("&Line Styles..."), this , SLOT(slotEditLineStyles()));
SetKeyEntry(15, tr("Styles..."), edid6, 0);
- tman = editMenu->insertItem( tr("Templates..."), this, SLOT(ManageTemp()));
+ tman = editMenu->insertItem( tr("&Templates..."), this, SLOT(ManageTemp()));
SetKeyEntry(16, tr("Templates..."), tman, 0);
- jman = editMenu->insertItem( tr("Javascripts..."), this, SLOT(ManageJava()));
+ jman = editMenu->insertItem( tr("&Javascripts..."), this, SLOT(ManageJava()));
editMenu->setItemEnabled(edUndo, 0);
editMenu->setItemEnabled(edid1, 0);
editMenu->setItemEnabled(edid2, 0);
@@ -685,28 +685,28 @@
StilMenu = new QPopupMenu();
ObjMenu = new QPopupMenu();
SetKeyEntry(19, tr("Select New Font"), 0, 0);
- ODup = ObjMenu->insertItem( tr("Duplicate"), this, SLOT(ObjektDup()), CTRL+Key_D);
+ ODup = ObjMenu->insertItem( tr("D&uplicate"), this, SLOT(ObjektDup()), CTRL+Key_D);
SetKeyEntry(20, tr("Duplicate"), ODup, CTRL+Key_D);
- OMDup = ObjMenu->insertItem( tr("Multiple Duplicate"), this, SLOT(ObjektDupM()));
+ OMDup = ObjMenu->insertItem( tr("&Multiple Duplicate"), this, SLOT(ObjektDupM()));
SetKeyEntry(21, tr("Multiple Duplicate"), OMDup, 0);
- Loesch = ObjMenu->insertItem( tr("Delete"), this, SLOT(DeleteObjekt()), CTRL+Key_K);
+ Loesch = ObjMenu->insertItem( tr("&Delete"), this, SLOT(DeleteObjekt()), CTRL+Key_K);
SetKeyEntry(22, tr("Delete"), Loesch, CTRL+Key_K);
ObjMenu->insertSeparator();
- Gr = ObjMenu->insertItem( tr("Group"), this, SLOT(GroupObj()), CTRL+Key_G);
+ Gr = ObjMenu->insertItem( tr("&Group"), this, SLOT(GroupObj()), CTRL+Key_G);
SetKeyEntry(23, tr("Group"), Gr, CTRL+Key_G);
- UnGr = ObjMenu->insertItem( tr("Un-group"), this, SLOT(UnGroupObj()),CTRL+Key_U);
+ UnGr = ObjMenu->insertItem( tr("&Ungroup"), this, SLOT(UnGroupObj()),CTRL+Key_U);
SetKeyEntry(24, tr("Un-group"), UnGr, CTRL+Key_U);
- LockOb = ObjMenu->insertItem( tr("Lock"), this, SLOT(ToggleObjLock()), CTRL+Key_H);
+ LockOb = ObjMenu->insertItem( tr("&Lock"), this, SLOT(ToggleObjLock()), CTRL+Key_H);
ObjMenu->insertSeparator();
- OBack = ObjMenu->insertItem( tr("Send to Back"), this, SLOT(Objekt2Back()));
+ OBack = ObjMenu->insertItem( tr("Send to &Back"), this, SLOT(Objekt2Back()));
SetKeyEntry(25, tr("Send to Back"), OBack, 0);
- OFront = ObjMenu->insertItem( tr("Bring to Front"), this, SLOT(Objekt2Front()));
+ OFront = ObjMenu->insertItem( tr("Bring to &Front"), this, SLOT(Objekt2Front()));
SetKeyEntry(26, tr("Bring to Front"), OFront, 0);
- OLower = ObjMenu->insertItem( tr("Lower"), this, SLOT(ObjektLower()));
+ OLower = ObjMenu->insertItem( tr("&Lower"), this, SLOT(ObjektLower()));
SetKeyEntry(27, tr("Lower"), OLower, 0);
- ORaise = ObjMenu->insertItem( tr("Raise"), this, SLOT(ObjektRaise()));
+ ORaise = ObjMenu->insertItem( tr("&Raise"), this, SLOT(ObjektRaise()));
SetKeyEntry(28, tr("Raise"), ORaise, 0);
- DistM = ObjMenu->insertItem( tr("Distribute/Align..."), this, SLOT(ObjektAlign()));
+ DistM = ObjMenu->insertItem( tr("Distribute/&Align..."), this, SLOT(ObjektAlign()));
SetKeyEntry(29, tr("Distribute/Align..."), DistM, 0);
ObjMenu->insertSeparator();
ShapeMenu = new QPopupMenu();
@@ -713,13 +713,13 @@
SCustom = new Autoforms(0);
ShapeMenu->insertItem(SCustom);
connect(SCustom, SIGNAL(FormSel(int, int, double *)), this, SLOT(MakeFrame(int, int, double *)));
- ShapeEdit = ShapeMenu->insertItem( tr("Edit Frame"), this, SLOT(ToggleFrameEdit()));
- ShapeM = ObjMenu->insertItem( tr("Shape"), ShapeMenu);
- PfadT = ObjMenu->insertItem( tr("Attach Text to Path"), this, SLOT(Pfadtext()));
- PfadDT = ObjMenu->insertItem( tr("Detach Text from Path"), this, SLOT(noPfadtext()));
- PfadV = ObjMenu->insertItem( tr("Combine Polygons"), this, SLOT(UniteOb()));
- PfadS = ObjMenu->insertItem( tr("Split Polygons"), this, SLOT(SplitUniteOb()));
- PfadTP = ObjMenu->insertItem( tr("Convert to Outlines"), this, SLOT(TraceText()));
+ ShapeEdit = ShapeMenu->insertItem( tr("&Edit Frame"), this, SLOT(ToggleFrameEdit()));
+ ShapeM = ObjMenu->insertItem( tr("&Shape"), ShapeMenu);
+ PfadT = ObjMenu->insertItem( tr("&Attach Text to Path"), this, SLOT(Pfadtext()));
+ PfadDT = ObjMenu->insertItem( tr("&Detach Text from Path"), this, SLOT(noPfadtext()));
+ PfadV = ObjMenu->insertItem( tr("&Combine Polygons"), this, SLOT(UniteOb()));
+ PfadS = ObjMenu->insertItem( tr("Split &Polygons"), this, SLOT(SplitUniteOb()));
+ PfadTP = ObjMenu->insertItem( tr("C&onvert to Outlines"), this, SLOT(TraceText()));
ObjMenu->setItemEnabled(ShapeM, 0);
ObjMenu->setItemEnabled(DistM, 0);
ObjMenu->setItemEnabled(Gr, 0);
@@ -731,95 +731,95 @@
ObjMenu->setItemEnabled(LockOb, 0);
ObjMenu->setItemEnabled(PfadTP, 0);
pageMenu = new QPopupMenu();
- MenID = pageMenu->insertItem( tr("Insert..."), this, SLOT(slotNewPageM()));
+ MenID = pageMenu->insertItem( tr("&Insert..."), this, SLOT(slotNewPageM()));
SetKeyEntry(30, tr("Insert..."), MenID, 0);
- pgmd = pageMenu->insertItem( tr("Delete..."), this, SLOT(DeletePage()));
+ pgmd = pageMenu->insertItem( tr("&Delete..."), this, SLOT(DeletePage()));
SetKeyEntry(31, tr("Delete..."), pgmd, 0);
- MenID = pageMenu->insertItem( tr("Copy")+"...", this, SLOT(CopyPage()));
+ MenID = pageMenu->insertItem( tr("&Copy")+"...", this, SLOT(CopyPage()));
SetKeyEntry(61, tr("Copy")+"...", MenID, 0);
- pgmv = pageMenu->insertItem( tr("Move..."), this, SLOT(MovePage()));
+ pgmv = pageMenu->insertItem( tr("&Move..."), this, SLOT(MovePage()));
SetKeyEntry(32, tr("Move..."), pgmv, 0);
- MenID = pageMenu->insertItem( tr("Apply Template..."), this, SLOT(ApplyTemp()));
+ MenID = pageMenu->insertItem( tr("&Apply Template..."), this, SLOT(ApplyTemp()));
SetKeyEntry(33, tr("Apply Template..."), MenID, 0);
- MenID = pageMenu->insertItem( tr("Manage Guides..."), this, SLOT(ManageGuides()));
+ MenID = pageMenu->insertItem( tr("&Manage Guides..."), this, SLOT(ManageGuides()));
SetKeyEntry(49, tr("Manage Guides..."), MenID, 0);
pageMenu->setItemEnabled(pgmd, 0);
pageMenu->setItemEnabled(pgmv, 0);
viewMenu=new QPopupMenu();
- MenID = viewMenu->insertItem( tr("Fit in Window"), this, SLOT(slotZoomFit()), CTRL+Key_0);
+ MenID = viewMenu->insertItem( tr("&Fit in Window"), this, SLOT(slotZoomFit()), CTRL+Key_0);
SetKeyEntry(34, tr("Fit in Window"), MenID, CTRL+Key_0);
- MenID = viewMenu->insertItem("50%", this, SLOT(slotZoom50()));
+ MenID = viewMenu->insertItem("&50%", this, SLOT(slotZoom50()));
SetKeyEntry(35, tr("50%"), MenID, 0);
- MenID = viewMenu->insertItem("75%", this, SLOT(slotZoom75()));
+ MenID = viewMenu->insertItem("&75%", this, SLOT(slotZoom75()));
SetKeyEntry(36, tr("75%"), MenID, 0);
- MenID = viewMenu->insertItem( tr("Actual Size"), this, SLOT(slotZoom100()), CTRL+Key_1);
+ MenID = viewMenu->insertItem( tr("&100%"), this, SLOT(slotZoom100()), CTRL+Key_1);
SetKeyEntry(37, tr("Actual Size"), MenID, CTRL+Key_1);
- MenID = viewMenu->insertItem("200%", this, SLOT(slotZoom200()));
+ MenID = viewMenu->insertItem("&200%", this, SLOT(slotZoom200()));
SetKeyEntry(38, tr("200%"), MenID, 0);
- MenID = viewMenu->insertItem( tr("Thumbnails"), this, SLOT(slotZoom20()));
+ MenID = viewMenu->insertItem( tr("&Thumbnails"), this, SLOT(slotZoom20()));
SetKeyEntry(39, tr("Thumbnails"), MenID, 0);
viewMenu->insertSeparator();
- Markers = viewMenu->insertItem( tr("Hide Margins"), this, SLOT(ToggleMarks()));
+ Markers = viewMenu->insertItem( tr("Hide &Margins"), this, SLOT(ToggleMarks()));
SetKeyEntry(40, tr("Hide Margins"), Markers, 0);
- FrameDr = viewMenu->insertItem( tr("Hide Frames"), this, SLOT(ToggleFrames()));
+ FrameDr = viewMenu->insertItem( tr("Hide &Frames"), this, SLOT(ToggleFrames()));
SetKeyEntry(41, tr("Hide Frames"), FrameDr, 0);
- Bilder = viewMenu->insertItem( tr("Hide Images"), this, SLOT(TogglePics()));
+ Bilder = viewMenu->insertItem( tr("Hide &Images"), this, SLOT(TogglePics()));
SetKeyEntry(42, tr("Hide Images"), Bilder, 0);
- Ras = viewMenu->insertItem( tr("Show Grid"), this, SLOT(ToggleRaster()));
+ Ras = viewMenu->insertItem( tr("Show &Grid"), this, SLOT(ToggleRaster()));
SetKeyEntry(43, tr("Show Grid"), Ras, 0);
- uRas = viewMenu->insertItem( tr("Snap to Grid"), this, SLOT(ToggleURaster()));
+ uRas = viewMenu->insertItem( tr("Snap to &Grid"), this, SLOT(ToggleURaster()));
SetKeyEntry(44, tr("Snap to Grid"), uRas, 0);
- Guide = viewMenu->insertItem( tr("Hide Guides"), this, SLOT(ToggleGuides()));
- uGuide = viewMenu->insertItem( tr("Snap to Guides"), this, SLOT(ToggleUGuides()));
- Base = viewMenu->insertItem( tr("Show Baseline Grid"), this, SLOT(ToggleBase()));
+ Guide = viewMenu->insertItem( tr("Hide G&uides"), this, SLOT(ToggleGuides()));
+ uGuide = viewMenu->insertItem( tr("Sna&p to Guides"), this, SLOT(ToggleUGuides()));
+ Base = viewMenu->insertItem( tr("Show &Baseline Grid"), this, SLOT(ToggleBase()));
toolMenu=new QPopupMenu();
- viewMpal = toolMenu->insertItem( tr("Properties"), this, SLOT(ToggleMpal()));
+ viewMpal = toolMenu->insertItem( tr("&Properties"), this, SLOT(ToggleMpal()));
SetKeyEntry(46, tr("Properties"), viewMpal, 0);
- viewTpal = toolMenu->insertItem( tr("Outline"), this, SLOT(ToggleTpal()));
+ viewTpal = toolMenu->insertItem( tr("&Outline"), this, SLOT(ToggleTpal()));
SetKeyEntry(47, tr("Outline"), viewTpal, 0);
- viewBpal = toolMenu->insertItem( tr("Scrapbook"), this, SLOT(ToggleBpal()));
+ viewBpal = toolMenu->insertItem( tr("&Scrapbook"), this, SLOT(ToggleBpal()));
SetKeyEntry(48, tr("Scrapbook"), viewBpal, 0);
- viewLpal = toolMenu->insertItem( tr("Layers"), this, SLOT(ToggleLpal()));
- viewSepal = toolMenu->insertItem( tr("Page Palette"), this, SLOT(ToggleSepal()));
- viewBopal = toolMenu->insertItem( tr("Bookmarks"), this, SLOT(ToggleBookpal()));
+ viewLpal = toolMenu->insertItem( tr("&Layers"), this, SLOT(ToggleLpal()));
+ viewSepal = toolMenu->insertItem( tr("P&age Palette"), this, SLOT(ToggleSepal()));
+ viewBopal = toolMenu->insertItem( tr("&Bookmarks"), this, SLOT(ToggleBookpal()));
extraMenu=new QPopupMenu();
- MenID = extraMenu->insertItem( tr("Manage Pictures"), this, SLOT(StatusPic()));
+ MenID = extraMenu->insertItem( tr("&Manage Pictures"), this, SLOT(StatusPic()));
SetKeyEntry(51, tr("Manage Pictures"), MenID, 0);
- hyph = extraMenu->insertItem( tr("Hyphenate Text"), this, SLOT(doHyphenate()));
+ hyph = extraMenu->insertItem( tr("&Hyphenate Text"), this, SLOT(doHyphenate()));
extraMenu->setItemEnabled(hyph, 0);
SetKeyEntry(50, tr("Hyphenate Text"), hyph, 0);
settingsMenu = new QPopupMenu();
- tip = settingsMenu->insertItem( tr("Tool-Tips"), this, SLOT(ToggleTips()));
- toolbarMenuTools = settingsMenu->insertItem( tr("Tools"), this, SLOT(ToggleTools()));
- toolbarMenuPDFTools = settingsMenu->insertItem( tr("PDF-Tools"), this, SLOT(TogglePDFTools()));
+ tip = settingsMenu->insertItem( tr("Toolti&ps"), this, SLOT(ToggleTips()));
+ toolbarMenuTools = settingsMenu->insertItem( tr("&Tools"), this, SLOT(ToggleTools()));
+ toolbarMenuPDFTools = settingsMenu->insertItem( tr("P&DF Tools"), this, SLOT(TogglePDFTools()));
SetKeyEntry(45, tr("Tools"), toolbarMenuTools, 0);
- SetKeyEntry(55, tr("Tool-Tips"), tip, 0);
+ SetKeyEntry(55, tr("Tooltips"), tip, 0);
tipsOn = true;
settingsMenu->setItemChecked(tip, tipsOn);
settingsMenu->insertSeparator();
- MenID = settingsMenu->insertItem( tr("Preferences..."), this , SLOT(slotPrefsOrg()));
- MenID = settingsMenu->insertItem( tr("Fonts..."), this , SLOT(slotFontOrg()));
+ MenID = settingsMenu->insertItem( tr("&Preferences..."), this , SLOT(slotPrefsOrg()));
+ MenID = settingsMenu->insertItem( tr("&Fonts..."), this , SLOT(slotFontOrg()));
SetKeyEntry(17, tr("Fonts..."), MenID, 0);
- settingsMenu->insertItem( tr("Hyphenator..."), this, SLOT(configHyphenator()));
- settingsMenu->insertItem( tr("Keyboard Shortcuts..."), this, SLOT(DefKB()));
+ settingsMenu->insertItem( tr("&Hyphenator..."), this, SLOT(configHyphenator()));
+ settingsMenu->insertItem( tr("&Keyboard Shortcuts..."), this, SLOT(DefKB()));
windowsMenu = new QPopupMenu();
windowsMenu->setCheckable( true );
connect(windowsMenu, SIGNAL(aboutToShow()), this, SLOT(windowsMenuAboutToShow()));
helpMenu=new QPopupMenu();
- MenID = helpMenu->insertItem( tr("About Scribus"), this, SLOT(slotHelpAbout()));
+ MenID = helpMenu->insertItem( tr("&About Scribus"), this, SLOT(slotHelpAbout()));
SetKeyEntry(52, tr("About Scribus"), MenID, 0);
- MenID = helpMenu->insertItem( tr("About Qt"), this, SLOT(slotHelpAboutQt()));
+ MenID = helpMenu->insertItem( tr("About &Qt"), this, SLOT(slotHelpAboutQt()));
SetKeyEntry(53, tr("About Qt"), MenID, 0);
helpMenu->insertSeparator();
- MenID = helpMenu->insertItem( tr("Scribus Manual..."), this, SLOT(slotOnlineHelp()));
+ MenID = helpMenu->insertItem( tr("Scribus &Manual..."), this, SLOT(slotOnlineHelp()));
SetKeyEntry(54, tr("Online-Help..."), MenID, 0);
// editMenu->insertItem( tr("Test"), this, SLOT(slotTest()));
// helpMenu->insertItem( tr("Test2"), this, SLOT(slotTest2()));
menuBar()->insertItem( tr("&File"), fileMenu);
menuBar()->insertItem( tr("&Edit"), editMenu);
- Stm = menuBar()->insertItem( tr("&Style"), StilMenu);
+ Stm = menuBar()->insertItem( tr("St&yle"), StilMenu);
Obm = menuBar()->insertItem( tr("&Item"), ObjMenu);
pgmm = menuBar()->insertItem( tr("&Page"), pageMenu);
menuBar()->setItemEnabled(Stm, 0);
@@ -836,23 +836,23 @@
menuBar()->insertSeparator();
menuBar()->insertItem( tr("&Help"), helpMenu);
AliMenu = new QPopupMenu();
- AliMenu->insertItem( tr("Left"));
- AliMenu->insertItem( tr("Center"));
- AliMenu->insertItem( tr("Right"));
- AliMenu->insertItem( tr("Block"));
- AliMenu->insertItem( tr("Forced"));
+ AliMenu->insertItem( tr("&Left"));
+ AliMenu->insertItem( tr("&Center"));
+ AliMenu->insertItem( tr("&Right"));
+ AliMenu->insertItem( tr("&Block"));
+ AliMenu->insertItem( tr("&Forced"));
ColorMenu = new QPopupMenu();
ColorMenC = new QComboBox(false);
ColorMenC->setEditable(false);
ColorMenu->insertItem(ColorMenC);
SizeTMenu = new QPopupMenu();
- SizeTMenu->insertItem( tr("Other..."));
+ SizeTMenu->insertItem( tr("&Other..."));
char *ar_sizes[] = {" 7", " 9", "10", "12", "14", "18", "24", "36", "48", "60", "72"};
size_t f_size = sizeof(ar_sizes) / sizeof(*ar_sizes);
for (uint s = 0; s < f_size; ++s)
SizeTMenu->insertItem(ar_sizes[s] + tr(" pt"));
ShadeMenu = new QPopupMenu();
- ShadeMenu->insertItem( tr("Other..."));
+ ShadeMenu->insertItem( tr("&Other..."));
ShadeMenu->insertItem("0 %");
ShadeMenu->insertItem("10 %");
ShadeMenu->insertItem("20 %");
@@ -1960,11 +1960,6 @@
sp = dia->SpinBox10->value();
atf = dia->AutoFrame->isChecked();
fp = dia->Doppelseiten->isChecked();
- if (dia->ComboBox3->currentItem() == 1)
- {
- b = mm2pts(qRound(pts2mm(dia->Pagebr)));
- h = mm2pts(qRound(pts2mm(dia->Pageho)));
- }
ret = doFileNew(b, h, tpr, lr, rr, br, ab, sp, atf, fp, dia->ComboBox3->currentItem(),
dia->ErsteSeite->isChecked(), dia->Orient, dia->PgNr->value());
FMess->setText( tr("Ready"));
@@ -2159,8 +2154,8 @@
void ScribusApp::windowsMenuAboutToShow()
{
windowsMenu->clear();
- int cascadeId = windowsMenu->insertItem( tr("Cascade"), wsp, SLOT(cascade() ) );
- int tileId = windowsMenu->insertItem( tr("Tile"), wsp, SLOT(tile() ) );
+ int cascadeId = windowsMenu->insertItem( tr("&Cascade"), wsp, SLOT(cascade() ) );
+ int tileId = windowsMenu->insertItem( tr("&Tile"), wsp, SLOT(tile() ) );
if ( wsp->windowList().isEmpty() )
{
windowsMenu->setItemEnabled( cascadeId, false );
@@ -2513,9 +2508,9 @@
ObjMenu->setItemEnabled(ShapeM, 1);
ObjMenu->setItemEnabled(PfadTP, 0);
StilMenu->clear();
- StilMenu->insertItem( tr("Color"), ColorMenu);
+ StilMenu->insertItem( tr("&Color"), ColorMenu);
if (b->isRaster)
- StilMenu->insertItem( tr("Invert"), this, SLOT(InvertPict()));
+ StilMenu->insertItem( tr("&Invert"), this, SLOT(InvertPict()));
WerkTools->KetteAus->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
WerkTools->Textedit->setEnabled(b->ScaleType);
@@ -2523,7 +2518,7 @@
WerkTools->Rotiere->setEnabled(true);
break;
case 4:
- importMenu->changeItem(fid2, tr("Get Text..."));
+ importMenu->changeItem(fid2, tr("&Get Text..."));
importMenu->setItemEnabled(fid2, 1);
importMenu->setItemEnabled(fid2aa, 1);
exportMenu->setItemEnabled(fid3, 1);
@@ -2541,13 +2536,13 @@
ObjMenu->setItemEnabled(ShapeM, 1);
ObjMenu->setItemEnabled(PfadTP, 1);
StilMenu->clear();
- StilMenu->insertItem( tr("Font"), FontMenu);
- StilMenu->insertItem( tr("Size"), SizeTMenu);
- StilMenu->insertItem( tr("Effects"), TypeStyleMenu);
- StilMenu->insertItem( tr("Alignment"), AliMenu);
- StilMenu->insertItem( tr("Color"), ColorMenu);
- StilMenu->insertItem( tr("Shade"), ShadeMenu);
- StilMenu->insertItem( tr("Tabulators..."), this, SLOT(EditTabs()));
+ StilMenu->insertItem( tr("&Font"), FontMenu);
+ StilMenu->insertItem( tr("&Size"), SizeTMenu);
+ StilMenu->insertItem( tr("&Effects"), TypeStyleMenu);
+ StilMenu->insertItem( tr("&Alignment"), AliMenu);
+ StilMenu->insertItem( tr("&Color"), ColorMenu);
+ StilMenu->insertItem( tr("&Shade"), ShadeMenu);
+ StilMenu->insertItem( tr("&Tabulators..."), this, SLOT(EditTabs()));
WerkTools->Rotiere->setEnabled(true);
WerkTools->Textedit2->setEnabled(true);
if ((b->NextBox != 0) || (b->BackBox != 0))
@@ -2669,8 +2664,8 @@
menuBar()->setItemEnabled(Stm, 1);
menuBar()->setItemEnabled(Obm, 1);
StilMenu->clear();
- StilMenu->insertItem( tr("Color"), ColorMenu);
- StilMenu->insertItem( tr("Shade"), ShadeMenu);
+ StilMenu->insertItem( tr("&Color"), ColorMenu);
+ StilMenu->insertItem( tr("&Shade"), ShadeMenu);
if (Nr == 6)
ObjMenu->setItemEnabled(ShapeM, 1);
WerkTools->KetteAus->setEnabled(false);
@@ -2754,11 +2749,11 @@
editMenu->setItemEnabled(edid1, 0);
editMenu->setItemEnabled(edid4, 0);
WerkTools->Rotiere->setEnabled(false);
- ObjMenu->changeItem(LockOb, tr("Unlock"));
+ ObjMenu->changeItem(LockOb, tr("Un&lock"));
}
else
{
- ObjMenu->changeItem(LockOb, tr("Lock"));
+ ObjMenu->changeItem(LockOb, tr("&Lock"));
if ((b->isTableItem) && (b->isSingleSel))
{
ObjMenu->setItemEnabled(PfadTP, 0);
@@ -2824,9 +2819,9 @@
{
PageItem* b = doc->ActPage->SelItem.at(0);
if (b->Locked)
- ObjMenu->changeItem(LockOb, tr("Unlock"));
+ ObjMenu->changeItem(LockOb, tr("Un&lock"));
else
- ObjMenu->changeItem(LockOb, tr("Lock"));
+ ObjMenu->changeItem(LockOb, tr("&Lock"));
}
}
@@ -3603,7 +3598,7 @@
fil = printer->outputToFile();
if (printer->CurrentPage->isChecked())
{
- Anf = doc->ActPage->PageNr;
+ Anf = doc->ActPage->PageNr+1;
Ende = doc->ActPage->PageNr+1;
}
else
@@ -3644,10 +3639,15 @@
view->CreatePS(dd, Ende-1, Anf-2, -1, sep, SepNam, farbe, mirrorH, mirrorV, useICC);
if (printer->PSLevel != 3)
{
+ QString tmp;
+ QString opts = "-dDEVICEWIDTHPOINTS=";
+ opts += tmp.setNum(doc->PageB);
+ opts += " -dDEVICEHEIGHTPOINTS=";
+ opts += tmp.setNum(doc->PageH);
if (printer->PSLevel == 1)
- system("ps2ps -dLanguageLevel=1 \""+fna+"\" \""+fna+".tmp\"");
+ system("ps2ps -dLanguageLevel=1 "+opts+" \""+fna+"\" \""+fna+".tmp\"");
else
- system("ps2ps \""+fna+"\" \""+fna+".tmp\"");
+ system("ps2ps "+opts+" \""+fna+"\" \""+fna+".tmp\"");
system("mv \""+fna+".tmp\" \""+fna+"\"");
}
if (!fil)
@@ -4551,12 +4551,12 @@
uint a, b;
if (doc->ShowPic)
{
- viewMenu->changeItem(Bilder, tr("Show Images"));
+ viewMenu->changeItem(Bilder, tr("Show &Images"));
doc->ShowPic = false;
}
else
{
- viewMenu->changeItem(Bilder, tr("Hide Images"));
+ viewMenu->changeItem(Bilder, tr("Hide &Images"));
doc->ShowPic = true;
}
for (a=0; a<view->Pages.count(); ++a)
@@ -4601,11 +4601,11 @@
Prefs.GridShown = false;
Prefs.GuidesShown = false;
Prefs.BaseShown = false;
- viewMenu->changeItem(Markers, tr("Show Margins"));
- viewMenu->changeItem(FrameDr, tr("Show Frames"));
- viewMenu->changeItem(Ras, tr("Show Grid"));
- viewMenu->changeItem(Guide, tr("Show Guides"));
- viewMenu->changeItem(Base, tr("Show Baseline Grid"));
+ viewMenu->changeItem(Markers, tr("Show &Margins"));
+ viewMenu->changeItem(FrameDr, tr("Show &Frames"));
+ viewMenu->changeItem(Ras, tr("Show &Grid"));
+ viewMenu->changeItem(Guide, tr("Show G&uides"));
+ viewMenu->changeItem(Base, tr("Show &Baseline Grid"));
}
view->DrawNew();
}
@@ -4614,9 +4614,9 @@
{
GuidesStat[0] = false;
if (Prefs.MarginsShown)
- viewMenu->changeItem(Markers, tr("Show Margins"));
+ viewMenu->changeItem(Markers, tr("Show &Margins"));
else
- viewMenu->changeItem(Markers, tr("Hide Margins"));
+ viewMenu->changeItem(Markers, tr("Hide &Margins"));
Prefs.MarginsShown = !Prefs.MarginsShown;
view->DrawNew();
}
@@ -4625,9 +4625,9 @@
{
GuidesStat[0] = false;
if (Prefs.FramesShown)
- viewMenu->changeItem(FrameDr, tr("Show Frames"));
+ viewMenu->changeItem(FrameDr, tr("Show &Frames"));
else
- viewMenu->changeItem(FrameDr, tr("Hide Frames"));
+ viewMenu->changeItem(FrameDr, tr("Hide &Frames"));
Prefs.FramesShown = !Prefs.FramesShown;
view->DrawNew();
}
@@ -4636,9 +4636,9 @@
{
GuidesStat[0] = false;
if (Prefs.GridShown)
- viewMenu->changeItem(Ras, tr("Show Grid"));
+ viewMenu->changeItem(Ras, tr("Show &Grid"));
else
- viewMenu->changeItem(Ras, tr("Hide Grid"));
+ viewMenu->changeItem(Ras, tr("Hide &Grid"));
Prefs.GridShown = !Prefs.GridShown;
view->DrawNew();
}
@@ -4647,9 +4647,9 @@
{
GuidesStat[0] = false;
if (Prefs.GuidesShown)
- viewMenu->changeItem(Guide, tr("Show Guides"));
+ viewMenu->changeItem(Guide, tr("Show G&uides"));
else
- viewMenu->changeItem(Guide, tr("Hide Guides"));
+ viewMenu->changeItem(Guide, tr("Hide G&uides"));
Prefs.GuidesShown = !Prefs.GuidesShown;
view->DrawNew();
}
@@ -4658,9 +4658,9 @@
{
GuidesStat[0] = false;
if (Prefs.BaseShown)
- viewMenu->changeItem(Base, tr("Show Baseline Grid"));
+ viewMenu->changeItem(Base, tr("Show &Baseline Grid"));
else
- viewMenu->changeItem(Base, tr("Hide Baseline Grid"));
+ viewMenu->changeItem(Base, tr("Hide &Baseline Grid"));
Prefs.BaseShown = !Prefs.BaseShown;
view->DrawNew();
}
@@ -6537,25 +6537,25 @@
move(Prefs.MainX, Prefs.MainY);
resize(Prefs.MainW, Prefs.MainH);
if (Prefs.GuidesShown)
- viewMenu->changeItem(Guide, tr("Hide Guides"));
+ viewMenu->changeItem(Guide, tr("Hide G&uides"));
else
- viewMenu->changeItem(Guide, tr("Show Guides"));
+ viewMenu->changeItem(Guide, tr("Show G&uides"));
if (Prefs.MarginsShown)
- viewMenu->changeItem(Markers, tr("Hide Margins"));
+ viewMenu->changeItem(Markers, tr("Hide &Margins"));
else
- viewMenu->changeItem(Markers, tr("Show Margins"));
+ viewMenu->changeItem(Markers, tr("Show &Margins"));
if (Prefs.FramesShown)
- viewMenu->changeItem(FrameDr, tr("Hide Frames"));
+ viewMenu->changeItem(FrameDr, tr("Hide &Frames"));
else
- viewMenu->changeItem(FrameDr, tr("Show Frames"));
+ viewMenu->changeItem(FrameDr, tr("Show &Frames"));
if (Prefs.GridShown)
- viewMenu->changeItem(Ras, tr("Hide Grid"));
+ viewMenu->changeItem(Ras, tr("Hide &Grid"));
else
- viewMenu->changeItem(Ras, tr("Show Grid"));
+ viewMenu->changeItem(Ras, tr("Show &Grid"));
if (Prefs.BaseShown)
- viewMenu->changeItem(Base, tr("Hide Baseline Grid"));
+ viewMenu->changeItem(Base, tr("Hide &Baseline Grid"));
else
- viewMenu->changeItem(Base, tr("Show Baseline Grid"));
+ viewMenu->changeItem(Base, tr("Show &Baseline Grid"));
}
void ScribusApp::ShowSubs()
@@ -6565,7 +6565,7 @@
{
mess = tr("The following Programs are missing:")+"\n\n";
if (HaveGS != 0)
- mess += tr("Ghostscript : You cannot use EPS-Images")+"\n\n";
+ mess += tr("Ghostscript : You cannot use EPS Images")+"\n\n";
QMessageBox::warning(this, tr("Warning"), mess, 1, 0, 0);
}
setTools(Prefs.Werkv);
@@ -8060,8 +8060,9 @@
}
}
-void ScribusApp::Collect()
+QString ScribusApp::Collect()
{
+ QString retVal = "";
QString CurDirP = QDir::currentDirPath();
QString s = QFileDialog::getExistingDirectory(QDir::currentDirPath(), this, "d", tr("Choose a Directory"), true);
if (s != "")
@@ -8073,6 +8074,20 @@
{
if (fi.isDir() && fi.isWritable())
{
+ QString fn;
+ if (doc->hasName)
+ {
+ QFileInfo fis(doc->DocName);
+ fn = s + fis.fileName();
+ }
+ else
+ fn = s + doc->DocName+".sla";
+ if (!overwrite(this, fn))
+ {
+ retVal = "";
+ return retVal;
+ }
+ retVal = s;
for (uint a = 0; a < view->MasterPages.count(); ++a)
{
for (uint b = 0; b < view->MasterPages.at(a)->Items.count(); ++b)
@@ -8173,16 +8188,11 @@
}
}
}
- QString fn;
- if (doc->hasName)
+ if (!DoFileSave(fn))
{
- QFileInfo fis(doc->DocName);
- fn = s + fis.fileName();
+ QMessageBox::warning(this, tr("Warning"), tr("Can't write the File: \n%1").arg(fn), tr("OK"));
+ retVal = "";
}
- else
- fn = s + doc->DocName+".sla";
- if (!DoFileSave(fn))
- QMessageBox::warning(this, tr("Warning"), tr("Can't write the File: \n%1").arg(fn), tr("OK"));
QMap<QString,QFont>::Iterator it3;
for (it3 = doc->UsedFonts.begin(); it3 != doc->UsedFonts.end(); ++it3)
{
@@ -8193,6 +8203,7 @@
}
}
QDir::setCurrent(CurDirP);
+ return retVal;
}
void ScribusApp::ReorgFonts()
/trunk/Scribus/scribus/libprefs/prefs.cpp
1737,6 → 1737,8
connect(TabListe, SIGNAL(highlighted(int)), TabWidget3, SLOT(raiseWidget(int)));
setSize(Vor->PageFormat);
setOrien(Vor->Ausrichtung);
Breite->setValue(Vor->PageBreite * Umrech);
Hoehe->setValue(Vor->PageHoehe * Umrech);
UnitChange();
}
 
/trunk/Scribus/scribus/plugins/pixmapexport/export.cpp
9,7 → 9,7
 
QString Name()
{
return QObject::tr("Save as Image...");
return QObject::tr("Save as &Image...");
}
 
 
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
48,7 → 48,7
 
QString Name()
{
return QObject::tr("Scripter Manual...");
return QObject::tr("S&cripter Manual...");
}
 
int Type()
96,11 → 96,11
}
}
Tes->pcon = new PConsole(d);
Tes->smenid = men->insertItem(QObject::tr("Scribus Scripts"), Tes->smen);
men->insertItem(QObject::tr("Execute Script..."), Tes, SLOT(slotTest()));
Tes->rmenid = men->insertItem(QObject::tr("Recent Scripts"), Tes->rmen);
Tes->smenid = men->insertItem(QObject::tr("&Scribus Scripts"), Tes->smen);
men->insertItem(QObject::tr("&Execute Script..."), Tes, SLOT(slotTest()));
Tes->rmenid = men->insertItem(QObject::tr("&Recent Scripts"), Tes->rmen);
men->insertSeparator();
Tes->cons = men->insertItem(QObject::tr("Show Console"), Tes, SLOT(slotInteractiveScript()));
Tes->cons = men->insertItem(QObject::tr("Show &Console"), Tes, SLOT(slotInteractiveScript()));
plug->menuBar()->insertItem(QObject::tr("S&cript"), men, -1, plug->menuBar()->count() - 2);
QObject::connect(Tes->pcon->OutWin, SIGNAL(returnPressed()), Tes, SLOT(slotExecute()));
QObject::connect(Tes->pcon, SIGNAL(Schliessen()), Tes, SLOT(slotInteractiveScript()));
294,12 → 294,12
{
if (pcon->isVisible())
{
men->changeItem(cons, tr("Show Console"));
men->changeItem(cons, tr("Show &Console"));
pcon->hide();
}
else
{
men->changeItem(cons, tr("Hide Console"));
men->changeItem(cons, tr("Hide &Console"));
pcon->show();
}
}
/trunk/Scribus/scribus/plugins/libchar/charselect.cpp
20,7 → 20,7
 
QString Name()
{
return QObject::tr("Insert Special");
return QObject::tr("&Insert Special");
}
 
int Type()
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
36,7 → 36,7
*/
QString Name()
{
return QObject::tr("Import SVG-Image...");
return QObject::tr("Import &SVG...");
}
 
/*!
513,7 → 513,7
double dx = ite->GrStartX + (ite->GrEndX-ite->GrStartX) / 2.0;
double dy = ite->GrStartY + (ite->GrEndY-ite->GrStartY) / 2.0;
QWMatrix mm;
if (gc->GY1 < gc->GY2)
if ((gc->GY1 < gc->GY2) && (gc->GX1 < gc->GX2))
{
mm.rotate(-angle2);
mm.rotate(angle1);
/trunk/Scribus/scribus/plugins/fontpreview/fontpreview.cpp
3,7 → 3,7
 
QString Name()
{
return QObject::tr("Fonts Preview");
return QObject::tr("&Fonts Preview");
}
 
 
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/icons/nftabout.xpm
File deleted
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: trunk/Scribus/scribus/plugins/newfromtemplateplugin/icons/nftinfo.xpm
===================================================================
--- trunk/Scribus/scribus/plugins/newfromtemplateplugin/icons/nftinfo.xpm (revision 307)
+++ trunk/Scribus/scribus/plugins/newfromtemplateplugin/icons/nftinfo.xpm (nonexistent)
@@ -1,26 +0,0 @@
-/* XPM */
-static char *info[]={
-"20 20 3 1",
-". c None",
-"# c #0000ff",
-"a c #ffffff",
-"....................",
-"....................",
-".......#####........",
-".....#########......",
-"....###aaaaa###.....",
-"...####aaaaa####....",
-"..#####aaaaa#####...",
-"..###############...",
-".#################..",
-".######aaaaa######..",
-".######aaaaa######..",
-".######aaaaa######..",
-".######aaaaa######..",
-"..#####aaaaa#####...",
-"..#####aaaaa#####...",
-"...####aaaaa####....",
-"....###########.....",
-".....#########......",
-".......#####........",
-"...................."};
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/icons/nftinfo.xpm
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.cpp
===================================================================
--- trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.cpp (revision 307)
+++ trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.cpp (revision 308)
@@ -13,7 +13,7 @@
QString Name()
{
- return QObject::tr("New From Template...");
+ return QObject::tr("New &from Template...");
}
int Type()
@@ -29,12 +29,12 @@
int ind = 0;
for (uint a = 0; a < plug->fileMenu->count(); ++a)
{
- if ((plug->fileMenu->text(plug->fileMenu->idAt(a)) == QObject::tr("New")) ||
- (plug->fileMenu->text(plug->fileMenu->idAt(a)) == "New"))
+ if ((plug->fileMenu->text(plug->fileMenu->idAt(a)) == QObject::tr("&New")) ||
+ (plug->fileMenu->text(plug->fileMenu->idAt(a)) == "&New"))
break;
ind++;
}
- int id = plug->fileMenu->insertItem(QObject::tr("New From Template..."), -1, ind+1);
+ int id = plug->fileMenu->insertItem(QObject::tr("New &from Template..."), -1, ind+1);
plug->fileMenu->connectItem(id, Nft, SLOT(RunNFTPlug()));
plug->fileMenu->setItemEnabled(id, 1);
}
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftrcreader.cpp
14,18 → 14,20
 
bool nftrcreader::startDocument()
{
inSettings = false;
inTemplate = false;
inName = false;
inFile = false;
inTNail = false;
inImg = false;
inPSize = false;
inColor = false;
inDescr = false;
inUsage = false;
inAuthor = false;
inEmail = false;
inSettings = false;
inTemplate = false;
inName = false;
inFile = false;
inTNail = false;
inImg = false;
inPSize = false;
inColor = false;
inDescr = false;
inUsage = false;
inScribusVersion = false;
inDate = false;
inAuthor = false;
inEmail = false;
return true;
}
 
47,6 → 49,10
inDescr = true;
else if (name == "usage")
inUsage = true;
else if (name == "scribus_version")
inScribusVersion = true;
else if (name == "date")
inDate = true;
else if (name == "author")
inAuthor = true;
else if (name == "email")
53,7 → 59,7
inEmail = true;
 
if (name == "template") { // <template id="1">, new template starts here
if (name == "template") { // new template starts here
inTemplate = true;
QString category;
for (int i = 0; i < attrs.count(); i++) {
98,7 → 104,11
else if (inDescr)
tmpTemplate->descr = tmp;
else if (inUsage)
tmpTemplate->usage = tmp;
tmpTemplate->usage = tmp;
else if (inScribusVersion)
tmpTemplate->scribusVersion = tmp;
else if (inDate)
tmpTemplate->date = tmp;
else if (inAuthor)
tmpTemplate->author = tmp;
else if (inEmail)
132,6 → 142,10
inDescr = false;
else if (inUsage && name == "usage")
inUsage = false;
else if (inScribusVersion && name == "scribus_version")
inScribusVersion = false;
else if (inDate && name == "date")
inDate = false;
else if (inAuthor && name == "author")
inAuthor = false;
else if (inEmail && name == "email")
195,6 → 209,8
cats.push_back(new Pair(en,lang));
en = new QString("PDF Forms"); lang = new QString(QObject::tr("PDF Forms"));
cats.push_back(new Pair(en,lang));
en = new QString("PDF Presentations"); lang = new QString(QObject::tr("PDF Presentations"));
cats.push_back(new Pair(en,lang));
en = new QString("Magazines"); lang = new QString(QObject::tr("Magazines"));
cats.push_back(new Pair(en,lang));
en = new QString("Posters"); lang = new QString(QObject::tr("Posters"));
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftrcreader.h
28,6 → 28,8
bool inColor;
bool inDescr;
bool inUsage;
bool inScribusVersion;
bool inDate;
bool inAuthor;
bool inEmail;
QString currentDir;
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftdialog.cpp
46,11 → 46,13
categoryList = new QListBox(splitter,"categoryList",0);
categoryList->setMinimumWidth(130);
categoryList->setMaximumWidth(200);
categoryList->setCursor(Qt::ArrowCursor);
tnailGrid = new QIconView(splitter,"tnailGrid",0);
tnailGrid->setMinimumWidth(300);
tnailGrid->setSpacing(5);
tnailGrid->setItemsMovable(false);
tnailGrid->setCursor(Qt::ArrowCursor);
QWidget* dtTmp = new QWidget(splitter, "dtTmp", 0);
dtTmp->setMinimumWidth(235);
63,6 → 65,7
detailBar->setMinimumHeight(32);
detailBar->setMargin(5);
detaillo->addWidget(detailBar);
detailBar->setCursor(Qt::ArrowCursor);
infoLabel = new QTextBrowser(dtTmp,"infoLabel");
infoLabel->setFrameShape(QFrame::Panel);
79,6 → 82,7
imgLabel->setSelectionMode(QIconView::NoSelection);
detaillo->addWidget(imgLabel);
imgLabel->setHidden(true);
imgLabel->setCursor(Qt::ArrowCursor);
aboutLabel = new QTextBrowser(dtTmp,"aboutLabel");
aboutLabel->setFrameShape(QFrame::Panel);
202,6 → 206,9
infoText += currentTemplate->descr + "<br>";
infoText += "<b>"+tr("Usage")+"</b><br>";
infoText += currentTemplate->usage + "<br>";
infoText += "<b>"+tr("Created with")+"</b><br>";
infoText += "Scribus " + currentTemplate->scribusVersion + "<br>";
infoText += currentTemplate->date + "<br><br>";
infoText += "<b>"+tr("Author")+"</b><br>";
infoText += currentTemplate->author + "<br>";
infoText += currentTemplate->email + "<br>";
287,12 → 294,20
 
void nftdialog::setupAbout()
{
QString text = "New From Template - 0.0.5<br><br>";
QString text = "New From Template - 0.0.6<br><br>";
text += "<b>Downloading Templates</b><br>";
text += "Document templates can be found at<br>";
text += "<i>http://insert/url/here</i><br><br>";
text += "<b>Installing Templates</b><br>";
text += "Extract the package to the template directory ";
text += "~/.scribus/templates for the current user or ";
text += "PREFIX/share/scribus/templates for all the users ";
text += "in the system.";
text += "Extract the package to the template directory<br>";
text += "<i>~/.scribus/templates</i><br>for the current user or<br>";
text += "<i>PREFIX/share/scribus/templates</i><br>for all users ";
text += "in the system.<br><br>";
text += "<b>Preparing a template</b><br>";
text += "Make sure images you use can be used anywhere. ";
text += "Fonts must be checked for this as well. ";
text += "If fonts cannot be shared remove them from the template directory ";
text += "before packaging the template.<br><br>";
aboutLabel->setText(text);
}
 
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/Makefile.am
16,12 → 16,3
KDE_OPTIONS = qtonly
AM_LDFLAGS = -s $(LIBFREETYPE_LIBS)
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(INSTALL_DATA) $(srcdir)/icons/nftinfo.xpm $(prefix)/share/scribus/icons/nftinfo.xpm
$(INSTALL_DATA) $(srcdir)/icons/nftabout.xpm $(prefix)/share/scribus/icons/nftabout.xpm
 
uninstall-local:
-rm -f $(prefix)/share/scribus/icons/nftinfo.xpm
-rm -f $(prefix)/share/scribus/icons/nftabout.xpm
 
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftsettings.cpp
2,7 → 2,6
* Riku Leino, tsoots@welho.com *
***************************************************************************/
#include "nftsettings.h"
#include <iostream>
 
nftsettings::nftsettings()
{
37,19 → 36,33
 
void nftsettings::addTemplates(QString dir) // dir will be searched for a sub folder called templates
{
// Add templates from the dir itself
QFile* tmplxml = new QFile(QDir::convertSeparators(dir + "/templates/template.xml"));
handler->setSourceDir(dir + "/templates");
if (tmplxml->exists()) {
QXmlInputSource* source = new QXmlInputSource(tmplxml);
reader->parse(source);
delete source;
}
delete tmplxml;
// And from all the subdirectories. template.xml file is only search one dir level deeper than the dir
QDir tmpldir(dir + "/templates");
if (tmpldir.exists()) {
tmpldir.setFilter(QDir::Dirs);
QStringList dirs = tmpldir.entryList();
for (uint i = 0; i < dirs.size(); i++) {
QFile* tmplxml = new QFile(QDir::convertSeparators(dir + "/templates/" + dirs[i] + "/template.xml"));
handler->setSourceDir(dir+"/templates/"+dirs[i]);
if (tmplxml->exists()) {
QXmlInputSource* source = new QXmlInputSource(tmplxml);
reader->parse(source);
delete source;
if ((dirs[i] != ".") && (dirs[i] != "..")) {
QFile* tmplxml = new QFile(QDir::convertSeparators(dir + "/templates/" + dirs[i] + "/template.xml"));
handler->setSourceDir(dir+"/templates/"+dirs[i]);
if (tmplxml->exists()) {
QXmlInputSource* source = new QXmlInputSource(tmplxml);
reader->parse(source);
delete source;
}
delete tmplxml;
}
delete tmplxml;
}
}
}
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nfttemplate.h
17,6 → 17,8
QString color;
QString descr;
QString usage;
QString scribusVersion;
QString date;
QString author;
QString email;
nfttemplate(const QString &tmplType);
/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
43,7 → 43,7
*/
QString Name()
{
return QObject::tr("Save Page as SVG...");
return QObject::tr("Save Page as &SVG...");
}
 
/*!
/trunk/Scribus/scribus/plugins/psimport/importps.cpp
30,7 → 30,7
*/
QString Name()
{
return QObject::tr("Import EPS/PS...");
return QObject::tr("Import &EPS/PS...");
}
 
/*!
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
3,20 → 3,18
***************************************************************************/
#include "satemplate.h"
#include "satemplate.moc"
#include "satdialog.h"
#include <qdir.h>
#include <iostream>
 
ScribusApp* Carrier;
QWidget* par;
 
QString Name()
{
return QObject::tr("Save as Template...");
return QObject::tr("Save as &Template...");
}
 
int Type()
{
return 5;
return 5;
}
 
void InitPlug(QWidget *d, ScribusApp *plug)
27,12 → 25,12
int ind = 0;
for (uint a = 0; a < plug->fileMenu->count(); ++a)
{
if ((plug->fileMenu->text(plug->fileMenu->idAt(a)) == QObject::tr("Save as...")) ||
(plug->fileMenu->text(plug->fileMenu->idAt(a)) == "Save as..."))
if ((plug->fileMenu->text(plug->fileMenu->idAt(a)) == QObject::tr("Save &As...")) ||
(plug->fileMenu->text(plug->fileMenu->idAt(a)) == "Save &As..."))
break;
ind++;
}
int id = plug->fileMenu->insertItem(QObject::tr("Save as Template..."), -1, ind+1);
int id = plug->fileMenu->insertItem(QObject::tr("Save as &Template..."), -1, ind+1);
plug->fileMenu->connectItem(id, satm, SLOT(RunSATPlug()));
plug->fileMenu->setItemEnabled(id, 0);
plug->MenuItemsFile.append(id);
56,14 → 54,18
bool hasName = Carrier->doc->hasName;
bool isModified = Carrier->doc->isModified();
QDir::setCurrent(QDir::homeDirPath() + "/.scribus/templates");
Carrier->Collect();
if (Carrier->Collect() == "")
return;
QString docPath = Carrier->doc->DocName;
QString docDir = docPath.left(docPath.findRev('/'));
QString docName = docPath.right(docPath.length() - docPath.findRev('/') - 1);
docName = docName.left(docName.findRev(".s"));
 
if (currentFile != Carrier->doc->DocName)
{ // TODO Check if the collect was canceled.
satdialog* satdia = new satdialog(par,docName);
satdialog* satdia = new satdialog(par,docName,
(int)Carrier->doc->PageB,
(int)Carrier->doc->PageH);
if (satdia->exec())
{
sat* s = new sat(Carrier, satdia, docPath.right(docPath.length() - docPath.findRev('/') - 1),docDir);
181,7 → 183,6
QString sat::getTemplateTag()
{
QString category = dia->catsCombo->currentText();
std::cout << "Category: |" << category << "|" << "\n";
if (category == "")
category = QObject::tr("Own Templates");
else
196,6 → 197,7
}
}
}
QDate now = QDate::currentDate();
QString tag = "\t<template category=\""+category+"\">\n";
tag += "\t\t<name>"+dia->nameEdit->text()+"</name>\n";
tag += "\t\t<file>"+file+"</file>\n";
205,10 → 207,12
tag += "\t\t<color>"+dia->colorsEdit->text()+"</color>\n";
tag += "\t\t<descr>"+dia->descrEdit->text()+"</descr>\n";
tag += "\t\t<usage>"+dia->usageEdit->text()+"</usage>\n";
tag += "\t\t<scribus_version>" + QString(VERSION) + "</scribus_version>\n";
tag += "\t\t<date>" + now.toString(Qt::ISODate) + "</date>\n";
tag += "\t\t<author>"+dia->authorEdit->text()+"</author>\n";
tag += "\t\t<email>"+dia->emailEdit->text()+"</email>\n";
tag += "\t</template>\n";
 
return tag;
}
 
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
2,6 → 2,8
#define MYPLUGIN_H
 
#include <qobject.h>
#include <qdatetime.h>
#include <qdir.h>
#include <scribus.h>
#include "satdialog.h"
 
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp
6,12 → 6,12
 
extern QPixmap loadIcon(QString nam);
 
satdialog::satdialog(QWidget* parent, QString tmplName) : QDialog(parent, "satdialog", TRUE)
satdialog::satdialog(QWidget* parent, QString tmplName, int pageW, int pageH) : QDialog(parent, "satdialog", TRUE)
{
isFullDetail = false;
setCaption(tr("Save as Template"));
setIcon(loadIcon("AppIcon.png"));
readPrefs();
 
QBoxLayout* blo = new QVBoxLayout(this,0,5,"blo");
QWidget* top = new QWidget(this);
top->setMaximumHeight(5);
30,7 → 30,7
blo->addWidget(top);
blo->addWidget(middle);
blo->addWidget(bottom);
 
QBoxLayout* mlo = new QVBoxLayout(center,0,5);
mlo->insertSpacing(0,5);
nameLabel = new QLabel( tr("Name"),center);
38,46 → 38,49
nameEdit = new QLineEdit(center);
nameEdit->setText(tmplName);
mlo->addWidget(nameEdit);
 
catsLabel = new QLabel( tr("Category"), center);
mlo->addWidget(catsLabel);
catsCombo = new QComboBox(center,"catsCombo");
mlo->addWidget(catsCombo);
setupCategories();
 
psizeLabel = new QLabel( tr("Page Size"),center);
mlo->addWidget(psizeLabel);
psizeEdit = new QLineEdit(center);
mlo->addWidget(psizeEdit);
setupPageSize(pageW, pageH);
 
colorsLabel = new QLabel( tr("Colors"),center);
mlo->addWidget(colorsLabel);
colorsEdit = new QLineEdit(center);
mlo->addWidget(colorsEdit);
 
descrLabel = new QLabel( tr("Description"),center);
mlo->addWidget(descrLabel);
descrEdit = new QTextEdit(center);
mlo->addWidget(descrEdit);
 
usageLabel = new QLabel( tr("Usage"),center);
mlo->addWidget(usageLabel);
usageEdit = new QTextEdit(center);
mlo->addWidget(usageEdit);
 
authorLabel = new QLabel( tr("Author"),center);
mlo->addWidget(authorLabel);
authorEdit = new QLineEdit(center);
mlo->addWidget(authorEdit);
authorEdit->setText(author);
 
emailLabel = new QLabel( tr("Email"),center);
mlo->addWidget(emailLabel);
emailEdit = new QLineEdit(center);
mlo->addWidget(emailEdit);
emailEdit->setText(email);
 
mlo->addStretch(10);
mlo->insertSpacing(-1,5);
 
QBoxLayout* tlo = new QHBoxLayout(bottom,0,5);
detailButton = new QPushButton( tr("More Details"), bottom);
tlo->addWidget(detailButton);
87,56 → 90,63
tlo->addWidget(okButton);
tlo->insertSpacing(0,5);
tlo->insertSpacing(-1,5);
minimumDetail();
 
if (isFullDetail)
fullDetail();
else
minimumDetail();
 
// Slots and signals connections
connect(detailButton, SIGNAL(clicked()), this, SLOT(detailClicked()));
connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
 
}
 
void satdialog::detailClicked()
{
if (isFullDetail) {
detailButton->setText( tr("More Details"));
if (isFullDetail)
{
isFullDetail = false;
minimumDetail();
} else {
detailButton->setText( tr("Less Details"));
}
else
{
isFullDetail = true;
fullDetail();
}
}
 
void satdialog::fullDetail()
void satdialog::fullDetail()
{
psizeLabel->setHidden(false);
psizeLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// psizeLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
catsLabel->setHidden(false);
catsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// catsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
colorsLabel->setHidden(false);
colorsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// colorsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
descrLabel->setHidden(false);
descrLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// descrLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
usageLabel->setHidden(false);
usageLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// usageLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
authorLabel->setHidden(false);
authorLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// authorLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
emailLabel->setHidden(false);
emailLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// emailLabel->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
psizeEdit->setHidden(false);
psizeEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// psizeEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
catsCombo->setHidden(false);
catsCombo->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
// catsCombo->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed));
colorsEdit->setHidden(false);
colorsEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// colorsEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
descrEdit->setHidden(false);
descrEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// descrEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
usageEdit->setHidden(false);
usageEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// usageEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
authorEdit->setHidden(false);
authorEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// authorEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
emailEdit->setHidden(false);
emailEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
// emailEdit->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred));
detailButton->setText( tr("Less Details"));
layout()->activate();
adjustSize();
}
144,39 → 154,102
void satdialog::minimumDetail()
{
catsLabel->setHidden(true);
catsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// catsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
psizeLabel->setHidden(true);
psizeLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// psizeLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
colorsLabel->setHidden(true);
colorsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// colorsLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
descrLabel->setHidden(true);
descrLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// descrLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
usageLabel->setHidden(true);
usageLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// usageLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
authorLabel->setHidden(true);
authorLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// authorLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
emailLabel->setHidden(true);
emailLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// emailLabel->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
catsCombo->setHidden(true);
catsCombo->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// catsCombo->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
psizeEdit->setHidden(true);
psizeEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// psizeEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
colorsEdit->setHidden(true);
colorsEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// colorsEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
descrEdit->setHidden(true);
descrEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// descrEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
usageEdit->setHidden(true);
usageEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// usageEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
authorEdit->setHidden(true);
authorEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// authorEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
emailEdit->setHidden(true);
emailEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
// emailEdit->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored));
detailButton->setText( tr("More Details"));
layout()->activate();
adjustSize();
}
 
void satdialog::setupCategories()
void satdialog::readPrefs()
{
author = "";
email = "";
isFullDetail = false;
QFile rc(QDir::convertSeparators(QDir::homeDirPath() + "/.scribus/sat.rc"));
if (rc.exists())
{
if (rc.open(IO_ReadOnly))
{
QTextStream stream(&rc);
QString line = stream.readLine();
QString attribute;
QString value;
while (line != NULL)
{
line = line.stripWhiteSpace();
attribute = line.left(line.find("="));
value = line.right(line.length() - line.find("=") - 1);
if ((line.left(1) != "#") &&
(line.find("=") != -1) &&
(line.right(1) != "="))
{ // If not a comment and '='can be found and is not the last charcter on the line
if (attribute == "author")
{
author = value;
}
else if (attribute == "email")
{
email = value;
}
else if (attribute = "max_detail")
{
if (value == "1")
isFullDetail = true;
else
isFullDetail = false;
}
}
line = stream.readLine();
}
rc.close();
}
}
}
 
void satdialog::writePrefs()
{
QString text = "author=" + authorEdit->text();
text += "\nemail=" + emailEdit->text();
text += QString("\nmax_detail=%1").arg(isFullDetail);
 
QFile rc(QDir::convertSeparators(QDir::homeDirPath() + "/.scribus/sat.rc"));
if ( rc.open( IO_WriteOnly ) )
{
QTextStream stream(&rc);
stream.setEncoding(QTextStream::UnicodeUTF8);
stream << text;
rc.close();
}
}
 
void satdialog::setupCategories()
{
// en will be used in template.xml and it will be then replaced with the lang when used for users
// to get the categories in their language.
QString* en = new QString("Newsletters"); QString* lang = new QString(QObject::tr("Newsletters"));
209,6 → 282,8
cats.push_back(new Pair(en,lang));
en = new QString("PDF Forms"); lang = new QString(QObject::tr("PDF Forms"));
cats.push_back(new Pair(en,lang));
en = new QString("PDF Presentations"); lang = new QString(QObject::tr("PDF Presentations"));
cats.push_back(new Pair(en,lang));
en = new QString("Magazines"); lang = new QString(QObject::tr("Magazines"));
cats.push_back(new Pair(en,lang));
en = new QString("Posters"); lang = new QString(QObject::tr("Posters"));
221,9 → 296,10
cats.push_back(new Pair(en,lang));
en = new QString("Own Templates"); lang = new QString(QObject::tr("Own Templates"));
cats.push_back(new Pair(en,lang));
 
QStringList* list = new QStringList();
for (uint i = 0; i < cats.size(); i++) {
for (uint i = 0; i < cats.size(); i++)
{
list->append(*cats[i]->second);
}
list->sort();
233,9 → 309,57
catsCombo->setEditable(true);
}
 
void satdialog::setupPageSize(int w, int h)
{
QString sizes[] = {"2380x3368", "1684x2380", "1190x1684", "842x1190", "595x842",
"421x595", "297x421", "210x297", "148x210",
"105x148", "2836x4008", "2004x2836", "1418x2004", "1002x1418", "709x1002", "501x709",
"355x501", "250x355", "178x250", "125x178", "89x125", "462x649", "298x683", "312x624",
"542x720", "595x935", "1224x792", "612x1008", "612x792", "792x1225"};
QString sizelist[] =
{"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "B0", "B1", "B2", "B3", "B4",
"B5", "B6", "B7", "B8", "B9", "B10", "C5E", "Comm10E", "DLE", "Executive", "Folio",
"Ledger", tr("Legal"), tr("Letter"), tr("Tabloid")};
 
QString orient, search, psize;
QString wString = QString("%1").arg(w);
QString hString = QString("%1").arg(h);
if (w > h)
{
orient = ", landscape";
search = hString+"x"+wString;
}
else if (w < h)
{
orient = ", portrait";
search = wString+"x"+hString;
}
int index = -1;
for (int i = 0; i < 30; i++)
{
if (sizes[i] == search)
{
index = i;
psize = sizelist[i];
break;
}
}
 
if (index == -1)
{
psize = "custom, "+wString+"x"+hString;
orient = "";
}
 
psizeEdit->setText(psize + orient);
 
}
 
satdialog::~satdialog()
{
for(uint i = 0; i < cats.size(); i++) {
writePrefs();
for(uint i = 0; i < cats.size(); i++)
{
delete cats[i];
}
}
/trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.h
1,12 → 1,16
/***************************************************************************
* Riku Leino, tsoots@welho.com *
***************************************************************************/
#ifndef STDIALOG_H
#define STDIALOG_H
#ifndef SATDIALOG_H
#define SATDIALOG_H
 
#include <vector>
#include <utility>
#include <qfile.h>
#include <qdir.h>
#include <qtextstream.h>
#include <qcombobox.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qlabel.h>
#include <qlayout.h>
35,10 → 39,15
QPushButton* detailButton;
QWidget* center;
QWidget* middle;
QString author;
QString email;
bool isFullDetail;
void fullDetail();
void minimumDetail();
void readPrefs();
void writePrefs();
void setupCategories();
void setupPageSize(int w, int h);
public:
std::vector<Pair*> cats;
QLineEdit* nameEdit;
49,7 → 58,7
QTextEdit* usageEdit;
QLineEdit* authorEdit;
QLineEdit* emailEdit;
satdialog(QWidget* parent, QString tmplName = "");
satdialog(QWidget* parent, QString tmplName = "", int pageW = 0, int pageH = 0);
~satdialog();
private slots:
void detailClicked();
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
38,7 → 38,7
*/
QString Name()
{
return QObject::tr("Print Preview");
return QObject::tr("Print Previe&w");
}
 
/*!
62,12 → 62,12
int ind = 0;
for (uint a = 0; a < plug->fileMenu->count(); ++a)
{
if ((plug->fileMenu->text(plug->fileMenu->idAt(a)) == QObject::tr("Print...")) ||
(plug->fileMenu->text(plug->fileMenu->idAt(a)) == "Print..."))
if ((plug->fileMenu->text(plug->fileMenu->idAt(a)) == QObject::tr("&Print...")) ||
(plug->fileMenu->text(plug->fileMenu->idAt(a)) == "&Print..."))
break;
ind++;
}
int id = plug->fileMenu->insertItem(QObject::tr("Print Preview"), -1, ind+1);
int id = plug->fileMenu->insertItem(QObject::tr("Print Previe&w"), -1, ind+1);
plug->fileMenu->connectItem(id, Tes, SLOT(RunPreview()));
plug->fileMenu->setItemEnabled(id, 0);
plug->MenuItemsFile.append(id);
/trunk/Scribus/scribus/page.cpp
3906,7 → 3906,7
newY = static_cast<int>(m->y()/sc);
if ((Mpressed) && (m->state() == RightButton) && (!doku->DragP) && (doku->AppMode == 1) && (!b->Locked) && (!((b->isTableItem) && (b->isSingleSel))))
{
if ((abs(Dxp - newX) > 5) || (abs(Dyp - newY) > 5))
if ((abs(Dxp - newX) > 10) || (abs(Dyp - newY) > 10))
{
doku->DragP = true;
doku->leaveDrag = false;
4570,7 → 4570,7
SeRy = newY;
HaveSelRect = true;
}
if ((ScApp->Prefs.GuidesShown) && (doku->AppMode == 1) && (!doku->GuideLock))
if ((ScApp->Prefs.GuidesShown) && (doku->AppMode == 1) && (!doku->GuideLock) && (!HaveSelRect))
{
if (YGuides.count() != 0)
{
/trunk/Scribus/scribus/libpdf/pdflib.cpp
2281,6 → 2281,7
double h2 = h / 2.0;
double StartX, StartY, EndX, EndY;
QValueList<double> StopVec;
QValueList<double> TransVec;
QStringList Gcolors;
QPtrVector<VColorStop> cstops = b->fill_gradient.colorStops();
switch (b->GrType)
2331,11 → 2332,14
EndY = b->GrEndY;
break;
}
StopVec.clear();
TransVec.clear();
Gcolors.clear();
if ((b->GrType == 5) || (b->GrType == 7))
{
StopVec.clear();
for (uint cst = 0; cst < b->fill_gradient.Stops(); ++cst)
{
TransVec.prepend(cstops.at(cst)->opacity);
StopVec.prepend(sqrt(pow(EndX - StartX, 2) + pow(EndY - StartY,2))*cstops.at(cst)->rampPoint);
Gcolors.prepend(SetFarbe(cstops.at(cst)->name, cstops.at(cst)->shade));
}
2342,7 → 2346,6
}
else
{
StopVec.clear();
for (uint cst = 0; cst < b->fill_gradient.Stops(); ++cst)
{
QWMatrix ma;
2351,15 → 2354,16
double w2 = sqrt(pow(EndX - StartX, 2) + pow(EndY - StartY,2))*cstops.at(cst)->rampPoint;
double x = ma.m11() * w2 + ma.dx();
double y = ma.m12() * w2 + ma.dy();
TransVec.append(cstops.at(cst)->opacity);
StopVec.append(x);
StopVec.append(y);
StopVec.append(-y);
Gcolors.append(SetFarbe(cstops.at(cst)->name, cstops.at(cst)->shade));
}
}
PDF_DoLinGradient(b, StopVec, Gcolors);
PDF_DoLinGradient(b, StopVec, TransVec, Gcolors);
}
 
void PDFlib::PDF_DoLinGradient(PageItem *b, QValueList<double> Stops, QStringList Colors)
void PDFlib::PDF_DoLinGradient(PageItem *b, QValueList<double> Stops, QValueList<double> Trans, QStringList Colors)
{
bool first = true;
double w = b->Width;
2366,8 → 2370,76
double h = -b->Height;
double w2 = b->GrStartX;
double h2 = -b->GrStartY;
QString TRes = "";
for (uint c = 0; c < Colors.count()-1; ++c)
{
if ((Options->Version == 14) && (((*Trans.at(c+1)) != 1) || ((*Trans.at(c)) != 1)))
{
StartObj(ObjCounter);
QString ShName = ResNam+IToStr(ResCount);
Shadings[ShName] = ObjCounter;
ResCount++;
ObjCounter++;
PutDoc("<<\n");
if ((b->GrType == 5) || (b->GrType == 7))
PutDoc("/ShadingType 3\n");
else
PutDoc("/ShadingType 2\n");
PutDoc("/ColorSpace /DeviceGray\n");
PutDoc("/BBox [0 "+FToStr(h)+" "+FToStr(w)+" 0]\n");
if ((b->GrType == 5) || (b->GrType == 7))
{
PutDoc("/Coords ["+FToStr(w2)+" "+FToStr(h2)+" "+FToStr((*Stops.at(c+1)))+" "+FToStr(w2)+" "+FToStr(h2)+" "+FToStr((*Stops.at(c)))+"]\n");
PutDoc("/Extend [true true]\n");
PutDoc("/Function\n<<\n/FunctionType 2\n/Domain [0 1]\n");
PutDoc("/C0 ["+FToStr((*Trans.at(c+1)))+"]\n");
PutDoc("/C1 ["+FToStr((*Trans.at(c)))+"]\n");
}
else
{
PutDoc("/Coords ["+FToStr((*Stops.at(c*2)))+" "+FToStr((*Stops.at(c*2+1)))+" "+FToStr((*Stops.at(c*2+2)))+" "+FToStr((*Stops.at(c*2+3)))+"]\n");
PutDoc("/Extend [true true]\n");
PutDoc("/Function\n<<\n/FunctionType 2\n/Domain [0 1]\n");
PutDoc("/C0 ["+FToStr((*Trans.at(c)))+"]\n");
PutDoc("/C1 ["+FToStr((*Trans.at(c+1)))+"]\n");
}
PutDoc("/N 1\n>>\n>>\nendobj\n");
StartObj(ObjCounter);
ObjCounter++;
PutDoc("<<\n/Type /XObject\n/Subtype /Form\n");
PutDoc("/FormType 1\n");
PutDoc("/Group << /S /Transparency /CS /DeviceGray >>\n");
PutDoc("/BBox [ 0 0 "+FToStr(b->Width)+" "+FToStr(-b->Height)+" ]\n");
PutDoc("/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]\n");
if (Shadings.count() != 0)
{
PutDoc("/Shading << \n");
QMap<QString,int>::Iterator it3;
for (it3 = Shadings.begin(); it3 != Shadings.end(); ++it3)
PutDoc("/"+it3.key()+" "+IToStr(it3.data())+" 0 R\n");
PutDoc(">>\n");
}
PutDoc(">>\n");
QString stre = "";
stre += "q\n"+SetClipPath(b)+"h\nW* n\n"+"/"+ShName+" sh\nQ\n";
if ((Options->Compress) && (CompAvail))
stre = CompressStr(&stre);
PutDoc("/Length "+IToStr(stre.length())+"\n");
if ((Options->Compress) && (CompAvail))
PutDoc("/Filter /FlateDecode\n");
PutDoc(">>\nstream\n"+EncStream(&stre, ObjCounter-1)+"\nendstream\nendobj\n");
Seite.XObjects[ResNam+IToStr(ResCount)] = ObjCounter-1;
ResCount++;
StartObj(ObjCounter);
QString GXName = ResNam+IToStr(ResCount);
Transpar[GXName] = ObjCounter;
ResCount++;
ObjCounter++;
PutDoc("<< /Type /ExtGState\n");
PutDoc("/SMask << /S /Luminosity /G "+IToStr(ObjCounter-2)+" 0 R >>\n");
PutDoc("/BM /Normal\n>>\nendobj\n");
TRes = GXName;
}
StartObj(ObjCounter);
QString ShName = ResNam+IToStr(ResCount);
Shadings[ShName] = ObjCounter;
2428,6 → 2500,8
}
PutDoc("/N 1\n>>\n>>\nendobj\n");
PutPage("q\n");
if ((Options->Version == 14) && (((*Trans.at(c+1)) != 1) || ((*Trans.at(c)) != 1)))
PutPage("/"+TRes+" gs\n");
PutPage(SetClipPath(b));
PutPage("h\nW* n\n");
PutPage("/"+ShName+" sh\nQ\n");
/trunk/Scribus/scribus/libpdf/pdflib.h
72,7 → 72,7
QByteArray ComputeMD5(QString in);
void PDF_Bookmark(int nr, double ypos);
void PDF_Gradient(PageItem *b);
void PDF_DoLinGradient(PageItem *b, QValueList<double> Stops, QStringList Colors);
void PDF_DoLinGradient(PageItem *b, QValueList<double> Stops, QValueList<double> Trans, QStringList Colors);
void PDF_Transparenz(PageItem *b);
void PDF_Annotation(PageItem *ite, uint PNr);
void PDF_Form(QString im);
/trunk/Scribus/scribus/scribus.h
183,7 → 183,7
public slots:
void slotStoryEditor();
void InvertPict();
void Collect();
QString Collect();
void ChBookmarks(int s, int e, int n);
void AddBookMark(PageItem *ite);
void DelBookMark(PageItem *ite);
/trunk/Scribus/scribus/templates/Makefile.am
1,4 → 1,4
EXTRA_DIST = template.xml
EXTRA_DIST = br1/br1.png br1/br1tn.png br1/map.png br1/br1.sla nl2/flowers.jpg nl2/nl2.sla nl2/nl2tn.png nl2/nl2.png nl1/kites.png nl1/nl1.png nl1/nl1tn.png nl1/nl1.sla template.xml
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/templates/