Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 106 → Rev 107

/trunk/Scribus/ChangeLogCVS
1,4 → 1,7
Changes since Version 1.1.2
19.11.2003 Fixed Bug in the Story Editor with linked Textframes.
You can now edit Texts on a Path with the Story Editor too.
 
18.11.2003 Fixed Segfault when opening certain Documents.
Improved the Hyphenator.
 
/trunk/Scribus/scribus/hyphenator.cpp
284,5 → 284,5
}
it->Dirty = true;
qApp->setOverrideCursor(QCursor(ArrowCursor), true);
doc->ActPage->RefreshItem(it);
it->OwnPage->RefreshItem(it);
}
/trunk/Scribus/scribus/story.cpp
137,7 → 137,7
updateHeaderStates();;
}
 
StoryEditor::StoryEditor(QWidget* parent, ScribusDoc *docc, PageItem *ite) : QDialog(parent, "StoryEditor", false, 0)
StoryEditor::StoryEditor(QWidget* parent, ScribusDoc *docc, PageItem *ite) : QDialog(parent, "StoryEditor", true, 0)
{
uint a;
int para = 0;
313,6 → 313,14
void StoryEditor::updateTextFrame()
{
bool first = false;
PageItem *nb = CurrItem;
while (nb != 0)
{
if (nb->BackBox != 0)
nb = nb->BackBox;
else
break;
}
for (uint a = 0; a < edList.count(); ++a)
{
Serializer *ss = new Serializer("");
322,20 → 330,12
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);
ss->GetText(nb, st, doc->Vorlagen[st].Font, doc->Vorlagen[st].FontSize, first);
delete ss;
first = true;
}
PageItem *nb = CurrItem;
while (nb != 0)
{
if (nb->BackBox != 0)
nb = nb->BackBox;
else
break;
}
while (nb != 0)
{
if (doc->Trenner->AutoCheck)
{
if (doc->Trenner->Language != nb->Language)
343,10 → 343,11
doc->Trenner->slotHyphenate(nb);
}
else
doc->ActPage->RefreshItem(nb);
nb->OwnPage->RefreshItem(nb);
nb = nb->NextBox;
}
TextChanged = false;
emit DocChanged();
}
 
void StoryEditor::styleChange(int st)
494,6 → 495,13
int al = tt->alignment();
int st = getStyle(table1->currentRow());
int rPos = tmp.find("\n");
if (CurrItem->PType == 8)
{
tmp.remove("\n");
tt->setText(tmp);
tt->setAlignment(al);
return;
}
if (rPos < static_cast<int>(tmp.length()))
{
tmp2 = tmp.left(rPos);
/trunk/Scribus/scribus/libabout/about.cpp
32,7 → 32,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = "18. November 2003 ";
QString bu = "19. November 2003 ";
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
6842,13 → 6842,11
{
PageItem *b = doc->ActPage->SelItem.at(0);
StoryEditor* dia = new StoryEditor(this, doc, b);
connect(dia, SIGNAL(DocChanged()), this, SLOT(slotDocCh()));
if (dia->exec())
{
if (dia->TextChanged)
{
dia->updateTextFrame();
slotDocCh();
}
}
delete dia;
}
/trunk/Scribus/scribus/page.cpp
1940,6 → 1940,8
}
}
}
if (b->PType == 8)
pmen->insertItem(tr("Edit Text..."), this, SIGNAL(EditText()));
if (!b->Locked)
{
pmen->insertItem(tr("Lock"), this, SLOT(ToggleLock()));
/trunk/Scribus/scribus/story.h
98,6 → 98,9
void KeyBS();
void KeyRet();
 
signals:
void DocChanged();
 
protected:
QHBoxLayout* Form1Layout;