Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 370 → Rev 371

/trunk/Scribus/ChangeLogCVS
1,5 → 1,8
Changes since Version 1.1.7
 
09.08.2004
* bug #955: When switching between multiple windows size and X,Y origin location are not updated for the selected object
 
08.08.2004
* bug #160: zoom tool should recenter
* bug #616: Properties/Language: Wrong language descriptions
/trunk/Scribus/scribus/story.cpp
32,6 → 32,75
 
extern QPixmap loadIcon(QString nam);
 
SideBar::SideBar(QWidget *pa) : QLabel(pa)
{
setEraseColor(QColor(255,255,255));
offs = 0;
editor = 0;
setMinimumWidth(fontMetrics().width( "No Style" )+30);
}
 
void SideBar::paintEvent(QPaintEvent *e)
{
QLabel::paintEvent(e);
int st;
QPainter p;
p.begin(this);
if (editor != 0)
{
for (int pa = 0; pa < editor->paragraphs(); ++pa)
{
QRect re = editor->paragraphRect(pa);
re.setWidth(width()-5);
re.moveBy(5, 0);
if ((re.y()+re.height())-offs < height())
p.drawLine(0, (re.y()+re.height())-offs, width()-1, (re.y()+re.height())-offs);
if (re.y()-offs < height())
{
if ((pa < static_cast<int>(editor->StyledText.count())) && (editor->StyledText.count() != 0))
{
if (editor->StyledText.at(pa)->count() > 0)
{
st = editor->StyledText.at(pa)->at(0)->cab;
if (st < 5)
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, "No Style");
else
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, editor->doc->Vorlagen[st].Vname);
}
else
{
st = editor->CurrentABStil;
if (st < 5)
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, "No Style");
else
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, editor->doc->Vorlagen[st].Vname);
}
}
else
{
st = editor->CurrentABStil;
if (st < 5)
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, "No Style");
else
p.drawText(re, Qt::AlignLeft | Qt::AlignTop, editor->doc->Vorlagen[st].Vname);
}
}
}
}
p.end();
}
 
void SideBar::doMove(int x, int y)
{
offs = y;
repaint();
}
 
void SideBar::doRepaint()
{
repaint();
}
 
SEditor::SEditor(QWidget* parent, ScribusDoc *docc) : QTextEdit(parent)
{
doc = docc;
1267,9 → 1336,12
setDockEnabled(FillTools, DockRight, false);
setDockEnabled(FillTools, DockBottom, false);
 
EdSplit = new QSplitter(vb);
/* SideBar Widget */
EditorBar = new SideBar(EdSplit);
/* Editor Widget, subclass of QTextEdit */
Editor = new SEditor(vb, docc);
StoryEd2Layout->addWidget( Editor );
Editor = new SEditor(EdSplit, docc);
StoryEd2Layout->addWidget( EdSplit );
/* Setting up Status Bar */
ButtonGroup1 = new QButtonGroup( statusBar(), "ButtonGroup1" );
1349,11 → 1421,16
updateStatus();
Editor->setFocus();
TextChanged = false;
EditorBar->setFrameStyle(Editor->frameStyle());
EditorBar->setLineWidth(Editor->lineWidth());
EditorBar->editor = Editor;
connect(Editor, SIGNAL(textChanged()), this, SLOT(modifiedText()));
connect(Editor, SIGNAL(clicked(int, int)), this, SLOT(updateProps(int, int)));
connect(Editor, SIGNAL(setProps(int, int)), this, SLOT(updateProps(int, int)));
connect(Editor, SIGNAL(cursorPositionChanged(int, int)), this, SLOT(updateProps(int, int)));
connect(Editor, SIGNAL(copyAvailable(bool)), this, SLOT(CopyAvail(bool )));
connect(Editor, SIGNAL(contentsMoving(int, int)), EditorBar, SLOT(doMove(int, int)));
connect(Editor, SIGNAL(textChanged()), EditorBar, SLOT(doRepaint()));
connect(AlignTools, SIGNAL(NewStyle(int)), this, SLOT(newAlign(int)));
connect(AlignTools, SIGNAL(NewAlign(int)), this, SLOT(newAlign(int)));
connect(FillTools, SIGNAL(NewColor(int, int)), this, SLOT(newTxFill(int, int)));
1411,6 → 1488,7
{
Editor->setFont( QFontDialog::getFont( 0, Editor->font() ) );
ScApp->Prefs.STEfont = Editor->font().toString();
EditorBar->repaint();
}
 
void StoryEditor::newTxFill(int c, int s)
/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("08").arg("August").arg("2004");
QString bu = tr("%1. %2 %3 ").arg("09").arg("August").arg("2004");
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
2336,7 → 2336,10
if (!doc->loading)
{
if (doc->ActPage->SelItem.count() != 0)
{
HaveNewSel(doc->ActPage->SelItem.at(0)->PType);
doc->ActPage->EmitValues(doc->ActPage->SelItem.at(0));
}
else
HaveNewSel(-1);
}
/trunk/Scribus/scribus/story.h
32,6 → 32,7
#include <qtoolbutton.h>
#include <qtoolbar.h>
#include <qlayout.h>
#include <qsplitter.h>
#include "pageitem.h"
#include "mspinbox.h"
#include "spalette.h"
81,6 → 82,7
ScribusDoc* doc;
bool UniCinp;
bool wasMod;
bool ready;
int UniCinC;
int CurrentStyle;
int CurrentABStil;
105,6 → 107,22
void setProps(int, int);
};
 
class SideBar : public QLabel
{
Q_OBJECT
 
public:
SideBar(QWidget *pa);
~SideBar() {};
void paintEvent(QPaintEvent *e);
int offs;
SEditor *editor;
 
public slots:
void doMove(int x, int y);
void doRepaint();
};
 
class SToolBColorF : public QToolBar
{
Q_OBJECT
237,6 → 255,8
SToolBColorF* FillTools;
SToolBColorS* StrokeTools;
SToolBStyle* StyleTools;
QSplitter* EdSplit;
SideBar* EditorBar;
SEditor* Editor;
QButtonGroup* ButtonGroup1;
QButtonGroup* ButtonGroup2;
/trunk/Scribus/scribus/po/scribus.pl_PL.ts
12048,7 → 12048,7
<name>ScribusView</name>
<message>
<source> %</source>
<translation></translation>
<translation>%</translation>
</message>
<message>
<source>Page </source>
/trunk/Scribus/scribus/qm/scribus.pl.qm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream