Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 102 → Rev 103

/trunk/Scribus/configure.in
183,9 → 183,9
echo "FreeType2 installed: No"
fi
if test $hacups = yes; then
echo "CUPS installed: Yes"
echo "CUPS installed: Yes"
else
echo "CUPS installed: No"
echo "CUPS installed: No"
fi
if test $hacms = yes; then
echo "LittleCMS installed: Yes"
193,17 → 193,18
echo "LittleCMS installed: No"
fi
if test $hastif = yes; then
echo "TiffLib installed: Yes"
echo "TiffLib installed: Yes"
else
echo "TiffLib installed: No"
echo "TiffLib installed: No"
fi
if test $COMPILE_PYTHON = no; then
echo "The Scripter-Plugin will not be compiled."
fi
if test $hapython = yes; then
echo "Using Python 2.3"
else
echo "Using Python < 2.3"
if test $hapython = yes; then
echo "Using Python 2.3"
else
echo "Using Python < 2.3"
fi
fi
echo ""
echo "Start make now."
/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.2
16.11.2003 Improved the Story Editor.
Fixed some issues with Copy and Paste.
 
15.11.2003 Added first version of the Story Editor.
 
12.11.2003 Fixed Bug with TIFF-Images.
/trunk/Scribus/scribus/story.cpp
20,6 → 20,7
#include <qtooltip.h>
#include <qpixmap.h>
#include <qcombobox.h>
#include <qmessagebox.h>
#include "serializer.h"
extern QPixmap loadIcon(QString nam);
 
62,13 → 63,13
{
QString tmp;
int p, i, l, r, c, n;
QTextEdit *tt;
SEditor *tt;
n = numRows();
r = currentRow();
c = currentColumn();
if (c == 1)
{
tt = (QTextEdit*)cellWidget(r, 1);
tt = (SEditor*)cellWidget(r, 1);
if ((k->key() == Key_Left) || (k->key() == Key_Right) || (k->key() == Key_Down) || (k->key() == Key_Up))
{
QTextEdit::CursorAction move;
78,7 → 79,7
case Key_Left:
if ((i == 0) && (r > 0))
{
tt = (QTextEdit*)cellWidget(r-1, 1);
tt = (SEditor*)cellWidget(r-1, 1);
setCurrentCell(r-1, 1);
move = QTextEdit::MoveEnd;
}
88,7 → 89,7
case Key_Right:
if ((i == static_cast<int>(tt->text().length())) && (r < n-1))
{
tt = (QTextEdit*)cellWidget(r+1, 1);
tt = (SEditor*)cellWidget(r+1, 1);
setCurrentCell(r+1, 1);
move = QTextEdit::MoveLineStart;
}
99,7 → 100,7
l = tt->lineOfChar(0, i);
if ((l == 0) && (r > 0))
{
tt = (QTextEdit*)cellWidget(r-1, 1);
tt = (SEditor*)cellWidget(r-1, 1);
setCurrentCell(r-1, 1);
move = QTextEdit::MoveEnd;
}
110,7 → 111,7
l = tt->lineOfChar(0, i);
if ((l == tt->lines()-1) && (r < n-1))
{
tt = (QTextEdit*)cellWidget(r+1, 1);
tt = (SEditor*)cellWidget(r+1, 1);
setCurrentCell(r+1, 1);
move = QTextEdit::MoveLineStart;
}
129,7 → 130,7
 
void STable::adjHeight(int r)
{
QTextEdit *cp = (QTextEdit*)cellWidget(r, 1);
SEditor *cp = (SEditor*)cellWidget(r, 1);
cp->sync();
QFontMetrics fm2(cp->currentFont());
setRowHeight(r, QMAX((fm2.lineSpacing() * (cp->lines()+1)), 24));
146,7 → 147,7
QPtrList<Pti> y = ite->Ptext;
setCaption( tr( "Story Editor" ) );
setIcon(loadIcon("AppIcon.png"));
Form1Layout = new QHBoxLayout( this, 11, 6, "Form1Layout");
Form1Layout = new QHBoxLayout( this, 5, 5, "Form1Layout");
edList.clear();
stList.clear();
style.append(tr("Left"));
162,6 → 163,28
}
}
CurrItem = ite;
 
fmenu = new QPopupMenu();
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("New"), this, SLOT(Do_new()), CTRL+Key_N);
/* fmenu->insertItem(tr("Save as..."), this, SLOT(SaveAs()));
fmenu->insertItem(loadIcon("DateiOpen16.png"), tr("Load..."), this, SLOT(LoadScript()));
fmenu->insertSeparator(); */
fmenu->insertItem(tr("Save and Exit"), this, SLOT(accept()));
fmenu->insertItem(tr("Exit without Saving"), this, SLOT(Do_leave()));
emenu = new QPopupMenu();
emenu->insertItem(tr("Undo"), this, SLOT(Do_undo()), CTRL+Key_Z);
emenu->insertItem(tr("Redo"), this, SLOT(Do_redo()));
emenu->insertSeparator();
emenu->insertItem(loadIcon("editcut.png"), tr("Cut"), this, SLOT(Do_cut()), CTRL+Key_X);
emenu->insertItem(loadIcon("editcopy.png"), tr("Copy"), this, SLOT(Do_copy()), CTRL+Key_C);
emenu->insertItem(loadIcon("editpaste.png"), tr("Paste"), this, SLOT(Do_paste()), CTRL+Key_V);
emenu->insertItem(loadIcon("editdelete.png"), tr("Clear"), this, SLOT(Do_del()), CTRL+Key_V);
emenu->insertSeparator();
emenu->insertItem(tr("Update Textframe"), this, SLOT(updateTextFrame()));
menuBar = new QMenuBar(this);
menuBar->insertItem(tr("File"), fmenu);
menuBar->insertItem(tr("Edit"), emenu);
Form1Layout->setMenuBar( menuBar );
table1 = new STable( this );
table1->setNumCols( 2 );
table1->horizontalHeader()->setLabel( 0, tr( "Style" ) );
187,9 → 210,91
}
if (Dat != "")
addPar(para, Dat, pstyle);
if (table1->numRows() == 0)
addPar(0, "", doc->CurrentABStil);
TextChanged = false;
SEditor *cp = (SEditor*)table1->cellWidget(0, 1);
cp->setFocus();
cp->setCursorPosition(0, 0);
}
 
void StoryEditor::closeEvent(QCloseEvent *)
{
Do_leave();
}
 
void StoryEditor::Do_leave()
{
if (TextChanged)
{
int t = QMessageBox::warning(this, tr("Warning"),
tr("Do you really want to loose all your Changes?"),
QMessageBox::No, QMessageBox::Yes, QMessageBox::NoButton);
if (t == QMessageBox::No)
return;
}
reject();
}
 
void StoryEditor::Do_new()
{
int t = QMessageBox::warning(this, tr("Warning"),
tr("Do you really want to clear all your Text?"),
QMessageBox::No, QMessageBox::Yes, QMessageBox::NoButton);
if (t == QMessageBox::No)
return;
table1->setNumCols( 2 );
table1->setNumRows( 0 );
stList.clear();
edList.clear();
addPar(0, "", doc->CurrentABStil);
SEditor *cp = (SEditor*)table1->cellWidget(0, 1);
cp->setFocus();
cp->setCursorPosition(0, 0);
}
 
void StoryEditor::Do_undo()
{
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
cp->undo();
table1->adjHeight(table1->currentRow());
}
 
void StoryEditor::Do_redo()
{
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
cp->redo();
table1->adjHeight(table1->currentRow());
}
 
void StoryEditor::Do_copy()
{
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
cp->copy();
table1->adjHeight(table1->currentRow());
}
 
void StoryEditor::Do_paste()
{
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
cp->paste();
table1->adjHeight(table1->currentRow());
}
 
void StoryEditor::Do_cut()
{
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
cp->cut();
table1->adjHeight(table1->currentRow());
}
 
void StoryEditor::Do_del()
{
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
cp->del();
table1->adjHeight(table1->currentRow());
}
 
void StoryEditor::updateTextFrame()
{
bool first = false;
196,7 → 301,7
for (uint a = 0; a < edList.count(); ++a)
{
Serializer *ss = new Serializer("");
QTextEdit *tt = edList.at(a);
SEditor *tt = edList.at(a);
QComboBox *cp = stList.at(a);
ss->Objekt = tt->text();
if (a < edList.count()-1)
222,7 → 327,7
align = st;
if (r != -1)
{
QTextEdit *tt = (QTextEdit*)table1->cellWidget(r, 1);
SEditor *tt = (SEditor*)table1->cellWidget(r, 1);
switch (align)
{
case 0:
286,7 → 391,7
 
void StoryEditor::WrapHandler()
{
int r = edList.findRef((QTextEdit*)sender());
int r = edList.findRef((SEditor*)sender());
if (r != -1)
table1->adjHeight(r);
}
293,7 → 398,7
 
void StoryEditor::clickAt( int row, int col)
{
int r = edList.findRef((QTextEdit*)sender());
int r = edList.findRef((SEditor*)sender());
if (r != -1)
{
table1->setCurrentCell(r, 1);
306,12 → 411,12
{
QString tmp, tmp2;
int r = table1->currentRow();
QTextEdit *tt = (QTextEdit*)sender();
SEditor *tt = (SEditor*)sender();
tmp = tt->text();
if (r < table1->numRows()-1)
{
int al = tt->alignment();
QTextEdit *bt = edList.at(r+1);
SEditor *bt = edList.at(r+1);
tmp2 = bt->text();
tt->setText(tmp + tmp2);
tt->setAlignment(al);
329,11 → 434,11
{
QString tmp, tmp2;
int r = table1->currentRow();
QTextEdit *tt = (QTextEdit*)sender();
SEditor *tt = (SEditor*)sender();
tmp = tt->text();
if (r > 0)
{
QTextEdit *bt = edList.at(r-1);
SEditor *bt = edList.at(r-1);
int al = bt->alignment();
tmp2 = bt->text();
bt->setText(tmp2 + tmp);
352,7 → 457,7
{
QString tmp, tmp2;
QString tmp3 = "";
QTextEdit *tt = (QTextEdit*)sender();
SEditor *tt = (SEditor*)sender();
tmp = tt->text();
int al = tt->alignment();
int st = getStyle(table1->currentRow());
/trunk/Scribus/scribus/scribus.cpp
2919,9 → 2919,9
doc->ActPage->DeleteItem();
}
slotDocCh();
editMenu->setItemEnabled(edid3, 1);
ClipB->setText(BufferI);
BuFromApp = true;
editMenu->setItemEnabled(edid3, 1);
}
}
 
2971,9 → 2971,9
BufferI = ss->WriteElem(&doc->ActPage->SelItem, doc);
delete ss;
}
editMenu->setItemEnabled(edid3, 1);
ClipB->setText(BufferI);
BuFromApp = true;
editMenu->setItemEnabled(edid3, 1);
}
}
 
6839,11 → 6839,13
{
PageItem *b = doc->ActPage->SelItem.at(0);
StoryEditor* dia = new StoryEditor(this, doc, b);
dia->exec();
if (dia->TextChanged)
if (dia->exec())
{
dia->updateTextFrame();
slotDocCh();
if (dia->TextChanged)
{
dia->updateTextFrame();
slotDocCh();
}
}
delete dia;
}
/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
1,6 → 1,6
#include "cmdobj.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmdobj.h"
 
PyObject *scribus_newrect(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
1,5 → 1,5
#include "cmdpage.h"
#include "cmdvar.h"
#include "cmdpage.h"
 
PyObject *scribus_actualpage(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
68,3 → 68,27
return -1;
}
 
void ReplaceColor(QString col, QString rep)
{
for (uint b = 0; b < Carrier->view->Pages.count(); b++)
{
for (uint c = 0; c < Carrier->view->Pages.at(b)->Items.count(); c++)
{
if (Carrier->view->Pages.at(b)->Items.at(c)->PType == 4)
{
for (uint d = 0; d < Carrier->view->Pages.at(b)->Items.at(c)->Ptext.count(); d++)
{
if (col == Carrier->view->Pages.at(b)->Items.at(c)->Ptext.at(d)->ccolor)
{
Carrier->view->Pages.at(b)->Items.at(c)->Ptext.at(d)->ccolor = rep;
}
}
}
if (col == Carrier->view->Pages.at(b)->Items.at(c)->Pcolor)
Carrier->view->Pages.at(b)->Items.at(c)->Pcolor = rep;
if (col == Carrier->view->Pages.at(b)->Items.at(c)->Pcolor2)
Carrier->view->Pages.at(b)->Items.at(c)->Pcolor2 = rep;
}
}
}
 
/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
1,6 → 1,6
#include "cmdgetprop.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmdgetprop.h"
 
PyObject *scribus_getfillcolor(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.h
4,7 → 4,6
#include <Python.h>
 
/** Managing Colors */
void ReplaceColor(QString col, QString rep);
PyObject *scribus_colornames(PyObject *self, PyObject* args);
PyObject *scribus_getcolor(PyObject *self, PyObject* args);
PyObject *scribus_setcolor(PyObject *self, PyObject* args);
/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
1,6 → 1,6
#include "cmdtext.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmdtext.h"
 
PyObject *scribus_getfontsize(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
1,6 → 1,6
#include "cmdmani.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmdmani.h"
 
PyObject *scribus_loadimage(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
1,6 → 1,6
#include "cmdsetprop.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmdsetprop.h"
 
PyObject *scribus_setgradfill(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h
1,9 → 1,9
#ifndef CMDVAR_H
#define CMDVAR_H
 
/*
#ifdef HAVE_PYTHON_23
#include <Python.h>
#endif
#endif */
 
#include "scribus.h"
 
/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
1,6 → 1,6
#include "cmddoc.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmddoc.h"
 
PyObject *scribus_newdoc(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.h
1,7 → 1,6
#ifndef CMDUTIL_H
#define CMDUTIL_H
 
#include <Python.h>
#include "scribus.h"
 
double PointToValue(double Val);
8,5 → 7,6
double ValToPts(double Val, int ein);
double ValueToPoint(double Val);
int GetItem(QString Name);
void ReplaceColor(QString col, QString rep);
#endif
 
/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
1,6 → 1,6
#include "cmdmisc.h"
#include "cmdutil.h"
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmdmisc.h"
 
PyObject *scribus_setredraw(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
14,8 → 14,20
* (at your option) any later version. *
* *
***************************************************************************/
#include "cmddialog.h"
#include "cmddoc.h"
#include "cmdpage.h"
#include "cmdobj.h"
#include "cmdgetprop.h"
#include "cmdsetprop.h"
#include "cmdtext.h"
#include "cmdmani.h"
#include "cmdcolor.h"
#include "cmdmisc.h"
#include "scriptplugin.h"
#include "scriptplugin.moc"
#include "cmdutil.h"
#include "cmdvar.h"
#include "customfdialog.h"
#include "helpbrowser.h"
#include "config.h"
24,18 → 36,6
#include <qdom.h>
#include <qtextstream.h>
#include <cstdlib>
#include "cmdvar.h"
#include "cmdutil.h"
#include "cmddialog.h"
#include "cmddoc.h"
#include "cmdpage.h"
#include "cmdobj.h"
#include "cmdgetprop.h"
#include "cmdsetprop.h"
#include "cmdtext.h"
#include "cmdmani.h"
#include "cmdcolor.h"
#include "cmdmisc.h"
 
QString Name()
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmddialog.cpp
1,5 → 1,5
#include "cmddialog.h"
#include "cmdvar.h"
#include "cmddialog.h"
 
PyObject *scribus_newdocdia(PyObject *self, PyObject* args)
{
/trunk/Scribus/scribus/story.h
23,6 → 23,8
#include <qptrlist.h>
#include <qtable.h>
#include <qtextedit.h>
#include <qpopupmenu.h>
#include <qmenubar.h>
#include "pageitem.h"
class QVBoxLayout;
class QHBoxLayout;
63,11 → 65,15
public:
StoryEditor( QWidget* parent, ScribusDoc *docc, PageItem* ite );
~StoryEditor() {};
void closeEvent(QCloseEvent *);
int getStyle(int where);
void addPar(int where, QString text, int sty);
 
QPopupMenu* fmenu;
QPopupMenu* emenu;
QMenuBar* menuBar;
STable* table1;
QPtrList<QTextEdit> edList;
QPtrList<SEditor> edList;
QPtrList<QComboBox> stList;
QStringList style;
ScribusDoc* doc;
75,6 → 81,14
bool TextChanged;
 
public slots:
void Do_leave();
void Do_new();
void Do_undo();
void Do_redo();
void Do_copy();
void Do_paste();
void Do_cut();
void Do_del();
void updateTextFrame();
void styleChange(int st);
void modifiedText();
/trunk/Scribus/scribus/po/scribus.de_DE.po
761,7 → 761,7
msgid "Zooms in or out"
msgstr "Ansicht vergrößern/verkleinern"
 
msgid "Insert Textbox"
msgid "Insert Text Frame"
msgstr "Textrahmen einfügen"
 
msgid "Insert Picture"
926,10 → 926,10
msgid "Tools"
msgstr "Werkzeuge"
 
msgid "Create Textchains"
msgid "Create Text Chains"
msgstr "Verbinde Textrahmen"
 
msgid "Break Textchains"
msgid "Break Text Chains"
msgstr "Löse Textverbindung"
 
msgid "Stepping:"
965,10 → 965,10
msgid "Opens a Document"
msgstr "Öffnet ein Dokument"
 
msgid "Saves the current Document"
msgid "Saves the Current Document"
msgstr "Speichert das aktuelle Dokument"
 
msgid "Prints the current Document"
msgid "Prints the Current Document"
msgstr "Druckt das aktuelle Dokument"
 
msgid "Copy Here"
1019,7 → 1019,7
msgid "None"
msgstr "Keine"
 
msgid "Closes the current Document"
msgid "Closes the Current Document"
msgstr "Schließt das aktuelle Dokument"
 
msgid "Range:"
1607,7 → 1607,7
msgid "Extras"
msgstr "Extras"
 
msgid "Saves the current Document as PDF"
msgid "Saves the Current Document as PDF"
msgstr "Speichert das aktuelle Dokument als PDF"
 
msgid "Rounded Rectangle"
2978,3 → 2978,18
msgid "Absolute Coordinates"
msgstr "Absolute Koordinaten"
 
msgid "Story Editor"
msgstr "Story Editor"
 
msgid "Update Textframe"
msgstr "Textrahmen auffrischen"
 
msgid "Do you really want to loose all your Changes?"
msgstr "Wollen Sie wirklich alle Änderungen verlieren?"
 
msgid "Do you really want to clear all your Text?"
msgstr "Wollen Sie wirklich den ganzen Text löschen?"
 
msgid "Edit Text..."
msgstr "Text bearbeiten..."
 
/trunk/Scribus/scribus/qm/scribus.de.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream