Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 386 → Rev 387

/trunk/Scribus/ChangeLogCVS
1,5 → 1,10
Changes since 1.2RC1
 
22.08.2004
* bug #728: "Hanging Conjunctions"
* feature #953: small improvement to the layer selector at the bottom
* feature #983: German ts-file for 1.2
 
21.08.2004
* feature #980: Finnish translation update
* feature #981: czech translation
/trunk/Scribus/scribus/gtaction.cpp
153,6 → 153,7
textFrame->ColGap = fstyle->getColumnsGap();
textFrame->Pcolor = fstyle->getBgColor();
textFrame->Shade = fstyle->getBgShade();
textFrame->TabValues = QValueList<double>(*(fstyle->getTabValues()));
gtParagraphStyle* pstyle = new gtParagraphStyle(*fstyle);
int pstyleIndex = findParagraphStyle(pstyle);
205,6 → 206,7
gtFont font;
getFrameFont(&font);
fstyle->setFont(font);
fstyle->setName("Default frame style");
}
 
void gtAction::createParagraphStyle(gtParagraphStyle* pstyle)
254,23 → 256,74
useFont = textFrame->IFont;
else if (ScApp->Prefs.AvailFonts[font->getName()] == 0)
{
if (!ScApp->Prefs.GFontSub.contains(font->getName()))
bool found = false;
QString tmpName = findFontName(font);
if (tmpName != NULL)
{
DmF *dia = new DmF(0, useFont, &ScApp->Prefs);
dia->exec();
useFont = dia->Ersatz;
delete dia;
ScApp->Prefs.GFontSub[font->getName()] = useFont;
useFont = tmpName;
found = true;
}
else
useFont = ScApp->Prefs.GFontSub[font->getName()];
if (!found)
{
if (font->getSlant() == gtFont::fontSlants[ITALIC])
{
gtFont* tmp = new gtFont(*font);
tmp->setSlant(OBLIQUE);
tmpName = findFontName(tmp);
if (tmpName != NULL)
{
useFont = tmpName;
found = true;
}
delete tmp;
}
else if (font->getSlant() == gtFont::fontSlants[OBLIQUE])
{
gtFont* tmp = new gtFont(*font);
tmp->setSlant(ITALIC);
tmpName = findFontName(tmp);
if (tmpName != NULL)
{
useFont = tmpName;
found = true;
}
delete tmp;
}
if (!found)
{
if (!ScApp->Prefs.GFontSub.contains(font->getName()))
{
DmF *dia = new DmF(0, useFont, &ScApp->Prefs);
dia->exec();
useFont = dia->Ersatz;
ScApp->Prefs.GFontSub[font->getName()] = useFont;
delete dia;
}
else
useFont = ScApp->Prefs.GFontSub[font->getName()];
}
}
}
if(!ScApp->doc->UsedFonts.contains(useFont))
ScApp->doc->AddFont(useFont, ScApp->Prefs.AvailFonts[useFont]->Font);
 
return useFont;
}
 
QString gtAction::findFontName(gtFont* font)
{
QString ret = NULL;
for (uint i = 0; i < static_cast<uint>(gtFont::NAMECOUNT); ++i)
{
QString nname = font->getName(i);
if (ScApp->Prefs.AvailFonts[nname] != 0)
{
ret = nname;
break;
}
}
return ret;
}
 
double gtAction::getFrameWidth()
{
return textFrame->Width;
/trunk/Scribus/scribus/mpalette.cpp
427,7 → 427,7
DistanceLayout2->addMultiCellWidget( showcurveCheckBox, 0, 0, 0, 1 );
startoffsetLabel = new QLabel( tr( "Start Offset:" ), Distance2, "startoffsetLabel" );
DistanceLayout2->addWidget( startoffsetLabel, 1, 0);
Dist = new MSpinBox( 0, 300, Distance2, 1 );
Dist = new MSpinBox( 0, 30000, Distance2, 1 );
Dist->setSuffix( tr( " pt" ) );
Dist->setLineStep(10);
DistanceLayout2->addWidget( Dist, 1, 1);
/trunk/Scribus/scribus/gtmeasure.cpp
0,0 → 1,103
/***************************************************************************
* Copyright (C) 2004 by Riku Leino *
* tsoots@welho.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include "gtmeasure.h"
 
double gtMeasure::ratio = 1.0;
 
void gtMeasure::init(Unit u)
{
switch (u)
{
case PT:
ratio = 1.0;
break;
case MM:
ratio = 0.3527777;
break;
case IN:
ratio = 1.0 / 72.0;
break;
case P:
ratio = 1.0 / 12.0;
break;
}
}
 
double gtMeasure::convert(double value)
{
return value / ratio;
}
 
double gtMeasure::convert(int value)
{
return value / ratio;
}
 
double gtMeasure::parse(QString value)
{
QString lowerValue = value.lower();
QString dbl = "0.0";
if (lowerValue.find("pt") != -1)
{
init(PT);
dbl = lowerValue.remove("pt");
}
else if (lowerValue.find("mm") != -1)
{
init(MM);
dbl = lowerValue.remove("pt");
}
else if (lowerValue.find("in") != -1)
{
init(IN);
dbl = lowerValue.remove("pt");
}
else if (lowerValue.find("p") != -1)
{
init(P);
dbl = lowerValue.remove("pt");
}
else
init(PT);
 
dbl = dbl.stripWhiteSpace();
if (dbl.find(".") == -1)
dbl += ".0";
return dbl.toDouble();
}
 
double gtMeasure::d2d(double value, Unit from)
{
init(from);
return convert(value);
}
 
 
double gtMeasure::i2d(int value, Unit from)
{
init(from);
return convert(value);
}
 
double gtMeasure::qs2d(QString value)
{
return convert(parse(value));
}
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/Makefile.am
===================================================================
--- Scribus/scribus/Makefile.am (revision 386)
+++ Scribus/scribus/Makefile.am (revision 387)
@@ -1,13 +1,13 @@
bin_PROGRAMS = scribus
-scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp measurements.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
-SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp measurements.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
+scribus_SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp gtmeasure.cpp measurements.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
+SOURCES = art_kmisc.c art_render_misc.c art_render_pattern.c art_rgb.c art_rgb_affine_private.c art_rgb_svp.c art_rgba_affine.c gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlibrgb.c gradienteditor.cpp gtgettext.cpp gtdialogs.cpp gtstyle.cpp gtframestyle.cpp gtparagraphstyle.cpp gtfont.cpp gtwriter.cpp gtaction.cpp gtmeasure.cpp measurements.cpp tabruler.cpp insertTable.cpp pageselector.cpp shadebutton.cpp alignselect.cpp styleselect.cpp search.cpp tabmanager.cpp fparser.cpp autoform.cpp story.cpp vgradient.cpp scpainter.cpp libpdf/pdflib.cpp libpostscript/pslib.cpp plugins/libchar/charselect.cpp libprefs/prefs.cpp libabout/about.cpp fontcombo.cpp scpreview.cpp lineformats.cpp multiline.cpp splash.cpp mergedoc.cpp bookpalette.cpp rc4.c md5.c cupsoptions.cpp guidemanager.cpp scribuswin.cpp hyphenator.cpp hyphen.c hyask.cpp hnjalloc.c hysettings.cpp seiten.cpp fpointarray.cpp fpoint.cpp annota.cpp buttonicon.cpp javadocs.cpp selfield.cpp editor.cpp page.cpp layers.cpp polyprops.cpp mpalette.cpp werktoolb.cpp keymanager.cpp navigator.cpp annot.cpp bookmwin.cpp cmsprefs.cpp customfdialog.cpp picsearch.cpp picstatus.cpp newtemp.cpp applytemplate.cpp muster.cpp scfonts_ttf.cpp scrap.cpp scfonts.cpp frameedit.cpp spalette.cpp edit1format.cpp editformats.cpp druck.cpp colorchart.cpp util.cpp cmykcolor.cpp cmykfw.cpp scribusXml.cpp linecombo.cpp linkbutton.cpp helpbrowser.cpp mspinbox.cpp movepage.cpp delpages.cpp inspage.cpp pdfopts.cpp tree.cpp missing.cpp fontprefs.cpp fmitem.cpp align.cpp serializer.cpp reformdoc.cpp docinfo.cpp mdup.cpp cpalette.cpp dcolor.cpp query.cpp colorm.cpp vruler.cpp hruler.cpp pageback.cpp pageitem.cpp newfile.cpp scribusview.cpp scribusdoc.cpp scribus.cpp main.cpp
INTERFACES =
TRANSLATIONS =
SUBDIRS = icons libabout libprefs plugins libpostscript libpdf profiles dicts templates po qm
-EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp gtaction.cpp gtaction.h gtwriter.cpp gtwriter.h gtfont.cpp gtfont.h gtdialogs.cpp gtdialogs.h gtstyle.cpp gtstyle.h gtframestyle.cpp gtframestyle.h gtparagraphstyle.cpp gtparagraphstyle.h gradienteditor.cpp gradienteditor.h pageselector.h insertTable.cpp insertTable.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h LoremIpsum.txt rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt
+EXTRA_DIST = main.cpp scribus.cpp scribus.h scribusdoc.cpp scribusdoc.h scribusview.cpp scribusview.h newfile.h newfile.cpp pageitem.cpp pageitem.h pageback.cpp pageback.h hruler.cpp hruler.h vruler.cpp vruler.h colorm.cpp colorm.h query.cpp query.h dcolor.cpp dcolor.h cpalette.cpp cpalette.h mdup.cpp mdup.h docinfo.cpp docinfo.h reformdoc.cpp reformdoc.h serializer.cpp serializer.h align.cpp align.h fmitem.cpp fmitem.h fontprefs.cpp fontprefs.h missing.cpp missing.h tree.cpp tree.h pdfopts.cpp pdfopts.h inspage.cpp inspage.h delpages.cpp delpages.h movepage.cpp movepage.h mspinbox.cpp mspinbox.h helpbrowser.cpp helpbrowser.h icons5.h linkbutton.cpp linkbutton.h icons6.h linecombo.cpp linecombo.h scribusXml.cpp scribusXml.h cmykfw.cpp cmykfw.h cmykcolor.cpp cmykcolor.h util.cpp colorchart.cpp colorchart.h druck.cpp druck.h editformats.cpp editformats.h edit1format.cpp edit1format.h spalette.cpp spalette.h frameedit.cpp frameedit.h scfonts.cpp scfonts.h scrap.cpp scrap.h scfonts_ttf.cpp scfonts_ttf.h muster.cpp muster.h applytemplate.cpp applytemplate.h newtemp.cpp newtemp.h picstatus.cpp picstatus.h picsearch.cpp picsearch.h customfdialog.cpp customfdialog.h cmsprefs.cpp cmsprefs.h bookmwin.cpp bookmwin.h annot.cpp annot.h navigator.cpp navigator.h keymanager.cpp keymanager.h werktoolb.cpp werktoolb.h mpalette.h mpalette.cpp polyprops.cpp polyprops.h layers.cpp layers.h page.cpp page.h editor.cpp editor.h selfield.cpp selfield.h javadocs.cpp javadocs.h buttonicon.cpp buttonicon.h annota.cpp annota.h fpoint.cpp fpoint.h fpointarray.cpp fpointarray.h seiten.cpp seiten.h hysettings.cpp hysettings.h hnjalloc.c hnjalloc.h hyask.cpp hyask.h hyphen.c hyphen.h hyphenator.cpp hyphenator.h scribuswin.cpp scribuswin.h guidemanager.cpp guidemanager.h cupsoptions.cpp cupsoptions.h md5.c md5.h rc4.c rc4.h mergedoc.cpp mergedoc.h bookpalette.cpp bookpalette.h splash.h fontcombo.h scpainter.cpp scpainter.h vgradient.cpp vgradient.h story.cpp story.h autoform.cpp autoform.h fparser.cpp fparser.h tabmanager.cpp tabmanager.h search.cpp search.h styleselect.cpp styleselect.h alignselect.cpp alignselect.h shadebutton.cpp shadebutton.h pageselector.cpp gtaction.cpp gtaction.h gtwriter.cpp gtwriter.h gtfont.cpp gtfont.h gtdialogs.cpp gtdialogs.h gtstyle.cpp gtstyle.h gtframestyle.cpp gtframestyle.h gtparagraphstyle.cpp gtparagraphstyle.h gtmeasure.cpp gtmeasure.h gradienteditor.cpp gradienteditor.h pageselector.h insertTable.cpp insertTable.h art_kmisc.c art_kmisc.h art_render_misc.c art_render_misc.h art_render_pattern.c art_render_pattern.h art_rgb.c art_rgb.h art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_svp.c art_rgb_svp.h art_rgba_affine.c art_rgba_affine.h gdk-pixbuf-xlib-drawable.c gdk-pixbuf-xlib-private.h gdk-pixbuf-xlib-render.c gdk-pixbuf-xlib.c gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.c gdk-pixbuf-xlibrgb.h LoremIpsum.txt rgbscribus.txt rgbscribusgreys.txt rgbscribusgnome.txt rgbsvg.txt
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/samples/
@@ -109,6 +109,10 @@
$(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/scribusXml.h $(prefix)/include/scribus/scribusXml.h
$(mkinstalldirs) $(prefix)/include/scribus/
+ $(INSTALL_DATA) $(srcdir)/gtaction.h $(prefix)/include/scribus/gtaction.h
+ $(mkinstalldirs) $(prefix)/include/scribus/
+ $(INSTALL_DATA) $(srcdir)/gtmeasure.h $(prefix)/include/scribus/gtmeasure.h
+ $(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/gtwriter.h $(prefix)/include/scribus/gtwriter.h
$(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/gtfont.h $(prefix)/include/scribus/gtfont.h
@@ -115,9 +119,13 @@
$(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/gtstyle.h $(prefix)/include/scribus/gtstyle.h
$(mkinstalldirs) $(prefix)/include/scribus/
- $(INSTALL_DATA) $(srcdir)/gtparagraphstyle.h $(prefix)/include/scribus/gtparagraph.h
+ $(INSTALL_DATA) $(srcdir)/gtparagraphstyle.h $(prefix)/include/scribus/gtparagraphstyle.h
$(mkinstalldirs) $(prefix)/include/scribus/
$(INSTALL_DATA) $(srcdir)/gtframestyle.h $(prefix)/include/scribus/gtframestyle.h
+ $(mkinstalldirs) $(prefix)/include/scribus/
+ $(INSTALL_DATA) $(srcdir)/missing.h $(prefix)/include/scribus/missing.h
+ $(mkinstalldirs) $(prefix)/include/scribus/
+ $(INSTALL_DATA) $(srcdir)/gradienteditor.h $(prefix)/include/scribus/gradienteditor.h
uninstall-local:
-rm -f $(prefix)/share/scribus/samples/LoremIpsum.txt
@@ -174,6 +182,10 @@
-rm -f $(prefix)/include/scribus/gtparagraphstyle.h
-rm -f $(prefix)/include/scribus/gtframestyle.h
-rm -f $(prefix)/include/scribus/pageselector.h
+ -rm -f $(prefix)/include/scribus/gtaction.h
+ -rm -f $(prefix)/include/scribus/gtmeasure.h
+ -rm -f $(prefix)/include/scribus/missing.h
+ -rm -f $(prefix)/include/scribus/gradienteditor.h
scribus_LDADD = $(LIBJPEG) $(LIBART_LIBS) $(LIBFREETYPE_LIBS) $(LIBCUPS) $(LIBLCMS) $(LIBDL) $(LIBDL2) $(LIBTIFF) -lm $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
AM_LDFLAGS = -export-dynamic -s
/trunk/Scribus/scribus/page.cpp
708,8 → 708,8
p.end();
if ((rd.intersects(apr.boundingRect())) || (rd.intersects(apr2.boundingRect())))
{
if ((sp) && (b->Ptext.count() >= b->MaxChars))
b->Dirty = true;
// if ((sp) && (b->Ptext.count() >= b->MaxChars))
// b->Dirty = true;
if (!((doku->EditClip) && (Mpressed)))
b->DrawObj(painter, rd);
b->Redrawn = true;
/trunk/Scribus/scribus/gtaction.h
44,6 → 44,7
int applyParagraphStyle(gtParagraphStyle* pstyle);
void applyFrameStyle(gtFrameStyle* fstyle);
QString validateFont(gtFont* font);
QString findFontName(gtFont* font);
void finalize();
public:
gtAction(bool append);
/trunk/Scribus/scribus/po/scribus.de.ts
1429,7 → 1429,7
</message>
<message>
<source>Rendering Intents</source>
<translation>Wiedergabemethoden</translation>
<translation>Render-Prioritäten</translation>
</message>
<message>
<source>Simulate Printer on the Screen</source>
1494,13 → 1494,13
<message>
<source>Default rendering intent for your monitor. Unless you know why to change it,
Relative Colorimetric or Perceptual should be chosen.</source>
<translation>Standard-Wiedergabemethode für Ihren Monitor. Ohne einen Grund zur Veränderung
<translation>Standard-Rendering Methode für Ihren Monitor. Ohne einen Grund zur Veränderung
sollte entweder relativ farbmetrisch oder Wahrnehmung aktiviert sein.</translation>
</message>
<message>
<source>Default rendering intent for your printer. Unless you know why to change it,
Relative Colorimetric or Perceptual should be chosen.</source>
<translation>Standard-Wiedergabemethode für den Drucker. Ohne einen Grund zur Veränderung
<translation>Standard-Rendering Methode für den Drucker. Ohne einen Grund zur Veränderung
sollte entweder relativ farbmetrisch oder Wahrnehmung aktiviert sein.</translation>
</message>
<message>
1518,7 → 1518,7
</message>
<message>
<source>&amp;Activate Color Management</source>
<translation>Farb&amp;management aktivieren</translation>
<translation>Farb-Management &amp;aktivieren</translation>
</message>
<message>
<source>&amp;Pictures:</source>
1538,11 → 1538,11
</message>
<message>
<source>M&amp;onitor:</source>
<translation>Monito&amp;r:</translation>
<translation>Moni&amp;tor:</translation>
</message>
<message>
<source>Pr&amp;inter:</source>
<translation>Dru&amp;cker:</translation>
<translation>&amp;Drucker:</translation>
</message>
<message>
<source>Sim&amp;ulate Printer on the Screen</source>
1803,11 → 1803,11
<name>CsvDialog</name>
<message>
<source>CSV Importer Options</source>
<translation>CSV Importer Optionen</translation>
<translation>Optionen für CSV-Importer</translation>
</message>
<message>
<source>Field delimiter:</source>
<translation>Feldbegrenzer:</translation>
<translation>Feldtrenner:</translation>
</message>
<message>
<source>(TAB)</source>
1815,11 → 1815,15
</message>
<message>
<source>Value delimiter:</source>
<translation>Wertbegrenzer:</translation>
<translation>Werttrenner:</translation>
</message>
<message>
<source>None</source>
<translation>Keiner</translation>
</message>
<message>
<source>First row is a header</source>
<translation>Erste Zeile ist Überschrift</translation>
<translation>Erste Zeile ist Kopfzeile</translation>
</message>
<message>
<source>OK</source>
1829,10 → 1833,6
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<message>
<source>None</source>
<translation>Keiner</translation>
</message>
</context>
<context>
<name>CupsOptions</name>
3288,7 → 3288,7
</message>
<message>
<source>Font Substitutions</source>
<translation>Schriftarten-Ersetzungen</translation>
<translation>Schrift Ersetzungen</translation>
</message>
<message>
<source>Additional Paths</source>
3304,7 → 3304,7
</message>
<message>
<source>Font Name</source>
<translation>Name der Schriftart</translation>
<translation>Schrift Name</translation>
</message>
<message>
<source>Replacement</source>
3348,7 → 3348,7
</message>
<message>
<source>Subset</source>
<translation>Nur benutzte Zeichen einbetten</translation>
<translation>Unterteilen</translation>
</message>
<message>
<source>Type</source>
3356,7 → 3356,7
</message>
<message>
<source>Path to Font File</source>
<translation>Pfad zur Schriftart</translation>
<translation>Pfad zur Schriftdatei</translation>
</message>
<message>
<source>&amp;Available Fonts</source>
3384,7 → 3384,7
</message>
<message>
<source>&amp;Remove</source>
<translation>Ent&amp;fernen</translation>
<translation>&amp;Entfernen</translation>
</message>
<message>
<source>&amp;OK</source>
3570,7 → 3570,7
<name>HySettings</name>
<message>
<source>Hyphenator Settings</source>
<translation>Silbentrennungs-Einstellungen</translation>
<translation>Einstellungen</translation>
</message>
<message>
<source>Fully Automatic</source>
4107,15 → 4107,15
</message>
<message>
<source> mm</source>
<translation>mm</translation>
<translation></translation>
</message>
<message>
<source> in</source>
<translation>in</translation>
<translation></translation>
</message>
<message>
<source> p</source>
<translation>p</translation>
<translation></translation>
</message>
</context>
<context>
4614,7 → 4614,7
</message>
<message>
<source>Rendering Intent:</source>
<translation>Wiedergabemethode:</translation>
<translation>Render Priorität:</translation>
</message>
<message>
<source>Perceptual</source>
5052,11 → 5052,11
</message>
<message>
<source>Rendering intent for the image</source>
<translation>Wiedergabemethode für das Bild</translation>
<translation>Render-Methode für das Bild</translation>
</message>
<message>
<source>Switches between Gap or Column width</source>
<translation>Schaltet zwischen Abstand und Spaltenbreite um</translation>
<translation></translation>
</message>
<message>
<source>Column width</source>
5076,7 → 5076,7
</message>
<message>
<source>Indicates the level the object is on, 0 means the object is at the bottom</source>
<translation>Zeit das Level an, auf dem sich das Objekt befindet. 0 bedeutet ganz unten</translation>
<translation></translation>
</message>
<message>
<source>Font Size:</source>
6691,7 → 6691,7
</message>
<message>
<source>Rendering intent for solid colors</source>
<translation>Wiedergabemethode für Farben festlegen</translation>
<translation>Render-Methode für Farben</translation>
</message>
<message>
<source>Color profile for images</source>
6699,7 → 6699,7
</message>
<message>
<source>Rendering intent for images</source>
<translation>Wiedergabemethode für Bilder festlegen</translation>
<translation>Render-Methode für Bilder</translation>
</message>
<message>
<source>Output profile for printing. If possible, get some guidance from your printer on profile selection.</source>
7855,7 → 7855,7
</message>
<message>
<source>Units</source>
<translation>Vorgabe für Maßeinheit</translation>
<translation>Einheiten</translation>
</message>
<message>
<source>Points (pt)</source>
7995,7 → 7995,7
</message>
<message>
<source>Grid Layout</source>
<translation>Vorgaben für Hilfslinien</translation>
<translation>Hilfslinien Einrichtung</translation>
</message>
<message>
<source>Minor Grid Spacing:</source>
8011,7 → 8011,7
</message>
<message>
<source>Grid Colors</source>
<translation>Farbeinstellungen für Hilfslinien</translation>
<translation>Hilfslinienfarben</translation>
</message>
<message>
<source>Minor Grid Color:</source>
8287,7 → 8287,7
</message>
<message>
<source>Misc.</source>
<translation>Verschiedenes</translation>
<translation>Versch.</translation>
</message>
<message>
<source>Displacement:</source>
8751,7 → 8751,7
</message>
<message>
<source>&amp;Grab Radius:</source>
<translation>Fangradi&amp;us:</translation>
<translation>Fang&amp;radius:</translation>
</message>
<message>
<source>&amp;Recent Documents:</source>
8763,7 → 8763,7
</message>
<message>
<source>&amp;Change...</source>
<translation>&amp;Ändern...</translation>
<translation>&amp;Wechseln...</translation>
</message>
<message>
<source>&amp;ICC Profiles:</source>
8779,7 → 8779,7
</message>
<message>
<source>Ch&amp;ange...</source>
<translation>Änd&amp;ern...</translation>
<translation>Ä&amp;ndern...</translation>
</message>
<message>
<source>&amp;Size:</source>
8787,7 → 8787,7
</message>
<message>
<source>Orie&amp;ntation:</source>
<translation>Ausrich&amp;tung:</translation>
<translation>Aus&amp;richtung:</translation>
</message>
<message>
<source>&amp;Width:</source>
8843,7 → 8843,7
</message>
<message>
<source>Min&amp;or Grid Color:</source>
<translation>Farbe der &amp;Teillinien:</translation>
<translation>&amp;Farbe der Teillinien:</translation>
</message>
<message>
<source>Majo&amp;r Grid Color:</source>
8851,11 → 8851,11
</message>
<message>
<source>&amp;User Guides Color:</source>
<translation>Farbe der Hilfs&amp;linien:</translation>
<translation>Farbe der &amp;Hilfslinien:</translation>
</message>
<message>
<source>Base&amp;line Grid Color:</source>
<translation>Farbe des &amp;Grundlinienrasters:</translation>
<translation>&amp;Farbe des Grundlinienrasters:</translation>
</message>
<message>
<source>In the &amp;Background</source>
8879,11 → 8879,11
</message>
<message>
<source>&amp;Scaling:</source>
<translation>&amp;Skalierung:</translation>
<translation>Ska&amp;lierung:</translation>
</message>
<message>
<source>D&amp;isplacement:</source>
<translation>Versat&amp;z:</translation>
<translation>&amp;Versatz:</translation>
</message>
<message>
<source>S&amp;caling:</source>
8891,7 → 8891,7
</message>
<message>
<source>Sc&amp;aling:</source>
<translation>Skalieru&amp;ng:</translation>
<translation>Ska&amp;lierung:</translation>
</message>
<message>
<source>Baseline &amp;Grid:</source>
8899,11 → 8899,11
</message>
<message>
<source>Baseline &amp;Offset:</source>
<translation>&amp;Grundlinienversatz:</translation>
<translation>Grundlinien-&amp;Versatz:</translation>
</message>
<message>
<source>Automatic &amp;Line Spacing:</source>
<translation>Au&amp;tomatischer Zeilenabstand:</translation>
<translation>Automatischer &amp;Zeilenabstand:</translation>
</message>
<message>
<source>Default &amp;Font:</source>
8919,15 → 8919,15
</message>
<message>
<source>Colu&amp;mns:</source>
<translation>S&amp;palten:</translation>
<translation>&amp;Spalten:</translation>
</message>
<message>
<source>&amp;Gap:</source>
<translation>Abs&amp;tand:</translation>
<translation>&amp;Abstand:</translation>
</message>
<message>
<source>&amp;Line Color:</source>
<translation>Linienfar&amp;be:</translation>
<translation>Linien&amp;farbe:</translation>
</message>
<message>
<source>&amp;Shading:</source>
8939,11 → 8939,11
</message>
<message>
<source>S&amp;hading:</source>
<translation>Ton&amp;wert:</translation>
<translation>&amp;Tonwert:</translation>
</message>
<message>
<source>&amp;Type of Line:</source>
<translation>Liniena&amp;rt:</translation>
<translation>Linien&amp;art:</translation>
</message>
<message>
<source>Line &amp;Width:</source>
8963,7 → 8963,7
</message>
<message>
<source>&amp;Free Scaling</source>
<translation>Freie &amp;Skalierung</translation>
<translation>&amp;Freie Skalierung</translation>
</message>
<message>
<source>&amp;Horizontal Scaling:</source>
8979,7 → 8979,7
</message>
<message>
<source>Keep Aspect &amp;Ratio</source>
<translation>Seitenverhältnisse &amp;beibehalten</translation>
<translation>Seitenverhältnisse beibe&amp;halten</translation>
</message>
<message>
<source>F&amp;ill Color:</source>
8999,7 → 8999,7
</message>
<message>
<source>&amp;Factor:</source>
<translation>Fak&amp;tor:</translation>
<translation>Fa&amp;ktor:</translation>
</message>
<message>
<source>Sa&amp;ve Contents on Changes</source>
9396,11 → 9396,11
<name>QFontDialog</name>
<message>
<source>&amp;Font</source>
<translation>&amp;Schriftart</translation>
<translation>Schrift&amp;art</translation>
</message>
<message>
<source>Font st&amp;yle</source>
<translation>Schrifts&amp;til</translation>
<translation>&amp;Formatierung</translation>
</message>
<message>
<source>&amp;Size</source>
9412,7 → 9412,7
</message>
<message>
<source>Stri&amp;keout</source>
<translation>Durch&amp;gestrichen</translation>
<translation>Du&amp;rchgestrichen</translation>
</message>
<message>
<source>&amp;Underline</source>
9424,11 → 9424,11
</message>
<message>
<source>Sample</source>
<translation>Beispiel</translation>
<translation>Vorschau</translation>
</message>
<message>
<source>Scr&amp;ipt</source>
<translation>Schr&amp;iftsystem</translation>
<translation>&amp;Zeichensatz</translation>
</message>
<message>
<source>OK</source>
9943,15 → 9943,15
</message>
<message>
<source>Comma Separated Value Files</source>
<translation>Komma separierte Daten</translation>
<translation>Kommaseparierte Dateien</translation>
</message>
<message>
<source>CSV_data</source>
<translation>CSV_data</translation>
<translation>CVS_data</translation>
</message>
<message>
<source>CSV_header</source>
<translation>CSV_Vorspann</translation>
<translation>CSV_header</translation>
</message>
</context>
<context>
11438,7 → 11438,7
</message>
<message>
<source>&amp;Line Styles...</source>
<translation>&amp;Linienstile...</translation>
<translation>&amp;Linien-Stile...</translation>
</message>
<message>
<source>&amp;Templates...</source>
12584,7 → 12584,7
</message>
<message>
<source>&amp;Display Font...</source>
<translation>&amp;Schriftart des Textes...</translation>
<translation>&amp;Schriftart...</translation>
</message>
<message>
<source>&amp;Settings</source>
13176,29 → 13176,29
<translation type="obsolete">Kopieren Sie eine bestehende template.xml nach template.lang_COUNTRY.xml, wobei Sie denselben Ländercode benutzen sollten wie die qm-Datei für Ihre Sprache auch hat. Außerdem muss die Kopie im selben Verzeichnis wie das Original liegen.</translation>
</message>
<message>
<source>Date</source>
<translation>Datum</translation>
</message>
<message>
<source>Document templates can be found at http://www.scribus.net/ in the Downloads section.</source>
<translation>Dokumentvorlagen können unter http://www.scribus.net/ im Downloadbereich gefunden werden.</translation>
<translation>Weitere Dokumentvorlagen finden Sie unter http://www.scribus.net/ im Download-Bereich.</translation>
</message>
<message>
<source>Make sure images and fonts you use can be used freely. If fonts cannot be shared do not collect them when saving as a template.</source>
<translation>Stellen Sie sicher daß Bilder und Schriften frei verwendet werden können.</translation>
<translation>Sie müssen sicherstellen, dass die Bilder und Fonts frei benutzt werden können. Wenn Sie Fonts nicht verbreiten dürfen, dann binden Sie diese beim Export als Vorlage nicht ein.</translation>
</message>
<message>
<source>The template creator should also make sure that the Installing Templates section above applies to their templates as well. This means a user should be able to download a template package and be able to extract them to the template directory and start using them.</source>
<translation>Wenn Sie selber Vorlagen bereitstellen, sollten Sie vorher ausprobieren, ob sie auch korrekt funktionieren. Das heißt, wenn Sie die Vorlage ins angegebene Verzeichnis kopieren, sollte sie sofort einsatzbereit sein.</translation>
<translation>Wenn Sie Vorlagen erstellen, sollten Sie darauf achten, dass Sie die Informationen in dem Abschnitt &quot;Vorlagen installieren&quot; beachten. Das bedeutet, der Benutzer sollte in der Lage sein, die Vorlage einfach in das entsprechende Verzeichnis zu kopieren und zu benutzen.</translation>
</message>
<message>
<source>Removing a template from the New From Template dialog will only remove the entry from the template.xml, it will not delete the document files. A popup menu with remove is only shown if you have write access to the template.xml file.</source>
<translation>Wenn Sie eine Vorlage hier entfernen, wird nur der Eintrag in template.xml gelöscht, die Vorlagendateien an sich bleiben erhalten. Außerdem erscheint das Popup-Menü mit Entfernen nur, wenn sie Schreibrechte auf template.xml besitzen.</translation>
<translation>Wenn Sie eine Vorlage von dieser Liste entfernen, wird nur der entsprechende Eintrag in der template.xml gelöscht, nicht die Vorlage selber. Sie können Vorlagen nur löschen, wenn Sie Schreibrechte auf template.xml besitzen.</translation>
</message>
<message>
<source>Copy an existing template.xml to a file called template.lang_COUNTRY.xml (use the same lang code that is present in the qm file for your language), for example template.fi.xml for Finnish language template.xml. The copy must be located in the same directory as the original template.xml so Scribus can load it.</source>
<translation>Kopieren Sie eine bestehende template.xml nach template.lang_COUNTRY.xml, wobei Sie denselben Ländercode benutzen sollten wie die qm-Datei für Ihre Sprache auch hat. Außerdem muss die Kopie im selben Verzeichnis wie das Original liegen.</translation>
<translation>Kopieren Sie die existierende template.xml nach template.lang_COUNTRY.xml (selber Ländercode wie bei den qm-Dateien), zum Beispiel template.fi.xml für Finnisch. Diese Kopie muss sich im selben Verzeichnis wie template.xml befinden.</translation>
</message>
<message>
<source>Date</source>
<translation>Datum</translation>
</message>
</context>
<context>
<name>satdialog</name>
/trunk/Scribus/scribus/qm/scribus.de.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/Scribus/scribus/gtfont.cpp
53,7 → 53,11
"Extra Condensed",
"Semi Condensed",
"Ultra Condensed",
"Condensed"
"Extra Compressed",
"Semi Compressed",
"Ultra Compressed",
"Condensed",
"Compressed"
};
 
gtFont::gtFont()
64,6 → 68,7
weight = "";
slant = "";
width = "";
append = "";
size = 12;
color = "Black";
shade = 100;
71,6 → 76,10
strokeShade = 100;
hscale = 100;
kerning = 0.0;
useFullName = true;
weightIndex = 0;
slantIndex = 1;
widthIndex = 2;
}
 
gtFont::gtFont(const gtFont& f)
80,6 → 89,7
weight = f.weight;
slant = f.slant;
width = f.width;
append = f.append;
size = f.size;
color = f.color;
shade = f.shade;
87,6 → 97,10
strokeShade = f.strokeShade;
hscale = f.hscale;
kerning = f.kerning;
useFullName = f.useFullName;
weightIndex = f.weightIndex;
slantIndex = f.slantIndex;
widthIndex = f.widthIndex;
fontEffects[NORMAL] = f.fontEffects[NORMAL];
fontEffects[UNDERLINE] = f.fontEffects[UNDERLINE];
fontEffects[STRIKETHROUGH] = f.fontEffects[STRIKETHROUGH];
160,43 → 174,110
setSlant(NO_SLANT);
setWidth(NO_WIDTH);
parseName();
useFullName = true;
}
 
void gtFont::setFamily(QString newFamily)
{
family = newFamily;
useFullName = false;
}
 
QString gtFont::getFamily()
{
return family;
}
 
void gtFont::setWeight(FontWeight newWeight)
{
weight = fontWeights[newWeight];
useFullName = false;
if ((newWeight == ROMAN) || (newWeight == REGULAR))
{
setSlant(NO_SLANT);
setWidth(NO_WIDTH);
}
}
 
void gtFont::setSlant(FontSlant newSlant)
void gtFont::setWeight(QString newWeight)
{
slant = fontSlants[newSlant];
weight = newWeight;
useFullName = false;
if ((newWeight == fontWeights[ROMAN]) ||
(newWeight == fontWeights[REGULAR]))
{
setSlant(NO_SLANT);
setWidth(NO_WIDTH);
}
}
 
void gtFont::setWidth(FontWidth newWidth)
QString gtFont::getWeight()
{
width = fontWidths[newWidth];
return weight;
}
 
void gtFont::setWeight(QString newWeight)
void gtFont::setSlant(FontSlant newSlant)
{
weight = newWeight;
slant = fontSlants[newSlant];
useFullName = false;
if (newSlant != NO_SLANT)
{
if (weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
else if (weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
}
}
 
void gtFont::setSlant(QString newSlant)
{
slant = newSlant;
useFullName = false;
if (newSlant != "")
{
if (weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
else if (weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
}
}
 
QString gtFont::getSlant()
{
return slant;
}
 
void gtFont::setWidth(FontWidth newWidth)
{
width = fontWidths[newWidth];
useFullName = false;
if (newWidth != NO_WIDTH)
{
if (weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
else if (weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
}
}
 
void gtFont::setWidth(QString newWidth)
{
width = newWidth;
useFullName = false;
if (newWidth != "")
{
if (weight == fontWeights[REGULAR])
setWeight(NO_WEIGHT);
else if (weight == fontWeights[ROMAN])
setWeight(NO_WEIGHT);
}
}
 
QString gtFont::getWidth()
{
return width;
}
 
void gtFont::setSize(int newSize)
{
size = newSize;
204,8 → 285,8
 
void gtFont::setSize(double newSize)
{
newSize = newSize * 10;
size = static_cast<int>(newSize);
double tmp = newSize * 10;
size = static_cast<int>(tmp);
}
 
void gtFont::setColor(QString newColor)
230,10 → 311,85
 
QString gtFont::getName()
{
QString name2 = family + " " + weight + " " + slant + " " + width;
if (useFullName)
return name;
 
QString name2 = family + " ";
if (weightIndex == 0)
name2 += weight + " ";
else if (slantIndex == 0)
name2 += slant + " ";
else if (widthIndex == 0)
name2 += width + " ";
if (weightIndex == 1)
name2 += weight + " ";
else if (slantIndex == 1)
name2 += slant + " ";
else if (widthIndex == 1)
name2 += width + " ";
if (weightIndex == 2)
name2 += weight + " ";
else if (slantIndex == 2)
name2 += slant + " ";
else if (widthIndex == 2)
name2 += width + " ";
name2 += append;
name2 = name2.simplifyWhiteSpace();
return name2;
}
 
QString gtFont::getName(uint i)
{
QString fname = family + " ";
switch (i)
{
case 0:
fname = fname + weight + " " + slant + " " + width + " " + append;
break;
case 1:
fname = fname + weight + " " + width + " " + slant + " " + append;
break;
case 2:
fname = fname + slant + " " + weight + " " + width + " " + append;
break;
case 3:
fname = fname + slant + " " + width + " " + weight + " " + append;
break;
case 4:
fname = fname + width + " " + weight + " " + slant + " " + append;
break;
case 5:
fname = fname + width + " " + slant + " " + weight + " " + append;
break;
case 6:
fname = fname + " " + append + " " + weight + " " + slant + " " + width;
break;
case 7:
fname = fname + " " + append + " " + weight + " " + width + " " + slant;
break;
case 8:
fname = fname + " " + append + " " + slant + " " + weight + " " + width;
break;
case 9:
fname = fname + " " + append + " " + slant + " " + width + " " + weight;
break;
case 10:
fname = fname + " " + append + " " + width + " " + weight + " " + slant;
break;
case 11:
fname = fname + " " + append + " " + width + " " + slant + " " + weight;
break;
case 12:
if ((append == "") && (weight == "") && (slant == "") && (width == ""))
fname = fname + " " + fontWeights[REGULAR];
break;
case 13:
if ((append == "") && (weight == "") && (slant == "") && (width == ""))
fname = fname + " " + fontWeights[ROMAN];
break;
}
fname = fname.simplifyWhiteSpace();
return fname;
}
 
int gtFont::getSize()
295,8 → 451,12
void gtFont::parseName()
{
int smallestIndex = -1;
int biggestIndex = - 1;
int index = -1;
bool found = false;
int tmpWeightIndex = -1;
int tmpSlantIndex = -1;
int tmpWidthIndex = -1;
for (int i = 1; i < FontWeightMAX; ++i)
{
index = name.find(fontWeights[i]); // f.e. Demi Bold
338,7 → 498,10
weight = tmpWeight;
if (smallestIndex == -1 || smallestIndex > index)
smallestIndex = index;
if ((biggestIndex == -1) || (biggestIndex < index + static_cast<int>(tmpWeight.length()) - 1))
biggestIndex = index + tmpWeight.length();
found = true;
tmpWeightIndex = index;
break;
}
}
354,7 → 517,10
slant = fontSlants[i];
if (smallestIndex == -1 || smallestIndex > index)
smallestIndex = index;
if ((biggestIndex == -1) || (biggestIndex < index + static_cast<int>(slant.length()) - 1))
biggestIndex = index + slant.length();
found = true;
tmpSlantIndex = index;
break;
}
}
379,7 → 545,7
if (index == -1)
{
fw2 = fontWidths[i];
fw2.replace(" B", " b"); // f.e. Demibold
fw2.replace(" B", " b");
fw2.replace(" C", " c");
fw2.replace(" H", " h");
fw2.replace(" L", " l");
403,19 → 569,66
width = tmpWidth;
if (smallestIndex == -1 || smallestIndex > index)
smallestIndex = index;
if ((biggestIndex == -1) || (biggestIndex < index + static_cast<int>(tmpWidth.length()) - 1))
biggestIndex = index + tmpWidth.length();
found = true;
tmpWidthIndex = index;
break;
}
}
if (!found)
width = fontWidths[NO_WIDTH];
 
if (tmpWeightIndex < tmpSlantIndex)
{
weightIndex = 0;
slantIndex = 1;
if (tmpWidthIndex < tmpWeightIndex)
{
widthIndex = 0;
weightIndex = 1;
slantIndex = 2;
}
else if (tmpWidthIndex < tmpSlantIndex)
{
widthIndex = 1;
slantIndex = 2;
}
else
widthIndex = 2;
}
else if (tmpWeightIndex > tmpSlantIndex)
{
slantIndex = 0;
weightIndex = 1;
if (tmpWidthIndex < tmpSlantIndex)
{
widthIndex = 0;
slantIndex = 1;
weightIndex = 2;
}
else if (tmpWidthIndex < tmpWeightIndex)
{
widthIndex = 1;
weightIndex = 2;
}
else
widthIndex = 2;
}
else
{
weightIndex = -2;
widthIndex = -1;
slantIndex = 0;
}
if (smallestIndex == -1)
family = name;
else
family = name.left(smallestIndex);
if (biggestIndex == -1)
append = "";
else
append = name.right(name.length() - biggestIndex);
family = family.stripWhiteSpace();
}
 
gtFont::~gtFont()
/trunk/Scribus/scribus/story.cpp
2137,7 → 2137,7
doc->Trenner->slotNewDict(nb->Language);
doc->Trenner->slotHyphenate(nb);
}
doc->ActPage->RefreshItem(nb);
doc->ActPage->update();
TextChanged = false;
emenu->setItemEnabled(Mupdt, 0);
fmenu->setItemEnabled(fid52, 0);
/trunk/Scribus/scribus/pageitem.cpp
101,6 → 101,7
ExtraV = 0;
Ptext.clear();
Ptext.setAutoDelete(true);
MaxChars = 0;
Pfile = "";
pixm = QImage();
pixmOrg = QImage();
564,8 → 565,10
p->scale(1, -1);
}
struct ZZ Zli3;
for (a = 0; a < MaxChars; ++a)
for (a = 0; a < Ptext.count(); ++a)
{
if (a > MaxChars)
break;
hl = Ptext.at(a);
chx = hl->ch;
if (hl->ch == QChar(30))
/trunk/Scribus/scribus/libabout/about.cpp
56,7 → 56,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg("21").arg("August").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("22").arg("August").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/gtfont.h
68,7 → 68,11
EXTRACONDENSED,
SEMICONDENSED,
ULTRACONDENSED,
EXTRACOMPRESSED,
SEMICOMPRESSED,
ULTRACOMPRESSED,
CONDENSED,
COMPRESSED,
FontWidthMAX
};
 
78,9 → 82,6
*/
class gtFont
{
static const QString fontWeights[];
static const QString fontSlants[];
static const QString fontWidths[];
private:
QString name;
QString family;
87,6 → 88,7
QString weight;
QString slant;
QString width;
QString append;
int size;
bool fontEffects[FontEffectMAX];
QString color;
96,9 → 98,16
/* Width of a character in percentages to it's "real width" */
int hscale;
double kerning;
bool useFullName;
int weightIndex;
int slantIndex;
int widthIndex;
void initArrays();
void parseName();
public:
static const QString fontWeights[];
static const QString fontSlants[];
static const QString fontWidths[];
void noEffects();
bool isToggled(FontEffect fe);
bool toggleEffect(FontEffect fe);
105,12 → 114,16
int getEffectsValue();
void setName(QString newName);
void setFamily(QString newFamily);
QString getFamily();
void setWeight(FontWeight newWeight);
void setWeight(QString newWeight);
QString getWeight();
void setSlant(FontSlant newSlant);
void setSlant(QString newSlant);
QString getSlant();
void setWidth(FontWidth newWidth);
void setWeight(QString newWeight);
void setSlant(QString newSlant);
void setWidth(QString newWidth);
QString getWidth();
void setSize(int newSize);
void setSize(double newSize);
void setColor(QString newColor);
118,6 → 131,8
void setStrokeColor(QString newColor);
void setStrokeShade(int newShade);
QString getName();
QString getName(uint i);
const static int NAMECOUNT = 14;
int getSize();
QString getColor();
int getShade();
132,4 → 147,4
~gtFont();
};
 
#endif // FONT_H
#endif // GTFONT_H
/trunk/Scribus/scribus/scribus.cpp
9010,6 → 9010,8
if (dia->TextChanged)
dia->updateTextFrame();
}
else
doc->ActPage->update();
BuildFontMenu();
CurrStED = NULL;
delete dia;
/trunk/Scribus/scribus/libpdf/pdflib.cpp
833,10 → 833,6
}
PutDoc(func+"\n>>\n");
}
/* PutDoc("/Cyan\n<<\n/Type /Halftone\n/HalftoneType 1\n/Frequency 50\n/Angle 45\n/SpotFunction /Round\n>>\n");
PutDoc("/Magenta\n<<\n/Type /Halftone\n/HalftoneType 1\n/Frequency 50\n/Angle 45\n/SpotFunction /Round\n>>\n");
PutDoc("/Yellow\n<<\n/Type /Halftone\n/HalftoneType 1\n/Frequency 50\n/Angle 45\n/SpotFunction /Round\n>>\n");
PutDoc("/Black\n<<\n/Type /Halftone\n/HalftoneType 1\n/Frequency 50\n/Angle 45\n/SpotFunction /Round\n>>\n"); */
PutDoc("/Default\n<<\n/Type /Halftone\n/HalftoneType 1\n/Frequency 50\n/Angle 45\n/SpotFunction /Round\n>>\n");
PutDoc(">>\nendobj\n");
ObjCounter++;
2647,9 → 2643,11
cc = ite->Ptext.at(d)->ch;
if ((cc == "(") || (cc == ")") || (cc == "\\"))
bm += "\\";
if (cc == QChar(13))
cc = "\\r";
bm += cc;
}
QStringList bmst = QStringList::split("\r", bm);
QStringList bmst = QStringList::split("\\r", bm);
const char *m[] = {"4", "5", "F", "l", "H", "n"};
ct = m[ite->AnChkStil];
StartObj(ObjCounter);
3052,7 → 3050,18
#endif
cc += ind2PDFabr[ite->AnFont];
cc += " "+FToStr(ite->ISize / 10.0)+" Tf\n";
cc += "1 0 0 1 0 0 Tm\n0 0 Td\n"+EncString("("+bm+")",ObjCounter-1)+" Tj\nET\nEMC";
if (bmst.count() > 1)
{
cc += "1 0 0 1 0 0 Tm\n0 0 Td\n";
for (uint mz = 0; mz < bmst.count(); ++mz)
{
cc += EncString("("+bmst[mz]+")",ObjCounter-1);
cc += " Tj\nT*\n";
}
cc += "ET\nEMC";
}
else
cc += "1 0 0 1 0 0 Tm\n0 0 Td\n"+EncString("("+bm+")",ObjCounter-1)+" Tj\nET\nEMC";
PDF_Form(cc);
}
if (ite->AnType == 4)
/trunk/Scribus/scribus/gtmeasure.h
0,0 → 1,52
/***************************************************************************
* Copyright (C) 2004 by Riku Leino *
* tsoots@welho.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#ifndef GTMEASURE_H
#define GTMEASURE_H
 
#include <qstring.h>
 
enum Unit {
POINTS = 0,
PT = 0,
MILLIMETERS = 1,
MM = 1,
INCHES = 2,
IN = 2,
PICAS = 3,
P = 3
};
 
class gtMeasure
{
private:
gtMeasure();
static double ratio;
static void init(Unit u);
static double convert(double value);
static double convert(int value);
static double parse(QString value);
public:
static double d2d(double value, Unit from);
static double i2d(int value, Unit from);
static double qs2d(QString value);
};
 
#endif // GTMEASURE_H
Property changes:
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property