Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 101 → Rev 102

/trunk/Scribus/configure.in
198,7 → 198,7
echo "TiffLib installed: No"
fi
if test $COMPILE_PYTHON = no; then
echo "The Scripter-Plugin will no be build."
echo "The Scripter-Plugin will not be compiled."
fi
if test $hapython = yes; then
echo "Using Python 2.3"
/trunk/Scribus/ChangeLogCVS
1,4 → 1,6
Changes since Version 1.1.2
15.11.2003 Added first version of the Story Editor.
 
12.11.2003 Fixed Bug with TIFF-Images.
 
10.11.2003 Added Web-Links to the PDF-Export.
/trunk/Scribus/scribus/story.cpp
0,0 → 1,375
/***************************************************************************
story.cpp - description
-------------------
begin : Tue Nov 11 2003
copyright : (C) 2003 by Franz Schmid
email : Franz.Schmid@altmuehlnet.de
***************************************************************************/
 
/***************************************************************************
* *
* 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. *
* *
***************************************************************************/
#include "story.h"
#include "story.moc"
#include <qlayout.h>
#include <qtooltip.h>
#include <qpixmap.h>
#include <qcombobox.h>
#include "serializer.h"
extern QPixmap loadIcon(QString nam);
 
 
SEditor::SEditor(QWidget* parent) : QTextEdit(parent)
{
clines = 0;
setFrameStyle( QFrame::NoFrame | QFrame::Plain );
// setTextFormat(Qt::RichText);
}
 
void SEditor::keyPressEvent(QKeyEvent *k)
{
int p, i;
getCursorPosition(&p, &i);
if ((k->key() == Key_Backspace) && (i == 0))
{
emit bsPressed();
return;
}
if ((k->key() == Key_Delete) && (i == static_cast<int>(text().length())))
{
emit delPressed();
return;
}
QTextEdit::keyPressEvent(k);
if (clines != lines())
emit wrapped();
clines = lines();
ensureCursorVisible();
}
 
 
STable::STable(QWidget* parent) : QTable(parent)
{
setShowGrid(false);
}
 
void STable::keyPressEvent(QKeyEvent *k)
{
QString tmp;
int p, i, l, r, c, n;
QTextEdit *tt;
n = numRows();
r = currentRow();
c = currentColumn();
if (c == 1)
{
tt = (QTextEdit*)cellWidget(r, 1);
if ((k->key() == Key_Left) || (k->key() == Key_Right) || (k->key() == Key_Down) || (k->key() == Key_Up))
{
QTextEdit::CursorAction move;
tt->getCursorPosition(&p, &i);
switch (k->key())
{
case Key_Left:
if ((i == 0) && (r > 0))
{
tt = (QTextEdit*)cellWidget(r-1, 1);
setCurrentCell(r-1, 1);
move = QTextEdit::MoveEnd;
}
else
move = QTextEdit::MoveBackward;
break;
case Key_Right:
if ((i == static_cast<int>(tt->text().length())) && (r < n-1))
{
tt = (QTextEdit*)cellWidget(r+1, 1);
setCurrentCell(r+1, 1);
move = QTextEdit::MoveLineStart;
}
else
move = QTextEdit::MoveForward;
break;
case Key_Up:
l = tt->lineOfChar(0, i);
if ((l == 0) && (r > 0))
{
tt = (QTextEdit*)cellWidget(r-1, 1);
setCurrentCell(r-1, 1);
move = QTextEdit::MoveEnd;
}
else
move = QTextEdit::MoveUp;
break;
case Key_Down:
l = tt->lineOfChar(0, i);
if ((l == tt->lines()-1) && (r < n-1))
{
tt = (QTextEdit*)cellWidget(r+1, 1);
setCurrentCell(r+1, 1);
move = QTextEdit::MoveLineStart;
}
else
move = QTextEdit::MoveDown;
break;
}
tt->moveCursor(move, false);
tt->setFocus();
updateHeaderStates();
return;
}
}
QTable::keyPressEvent(k);
}
 
void STable::adjHeight(int r)
{
QTextEdit *cp = (QTextEdit*)cellWidget(r, 1);
cp->sync();
QFontMetrics fm2(cp->currentFont());
setRowHeight(r, QMAX((fm2.lineSpacing() * (cp->lines()+1)), 24));
updateHeaderStates();;
}
 
StoryEditor::StoryEditor(QWidget* parent, ScribusDoc *docc, PageItem *ite) : QDialog(parent, "StoryEditor", false, 0)
{
uint a;
int para = 0;
int pstyle;
doc = docc;
QString Dat = "";
QPtrList<Pti> y = ite->Ptext;
setCaption( tr( "Story Editor" ) );
setIcon(loadIcon("AppIcon.png"));
Form1Layout = new QHBoxLayout( this, 11, 6, "Form1Layout");
edList.clear();
stList.clear();
style.append(tr("Left"));
style.append(tr("Center"));
style.append(tr("Right"));
style.append(tr("Block"));
style.append(tr("Forced"));
if (doc->Vorlagen.count() > 5)
{
for (uint a = 5; a < doc->Vorlagen.count(); ++a)
{
style.append(doc->Vorlagen[a].Vname);
}
}
CurrItem = ite;
table1 = new STable( this );
table1->setNumCols( 2 );
table1->horizontalHeader()->setLabel( 0, tr( "Style" ) );
table1->horizontalHeader()->setLabel( 1, tr( "Text" ) );
table1->setSelectionMode( QTable::Single );
table1->setColumnStretchable(0, false);
table1->setColumnStretchable(1, true);
Form1Layout->addWidget( table1 );
resize( QSize(509, 326).expandedTo(minimumSizeHint()) );
show();
for (a = 0; a < y.count(); ++a)
{
QString b = y.at(a)->ch;
pstyle = y.at(a)->cab;
if (b == QChar(13))
{
addPar(para, Dat, pstyle);
Dat = "";
para++;
}
else
Dat += b;
}
if (Dat != "")
addPar(para, Dat, pstyle);
TextChanged = false;
}
 
void StoryEditor::updateTextFrame()
{
bool first = false;
for (uint a = 0; a < edList.count(); ++a)
{
Serializer *ss = new Serializer("");
QTextEdit *tt = edList.at(a);
QComboBox *cp = stList.at(a);
ss->Objekt = tt->text();
if (a < edList.count()-1)
ss->Objekt += QChar(10);
int st = cp->currentItem();
ss->GetText(CurrItem, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize, first);
delete ss;
first = true;
}
if (doc->Trenner->AutoCheck)
doc->Trenner->slotHyphenate(CurrItem);
doc->ActPage->RefreshItem(CurrItem);
TextChanged = false;
}
 
void StoryEditor::styleChange(int st)
{
int r = stList.findRef((QComboBox*)sender());
int align;
if (st > 4)
align = doc->Vorlagen[st].Ausri;
else
align = st;
if (r != -1)
{
QTextEdit *tt = (QTextEdit*)table1->cellWidget(r, 1);
switch (align)
{
case 0:
tt->setAlignment(Qt::AlignLeft);
break;
case 1:
tt->setAlignment(Qt::AlignCenter);
break;
case 2:
tt->setAlignment(Qt::AlignRight);
break;
case 3:
case 4:
tt->setAlignment(Qt::AlignJustify);
break;
default:
break;
}
}
}
 
int StoryEditor::getStyle(int where)
{
QComboBox *cp = stList.at(where);
return cp->currentItem();
}
 
void StoryEditor::addPar(int where, QString text, int sty)
{
table1->insertRows(where);
QComboBox *ct = new QComboBox( this );
ct->insertStringList(style);
ct->setMaximumSize(200, 24);
ct->setEditable(false);
table1->setCellWidget(where, 0, ct);
SEditor *cp = new SEditor(this);
stList.insert(where, ct);
edList.insert(where, cp);
table1->setCellWidget(where, 1, cp);
table1->setCurrentCell(where, 1);
cp->setText(text);
table1->adjHeight(where);
connect(ct, SIGNAL(highlighted(int)), this, SLOT(styleChange(int)));
ct->setCurrentItem(sty);
disconnect(ct, SIGNAL(highlighted(int)), this, SLOT(styleChange(int)));
cp->setFocus();
cp->setCursorPosition(0, 0);
connect(cp, SIGNAL(wrapped()), this, SLOT(WrapHandler()));
connect(cp, SIGNAL(delPressed()), this, SLOT(KeyDel()));
connect(cp, SIGNAL(bsPressed()), this, SLOT(KeyBS()));
connect(cp, SIGNAL(returnPressed()), this, SLOT(KeyRet()));
connect(cp, SIGNAL(clicked(int, int)), this, SLOT(clickAt(int, int)));
connect(cp, SIGNAL(textChanged()), this, SLOT(modifiedText()));
connect(ct, SIGNAL(activated(int)), this, SLOT(styleChange(int)));
}
 
