Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 5555 → Rev 5556

/branches/Version13x/Scribus/scribus/prefs.cpp
700,7 → 700,7
addItem( tr("Miscellaneous"), loadIcon("misc.png"), tabMiscellaneous);
 
// plugin manager. pv.
PluginManagerPrefsGui* pluginManagerPrefsGui = new PluginManagerPrefsGui(prefsWidgets);
pluginManagerPrefsGui = new PluginManagerPrefsGui(prefsWidgets);
addItem( tr("Plugins"), loadIcon("plugins.png"), pluginManagerPrefsGui );
connect(this, SIGNAL(accepted()), pluginManagerPrefsGui, SLOT(apply()));
 
849,7 → 849,41
ASTime->setValue(prefsData->AutoSaveTime / 1000 / 60);
}
else if (current == tabView) // Display
{qDebug("TODO!");
{
int decimals = unitGetPrecisionFromIndex(docUnitIndex);
QString unitSuffix = unitGetSuffixFromIndex(docUnitIndex);
QPixmap pm5(54, 14);
pm5.fill(prefsData->DpapColor);
colorPaper = prefsData->DpapColor;
backColor->setPixmap(pm5);
backColor->setText( QString::null );
checkUnprintable->setChecked( prefsData->marginColored );
checkPictures->setChecked(prefsData->guidesSettings.showPic);
checkLink->setChecked(prefsData->guidesSettings.linkShown);
checkControl->setChecked(prefsData->guidesSettings.showControls);
checkFrame->setChecked(prefsData->guidesSettings.framesShown);
checkRuler->setChecked(prefsData->guidesSettings.rulerMode);
checkRuler->setChecked(prefsData->guidesSettings.rulerMode);
topScratch->setDecimals( decimals );
topScratch->setValue(prefsData->ScratchTop * unitRatio);
leftScratch->setDecimals( decimals );
leftScratch->setValue(prefsData->ScratchLeft * unitRatio);
bottomScratch->setDecimals( decimals );
bottomScratch->setValue(prefsData->ScratchBottom * unitRatio);
rightScratch->setDecimals( decimals );
rightScratch->setValue(prefsData->ScratchRight * unitRatio);
topScratch->setSuffix(unitSuffix);
bottomScratch->setSuffix(unitSuffix);
leftScratch->setSuffix(unitSuffix);
rightScratch->setSuffix(unitSuffix);
gapHorizontal->setSuffix( unitSuffix );
gapHorizontal->setDecimals( decimals );
gapHorizontal->setValue(prefsData->pageSets[prefsData->FacingPages].GapHorizontal * unitRatio);
gapVertical->setSuffix( unitSuffix );
gapVertical->setDecimals( decimals );
gapVertical->setValue(prefsData->pageSets[prefsData->FacingPages].GapVertical * unitRatio);
drawRuler();
CaliSlider->setValue(static_cast<int>(100 * DisScale)-100);
}
else if (current == tabHyphenator) // Hyphenator
{
886,24 → 920,29
else if (current == tabColorManagement && CMSavail) // Color Management
tabColorManagement->restoreDefaults();
else if (current == tabDefaultItemAttributes) // Document Item Attributes
{qDebug("TODO!");
{
defaultAttributesList=tabDefaultItemAttributes->getDocAttributesNames();
tabDefaultItemAttributes->setup(&prefsData->defaultItemAttributes);
}
else if (current == tabDefaultTOCIndexPrefs) // Table of Contents
{qDebug("TODO!");
{
tabDefaultTOCIndexPrefs->setupItemAttrs( defaultAttributesList );
tabDefaultTOCIndexPrefs->setup(&prefsData->defaultToCSetups, NULL);
}
else if (current == tabKeyboardShortcuts) // Keyboard Shortcuts
{qDebug("TODO!");
}
tabKeyboardShortcuts->restoreDefaults();
else if (current == tabExtTools) // External Tools
{qDebug("TODO!");
}
tabExtTools->restoreDefaults(prefsData);
else if (current == tabMiscellaneous) // Miscellaneous
{qDebug("TODO!");
{
AskForSubs->setChecked(prefsData->askBeforeSubstituite);
stylePreview->setChecked(prefsData->haveStylePreview);
startUpDialog->setChecked(prefsData->showStartupDialog);
useStandardLI->setChecked(prefsData->useStandardLI);
paragraphsLI->setValue(prefsData->paragraphsLI);
}
else if (current == tabMiscellaneous) // Plugins
{qDebug("TODO!");
// else if (current == pluginManagerPrefsGui) // Plugins
}
}
 
void Preferences::addPlugins()
{
/branches/Version13x/Scribus/scribus/tabkeyboardshortcutswidget.cpp
88,6 → 88,14
connect( searchTextLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(applySearch(const QString&)));
}
 
void TabKeyboardShortcutsWidget::restoreDefaults()
{
loadableSets->clear();
loadableSets->insertStringList(scanForSets());
keyTable->setSorting(-1);
insertActions();
dispKey(0);
}
 
const QMap<QString, Keys> TabKeyboardShortcutsWidget::getNewKeyMap()
{
/branches/Version13x/Scribus/scribus/tabkeyboardshortcutswidget.h
48,6 → 48,7
bool event( QEvent* ev );
void keyPressEvent(QKeyEvent *k);
void keyReleaseEvent(QKeyEvent *k);
void restoreDefaults();
protected:
QMap<QString,Keys> keyMap;
/branches/Version13x/Scribus/scribus/prefs.h
50,6 → 50,7
class PageLayouts;
class TabExternalToolsWidget;
class TabKeyboardShortcutsWidget;
class PluginManagerPrefsGui;
 
#include "langmgr.h"
 
352,6 → 353,7
PrefsManager* prefsManager;
//Replace with commonstrings when translators have that one done.
QString customText, customTextTR;
PluginManagerPrefsGui* pluginManagerPrefsGui;
 
//! \brief Setup the GUI widgets by values taken from PrefsManager.
void restoreDefaults();