Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 5898 → Rev 5897

/branches/Version13x/Scribus/scribus/prefs.cpp
53,6 → 53,7
extern QPixmap loadIcon(QString nam);
extern ScribusQApp* ScQApp;
 
 
Preferences::Preferences( QWidget* parent) : PrefsDialogBase( parent )
{
prefsManager=PrefsManager::instance();
75,12 → 76,14
tabTypo = new TabTypograpy( prefsWidgets, &prefsData->typographicSettings);
addItem( tr("Typography"), loadIcon("typography.png"), tabTypo);
 
tabTools = new TabTools(prefsWidgets, &prefsData->toolSettings, docUnitIndex, ap->doc);
tabTools = new TabTools( prefsWidgets, &prefsData->toolSettings, docUnitIndex, ap->doc);
addItem( tr("Tools"), loadIcon("tools.png"), tabTools);
 
tabHyphenator = new HySettings(prefsWidgets, &ap->LangTransl);
addItem( tr("Hyphenator"), loadIcon("hyphenate.png"), tabHyphenator);
 
// ap->PrefsPfad is propably obsolete
//tabFonts = new FontPrefs(prefsWidgets, false, ap->PrefsPfad, 0);
tabFonts = new FontPrefs(prefsWidgets, false, prefsManager->preferencesLocation(), ap->doc);
addItem( tr("Fonts"), loadIcon("font.png"), tabFonts);
 
/branches/Version13x/Scribus/scribus/tabtools.cpp
913,7 → 913,7
if (!fontPreview)
return;
 
SampleItem *si = new SampleItem(docu);
SampleItem *si = new SampleItem(0);
si->setText(tr("Woven silk pyjamas exchanged for blue quartz"));
if (colorComboTextBackground->currentText() != CommonStrings::NoneColor)
{
/branches/Version13x/Scribus/scribus/sampleitem.cpp
17,12 → 17,12
#include <qcursor.h>
#include "text/nlsconfig.h"
 
 
SampleItem::SampleItem(ScribusDoc* doc) :
QObject()
{
used = true;
m_Doc=doc;
 
if (doc==0)
{
qApp->setOverrideCursor(QCursor(Qt::WaitCursor));