void StoryEditor::modifiedText()
{
TextChanged = true;
}
 
void StoryEditor::WrapHandler()
{
int r = edList.findRef((QTextEdit*)sender());
if (r != -1)
table1->adjHeight(r);
}
 
void StoryEditor::clickAt( int row, int col)
{
int r = edList.findRef((QTextEdit*)sender());
if (r != -1)
{
table1->setCurrentCell(r, 1);
table1->cellWidget(r, 1)->setFocus();
table1->updateHeaderStates();
}
}
 
void StoryEditor::KeyDel()
{
QString tmp, tmp2;
int r = table1->currentRow();
QTextEdit *tt = (QTextEdit*)sender();
tmp = tt->text();
if (r < table1->numRows()-1)
{
int al = tt->alignment();
QTextEdit *bt = edList.at(r+1);
tmp2 = bt->text();
tt->setText(tmp + tmp2);
tt->setAlignment(al);
edList.remove(r+1);
stList.remove(r+1);
table1->removeRow(r+1);
table1->setCurrentCell(r, 1);
table1->adjHeight(r);
tt->setFocus();
tt->setCursorPosition(0, tmp.length());
}
}
 
void StoryEditor::KeyBS()
{
QString tmp, tmp2;
int r = table1->currentRow();
QTextEdit *tt = (QTextEdit*)sender();
tmp = tt->text();
if (r > 0)
{
QTextEdit *bt = edList.at(r-1);
int al = bt->alignment();
tmp2 = bt->text();
bt->setText(tmp2 + tmp);
bt->setAlignment(al);
edList.remove(r);
stList.remove(r);
table1->removeRow(r);
table1->setCurrentCell(r-1, 1);
table1->adjHeight(r-1);
bt->setFocus();
bt->setCursorPosition(0, tmp2.length());
}
}
 
void StoryEditor::KeyRet()
{
QString tmp, tmp2;
QString tmp3 = "";
QTextEdit *tt = (QTextEdit*)sender();
tmp = tt->text();
int al = tt->alignment();
int st = getStyle(table1->currentRow());
int rPos = tmp.find("\n");
if (rPos < static_cast<int>(tmp.length()))
{
tmp2 = tmp.left(rPos);
tmp3 = tmp.mid(rPos+1);
tt->setText(tmp2);
}
else
{
tmp.remove("\n");
tt->setText(tmp);
}
tt->setAlignment(al);
table1->adjHeight(table1->currentRow());
addPar(table1->currentRow()+1, tmp3, st);
}
 
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/page.h
===================================================================
--- Scribus/scribus/page.h (revision 101)
+++ Scribus/scribus/page.h (revision 102)
@@ -289,6 +289,7 @@
void CopyItem();
void ItemTextStil(int);
void LoadPic();
+ void EditText();
void LoadElem(QString, int, int, bool, bool, ScribusDoc *);
void Amode(int);
void AnnotProps();
Index: Scribus/scribus/libabout/about.cpp
===================================================================
--- Scribus/scribus/libabout/about.cpp (revision 101)
+++ Scribus/scribus/libabout/about.cpp (revision 102)
@@ -32,7 +32,7 @@
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
- QString bu = "13. November 2003 ";
+ QString bu = "15. November 2003 ";
#ifdef HAVE_CMS
bu += "C";
#else
Index: Scribus/scribus/Makefile.am
===================================================================
--- Scribus/scribus/Makefile.am (revision 101)
+++ Scribus/scribus/Makefile.am (revision 102)
@@ -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 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 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 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 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 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 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
+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 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
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/include/scribus/
/trunk/Scribus/scribus/scribus.cpp
69,6 → 69,7
#include "mergedoc.h"
#include "lineformats.h"
#include "missing.h"
#include "story.h"
extern QPixmap loadIcon(QString nam);
extern bool overwrite(QWidget *parent, QString filename);
 
3372,6 → 3373,7
connect(doc->ActPage, SIGNAL(AddObj(uint, uint)), Tpal, SLOT(slotAddElement(uint, uint)));
connect(doc->ActPage, SIGNAL(UpdtObj(uint, uint)), Tpal, SLOT(slotUpdateElement(uint, uint)));
connect(doc->ActPage, SIGNAL(MoveObj(uint, uint, uint)), Tpal, SLOT(slotMoveElement(uint, uint, uint)));
connect(doc->ActPage, SIGNAL(EditText()), this, SLOT(slotStoryEditor()));
slotDocCh(!doc->loading);
}
 
6448,6 → 6450,7
QString datein = "";
QString lang = QString(QTextCodec::locale()).left(2);
QString pfad = PREL;
Prefs.Language = tr("English");
pfad += "/lib/scribus/dicts/";
QDir d(pfad, "*.dic", QDir::Name, QDir::Files | QDir::NoSymLinks);
if ((d.exists()) && (d.count() != 0))
6830,6 → 6833,22
}
}
 
void ScribusApp::slotStoryEditor()
{
if (doc->ActPage->SelItem.count() != 0)
{
PageItem *b = doc->ActPage->SelItem.at(0);
StoryEditor* dia = new StoryEditor(this, doc, b);
dia->exec();
if (dia->TextChanged)
{
dia->updateTextFrame();
slotDocCh();
}
delete dia;
}
}
 
void ScribusApp::slotTest()
{
}
/trunk/Scribus/scribus/page.cpp
1924,6 → 1924,7
if (b->PType == 4)
{
pmen->insertItem(tr("Get Text..."), this, SIGNAL(LoadPic()));
pmen->insertItem(tr("Edit Text..."), this, SIGNAL(EditText()));
if (PageNam == "")
{
int pxb = pmen->insertItem(tr("Is PDF-Bookmark"), this, SLOT(ToggleBookmark()));
5531,6 → 5532,11
ax = a;
for (int xx=0; xx<ax+1; ++xx)
{
if (nb->Ptext.at(a)->ch == QChar(13))
{
cr = false;
break;
}
nb->Ptext.at(a)->cab = s;
if (doku->Vorlagen[s].Font != "")
{
5537,11 → 5543,6
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
}
if (nb->Ptext.at(a)->ch == QChar(13))
{
cr = false;
break;
}
a--;
}
if (cr)
/trunk/Scribus/scribus/scribus.h
155,6 → 155,7
QString LoadEnc;
 
public slots:
void slotStoryEditor();
void InvertPict();
void Collect();
void ChBookmarks(int s, int e, int n);
/trunk/Scribus/scribus/story.h
0,0 → 1,93
/***************************************************************************
story.h - description
-------------------
begin : Tue Nov 11 2003
copyright : (C) 2003 by Franz Schmid
email : Franz.Schmid@altmuehlnet.de
***************************************************************************/
 
/***************************************************************************
* *
* 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. *
* *
***************************************************************************/
 
#ifndef STORY_H
#define STORY_H
 
#include <qvariant.h>
#include <qdialog.h>
#include <qptrlist.h>
#include <qtable.h>
#include <qtextedit.h>
#include "pageitem.h"
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QComboBox;
 
class SEditor : public QTextEdit
{
Q_OBJECT
 
public:
SEditor (QWidget* parent);
~SEditor() {};
void keyPressEvent(QKeyEvent *k);
int clines;
 
signals:
void wrapped();
void bsPressed();
void delPressed();
};
 
class STable : public QTable
{
Q_OBJECT
 
public:
STable (QWidget* parent);
~STable() {};
void keyPressEvent(QKeyEvent *k);
void adjHeight(int r);
};
 
class StoryEditor : public QDialog
{
Q_OBJECT
 
public:
StoryEditor( QWidget* parent, ScribusDoc *docc, PageItem* ite );
~StoryEditor() {};
int getStyle(int where);
void addPar(int where, QString text, int sty);
 
STable* table1;
QPtrList<QTextEdit> edList;
QPtrList<QComboBox> stList;
QStringList style;
ScribusDoc* doc;
PageItem* CurrItem;
bool TextChanged;
 
public slots:
void updateTextFrame();
void styleChange(int st);
void modifiedText();
void WrapHandler();
void clickAt( int row, int col);
void KeyDel();
void KeyBS();
void KeyRet();
 
protected:
QHBoxLayout* Form1Layout;
 
};
 
#endif
 
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.kdevprj
===================================================================
--- Scribus/scribus.kdevprj (revision 101)
+++ Scribus/scribus.kdevprj (revision 102)
@@ -23,12 +23,12 @@
cppflags=
cxxflags=\s-O0 -Wall
ldadd=-ldl -lcms -ltiff -lm $(LIB_QT) -lXext -lX11
-ldflags=\s-s -export-dynamic\s
+ldflags=\s-s -export-dynamic\s
[General]
AMChanged=false
author=Franz Schmid
-configure_args=
+configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s
email=Franz.Schmid@altmuehlnet.de
kdevprj_version=1.3
lfv_open_groups=Quellen
@@ -40,7 +40,7 @@
sgml_file=
short_info=
sub_dir=scribus/
-version=1.1.2cvs
+version=1.1.3cvs
version_control=CVS
workspace=1
@@ -101,7 +101,7 @@
type=DATA
[scribus/Makefile.am]
-files=scribus/main.cpp,scribus/scribus.cpp,scribus/scribus.h,scribus/scribusdoc.cpp,scribus/scribusdoc.h,scribus/scribusview.cpp,scribus/scribusview.h,scribus/newfile.h,scribus/newfile.cpp,scribus/pageitem.cpp,scribus/pageitem.h,scribus/pageback.cpp,scribus/pageback.h,scribus/hruler.cpp,scribus/hruler.h,scribus/vruler.cpp,scribus/vruler.h,scribus/colorm.cpp,scribus/colorm.h,scribus/query.cpp,scribus/query.h,scribus/dcolor.cpp,scribus/dcolor.h,scribus/cpalette.cpp,scribus/cpalette.h,scribus/mdup.cpp,scribus/mdup.h,scribus/docinfo.cpp,scribus/docinfo.h,scribus/reformdoc.cpp,scribus/reformdoc.h,scribus/serializer.cpp,scribus/serializer.h,scribus/align.cpp,scribus/align.h,scribus/fmitem.cpp,scribus/fmitem.h,scribus/fontprefs.cpp,scribus/fontprefs.h,scribus/missing.cpp,scribus/missing.h,scribus/tree.cpp,scribus/tree.h,scribus/pdfopts.cpp,scribus/pdfopts.h,scribus/inspage.cpp,scribus/inspage.h,scribus/delpages.cpp,scribus/delpages.h,scribus/movepage.cpp,scribus/movepage.h,scribus/mspinbox.cpp,scribus/mspinbox.h,scribus/helpbrowser.cpp,scribus/helpbrowser.h,scribus/icons5.h,scribus/linkbutton.cpp,scribus/linkbutton.h,scribus/icons6.h,scribus/linecombo.cpp,scribus/linecombo.h,scribus/scribusXml.cpp,scribus/scribusXml.h,scribus/cmykfw.cpp,scribus/cmykfw.h,scribus/cmykcolor.cpp,scribus/cmykcolor.h,scribus/util.cpp,scribus/colorchart.cpp,scribus/colorchart.h,scribus/druck.cpp,scribus/druck.h,scribus/editformats.cpp,scribus/editformats.h,scribus/edit1format.cpp,scribus/edit1format.h,scribus/spalette.cpp,scribus/spalette.h,scribus/frameedit.cpp,scribus/frameedit.h,scribus/scfonts.cpp,scribus/scfonts.h,scribus/scrap.cpp,scribus/scrap.h,scribus/scfonts_ttf.cpp,scribus/scfonts_ttf.h,scribus/muster.cpp,scribus/muster.h,scribus/applytemplate.cpp,scribus/applytemplate.h,scribus/newtemp.cpp,scribus/newtemp.h,scribus/picstatus.cpp,scribus/picstatus.h,scribus/picsearch.cpp,scribus/picsearch.h,scribus/customfdialog.cpp,scribus/customfdialog.h,scribus/cmsprefs.cpp,scribus/cmsprefs.h,scribus/bookmwin.cpp,scribus/bookmwin.h,scribus/annot.cpp,scribus/annot.h,scribus/navigator.cpp,scribus/navigator.h,scribus/keymanager.cpp,scribus/keymanager.h,scribus/werktoolb.cpp,scribus/werktoolb.h,scribus/mpalette.h,scribus/mpalette.cpp,scribus/polyprops.cpp,scribus/polyprops.h,scribus/layers.cpp,scribus/layers.h,scribus/page.cpp,scribus/page.h,scribus/editor.cpp,scribus/editor.h,scribus/selfield.cpp,scribus/selfield.h,scribus/javadocs.cpp,scribus/javadocs.h,scribus/buttonicon.cpp,scribus/buttonicon.h,scribus/annota.cpp,scribus/annota.h,scribus/fpoint.cpp,scribus/fpoint.h,scribus/fpointarray.cpp,scribus/fpointarray.h,scribus/seiten.cpp,scribus/seiten.h,scribus/hysettings.cpp,scribus/hysettings.h,scribus/hnjalloc.c,scribus/hnjalloc.h,scribus/hyask.cpp,scribus/hyask.h,scribus/hyphen.c,scribus/hyphen.h,scribus/hyphenator.cpp,scribus/hyphenator.h,scribus/scribuswin.cpp,scribus/scribuswin.h,scribus/guidemanager.cpp,scribus/guidemanager.h,scribus/cupsoptions.cpp,scribus/cupsoptions.h,scribus/md5.c,scribus/md5.h,scribus/rc4.c,scribus/rc4.h,scribus/bookpalette.cpp,scribus/bookpalette.h,scribus/mergedoc.cpp,scribus/mergedoc.h,scribus/splash.cpp,scribus/splash.h,scribus/multiline.cpp,scribus/multiline.h,scribus/lineformats.cpp,scribus/lineformats.h,scribus/scpreview.cpp,scribus/scpreview.h,scribus/fontcombo.cpp,scribus/fontcombo.h,scribus/art_kmisc.c,scribus/art_kmisc.h,scribus/art_render_misc.c,scribus/art_render_misc.h,scribus/art_render_pattern.c,scribus/art_render_pattern.h,scribus/art_rgb.c,scribus/art_rgb.h,scribus/art_rgb_affine_private.c,scribus/art_rgb_affine_private.h,scribus/art_rgb_svp.c,scribus/art_rgb_svp.h,scribus/art_rgba_affine.c,scribus/art_rgba_affine.h,scribus/gdk-pixbuf-xlib-drawable.c,scribus/gdk-pixbuf-xlib-private.h,scribus/gdk-pixbuf-xlib-render.c,scribus/gdk-pixbuf-xlib.c,scribus/gdk-pixbuf-xlib.h,scribus/gdk-pixbuf-xlibrgb.c,scribus/gdk-pixbuf-xlibrgb.h,scribus/vgradient.cpp,scribus/vgradient.h,scribus/scpainter.cpp,scribus/scpainter.h
+files=scribus/main.cpp,scribus/scribus.cpp,scribus/scribus.h,scribus/scribusdoc.cpp,scribus/scribusdoc.h,scribus/scribusview.cpp,scribus/scribusview.h,scribus/newfile.h,scribus/newfile.cpp,scribus/pageitem.cpp,scribus/pageitem.h,scribus/pageback.cpp,scribus/pageback.h,scribus/hruler.cpp,scribus/hruler.h,scribus/vruler.cpp,scribus/vruler.h,scribus/colorm.cpp,scribus/colorm.h,scribus/query.cpp,scribus/query.h,scribus/dcolor.cpp,scribus/dcolor.h,scribus/cpalette.cpp,scribus/cpalette.h,scribus/mdup.cpp,scribus/mdup.h,scribus/docinfo.cpp,scribus/docinfo.h,scribus/reformdoc.cpp,scribus/reformdoc.h,scribus/serializer.cpp,scribus/serializer.h,scribus/align.cpp,scribus/align.h,scribus/fmitem.cpp,scribus/fmitem.h,scribus/fontprefs.cpp,scribus/fontprefs.h,scribus/missing.cpp,scribus/missing.h,scribus/tree.cpp,scribus/tree.h,scribus/pdfopts.cpp,scribus/pdfopts.h,scribus/inspage.cpp,scribus/inspage.h,scribus/delpages.cpp,scribus/delpages.h,scribus/movepage.cpp,scribus/movepage.h,scribus/mspinbox.cpp,scribus/mspinbox.h,scribus/helpbrowser.cpp,scribus/helpbrowser.h,scribus/icons5.h,scribus/linkbutton.cpp,scribus/linkbutton.h,scribus/icons6.h,scribus/linecombo.cpp,scribus/linecombo.h,scribus/scribusXml.cpp,scribus/scribusXml.h,scribus/cmykfw.cpp,scribus/cmykfw.h,scribus/cmykcolor.cpp,scribus/cmykcolor.h,scribus/util.cpp,scribus/colorchart.cpp,scribus/colorchart.h,scribus/druck.cpp,scribus/druck.h,scribus/editformats.cpp,scribus/editformats.h,scribus/edit1format.cpp,scribus/edit1format.h,scribus/spalette.cpp,scribus/spalette.h,scribus/frameedit.cpp,scribus/frameedit.h,scribus/scfonts.cpp,scribus/scfonts.h,scribus/scrap.cpp,scribus/scrap.h,scribus/scfonts_ttf.cpp,scribus/scfonts_ttf.h,scribus/muster.cpp,scribus/muster.h,scribus/applytemplate.cpp,scribus/applytemplate.h,scribus/newtemp.cpp,scribus/newtemp.h,scribus/picstatus.cpp,scribus/picstatus.h,scribus/picsearch.cpp,scribus/picsearch.h,scribus/customfdialog.cpp,scribus/customfdialog.h,scribus/cmsprefs.cpp,scribus/cmsprefs.h,scribus/bookmwin.cpp,scribus/bookmwin.h,scribus/annot.cpp,scribus/annot.h,scribus/navigator.cpp,scribus/navigator.h,scribus/keymanager.cpp,scribus/keymanager.h,scribus/werktoolb.cpp,scribus/werktoolb.h,scribus/mpalette.h,scribus/mpalette.cpp,scribus/polyprops.cpp,scribus/polyprops.h,scribus/layers.cpp,scribus/layers.h,scribus/page.cpp,scribus/page.h,scribus/editor.cpp,scribus/editor.h,scribus/selfield.cpp,scribus/selfield.h,scribus/javadocs.cpp,scribus/javadocs.h,scribus/buttonicon.cpp,scribus/buttonicon.h,scribus/annota.cpp,scribus/annota.h,scribus/fpoint.cpp,scribus/fpoint.h,scribus/fpointarray.cpp,scribus/fpointarray.h,scribus/seiten.cpp,scribus/seiten.h,scribus/hysettings.cpp,scribus/hysettings.h,scribus/hnjalloc.c,scribus/hnjalloc.h,scribus/hyask.cpp,scribus/hyask.h,scribus/hyphen.c,scribus/hyphen.h,scribus/hyphenator.cpp,scribus/hyphenator.h,scribus/scribuswin.cpp,scribus/scribuswin.h,scribus/guidemanager.cpp,scribus/guidemanager.h,scribus/cupsoptions.cpp,scribus/cupsoptions.h,scribus/md5.c,scribus/md5.h,scribus/rc4.c,scribus/rc4.h,scribus/bookpalette.cpp,scribus/bookpalette.h,scribus/mergedoc.cpp,scribus/mergedoc.h,scribus/splash.cpp,scribus/splash.h,scribus/multiline.cpp,scribus/multiline.h,scribus/lineformats.cpp,scribus/lineformats.h,scribus/scpreview.cpp,scribus/scpreview.h,scribus/fontcombo.cpp,scribus/fontcombo.h,scribus/art_kmisc.c,scribus/art_kmisc.h,scribus/art_render_misc.c,scribus/art_render_misc.h,scribus/art_render_pattern.c,scribus/art_render_pattern.h,scribus/art_rgb.c,scribus/art_rgb.h,scribus/art_rgb_affine_private.c,scribus/art_rgb_affine_private.h,scribus/art_rgb_svp.c,scribus/art_rgb_svp.h,scribus/art_rgba_affine.c,scribus/art_rgba_affine.h,scribus/gdk-pixbuf-xlib-drawable.c,scribus/gdk-pixbuf-xlib-private.h,scribus/gdk-pixbuf-xlib-render.c,scribus/gdk-pixbuf-xlib.c,scribus/gdk-pixbuf-xlib.h,scribus/gdk-pixbuf-xlibrgb.c,scribus/gdk-pixbuf-xlibrgb.h,scribus/vgradient.cpp,scribus/vgradient.h,scribus/scpainter.cpp,scribus/scpainter.h,scribus/story.cpp,scribus/story.h
sub_dirs=icons,libabout,libprefs,plugins,libpostscript,profiles,libpdf,dicts,po,qm
type=prog_main
@@ -2671,6 +2671,18 @@
install_location=
type=HEADER
+[scribus/story.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[scribus/story.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
[scribus/tree.cpp]
dist=true
install=false