Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 411 → Rev 412

/trunk/Scribus/scribus/story.cpp
1464,7 → 1464,7
StoryEd2Layout = new QHBoxLayout( 0, 5, 5, "StoryEd2Layout");
/* Setting up Menu Bar */
fmenu = new QPopupMenu();
fmenu->insertItem(loadIcon("DateiNeu16.png"), tr("&New"), this, SLOT(Do_new()), CTRL+Key_N);
fmenu->insertItem(loadIcon("editdelete.png"), tr("&New"), this, SLOT(Do_new()), CTRL+Key_N);
fid52 = fmenu->insertItem(loadIcon("reload16.png"), tr("&Reload Text from Frame"), this, SLOT(slotFileRevert()));
fmenu->insertSeparator();
fmenu->insertItem(loadIcon("DateiSave16.png"), tr("&Save to File..."), this, SLOT(SaveTextFile()));
1472,7 → 1472,7
fmenu->insertItem(tr("Save &Document"), this, SLOT(Do_saveDocument()), CTRL+Key_S);
fmenu->insertSeparator();
/* changes to fit the #662 bug 05/28/04 petr vanek */
fmenu->insertItem(loadIcon("DateiClos16.png"), tr("&Update Text Frame and Exit"), this, SLOT(Do_leave2()));
fmenu->insertItem(loadIcon("ok.png"), tr("&Update Text Frame and Exit"), this, SLOT(Do_leave2()));
fmenu->insertItem(loadIcon("exit.png"), tr("&Exit Without Updating Text Frame"), this, SLOT(Do_leave()));
/* end of changes */
emenu = new QPopupMenu();
1497,7 → 1497,7
 
/* Setting up Toolbars */
FileTools = new QToolBar( tr("File"), this);
DatNeu = new QToolButton(loadIcon("DateiNeu.xpm"), tr("Clear all Text"), QString::null, this, SLOT(Do_new()), FileTools);
DatNeu = new QToolButton(loadIcon("editdelete.png"), tr("Clear all Text"), QString::null, this, SLOT(Do_new()), FileTools);
DatOpe = new QToolButton(loadIcon("DateiOpen.xpm"), tr("Load Text from File"), QString::null, this, SLOT(LoadTextFile()), FileTools);
DatSav = new QToolButton(loadIcon("DateiSave2.png"), tr("Save Text to File"), QString::null, this, SLOT(SaveTextFile()), FileTools);
DatClo = new QToolButton(loadIcon("DateiClose.png"), tr("Update Text Frame and Exit"), QString::null, this, SLOT(Do_leave2()), FileTools);
/trunk/Scribus/scribus/plugins/fontpreview/ui.cpp
7,6 → 7,7
#include <qlayout.h>
#include <qtooltip.h>
#include <qwhatsthis.h>
#include <qstring.h>
 
extern QPixmap FontSample(QString da, int s, QString ts, QColor back);
extern QPixmap loadIcon(QString nam);
47,7 → 48,7
 
FontPreviewLayout->addLayout( layout6, 0, 0 );
languageChange();
resize( QSize(640, 480).expandedTo(minimumSizeHint()) );
resize( QSize(800, 600).expandedTo(minimumSizeHint()) );
layout()->activate();
clearWState( WState_Polished );
SCFontsIterator fontIter(carrier->Prefs.AvailFonts);
107,8 → 108,13
*/
void FontPreview::fontList_changed( QListBoxItem *item )
{
uint size = 16;
QString t = tr("Woven silk pyjamas exchanged for blue quartz");
if (carrier->doc->Dsize && carrier->doc->Dsize < 28 && carrier->doc->Dsize > 10)
size = carrier->doc->Dsize;
t.replace('\n', " "); // remove French <NL> from translation...
QString da = carrier->Prefs.AvailFonts[item->text()]->Datei;
QPixmap pixmap = FontSample(da, 28, tr("Woven silk pyjamas exchanged for blue quartz"), paletteBackgroundColor());
QPixmap pixmap = FontSample(da, size, t, paletteBackgroundColor());
fontPreview->clear();
fontPreview->setPixmap(pixmap);
}