Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 381 → Rev 382

/trunk/Scribus/scribus/story.cpp
391,6 → 391,8
chars->setAutoDelete(true);
chars->clear();
p2 = static_cast<int>(StyledText.count());
StyledText.append(chars);
ParagStyles.append(CurrentABStil);
}
else
chars = StyledText.at(p);
462,6 → 464,8
chars->setAutoDelete(true);
chars->clear();
p2 = static_cast<int>(StyledText.count());
StyledText.append(chars);
ParagStyles.append(CurrentABStil);
}
else
chars = StyledText.at(p);
/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("16").arg("August").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("17").arg("August").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
140,6 → 140,7
initScribus();
splash->close();
delete splash;
splash = 0;
}
 
void ScribusApp::initScribus()
/trunk/Scribus/scribus/plugins/scriptplugin/samples/golden-mean.py
0,0 → 1,90
"""Golden Mean for Scribus.
 
This script creates supplementary marks on the page to
help design the "right" layout in golden mean (golden
ratio).
The marks are located in new non-printable layer.
 
See www.yarpen.cz, py.cz and scribus.net for fresh
versions to come...
 
REQUIREMENTS:
Scribus - CVS version later 02/24/2004 or later release 1.5
 
MORE INFO:
See e.g.
http://home.att.net/~vmueller/prop/theo.html
or Google for more theory :)
 
CONTACT:
email : petr@yarpen.cz
Feature requests and bug reports welcomed
"""
# ****************************************************************************
# 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.
#
# ****************************************************************************
 
from math import sqrt
from scribus import *
 
GMLAYER = "Golden Mean Layer"
 
def goldenMean(aSize=0):
"""x = (?5-1)/2"""
return aSize * ((sqrt(5) - 1)/2)
 
 
def createMark(X=0, Y=0, aName=""):
"""Create something like cross on page."""
D = 10
if ObjectExists(aName) == 1:
return
CreatePolyLine(
[X-D, Y, X+D, Y, X, Y-D, X, Y+D,
X-D, Y, X, Y-D, X, Y+D, X+D, Y], aName)
 
 
# main
if HaveDoc():
# remember user settings
unit = GetUnit()
layer = GetActiveLayer()
 
# set my environment - points needed
SetUnit(0)
# Paper format
paper = PageDimension()
layerExists = 0
for i in GetLayers():
if i == GMLAYER:
layerExists = 1
if layerExists == 0:
CreateLayer(GMLAYER)
SetActiveLayer(GMLAYER)
SetLayerPrintable(GMLAYER, 0)
createMark(goldenMean(paper[0]), goldenMean(paper[1]), "GoldenMeanA4-1")
createMark(paper[0] - goldenMean(paper[0]), goldenMean(paper[1]),
"GoldenMeanA4-2")
createMark(goldenMean(paper[0]), paper[1] - goldenMean(paper[1]),
"GoldenMeanA4-3")
createMark(paper[0] - goldenMean(paper[0]), paper[1] - goldenMean(paper[1]),
"GoldenMeanA4-4")
 
# restore user settings
SetUnit(unit)
SetActiveLayer(layer)
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/plugins/gettext/csvim/csvdia.cpp
===================================================================
--- Scribus/scribus/plugins/gettext/csvim/csvdia.cpp (revision 381)
+++ Scribus/scribus/plugins/gettext/csvim/csvdia.cpp (revision 382)
@@ -72,7 +72,7 @@
bool CsvDialog::useVDelim()
{
- return vdelimCombo->currentItem() == 2;
+ return vdelimCombo->currentItem() != 2;
}
CsvDialog::~CsvDialog()
/trunk/Scribus/scribus/plugins/fontpreview/ui.h
30,11 → 30,6
QLabel* fontPreview;
 
public slots:
/** accept dialog */
virtual void okButton_clicked();
/** reject dialog */
virtual void cancelButton_clicked();
/** creates font sample */
virtual void fontList_changed( QListBoxItem * );
 
protected:
/trunk/Scribus/scribus/scribus.h
149,6 → 149,8
* information such as filename and does the serialization of your files.
*/
ScribusDoc *doc;
/** the splash screen */
SplashScreen * splash;
QLabel* FMess;
QProgressBar* FProg;
QLabel* XMess;
437,8 → 439,6
void TextScale(int);
 
private:
/** the splash screen */
SplashScreen * splash;
/** init methods */
void initScribus();
 
/trunk/Scribus/scribus/scpreview.cpp
12,6 → 12,7
#include <cmath>
#include <cstdlib>
#include "missing.h"
#include "scribus.h"
extern double QStodouble(QString in);
extern int QStoInt(QString in);
extern QString GetAttr(QDomElement *el, QString at, QString def="0");
18,6 → 19,7
extern double xy2Deg(double x, double y);
extern QPointArray FlattenPath(FPointArray ina, QValueList<uint> &Segs);
extern QImage LoadPict(QString fn, bool *gray = 0);
extern ScribusApp* ScApp;
 
ScPreview::ScPreview(preV *prefs)
{
83,10 → 85,14
{
if ((!Prefs->GFontSub.contains(tmpf)) || (!Prefs->AvailFonts[Prefs->GFontSub[tmpf]]->UseFont))
{
if (ScApp->splash != 0)
ScApp->splash->hide();
DmF *dia = new DmF(0, tmpf, Prefs);
dia->exec();
tmpf = dia->Ersatz;
delete dia;
if (ScApp->splash != 0)
ScApp->splash->show();
Prefs->GFontSub[pg.attribute("NAME")] = tmpf;
}
else