Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 123 → Rev 124

/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.3
12.12.2003 Added a Toolbar Button for the Story Editor.
Added a Statusbar to the Story Editor.
 
10.12.2003 Fixed Preferences Issues.
Combined the Toolbar Buttons for Rectangles and Circles into one Button
containing all Autoforms.
/trunk/Scribus/scribus/werktoolb.h
39,6 → 39,7
QToolButton* Select;
QToolButton* Rotiere;
QToolButton* Textedit;
QToolButton* Textedit2;
QToolButton* Zoom;
QToolButton* Texte;
QToolButton* BildB;
/trunk/Scribus/scribus/util.cpp
61,6 → 61,7
#endif
extern ProfilesL InputProfiles;
 
void CopyPageItem(struct CLBuf *Buffer, PageItem *b);
bool overwrite(QWidget *parent, QString filename);
FPointArray traceChar(FT_Face face, uint chr, int chs, double *x, double *y);
FPoint GetMaxClipF(FPointArray Clip);
1360,3 → 1361,138
}
return retval;
}
 
void CopyPageItem(struct CLBuf *Buffer, PageItem *b)
{
uint a;
Buffer->PType = b->PType;
Buffer->Xpos = b->Xpos;
Buffer->Ypos = b->Ypos;
Buffer->Width = b->Width;
Buffer->Height = b->Height;
Buffer->RadRect = b->RadRect;
Buffer->FrameType = b->FrameType;
Buffer->ClipEdited = b->ClipEdited;
Buffer->Pwidth = b->Pwidth;
Buffer->Pcolor = b->Pcolor;
Buffer->Pcolor2 = b->Pcolor2;
Buffer->Shade = b->Shade;
Buffer->Shade2 = b->Shade2;
Buffer->GrColor = b->GrColor;
Buffer->GrColor2 = b->GrColor2;
Buffer->GrShade = b->GrShade;
Buffer->GrShade2 = b->GrShade2;
Buffer->GrType = b->GrType;
Buffer->TxtStroke = b->TxtStroke;
Buffer->TxtFill = b->TxtFill;
Buffer->ShTxtStroke = b->ShTxtStroke;
Buffer->ShTxtFill = b->ShTxtFill;
Buffer->TxtScale = b->TxtScale;
Buffer->TxTStyle = b->TxTStyle;
Buffer->Rot = b->Rot;
Buffer->PLineArt = b->PLineArt;
Buffer->PLineEnd = b->PLineEnd;
Buffer->PLineJoin = b->PLineJoin;
Buffer->LineSp = b->LineSp;
Buffer->LocalScX = b->LocalScX;
Buffer->LocalScY = b->LocalScY;
Buffer->LocalX = b->LocalX;
Buffer->LocalY = b->LocalY;
Buffer->PicArt = b->PicArt;
Buffer->flippedH = b->flippedH;
Buffer->flippedV = b->flippedV;
Buffer->BBoxX = b->BBoxX;
Buffer->BBoxH = b->BBoxH;
Buffer->isPrintable = b->isPrintable;
Buffer->isBookmark = b->isBookmark;
Buffer->BMnr = b->BMnr;
Buffer->isAnnotation = b->isAnnotation;
Buffer->AnType = b->AnType;
Buffer->AnAction = b->AnAction;
Buffer->An_E_act = b->An_E_act;
Buffer->An_X_act = b->An_X_act;
Buffer->An_D_act = b->An_D_act;
Buffer->An_Fo_act = b->An_Fo_act;
Buffer->An_Bl_act = b->An_Bl_act;
Buffer->An_K_act = b->An_K_act;
Buffer->An_F_act = b->An_F_act;
Buffer->An_V_act = b->An_V_act;
Buffer->An_C_act = b->An_C_act;
Buffer->An_Extern = b->An_Extern;
Buffer->AnZiel = b->AnZiel;
Buffer->AnName = b->AnName;
Buffer->AnActType = b->AnActType;
Buffer->AnToolTip = b->AnToolTip;
Buffer->AnBwid = b->AnBwid;
Buffer->AnBsty = b->AnBsty;
Buffer->AnFeed = b->AnFeed;
Buffer->AnFlag = b->AnFlag;
Buffer->AnFont = b->AnFont;
Buffer->AnRollOver = b->AnRollOver;
Buffer->AnDown = b->AnDown;
Buffer->AnFormat = b->AnFormat;
Buffer->AnVis = b->AnVis;
Buffer->AnMaxChar = b->AnMaxChar;
Buffer->AnChkStil = b->AnChkStil;
Buffer->AnIsChk = b->AnIsChk;
Buffer->AnAAact = b->AnAAact;
Buffer->AnBColor = b->AnBColor;
Buffer->AnHTML = b->AnHTML;
Buffer->AnUseIcons = b->AnUseIcons;
Buffer->AnIPlace = b->AnIPlace;
Buffer->AnScaleW = b->AnScaleW;
Buffer->Extra = b->Extra;
Buffer->TExtra = b->TExtra;
Buffer->BExtra = b->BExtra;
Buffer->RExtra = b->RExtra;
Buffer->Pfile = b->Pfile;
Buffer->Pfile2 = b->Pfile2;
Buffer->Pfile3 = b->Pfile3;
QString Text = "";
if (b->Ptext.count() != 0)
{
for (a=0; a<b->Ptext.count(); ++a)
{
if( (b->Ptext.at(a)->ch == "\n") || (b->Ptext.at(a)->ch == "\r"))
Text += QString(QChar(5))+"\t";
else
Text += b->Ptext.at(a)->ch+"\t";
Text += b->Ptext.at(a)->cfont+"\t";
Text += QString::number(b->Ptext.at(a)->csize / 10.0)+"\t";
Text += b->Ptext.at(a)->ccolor+"\t";
Text += QString::number(b->Ptext.at(a)->cextra)+"\t";
Text += QString::number(b->Ptext.at(a)->cshade)+'\t';
Text += QString::number(b->Ptext.at(a)->cstyle)+'\t';
Text += QString::number(b->Ptext.at(a)->cab)+'\t';
Text += b->Ptext.at(a)->cstroke+"\t";
Text += QString::number(b->Ptext.at(a)->cshade2)+'\t';
Text += QString::number(b->Ptext.at(a)->cscale)+'\n';
}
}
Buffer->Ptext = Text;
Buffer->Clip = b->Clip.copy();
Buffer->PoLine = b->PoLine.copy();
Buffer->PoShow = b->PoShow;
Buffer->BaseOffs = b->BaseOffs;
Buffer->Textflow = b->Textflow;
Buffer->Textflow2 = b->Textflow2;
Buffer->Ausrich = b->Ausrich;
Buffer->IFont = b->IFont;
Buffer->ISize = b->ISize;
Buffer->ExtraV = b->ExtraV;
Buffer->Groups = b->Groups;
Buffer->IProfile = b->IProfile;
Buffer->IRender = b->IRender;
Buffer->UseEmbedded = b->UseEmbedded;
Buffer->EmProfile = b->EmProfile;
Buffer->LayerNr = b->LayerNr;
Buffer->ScaleType = b->ScaleType;
Buffer->AspectRatio = b->AspectRatio;
Buffer->Locked = b->Locked;
Buffer->Transparency = b->Transparency;
Buffer->TranspStroke = b->TranspStroke;
Buffer->Reverse = b->Reverse;
Buffer->InvPict = b->InvPict;
Buffer->NamedLStyle = b->NamedLStyle;
Buffer->Language = b->Language;
}
/trunk/Scribus/scribus/story.cpp
21,6 → 21,7
#include <qpixmap.h>
#include <qcombobox.h>
#include <qmessagebox.h>
#include <qregexp.h>
#include "serializer.h"
extern QPixmap loadIcon(QString nam);
 
189,7 → 190,10
EndK = 0;
tt->moveCursor(move, false);
tt->setFocus();
updateHeaderStates();
#if QT_VERSION >= 0x030100
updateHeaderStates();
#endif
emit StatBarUpdt();
return;
}
}
204,7 → 208,9
cp->sync();
QFontMetrics fm2(cp->currentFont());
setRowHeight(r, QMAX((fm2.lineSpacing() * (cp->lines()+1)), 24));
updateHeaderStates();;
#if QT_VERSION >= 0x030100
updateHeaderStates();
#endif
}
 
StoryEditor::StoryEditor(QWidget* parent, ScribusDoc *docc, PageItem *ite) : QDialog(parent, "StoryEditor", true, 0)
216,7 → 222,7
QString Dat = "";
setCaption( tr( "Story Editor" ) );
setIcon(loadIcon("AppIcon.png"));
Form1Layout = new QHBoxLayout( this, 5, 5, "Form1Layout");
Form1Layout = new QVBoxLayout( this, 5, 5, "Form1Layout");
edList.clear();
stList.clear();
style.append( tr("Left"));
262,7 → 268,38
table1->setSelectionMode( QTable::Single );
table1->setColumnStretchable(0, false);
table1->setColumnStretchable(1, true);
table1->verticalHeader()->hide();
table1->setLeftMargin(0);
Form1Layout->addWidget( table1 );
 
StateBar = new QStatusBar(this, "st");
WordCT = new QLabel(StateBar, "wt");
WordCT->setText( tr("Words: "));
StateBar->addWidget(WordCT, 0, true);
WordC = new QLabel(StateBar, "wc");
StateBar->addWidget(WordC, 1, true);
CharCT = new QLabel(StateBar, "ct");
CharCT->setText( tr("Chars: "));
StateBar->addWidget(CharCT, 0, true);
CharC = new QLabel(StateBar, "cc");
StateBar->addWidget(CharC, 1, true);
ParCT = new QLabel(StateBar, "pt");
ParCT->setText( tr("Total Paragraphs: "));
StateBar->addWidget(ParCT, 0, true);
ParC = new QLabel(StateBar, "pc");
StateBar->addWidget(ParC, 1, true);
WordCT2 = new QLabel(StateBar, "wt");
WordCT2->setText( tr("Words: "));
StateBar->addWidget(WordCT2, 0, true);
WordC2 = new QLabel(StateBar, "wc");
StateBar->addWidget(WordC2, 1, true);
CharCT2 = new QLabel(StateBar, "ct");
CharCT2->setText( tr("Chars: "));
StateBar->addWidget(CharCT2, 0, true);
CharC2 = new QLabel(StateBar, "cc");
StateBar->addWidget(CharC2, 1, true);
Form1Layout->addWidget( StateBar );
 
resize( QSize(509, 326).expandedTo(minimumSizeHint()) );
show();
QPtrList<Pti> y;
314,8 → 351,50
emenu->setItemEnabled(Mcut, 0);
emenu->setItemEnabled(Mdel, 0);
emenu->setItemEnabled(Mupdt, 0);
updateStatus();
connect(table1, SIGNAL(StatBarUpdt()), this, SLOT(updateStatus()));
}
 
void StoryEditor::updateStatus()
{
QString tmp;
ParC->setText(tmp.setNum(edList.count()));
SEditor *cp = (SEditor*)table1->cellWidget(table1->currentRow(), 1);
QRegExp rx( "(\\w+)\\b" );
int pos = 0;
int counter = 0;
int counter1 = 0;
int counter2 = 0;
while ( pos >= 0 )
{
pos = rx.search( cp->text(), pos );
if ( pos > -1 )
{
counter++;
pos += rx.matchedLength();
}
}
WordC->setText(tmp.setNum(counter));
CharC->setText(tmp.setNum(cp->length()));
for (uint a = 0; a < edList.count(); ++a)
{
SEditor *tt = edList.at(a);
int pos = 0;
while ( pos >= 0 )
{
pos = rx.search( tt->text(), pos );
if ( pos > -1 )
{
counter2++;
pos += rx.matchedLength();
}
}
counter1 += tt->length();
}
WordC2->setText(tmp.setNum(counter2));
CharC2->setText(tmp.setNum(counter1));
}
 
void StoryEditor::closeEvent(QCloseEvent *)
{
Do_leave();
356,6 → 435,7
emenu->setItemEnabled(Mcopy, 0);
emenu->setItemEnabled(Mcut, 0);
emenu->setItemEnabled(Mdel, 0);
updateStatus();
}
 
void StoryEditor::Do_undo()
564,6 → 644,7
table1->HomeK = 0;
table1->EndK = 0;
emenu->setItemEnabled(Mupdt, 1);
updateStatus();
}
 
void StoryEditor::WrapHandler()
580,7 → 661,10
{
table1->setCurrentCell(r, 1);
table1->cellWidget(r, 1)->setFocus();
#if QT_VERSION >= 0x030100
table1->updateHeaderStates();
#endif
updateStatus();
}
}
 
604,6 → 688,7
table1->adjHeight(r);
tt->setFocus();
tt->setCursorPosition(0, tmp.length());
updateStatus();
}
}
 
627,6 → 712,7
table1->adjHeight(r-1);
bt->setFocus();
bt->setCursorPosition(0, tmp2.length());
updateStatus();
}
}
 
660,5 → 746,6
tt->setAlignment(al);
table1->adjHeight(table1->currentRow());
addPar(table1->currentRow()+1, tmp3, st);
updateStatus();
}
 
/trunk/Scribus/scribus/icons/Makefile.am
1,7 → 1,7
####### kdevelop will overwrite this part!!! (begin)##########
 
 
EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png oval.png rect.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png arrowr.png arrowl.png arrowu.png arrowd.png cross.png triangle2.png trir.png tril.png trid.png trit.png halfovalu.png halfovald.png halfovalr.png halfovall.png frame.png torus.png
EXTRA_DIST = Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClos.xpm DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave.xpm AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png oval.png rect.png text_force.png ok.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png arrowr.png arrowl.png arrowu.png arrowd.png cross.png triangle2.png trir.png tril.png trid.png trit.png halfovalu.png halfovald.png halfovalr.png halfovall.png frame.png torus.png signature.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
286,6 → 286,8
$(INSTALL_DATA) $(srcdir)/cross.png $(prefix)/lib/scribus/icons/cross.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/triangle2.png $(prefix)/lib/scribus/icons/triangle2.png
$(mkinstalldirs) $(prefix)/lib/scribus/icons/
$(INSTALL_DATA) $(srcdir)/signature.png $(prefix)/lib/scribus/icons/signature.png
 
 
uninstall-local:
430,6 → 432,7
-rm -f $(prefix)/lib/scribus/icons/trid.png
-rm -f $(prefix)/lib/scribus/icons/trit.png
-rm -f $(prefix)/lib/scribus/icons/trir.png
-rm -f $(prefix)/lib/scribus/icons/signature.png
 
 
####### kdevelop will overwrite this part!!! (end)############
/trunk/Scribus/scribus/icons/signature.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/scribus/pageitem.h
===================================================================
--- Scribus/scribus/pageitem.h (revision 123)
+++ Scribus/scribus/pageitem.h (revision 124)
@@ -55,7 +55,6 @@
/** Zeichnet das Item */
void paintObj(QRect e=QRect(), QPixmap *ppX = 0);
void DrawObj(ScPainter *p, QRect e);
- void CopyIt(struct CLBuf *Buffer);
void SetZeichAttr(struct Pti *hl, int *chs, QString *chx);
void SetFarbe(QColor *tmp, QString farbe, int shad);
void DrawZeichenS(ScPainter *p, struct ZZ *hl);
Index: Scribus/scribus/pageitem.cpp
===================================================================
--- Scribus/scribus/pageitem.cpp (revision 123)
+++ Scribus/scribus/pageitem.cpp (revision 124)
@@ -1557,139 +1557,3 @@
}
}
}
-
-
-void PageItem::CopyIt(struct CLBuf *Buffer)
-{
- uint a;
- Buffer->PType = PType;
- Buffer->Xpos = Xpos;
- Buffer->Ypos = Ypos;
- Buffer->Width = Width;
- Buffer->Height = Height;
- Buffer->RadRect = RadRect;
- Buffer->FrameType = FrameType;
- Buffer->ClipEdited = ClipEdited;
- Buffer->Pwidth = Pwidth;
- Buffer->Pcolor = Pcolor;
- Buffer->Pcolor2 = Pcolor2;
- Buffer->Shade = Shade;
- Buffer->Shade2 = Shade2;
- Buffer->GrColor = GrColor;
- Buffer->GrColor2 = GrColor2;
- Buffer->GrShade = GrShade;
- Buffer->GrShade2 = GrShade2;
- Buffer->GrType = GrType;
- Buffer->TxtStroke = TxtStroke;
- Buffer->TxtFill = TxtFill;
- Buffer->ShTxtStroke = ShTxtStroke;
- Buffer->ShTxtFill = ShTxtFill;
- Buffer->TxtScale = TxtScale;
- Buffer->TxTStyle = TxTStyle;
- Buffer->Rot = Rot;
- Buffer->PLineArt = PLineArt;
- Buffer->PLineEnd = PLineEnd;
- Buffer->PLineJoin = PLineJoin;
- Buffer->LineSp = LineSp;
- Buffer->LocalScX = LocalScX;
- Buffer->LocalScY = LocalScY;
- Buffer->LocalX = LocalX;
- Buffer->LocalY = LocalY;
- Buffer->PicArt = PicArt;
- Buffer->flippedH = flippedH;
- Buffer->flippedV = flippedV;
- Buffer->BBoxX = BBoxX;
- Buffer->BBoxH = BBoxH;
- Buffer->isPrintable = isPrintable;
- Buffer->isBookmark = isBookmark;
- Buffer->BMnr = BMnr;
- Buffer->isAnnotation = isAnnotation;
- Buffer->AnType = AnType;
- Buffer->AnAction = AnAction;
- Buffer->An_E_act = An_E_act;
- Buffer->An_X_act = An_X_act;
- Buffer->An_D_act = An_D_act;
- Buffer->An_Fo_act = An_Fo_act;
- Buffer->An_Bl_act = An_Bl_act;
- Buffer->An_K_act = An_K_act;
- Buffer->An_F_act = An_F_act;
- Buffer->An_V_act = An_V_act;
- Buffer->An_C_act = An_C_act;
- Buffer->An_Extern = An_Extern;
- Buffer->AnZiel = AnZiel;
- Buffer->AnName = AnName;
- Buffer->AnActType = AnActType;
- Buffer->AnToolTip = AnToolTip;
- Buffer->AnBwid = AnBwid;
- Buffer->AnBsty = AnBsty;
- Buffer->AnFeed = AnFeed;
- Buffer->AnFlag = AnFlag;
- Buffer->AnFont = AnFont;
- Buffer->AnRollOver = AnRollOver;
- Buffer->AnDown = AnDown;
- Buffer->AnFormat = AnFormat;
- Buffer->AnVis = AnVis;
- Buffer->AnMaxChar = AnMaxChar;
- Buffer->AnChkStil = AnChkStil;
- Buffer->AnIsChk = AnIsChk;
- Buffer->AnAAact = AnAAact;
- Buffer->AnBColor = AnBColor;
- Buffer->AnHTML = AnHTML;
- Buffer->AnUseIcons = AnUseIcons;
- Buffer->AnIPlace = AnIPlace;
- Buffer->AnScaleW = AnScaleW;
- Buffer->Extra = Extra;
- Buffer->TExtra = TExtra;
- Buffer->BExtra = BExtra;
- Buffer->RExtra = RExtra;
- Buffer->Pfile = Pfile;
- Buffer->Pfile2 = Pfile2;
- Buffer->Pfile3 = Pfile3;
- QString Text = "";
- if (Ptext.count() != 0)
- {
- for (a=0; a<Ptext.count(); ++a)
- {
- if( (Ptext.at(a)->ch == "\n") || (Ptext.at(a)->ch == "\r"))
- Text += QString(QChar(5))+"\t";
- else
- Text += Ptext.at(a)->ch+"\t";
- Text += Ptext.at(a)->cfont+"\t";
- Text += QString::number(Ptext.at(a)->csize / 10.0)+"\t";
- Text += Ptext.at(a)->ccolor+"\t";
- Text += QString::number(Ptext.at(a)->cextra)+"\t";
- Text += QString::number(Ptext.at(a)->cshade)+'\t';
- Text += QString::number(Ptext.at(a)->cstyle)+'\t';
- Text += QString::number(Ptext.at(a)->cab)+'\t';
- Text += Ptext.at(a)->cstroke+"\t";
- Text += QString::number(Ptext.at(a)->cshade2)+'\t';
- Text += QString::number(Ptext.at(a)->cscale)+'\n';
- }
- }
- Buffer->Ptext = Text;
- Buffer->Clip = Clip.copy();
- Buffer->PoLine = PoLine.copy();
- Buffer->PoShow = PoShow;
- Buffer->BaseOffs = BaseOffs;
- Buffer->Textflow = Textflow;
- Buffer->Textflow2 = Textflow2;
- Buffer->Ausrich = Ausrich;
- Buffer->IFont = IFont;
- Buffer->ISize = ISize;
- Buffer->ExtraV = ExtraV;
- Buffer->Groups = Groups;
- Buffer->IProfile = IProfile;
- Buffer->IRender = IRender;
- Buffer->UseEmbedded = UseEmbedded;
- Buffer->EmProfile = EmProfile;
- Buffer->LayerNr = LayerNr;
- Buffer->ScaleType = ScaleType;
- Buffer->AspectRatio = AspectRatio;
- Buffer->Locked = Locked;
- Buffer->Transparency = Transparency;
- Buffer->TranspStroke = TranspStroke;
- Buffer->Reverse = Reverse;
- Buffer->InvPict = InvPict;
- Buffer->NamedLStyle = NamedLStyle;
- Buffer->Language = Language;
-}
Index: Scribus/scribus/werktoolb.cpp
===================================================================
--- Scribus/scribus/werktoolb.cpp (revision 123)
+++ Scribus/scribus/werktoolb.cpp (revision 124)
@@ -48,6 +48,9 @@
Textedit = new QToolButton(loadIcon("Editm.xpm"), tr("Edit Contents of Frame"), QString::null, this, SLOT(ModeFromTB()), this);
Textedit->setToggleButton( true );
Textedit->setEnabled( FALSE );
+ Textedit2 = new QToolButton(loadIcon("signature.png"), tr("Edit the Text with the Story Editor"), QString::null, this, SLOT(ModeFromTB()), this);
+ Textedit2->setToggleButton( true );
+ Textedit2->setEnabled( FALSE );
KetteEin = new QToolButton(loadIcon("Lock.xpm"), tr("Create Text Chains"), QString::null, this, SLOT(ModeFromTB()), this);
KetteEin->setToggleButton( true );
KetteEin->setEnabled(false);
@@ -110,6 +113,7 @@
Select->setOn(false);
Rotiere->setOn(false);
Textedit->setOn(false);
+ Textedit2->setOn(false);
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
@@ -130,6 +134,7 @@
Select->setOn(false);
Rotiere->setOn(false);
Textedit->setOn(false);
+ Textedit2->setOn(false);
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
@@ -147,6 +152,7 @@
Select->setOn(false);
Rotiere->setOn(false);
Textedit->setOn(false);
+ Textedit2->setOn(false);
Zoom->setOn(false);
Texte->setOn(false);
BildB->setOn(false);
@@ -171,6 +177,11 @@
Textedit->setOn(true);
emit NewMode(7);
}
+ if (Textedit2 == sender())
+ {
+ Textedit2->setOn(true);
+ emit NewMode(3);
+ }
if (Zoom == sender())
{
Zoom->setOn(true);
Index: Scribus/scribus/muster.cpp
===================================================================
--- Scribus/scribus/muster.cpp (revision 123)
+++ Scribus/scribus/muster.cpp (revision 124)
@@ -6,6 +6,7 @@
#include <qcursor.h>
extern QPixmap loadIcon(QString nam);
+extern void CopyPageItem(struct CLBuf *Buffer, PageItem *b);
MusterSeiten::MusterSeiten( QWidget* parent, ScribusDoc *doc, ScribusView *view, QString temp)
: QDialog( parent, "Muster", false, WDestructiveClose)
@@ -152,7 +153,8 @@
int inde = View->MasterNames[sMuster];
for (uint a=0; a<View->Pages.at(inde)->Items.count(); ++a)
{
- View->Pages.at(inde)->Items.at(a)->CopyIt(&Buffer);
+ CopyPageItem(&Buffer, View->Pages.at(inde)->Items.at(a));
+// View->Pages.at(inde)->Items.at(a)->CopyIt(&Buffer);
Doc->ActPage->PasteItem(&Buffer, true, true);
}
Doc->ActPage->Deselect(true);
/trunk/Scribus/scribus/libabout/about.cpp
33,7 → 33,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(10).arg("December").arg(2003);
QString bu = tr("%1. %2 %3 ").arg(12).arg("December").arg(2003);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
74,6 → 74,7
#include "autoform.h"
extern QPixmap loadIcon(QString nam);
extern bool overwrite(QWidget *parent, QString filename);
extern void CopyPageItem(struct CLBuf *Buffer, PageItem *b);
 
using namespace std;
 
1966,6 → 1967,7
WerkTools->KetteAus->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
WerkTools->Textedit->setEnabled(false);
WerkTools->Textedit2->setEnabled(false);
WerkTools->Rotiere->setEnabled(false);
Mpal->Cpal->GradCombo->setCurrentItem(0);
Tpal->slotShowSelect(doc->ActPage->PageNr, -1);
1988,6 → 1990,7
WerkTools->KetteAus->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
WerkTools->Textedit->setEnabled(true);
WerkTools->Textedit2->setEnabled(false);
WerkTools->Rotiere->setEnabled(true);
break;
case 4:
2010,6 → 2013,7
StilMenu->insertItem( tr("Color"), ColorMenu);
StilMenu->insertItem( tr("Shade"), ShadeMenu);
WerkTools->Rotiere->setEnabled(true);
WerkTools->Textedit2->setEnabled(true);
if ((b->NextBox != 0) || (b->BackBox != 0))
{
WerkTools->KetteAus->setEnabled(true);
2063,6 → 2067,7
StilMenu->insertItem( tr("Shade"), ShadeMenu);
WerkTools->Rotiere->setEnabled(true);
WerkTools->Textedit->setEnabled(false);
WerkTools->Textedit2->setEnabled(false);
WerkTools->KetteEin->setEnabled(false);
WerkTools->KetteAus->setEnabled(false);
if (doc->AppMode == 7)
3795,6 → 3800,7
WerkTools->Select->setEnabled(false);
WerkTools->Rotiere->setEnabled(false);
WerkTools->Textedit->setEnabled(false);
WerkTools->Textedit2->setEnabled(false);
WerkTools->Zoom->setEnabled(false);
WerkTools->Texte->setEnabled(false);
WerkTools->BildB->setEnabled(false);
3833,6 → 3839,7
WerkToolsP->PDFTool->setEnabled(true);
WerkToolsP->PDFaTool->setEnabled(true);
WerkTools->Textedit->setOn(false);
WerkTools->Textedit2->setOn(false);
ObjMenu->setItemEnabled(Loesch, true);
ShapeMenu->setItemChecked(ShapeEdit, false);
if (HaveDoc)
3853,6 → 3860,7
WerkTools->Select->setOn(true);
WerkTools->Rotiere->setOn(false);
WerkTools->Textedit->setOn(false);
WerkTools->Textedit2->setOn(false);
WerkTools->Zoom->setOn(false);
WerkTools->Texte->setOn(false);
WerkTools->BildB->setOn(false);
3869,6 → 3877,12
 
void ScribusApp::ModeFromTB(int m)
{
if (m == 3)
{
slotStoryEditor();
slotSelect();
return;
}
if (m == 10)
doc->ElemToLink = doc->ActPage->SelItem.at(0);
if (doc->AppMode == 13)
3933,6 → 3947,7
}
WerkTools->Select->setOn(false);
WerkTools->Textedit->setOn(true);
WerkTools->Textedit2->setOn(true);
doc->ActPage->slotDoCurs(true);
menuBar()->setItemEnabled(Obm, 0);
CurTimer = new QTimer(doc->ActPage);
4212,7 → 4227,7
Page* Ziel = doc->ActPage;
for (uint ite = 0; ite < from->Items.count(); ++ite)
{
from->Items.at(ite)->CopyIt(&Buffer);
CopyPageItem(&Buffer, from->Items.at(ite));
Ziel->PasteItem(&Buffer, true, true);
if (from->Items.at(ite)->isBookmark)
AddBookMark(Ziel->Items.at(Ziel->Items.count()-1));
/trunk/Scribus/scribus/page.cpp
793,10 → 793,10
p.end();
b->Dirty = true;
QRect g = neu.boundingRect();
g.setX(g.x()-static_cast<int>(b->Pwidth / 2.0));
g.setY(g.y()-static_cast<int>(b->Pwidth / 2.0));
g.setWidth(g.width()+static_cast<int>(b->Pwidth / 2.0));
g.setHeight(g.height()+static_cast<int>(b->Pwidth / 2.0));
g.setX(g.x()-static_cast<int>(QMAX(6, b->Pwidth / 2.0)));
g.setY(g.y()-static_cast<int>(QMAX(6, b->Pwidth / 2.0)));
g.setWidth(g.width()+static_cast<int>(QMAX(6, b->Pwidth / 2.0)));
g.setHeight(g.height()+static_cast<int>(QMAX(6, b->Pwidth / 2.0)));
if (single)
{
QRect rd = ViewReg().boundingRect().intersect(g);
2782,8 → 2782,14
int storedClRe = ClRe;
for (uint itm = 0; itm < SelNode.count(); ++itm)
{
npf.setX(b->PoLine.point(*SelNode.at(itm)).x() + (newX-Mxp));
npf.setY(b->PoLine.point(*SelNode.at(itm)).y() + (newY-Myp));
p.begin(this);
p.translate(static_cast<int>(b->Xpos*doku->Scale), static_cast<int>(b->Ypos*doku->Scale));
p.rotate(b->Rot);
FPoint npfN = FPoint(p.xFormDev(QPoint(newX, newY)));
FPoint npfM = FPoint(p.xFormDev(QPoint(Mxp, Myp)));
p.end();
npf.setX(b->PoLine.point(*SelNode.at(itm)).x() + (npfN.x()-npfM.x()));
npf.setY(b->PoLine.point(*SelNode.at(itm)).y() + (npfN.y()-npfM.y()));
ClRe = *SelNode.at(itm);
b->OldB2 = b->Width;
b->OldH2 = b->Height;
2792,11 → 2798,11
b->OldB2 = b->Width;
b->OldH2 = b->Height;
ClRe = storedClRe;
Mxp = newX;
Myp = newY;
}
else
MoveClipPoint(b, npf);
Mxp = newX;
Myp = newY;
}
return;
}
3576,6 → 3582,7
break;
default:
z = PaintPoly(Rxp, Ryp, 1+Rxpd, 1+Rypd, doku->Dwidth, doku->Dbrush, doku->Dpen);
SetFrameShape(Items.at(z), doku->ValCount, doku->ShapeValues);
SetupDraw(z);
emit HaveSel(6);
break;
/trunk/Scribus/scribus/art_rgb_svp.c
427,9 → 427,15
int i;
int a, da;
 
#ifdef WORDS_BIGENDIAN
r = (rgb >> 8) & 0xff;
g = (rgb >> 16) & 0xff;
b = (rgb >> 24) & 0xff;
#else
r = (rgb >> 16) & 0xff;
g = (rgb >> 8) & 0xff;
b = rgb & 0xff;
#endif
 
data.r = r;
data.g = g;
/trunk/Scribus/scribus/story.h
25,6 → 25,8
#include <qtextedit.h>
#include <qpopupmenu.h>
#include <qmenubar.h>
#include <qstatusbar.h>
#include <qlabel.h>
#include "pageitem.h"
class QVBoxLayout;
class QHBoxLayout;
60,6 → 62,9
void adjHeight(int r);
int HomeK;
int EndK;
 
signals:
void StatBarUpdt();
};
 
class StoryEditor : public QDialog
76,6 → 81,17
QPopupMenu* fmenu;
QPopupMenu* emenu;
QMenuBar* menuBar;
QStatusBar* StateBar;
QLabel* ParCT;
QLabel* ParC;
QLabel* WordCT;
QLabel* WordC;
QLabel* CharCT;
QLabel* CharC;
QLabel* WordCT2;
QLabel* WordC2;
QLabel* CharCT2;
QLabel* CharC2;
STable* table1;
QPtrList<SEditor> edList;
QPtrList<QComboBox> stList;
92,6 → 108,7
int Mupdt;
 
public slots:
void updateStatus();
void Do_leave();
void Do_new();
void Do_undo();
117,7 → 134,7
void EditSt();
 
protected:
QHBoxLayout* Form1Layout;
QVBoxLayout* Form1Layout;
 
};