Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 82 → Rev 83

/trunk/Scribus/ChangeLogCVS
1,4 → 1,8
Changes since Version 1.1.1
21.10.2003 Included the new Icons contributed by Sven Powalla.
Fixed issue with the "Find Picture" Command.
Locked Object can't be dragged anymore.
 
20.10.2003 Included the Scripter Plugin into the main Package.
Fixed the ./configure script that libtiff is recognized
on a stock RH9 installation.
/trunk/Scribus/scribus/bookpalette.cpp
23,7 → 23,7
: QDialog( parent, "Books", false, 0 )
// : QDialog( parent, "Books", false, Qt::WStyle_Customize | Qt::WStyle_Title | Qt::WStyle_Tool )
{
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
setCaption( tr( "Bookmarks" ) );
PaletteLayout = new QVBoxLayout( this, 0, 0, "PaletteLayout");
BView = new BookMView(this);
/trunk/Scribus/scribus/pdfopts.cpp
14,7 → 14,7
: QDialog( parent, "pdf", true, 0 )
{
setCaption( tr( "Create PDF-File" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
FontsToEmbed.clear();
view = vie;
EffVal = Eff;
/trunk/Scribus/scribus/lineformats.cpp
9,7 → 9,7
{
resize( 327, 260 );
setCaption( tr( "Edit Line Styles" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Docu = doc;
TempStyles = doc->MLineStyles;
StilFormateLayout = new QHBoxLayout( this );
/trunk/Scribus/scribus/align.cpp
8,7 → 8,7
{
Anzahl = anz;
Anzahl > 2 ? setCaption(tr("Distribute/Align")) : setCaption(tr("Align"));
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
AlignLayout = new QVBoxLayout( this );
AlignLayout->setSpacing( 0 );
AlignLayout->setMargin( 0 );
/trunk/Scribus/scribus/customfdialog.cpp
164,7 → 164,7
CustomFDialog::CustomFDialog(QWidget *pa, QString cap, QString filter, bool Pre, bool mod, bool comp, bool cod)
: QFileDialog(QString::null, filter, pa, 0, true)
{
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
setCaption(cap);
cDir = QDir();
setDir(cDir);
/trunk/Scribus/scribus/mpalette.cpp
27,7 → 27,7
HaveDoc = false;
HaveItem = false;
Umrech = UmReFaktor;
setIcon( loadIcon("AppIcon.xpm") );
setIcon( loadIcon("AppIcon.png") );
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
 
MpalLayout = new QVBoxLayout( this, 5, 1, "MpalLayout");
/trunk/Scribus/scribus/edit1format.cpp
7,7 → 7,7
: QDialog( parent, "EditST", true, 0)
{
setCaption( tr( "Edit Style" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
AutoVal = au;
EditStyleLayout = new QGridLayout( this );
EditStyleLayout->setSpacing( 6 );
/trunk/Scribus/scribus/vruler.h
19,11 → 19,7
#define VRULER_H
 
#include <qwidget.h>
#include <qfont.h>
#include <qpainter.h>
#include <qcolor.h>
#include <qrect.h>
#include <qpointarray.h>
#include <qscrollview.h>
#include "scribusdoc.h"
/**Vertikales Lineal
43,7 → 39,6
int Markp;
int oldMark;
bool Mpressed;
QFont rfont;
private: // Private attributes
/** Zeichensatz des Lineals */
ScribusDoc *doku;
/trunk/Scribus/scribus/icons/AppIcon.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/icons/scribusicon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/Scribus/scribus/icons/AppIcon.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/icons/AppIcon.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/Scribus/scribus/icons/Splash.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/Scribus/scribus/icons/Makefile.am
===================================================================
--- trunk/Scribus/scribus/icons/Makefile.am (revision 82)
+++ trunk/Scribus/scribus/icons/Makefile.am (revision 83)
@@ -1,7 +1,7 @@
####### kdevelop will overwrite this part!!! (begin)##########
-EXTRA_DIST = 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 AppIcon.xpm 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 oval.png rect.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
+EXTRA_DIST = 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 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 oval.png rect.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
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
@@ -37,7 +37,7 @@
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/DateiSave.xpm $(prefix)/lib/scribus/icons/DateiSave.xpm
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
- $(INSTALL_DATA) $(srcdir)/AppIcon.xpm $(prefix)/lib/scribus/icons/AppIcon.xpm
+ $(INSTALL_DATA) $(srcdir)/AppIcon.png $(prefix)/lib/scribus/icons/AppIcon.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/LupeZ.xpm $(prefix)/lib/scribus/icons/LupeZ.xpm
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
/trunk/Scribus/scribus/scrap.cpp
121,7 → 121,7
{
resize( 230, 190 );
setCaption( tr( "Scrapbook" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
ScFilename = "";
Prefs = prefs;
Changed = false;
/trunk/Scribus/scribus/picstatus.cpp
22,6 → 22,7
#include <qtoolbutton.h>
#include <qstringlist.h>
#include <qtextstream.h>
#include <qcursor.h>
#include <cstdio>
#include "picsearch.h"
extern QPixmap loadIcon(QString nam);
32,7 → 33,7
uint p, i;
QString tmp;
setCaption( tr( "Pictures" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
doc = docu;
view = viewi;
ItemNrs.clear();
193,7 → 194,10
QString BildNam = PicTable->text(ZNr, 0);
QString OldPfad = PicTable->text(ZNr, 1);
QStringList Pfade;
FILE *fp = popen("find /home /cdrom /floppy -name " + BildNam, "r");
qApp->setOverrideCursor(QCursor(waitCursor), true);
qApp->processEvents();
FILE *fp = popen("find /home -name " + BildNam, "r");
qApp->setOverrideCursor(QCursor(arrowCursor), true);
if (fp == NULL)
return;
QTextStream ts(fp, IO_ReadOnly);
/trunk/Scribus/scribus/vruler.cpp
19,12 → 19,13
#include "vruler.moc"
#include "page.h"
#include <qcursor.h>
#include <qcolor.h>
#include <qrect.h>
#include <qpointarray.h>
Vruler::Vruler(QScrollView *pa, ScribusDoc *doc) : QWidget(pa)
{
setEraseColor(QColor(255,255,255));
doku = doc;
rfont = font();
rfont.setPointSize(9);
offs = -12;
Markp = 0;
oldMark = 0;
81,7 → 82,7
p.translate(0, -offs);
p.setBrush(black);
p.setPen(black);
p.setFont(rfont);
p.setFont(font());
p.scale(1.0, sc);
if ((doku->PageFP) && (doku->PagesSbS))
{
/trunk/Scribus/scribus/cmsprefs.cpp
15,7 → 15,7
: QDialog( parent, "CMS", true, 0 )
{
setCaption( tr( "Color Management Settings" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Prefs = Vor;
Changed = false;
CMSPrefsLayout = new QVBoxLayout( this );
/trunk/Scribus/scribus/buttonicon.cpp
7,7 → 7,7
{
Item = ite;
setCaption( tr( "Icon Placement" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
ButtonIconLayout = new QVBoxLayout( this, 11, 6, "ButtonIconLayout");
Layout1 = new QGridLayout( 0, 0, 6, "Layout6");
TextLabel1_2 = new QLabel( this, "TextLabel1_2" );
/trunk/Scribus/scribus/mergedoc.cpp
19,7 → 19,7
MergeDoc::MergeDoc( QWidget* parent ) : QDialog( parent, "merge", true, 0 )
{
setCaption( tr( "Import a Page" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Count = 0;
 
MergeDocLayout = new QVBoxLayout( this, 11, 6, "MergeDocLayout");
/trunk/Scribus/scribus/seiten.cpp
502,7 → 502,7
// : QDialog( parent, "SP", false, Qt::WStyle_Customize | Qt::WStyle_Title | Qt::WStyle_Tool)
{
setCaption( tr( "Arrange Pages" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
SeitenPalLayout = new QVBoxLayout( this );
SeitenPalLayout->setSpacing( 5 );
SeitenPalLayout->setMargin( 5 );
/trunk/Scribus/scribus/guidemanager.cpp
8,7 → 8,7
{
QString tmp;
setCaption( tr( "Manage Guides" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Einheit = Einh;
XLocal = page->XGuides;
YLocal = page->YGuides;
/trunk/Scribus/scribus/hysettings.cpp
9,7 → 9,7
QStringList lada;
resize( 218, 103 );
setCaption( tr( "Hyphenator Settings" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
HySettingsLayout = new QVBoxLayout( this, 11, 6, "HySettingsLayout");
 
Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3");
/trunk/Scribus/scribus/scribusview.cpp
134,8 → 134,8
while (fom.height() > LE->ed->height());
LA->setFont(ff);
LY->setFont(ff);
HR->rfont = ff;
VR->rfont = ff;
HR->setFont(ff);
VR->setFont(ff);
}
QRect forec = fom.boundingRect("3200.00 %");
int sadj = forec.width() - LE->ed->width();
/trunk/Scribus/scribus/druck.cpp
29,7 → 29,7
AdvOptions::AdvOptions(QWidget* parent, bool Hm, bool Vm, bool Ic) : QDialog( parent, "prin", true, 0 )
{
setCaption( tr( "Advanced Options" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
AdvOptionsLayout = new QVBoxLayout( this );
AdvOptionsLayout->setSpacing( 5 );
AdvOptionsLayout->setMargin( 10 );
79,7 → 79,7
{
PrinterOpts = "";
setCaption( tr( "Setup Printer" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
DruckLayout = new QVBoxLayout( this );
DruckLayout->setSpacing( 6 );
DruckLayout->setMargin( 10 );
/trunk/Scribus/scribus/missing.cpp
69,7 → 69,7
setCaption( tr( "Missing Font" ) );
else
setCaption( tr( "Select Font" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
MissingFontLayout = new QHBoxLayout( this );
MissingFontLayout->setSpacing( 0 );
MissingFontLayout->setMargin( 10 );
/trunk/Scribus/scribus/muster.cpp
9,7 → 9,7
: QDialog( parent, "Muster", false, WDestructiveClose)
{
setCaption( tr( "Edit Templates" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Doc = doc;
View = view;
MusterSeitenLayout = new QHBoxLayout( this );
/trunk/Scribus/scribus/libabout/about.cpp
17,7 → 17,7
: QDialog( parent, "About", true, 0 )
{
setCaption( tr( "About Scribus")+" "+VERSION );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
AboutLayout = new QVBoxLayout( this );
AboutLayout->setSpacing( 6 );
AboutLayout->setMargin( 10 );
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "20. October 2003 ";
QString bu = "21. October 2003 ";
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/newfile.cpp
27,7 → 27,7
einheit = Vor->Einheit;
Orient = 0;
setCaption( tr( "New Document" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
NewDocLayout = new QHBoxLayout( this, 10, 5, "NewDocLayout");
Layout9 = new QVBoxLayout(0, 0, 5, "Layout9");
 
/trunk/Scribus/scribus/helpbrowser.cpp
31,7 → 31,7
setCaption( Capt );
mHistory.clear();
struct histd his;
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
HelpBrowserLayout = new QVBoxLayout( this );
HelpBrowserLayout->setSpacing( 2 );
HelpBrowserLayout->setMargin( 2 );
/trunk/Scribus/scribus/hruler.cpp
19,12 → 19,13
#include "hruler.moc"
#include "page.h"
#include <qcursor.h>
#include <qcolor.h>
#include <qrect.h>
#include <qpointarray.h>
Hruler::Hruler(QScrollView *pa, ScribusDoc *doc) : QWidget(pa)
{
setEraseColor(QColor(255,255,255));
doku = doc;
rfont = font();
rfont.setPointSize(rfont.pointSize()-1);
offs = -10;
Markp = 0;
repX = false;
92,7 → 93,7
}
p.setBrush(black);
p.setPen(black);
p.setFont(rfont);
p.setFont(font());
p.scale(sc, 1.0);
((doku->PageFP) && (doku->PagesSbS)) ? pc = 2 : pc = 1;
if (doku->MasterP)
/trunk/Scribus/scribus/query.cpp
23,7 → 23,7
if ( !name )
setName( "Query" );
setCaption( tr( titel ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
QueryLayout->setSpacing( 6 );
QueryLayout->setMargin( 11 );
/trunk/Scribus/scribus/scribus.cpp
99,7 → 99,7
ScribusApp::ScribusApp(SplashScreen *splash)
{
setCaption(tr("Scribus " VERSION));
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
initMenuBar();
initStatusBar();
WerkTools2 = new QToolBar(tr("File"), this);
/trunk/Scribus/scribus/hyask.cpp
36,7 → 36,7
{
resize( 322, 73 );
setCaption( tr( "Possible Hyphenation" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
HyAskLayout = new QVBoxLayout( this, 11, 6, "HyAskLayout");
 
Wort = new WortEdit( this );
/trunk/Scribus/scribus/annota.cpp
17,7 → 17,7
: QDialog( parent, "AN", true, 0 )
{
setCaption( tr( "Annotation Properties" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
item = it;
Breite = b;
Hoehe = h;
/trunk/Scribus/scribus/applytemplate.cpp
6,7 → 6,7
: QDialog( parent, "apply", true, 0)
{
setCaption( tr( "Apply Template" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
ApplyTLayout = new QVBoxLayout( this, 10, 8, "ApplyTLayout");
layout3 = new QHBoxLayout( 0, 0, 6, "layout3");
TextLabel1 = new QLabel( this, "TextLabel1" );
/trunk/Scribus/scribus/libprefs/prefs.cpp
33,7 → 33,7
DisScale = Vor->DisScale;
KKC = Vor->KeyActions;
setCaption( tr( "Preferences" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
PrefsLayout = new QVBoxLayout( this );
PrefsLayout->setSpacing( 6 );
/trunk/Scribus/scribus/javadocs.cpp
8,7 → 8,7
: QDialog( parent, "Javadocs", true, 0 )
{
setCaption( tr( "Global JavaScripts" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Doc = doc;
View = vie;
JavaDocsLayout = new QHBoxLayout( this, 11, 6, "JavaDocsLayout");
/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
8,7 → 8,7
{
resize( 431, 306 );
setCaption( tr( "Script Console" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
PConsoleLayout = new QVBoxLayout( this, 11, 6, "PConsoleLayout");
OutWin = new ConsWin(this);
OutWin->setMinimumSize( QSize( 300, 0 ) );
/trunk/Scribus/scribus/plugins/libchar/charselect.cpp
120,7 → 120,7
setCaption( tr( "Select Character:" )+" "+pl->doc->CurrFont );
ite = item;
ap = pl;
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
ZAuswahlLayout = new QVBoxLayout( this );
ZAuswahlLayout->setSpacing( 6 );
ZAuswahlLayout->setMargin( 11 );
/trunk/Scribus/scribus/plugins/printpreview/preview.cpp
48,7 → 48,7
app = pl;
APage = 0;
MPage = app->doc->PageC;
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
PLayout = new QVBoxLayout(this, 0, 0, "PLayout");
Layout1 = new QHBoxLayout;
Layout1->setSpacing(6);
/trunk/Scribus/scribus/multiline.cpp
16,7 → 16,7
MultiLine::MultiLine( QWidget* parent, ScribusDoc* doc, multiLine ml, QString nam, bool ed, QMap<QString,multiLine> *Sty)
: QDialog( parent, "Multiline", true, 0 )
{
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
setCaption( tr( "Edit Style" ) );
Docu = doc;
TempVorl = ml;
/trunk/Scribus/scribus/mdup.cpp
14,7 → 14,7
: QDialog( parent, "m", true, 0 )
{
setCaption( tr( "Multiple Duplicate" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
MdupLayout = new QVBoxLayout( this );
MdupLayout->setSpacing( 5 );
MdupLayout->setMargin( 10 );
/trunk/Scribus/scribus/fontprefs.cpp
12,7 → 12,7
: QDialog( parent, "fpre", true, 0 )
{
setCaption( tr( "Global Font Settings" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Prefs = prefs;
RList = Prefs->GFontSub;
HomeP = PPath;
/trunk/Scribus/scribus/polyprops.cpp
25,7 → 25,7
PolygonProps::PolygonProps(QWidget* parent) : QDialog( parent, "poly", true, 0 )
{
setCaption( tr( "Polygon Properties" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Pre = new QPixmap(101, 101);
Pre->fill(white);
PolygonPropsLayout = new QVBoxLayout( this, 10, 5, "PolygonPropsLayout");
/trunk/Scribus/scribus/page.cpp
2507,7 → 2507,7
{
newX = static_cast<int>(m->x()/sc);
newY = static_cast<int>(m->y()/sc);
if ((Mpressed) && (m->state() == RightButton) && (!doku->DragP) && (doku->AppMode == 1))
if ((Mpressed) && (m->state() == RightButton) && (!doku->DragP) && (doku->AppMode == 1) && (!b->Locked))
{
if ((abs(Dxp - newX) > 3) || (abs(Dyp - newY) > 3))
{
6654,6 → 6654,13
bool found = false;
int ret = -1;
QFileInfo fi = QFileInfo(fn);
if (!fi.exists())
{
Items.at(ItNr)->Pfile = fi.absFilePath();
Items.at(ItNr)->PicAvail = false;
Items.at(ItNr)->PicArt = false;
return;
}
QString ext = fi.extension(false).lower();
if (ext == "pdf")
{
6682,7 → 6689,7
}
else
{
Items.at(ItNr)->Pfile = fn;
Items.at(ItNr)->Pfile = fi.absFilePath();
Items.at(ItNr)->PicAvail = false;
Items.at(ItNr)->PicArt = false;
}
6813,7 → 6820,7
}
else
{
Items.at(ItNr)->Pfile = fn;
Items.at(ItNr)->Pfile = fi.absFilePath();
Items.at(ItNr)->PicAvail = false;
Items.at(ItNr)->PicArt = false;
}
6821,7 → 6828,7
}
else
{
Items.at(ItNr)->Pfile = fn;
Items.at(ItNr)->Pfile = fi.absFilePath();
Items.at(ItNr)->PicAvail = false;
Items.at(ItNr)->PicArt = false;
}
/trunk/Scribus/scribus/annot.cpp
24,7 → 24,7
: QDialog( parent, "AN", true, 0 )
{
setCaption( tr( "Field Properties" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
item = it;
Breite = b;
Hoehe = h;
/trunk/Scribus/scribus/reformdoc.cpp
26,7 → 26,7
Breite = qRound(Pagebr * UmReFaktor * 100);
Hoehe = qRound(Pageho * UmReFaktor * 100);
setCaption( tr( "Document Setup" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
ReformDocLayout = new QVBoxLayout( this );
ReformDocLayout->setSpacing( 6 );
ReformDocLayout->setMargin( 10 );
/trunk/Scribus/scribus/delpages.cpp
21,7 → 21,7
: QDialog( parent, "DelPages", true, 0 )
{
setCaption( tr( "Delete Pages" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
/trunk/Scribus/scribus/selfield.cpp
8,7 → 8,7
: QDialog( parent, "sef", true, 0 )
{
setCaption( tr( "Select Fields" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
FTyp = Art;
SelectFieldsLayout = new QVBoxLayout( this, 11, 6, "SelectFieldsLayout");
Layout5 = new QHBoxLayout( 0, 0, 6, "Layout5");
/trunk/Scribus/scribus/tree.cpp
25,7 → 25,7
setMinimumSize( QSize( 220, 240 ) );
setMaximumSize( QSize( 800, 600 ) );
setCaption( tr( "Outline" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
 
ListView1 = new QListView( this, "ListView1" );
 
/trunk/Scribus/scribus/frameedit.cpp
10,7 → 10,7
{
// resize( 155, 165 );
setCaption( tr( "Nodes" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
NodePaletteLayout = new QVBoxLayout( this );
NodePaletteLayout->setSpacing( 2 );
NodePaletteLayout->setMargin( 5 );
/trunk/Scribus/scribus/cmykfw.cpp
29,7 → 29,7
orig.getCMYK(&cc, &cm, &cy, &ck);
resize( 498, 306 );
setCaption( tr( "Edit Color" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
CMYKFarbenLayout = new QHBoxLayout( this );
CMYKFarbenLayout->setSpacing( 6 );
CMYKFarbenLayout->setMargin( 11 );
/trunk/Scribus/scribus/movepage.cpp
25,7 → 25,7
setCaption( tr( "Move Pages" ) );
else
setCaption( tr( "Copy Page" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
/trunk/Scribus/scribus/docinfo.cpp
23,7 → 23,7
{
setMaximumSize( QSize( 32767, 32767 ) );
setCaption( tr( "Document Info" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
DocInfosLayout = new QVBoxLayout( this );
DocInfosLayout->setSpacing( 6 );
DocInfosLayout->setMargin( 11 );
/trunk/Scribus/scribus/editformats.cpp
9,7 → 9,7
{
resize( 327, 260 );
setCaption( tr( "Edit Styles" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
fon = avail;
Docu = doc;
StilFormateLayout = new QHBoxLayout( this );
/trunk/Scribus/scribus/cupsoptions.cpp
28,7 → 28,7
{
FlagsOpt.clear();
setCaption( tr( "Printer Options" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
CupsOptionsLayout = new QVBoxLayout( this );
CupsOptionsLayout->setSpacing( 5 );
CupsOptionsLayout->setMargin( 10 );
/trunk/Scribus/scribus/editor.cpp
11,7 → 11,7
: QDialog( parent, "editor", true, 0 )
{
setCaption( tr( "Editor" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
view = vie;
EditorLayout = new QVBoxLayout( this, 0, 0, "EditorLayout");
EditTex = new QTextEdit( this, "EditTex" );
/trunk/Scribus/scribus/scribuswin.cpp
24,7 → 24,7
ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* ddoc)
: QMainWindow(parent, "", WDestructiveClose)
{
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
doc = ddoc;
muster = NULL;
NrItems = 0;
/trunk/Scribus/scribus/colorm.cpp
32,7 → 32,7
setMinimumSize( QSize( 300, 260 ) );
setSizeGripEnabled(true);
setCaption( tr( "Colors" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Layout2 = new QHBoxLayout( this );
Layout2->setSpacing( 6 );
Layout2->setMargin( 11 );
/trunk/Scribus/scribus/layers.cpp
14,7 → 14,7
LayerPalette::LayerPalette(QWidget* parent)
: QDialog( parent, "Layers", false, 0 )
{
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
setCaption( tr( "Layers" ) );
LayerPaletteLayout = new QVBoxLayout( this, 10, 5, "LayerPaletteLayout");
 
/trunk/Scribus/scribus/picsearch.cpp
9,7 → 9,7
: QDialog( parent, "pi2", true, 0 )
{
setCaption( tr( "Result" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
Bild = "";
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, sizePolicy().hasHeightForWidth() ) );
PicSearchLayout = new QVBoxLayout( this );
/trunk/Scribus/scribus/hruler.h
19,11 → 19,7
#define HRULER_H
 
#include <qwidget.h>
#include <qfont.h>
#include <qpainter.h>
#include <qcolor.h>
#include <qrect.h>
#include <qpointarray.h>
#include <qscrollview.h>
#include "scribusdoc.h"
 
44,7 → 40,6
int Markp;
bool repX;
bool Mpressed;
QFont rfont;
private: // Private attributes
/** Zeichensatz des Lineals */
ScribusDoc *doku;
/trunk/Scribus/scribus/newtemp.cpp
15,7 → 15,7
: QDialog( parent, "newt", true, 0 )
{
setCaption( tr( titel ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
QueryLayout = new QVBoxLayout( this );
QueryLayout->setSpacing( 6 );
QueryLayout->setMargin( 11 );
/trunk/Scribus/scribus/dcolor.cpp
24,7 → 24,7
{
setName( "DelColor" );
setCaption( tr( "Delete Color" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
/trunk/Scribus/scribus/keymanager.cpp
10,7 → 10,7
: QDialog( parent, "key", true, 0 )
{
setCaption( tr( "Manage Keyboard Shortcuts" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
KK = Ke;
Part1 = "";
Part2 = "";
/trunk/Scribus/scribus/inspage.cpp
14,7 → 14,7
: QDialog( parent, "InsPage", true, 0 )
{
setCaption( tr( "Insert Page" ) );
setIcon(loadIcon("AppIcon.xpm"));
setIcon(loadIcon("AppIcon.png"));
DLayout = new QVBoxLayout( this );
DLayout->setSpacing( 5 );
DLayout->setMargin( 10 );
/trunk/Scribus/scribus/scribusXml.cpp
1119,20 → 1119,6
tmp += tmp2.at(cxx)+tmp3;
}
}
/* else
{
tmp += QString(QChar(QStoInt(it.attribute("CH")))) + "\t";
tmp += DoFonts[it.attribute("CFONT")] + "\t";
tmp += it.attribute("CSIZE") + "\t";
tmp += it.attribute("CCOLOR") + "\t";
tmp += it.attribute("CEXTRA") + "\t";
tmp += it.attribute("CSHADE") + "\t";
tmp += it.attribute("CSTYLE") + "\t";
tmp += it.attribute("CAB","0") + "\t";
tmp += it.attribute("CSTROKE","None") + "\t";
tmp += it.attribute("CSHADE2","100") + "\t";
tmp += it.attribute("CSCALE","100") + "\n";
} */
IT=IT.nextSibling();
}
OB.Ptext = tmp;