Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 15020 → Rev 15021

/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
15,7 → 15,7
#include "units.h"
#include "util_icon.h"
 
Prefs_PDFExport::Prefs_PDFExport(QWidget* parent)
Prefs_PDFExport::Prefs_PDFExport(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent),
cmsEnabled(false),
m_doc(NULL)
/trunk/Scribus/scribus/ui/prefs_paths.cpp
10,8 → 10,9
 
#include "prefs_paths.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_Paths::Prefs_Paths(QWidget* parent)
Prefs_Paths::Prefs_Paths(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_display.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Display : public Prefs_Pane, Ui::Prefs_Display
{
Q_OBJECT
 
public:
Prefs_Display(QWidget* parent=0);
Prefs_Display(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Display();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_itemtools.cpp
15,7 → 15,7
#include "prefsmanager.h"
#include "sampleitem.h"
 
Prefs_ItemTools::Prefs_ItemTools(QWidget* parent)
Prefs_ItemTools::Prefs_ItemTools(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent),
m_doc(NULL),
showFontPreview(false)
/trunk/Scribus/scribus/ui/prefs_pdfexport.h
20,7 → 20,7
Q_OBJECT
 
public:
Prefs_PDFExport(QWidget* parent=0);
Prefs_PDFExport(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_PDFExport();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void restoreDefaults(struct ApplicationPrefs *prefsData, ScribusDoc* doc, const ProfilesL & PDFXProfiles,
/trunk/Scribus/scribus/ui/prefs_hyphenator.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Hyphenator : public Prefs_Pane, Ui::Prefs_Hyphenator
{
Q_OBJECT
 
public:
Prefs_Hyphenator(QWidget* parent=0);
Prefs_Hyphenator(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Hyphenator();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_tableofcontents.h
24,7 → 24,7
Q_OBJECT
 
public:
Prefs_TableOfContents(QWidget* parent=0);
Prefs_TableOfContents(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_TableOfContents();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_typography.cpp
7,8 → 7,9
 
#include "prefs_typography.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_Typography::Prefs_Typography(QWidget* parent)
Prefs_Typography::Prefs_Typography(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_guides.cpp
8,10 → 8,11
#include <QColorDialog>
#include "ui/prefs_guides.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
#include "scrspinbox.h"
#include "units.h"
 
Prefs_Guides::Prefs_Guides(QWidget* parent)
Prefs_Guides::Prefs_Guides(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_imagecache.cpp
10,8 → 10,9
 
#include "prefs_imagecache.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_ImageCache::Prefs_ImageCache(QWidget* parent)
Prefs_ImageCache::Prefs_ImageCache(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_documentitemattributes.h
18,7 → 18,7
Q_OBJECT
 
public:
Prefs_DocumentItemAttributes(QWidget* parent=0);
Prefs_DocumentItemAttributes(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_DocumentItemAttributes();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_userinterface.h
16,12 → 16,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_UserInterface : public Prefs_Pane, Ui::Prefs_UserInterface
{
Q_OBJECT
 
public:
Prefs_UserInterface(QWidget* parent=0);
Prefs_UserInterface(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_UserInterface();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_documentitemattributes.cpp
10,7 → 10,7
#include "ui/prefs_documentitemattributes.h"
#include "prefsstructs.h"
 
Prefs_DocumentItemAttributes::Prefs_DocumentItemAttributes(QWidget* parent)
Prefs_DocumentItemAttributes::Prefs_DocumentItemAttributes(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_display.cpp
13,10 → 13,11
 
#include "prefs_display.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
#include "units.h"
#include "util_icon.h"
 
Prefs_Display::Prefs_Display(QWidget* parent)
Prefs_Display::Prefs_Display(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_plugins.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Plugins : public Prefs_Pane, Ui::Prefs_Plugins
{
Q_OBJECT
 
public:
Prefs_Plugins(QWidget* parent=0);
Prefs_Plugins(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Plugins();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_externaltools.cpp
17,7 → 17,7
 
#include "prefs_externaltools.h"
 
Prefs_ExternalTools::Prefs_ExternalTools(QWidget* parent)
Prefs_ExternalTools::Prefs_ExternalTools(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_documentsetup.h
18,7 → 18,7
Q_OBJECT
 
public:
Prefs_DocumentSetup(QWidget* parent=0);
Prefs_DocumentSetup(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_DocumentSetup();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_colormanagement.cpp
9,8 → 9,9
#include "prefsstructs.h"
#include "scribusstructs.h"
#include "scribuscore.h"
#include "scribusdoc.h"
 
Prefs_ColorManagement::Prefs_ColorManagement(QWidget* parent)
Prefs_ColorManagement::Prefs_ColorManagement(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
m_canChangeMonitorProfile = !ScCore->primaryMainWindow()->HaveDoc;
/trunk/Scribus/scribus/ui/prefs_externaltools.h
18,7 → 18,7
Q_OBJECT
 
public:
Prefs_ExternalTools(QWidget* parent=0);
Prefs_ExternalTools(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_ExternalTools();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_colormanagement.h
12,6 → 12,8
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
typedef QMap<QString,QString> ProfilesL;
 
class SCRIBUS_API Prefs_ColorManagement : public Prefs_Pane, Ui::Prefs_ColorManagement
19,7 → 21,7
Q_OBJECT
 
public:
Prefs_ColorManagement(QWidget* parent=0);
Prefs_ColorManagement(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_ColorManagement();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
void setProfiles(struct ApplicationPrefs *prefsData, ProfilesL *inputProfiles, ProfilesL *inputProfilesCMYK, ProfilesL *printerProfiles, ProfilesL *monitorProfiles);
/trunk/Scribus/scribus/ui/prefs_preflightverifier.h
21,7 → 21,7
Q_OBJECT
 
public:
Prefs_PreflightVerifier(QWidget* parent=0);
Prefs_PreflightVerifier(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_PreflightVerifier();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_printer.cpp
14,7 → 14,7
#include "util_printer.h"
#include "units.h"
 
Prefs_Printer::Prefs_Printer(QWidget* parent)
Prefs_Printer::Prefs_Printer(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_scrapbook.cpp
7,8 → 7,9
 
#include "prefs_scrapbook.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_Scrapbook::Prefs_Scrapbook(QWidget* parent)
Prefs_Scrapbook::Prefs_Scrapbook(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_documentsections.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_DocumentSections : public Prefs_Pane, Ui::Prefs_DocumentSections
{
Q_OBJECT
 
public:
Prefs_DocumentSections(QWidget* parent=0);
Prefs_DocumentSections(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_DocumentSections();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.h
26,7 → 26,7
Q_OBJECT
 
public:
Prefs_KeyboardShortcuts(QWidget* parent=0);
Prefs_KeyboardShortcuts(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_KeyboardShortcuts();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_printer.h
17,7 → 17,7
Q_OBJECT
 
public:
Prefs_Printer(QWidget* parent=0);
Prefs_Printer(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Printer();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_scrapbook.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Scrapbook : public Prefs_Pane, Ui::Prefs_Scrapbook
{
Q_OBJECT
 
public:
Prefs_Scrapbook(QWidget* parent=0);
Prefs_Scrapbook(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Scrapbook();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_paths.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Paths : public Prefs_Pane, Ui::Prefs_Paths
{
Q_OBJECT
 
public:
Prefs_Paths(QWidget* parent=0);
Prefs_Paths(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Paths();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_guides.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Guides : public Prefs_Pane, Ui::Prefs_Guides
{
Q_OBJECT
 
public:
Prefs_Guides(QWidget* parent=0);
Prefs_Guides(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Guides();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_itemtools.h
19,7 → 19,7
Q_OBJECT
 
public:
Prefs_ItemTools(QWidget* parent=0);
Prefs_ItemTools(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_ItemTools();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_fonts.cpp
36,7 → 36,7
#include "fontlistmodel.h"
#include "fontlistview.h"
 
Prefs_Fonts::Prefs_Fonts(QWidget* parent)
Prefs_Fonts::Prefs_Fonts(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent),
m_doc(NULL)
{
/trunk/Scribus/scribus/ui/prefs_userinterface.cpp
13,10 → 13,11
#include "langmgr.h"
#include "prefs_userinterface.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
#include "util.h"
 
 
Prefs_UserInterface::Prefs_UserInterface(QWidget* parent)
Prefs_UserInterface::Prefs_UserInterface(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_miscellaneous.cpp
7,8 → 7,9
 
#include "ui/prefs_miscellaneous.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_Miscellaneous::Prefs_Miscellaneous(QWidget* parent)
Prefs_Miscellaneous::Prefs_Miscellaneous(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_operatortools.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_OperatorTools : public Prefs_Pane, Ui::Prefs_OperatorTools
{
Q_OBJECT
 
public:
Prefs_OperatorTools(QWidget* parent=0);
Prefs_OperatorTools(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_OperatorTools();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
17,7 → 17,7
#include "units.h"
#include "util.h"
 
Prefs_DocumentSetup::Prefs_DocumentSetup(QWidget* parent)
Prefs_DocumentSetup::Prefs_DocumentSetup(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_miscellaneous.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Miscellaneous : public Prefs_Pane, Ui::Prefs_Miscellaneous
{
Q_OBJECT
 
public:
Prefs_Miscellaneous(QWidget* parent=0);
Prefs_Miscellaneous(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Miscellaneous();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_operatortools.cpp
10,7 → 10,9
#include "scrspinbox.h"
#include "units.h"
 
Prefs_OperatorTools::Prefs_OperatorTools(QWidget* parent)
#include "scribusdoc.h"
 
Prefs_OperatorTools::Prefs_OperatorTools(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_hyphenator.cpp
11,11 → 11,12
#include "langmgr.h"
#include "prefsstructs.h"
#include "scribuscore.h" //FIXME: for the ScCore call (remove this call)
#include "scribusdoc.h"
#include "scribus.h" //FIXME: for the ScCore call (remove this call)
#include "util_icon.h"
#include "util.h"
 
Prefs_Hyphenator::Prefs_Hyphenator(QWidget* parent)
Prefs_Hyphenator::Prefs_Hyphenator(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_documentsections.cpp
7,8 → 7,9
 
#include "prefs_documentsections.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_DocumentSections::Prefs_DocumentSections(QWidget* parent)
Prefs_DocumentSections::Prefs_DocumentSections(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_typography.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_Typography : public Prefs_Pane, Ui::Prefs_Typography
{
Q_OBJECT
 
public:
Prefs_Typography(QWidget* parent=0);
Prefs_Typography(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Typography();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_documentinformation.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_DocumentInformation : public Prefs_Pane, Ui::Prefs_DocumentInformation
{
Q_OBJECT
 
public:
Prefs_DocumentInformation(QWidget* parent=0);
Prefs_DocumentInformation(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_DocumentInformation();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/prefs_imagecache.h
12,12 → 12,14
#include "prefs_pane.h"
#include "scribusapi.h"
 
class ScribusDoc;
 
class SCRIBUS_API Prefs_ImageCache : public Prefs_Pane, Ui::Prefs_ImageCache
{
Q_OBJECT
 
public:
Prefs_ImageCache(QWidget* parent=0);
Prefs_ImageCache(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_ImageCache();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
/trunk/Scribus/scribus/ui/preferencesdialog.cpp
25,6 → 25,29
 
PreferencesDialog::PreferencesDialog(QWidget* parent, ApplicationPrefs& prefsData, ScribusDoc* doc)
: QDialog(parent),
prefs_ColorManagement(0),
prefs_UserInterface(0),
prefs_DocumentInformation(0),
prefs_DocumentSections(0),
prefs_DocumentSetup(0),
prefs_Display(0),
prefs_ExternalTools(0),
prefs_Guides(0),
prefs_KeyboardShortcuts(0),
prefs_Paths(0),
prefs_Printer(0),
prefs_Hyphenator(0),
prefs_Miscellaneous(0),
prefs_Plugins(0),prefs_PreflightVerifier(0),
prefs_Scrapbook(0),
prefs_Typography(0),
prefs_ItemTools(0),
prefs_OperatorTools(0),
prefs_Fonts(0),
prefs_TableOfContents(0),
prefs_PDFExport(0),
prefs_DocumentItemAttributes(0),
prefs_ImageCache(0),
counter(0),
m_Doc(doc)
{
33,61 → 56,59
setupListWidget();
while (prefsStackWidget->currentWidget()!=0)
prefsStackWidget->removeWidget(prefsStackWidget->currentWidget());
prefs_UserInterface = new Prefs_UserInterface(prefsStackWidget);
prefs_UserInterface = new Prefs_UserInterface(prefsStackWidget, m_Doc);
addItem( tr("User Interface"), loadIcon("scribus.png"), prefs_UserInterface);
prefs_Paths = new Prefs_Paths(prefsStackWidget);
prefs_Paths = new Prefs_Paths(prefsStackWidget, m_Doc);
addItem( tr("Paths"), loadIcon("22/system-file-manager.png"), prefs_Paths);
prefs_DocumentSetup = new Prefs_DocumentSetup(prefsStackWidget);
prefs_DocumentSetup = new Prefs_DocumentSetup(prefsStackWidget, m_Doc);
addItem( tr("Document Setup"), loadIcon("scribusdoc.png"), prefs_DocumentSetup);
if (doc)
{
prefs_DocumentInformation = new Prefs_DocumentInformation(prefsStackWidget);
prefs_DocumentInformation = new Prefs_DocumentInformation(prefsStackWidget, m_Doc);
addItem( tr("Document Information"), loadIcon("documentinfo32.png"), prefs_DocumentInformation);
}
else prefs_DocumentInformation=0;
prefs_Guides = new Prefs_Guides(prefsStackWidget);
prefs_Guides = new Prefs_Guides(prefsStackWidget, m_Doc);
addItem( tr("Guides"), loadIcon("guides.png"), prefs_Guides);
prefs_Typography = new Prefs_Typography(prefsStackWidget);
prefs_Typography = new Prefs_Typography(prefsStackWidget, m_Doc);
addItem( tr("Typography"), loadIcon("typography.png"), prefs_Typography);
prefs_ItemTools = new Prefs_ItemTools(prefsStackWidget);
prefs_ItemTools = new Prefs_ItemTools(prefsStackWidget, m_Doc);
addItem( tr("Item Tools"), loadIcon("tools.png"), prefs_ItemTools);
prefs_OperatorTools = new Prefs_OperatorTools(prefsStackWidget);
prefs_OperatorTools = new Prefs_OperatorTools(prefsStackWidget, m_Doc);
addItem( tr("Operator Tools"), loadIcon("tools.png"), prefs_OperatorTools);
prefs_Hyphenator = new Prefs_Hyphenator(prefsStackWidget);
prefs_Hyphenator = new Prefs_Hyphenator(prefsStackWidget, m_Doc);
addItem( tr("Hyphenator"), loadIcon("hyphenate.png"), prefs_Hyphenator);
prefs_Fonts = new Prefs_Fonts(prefsStackWidget);
prefs_Fonts = new Prefs_Fonts(prefsStackWidget, m_Doc);
addItem( tr("Fonts"), loadIcon("22/preferences-desktop-font.png"), prefs_Fonts);
prefs_ColorManagement = new Prefs_ColorManagement(prefsStackWidget);
prefs_ColorManagement = new Prefs_ColorManagement(prefsStackWidget, m_Doc);
addItem( tr("Color Management"), loadIcon("blend.png"), prefs_ColorManagement);
prefs_Printer = new Prefs_Printer(prefsStackWidget);
prefs_Printer = new Prefs_Printer(prefsStackWidget, m_Doc);
addItem( tr("Printer"), loadIcon("22/printer.png"), prefs_Printer);
prefs_PDFExport = new Prefs_PDFExport(prefsStackWidget);
prefs_PDFExport = new Prefs_PDFExport(prefsStackWidget, m_Doc);
addItem( tr("PDF Export"), loadIcon("acroread32.png"), prefs_PDFExport);
prefs_PreflightVerifier = new Prefs_PreflightVerifier(prefsStackWidget);
prefs_PreflightVerifier = new Prefs_PreflightVerifier(prefsStackWidget, m_Doc);
addItem( tr("Preflight Verifier"), loadIcon("checkdoc.png"), prefs_PreflightVerifier);
prefs_DocumentItemAttributes = new Prefs_DocumentItemAttributes(prefsStackWidget);
prefs_DocumentItemAttributes = new Prefs_DocumentItemAttributes(prefsStackWidget, m_Doc);
addItem( tr("Document Item Attributes"), loadIcon("docattributes.png"), prefs_DocumentItemAttributes);
prefs_TableOfContents = new Prefs_TableOfContents(prefsStackWidget);
prefs_TableOfContents = new Prefs_TableOfContents(prefsStackWidget, m_Doc);
addItem( tr("Tables of Contents"), loadIcon("tabtocindex.png"), prefs_TableOfContents);
if (doc)
{
prefs_DocumentSections = new Prefs_DocumentSections(prefsStackWidget);
prefs_DocumentSections = new Prefs_DocumentSections(prefsStackWidget, m_Doc);
addItem( tr("Sections"), loadIcon("tabtocindex.png"), prefs_DocumentSections);
}
else prefs_DocumentSections=0;
prefs_KeyboardShortcuts = new Prefs_KeyboardShortcuts(prefsStackWidget);
prefs_KeyboardShortcuts = new Prefs_KeyboardShortcuts(prefsStackWidget, m_Doc);
addItem( tr("Keyboard Shortcuts"), loadIcon("22/preferences-desktop-keyboard-shortcuts.png"), prefs_KeyboardShortcuts);
prefs_Scrapbook = new Prefs_Scrapbook(prefsStackWidget);
prefs_Scrapbook = new Prefs_Scrapbook(prefsStackWidget, m_Doc);
addItem( tr("Scrapbook"), loadIcon("scrap.png"), prefs_Scrapbook);
prefs_Display = new Prefs_Display(prefsStackWidget);
prefs_Display = new Prefs_Display(prefsStackWidget, m_Doc);
addItem( tr("Display"), loadIcon("22/video-display.png"), prefs_Display);
prefs_ExternalTools = new Prefs_ExternalTools(prefsStackWidget);
prefs_ExternalTools = new Prefs_ExternalTools(prefsStackWidget, m_Doc);
addItem( tr("External Tools"), loadIcon("externaltools.png"), prefs_ExternalTools);
prefs_Miscellaneous = new Prefs_Miscellaneous(prefsStackWidget);
prefs_Miscellaneous = new Prefs_Miscellaneous(prefsStackWidget, m_Doc);
addItem( tr("Miscellaneous"), loadIcon("misc.png"), prefs_Miscellaneous);
prefs_Plugins = new Prefs_Plugins(prefsStackWidget);
prefs_Plugins = new Prefs_Plugins(prefsStackWidget, m_Doc);
addItem( tr("Plugins"), loadIcon("plugins.png"), prefs_Plugins);
prefs_ImageCache = new Prefs_ImageCache(prefsStackWidget);
prefs_ImageCache = new Prefs_ImageCache(prefsStackWidget, m_Doc);
addItem( tr("Image Cache"), loadIcon("22/image-x-generic.png"), prefs_ImageCache);
arrangeIcons();
if (preferencesTypeList->count()>0)
131,6 → 152,8
prefs_UserInterface->restoreDefaults(&localPrefs);
prefs_Paths->restoreDefaults(&localPrefs);
prefs_DocumentSetup->restoreDefaults(&localPrefs);
if (prefs_DocumentInformation)
prefs_DocumentInformation->restoreDefaults(&localPrefs);
prefs_Guides->restoreDefaults(&localPrefs);
prefs_Typography->restoreDefaults(&localPrefs);
prefs_ItemTools->restoreDefaults(&localPrefs);
143,6 → 166,8
prefs_PreflightVerifier->restoreDefaults(&localPrefs);
prefs_DocumentItemAttributes->restoreDefaults(&localPrefs);
prefs_TableOfContents->restoreDefaults(&localPrefs);
if (prefs_DocumentSections)
prefs_DocumentSections->restoreDefaults(&localPrefs);
prefs_KeyboardShortcuts->restoreDefaults(&localPrefs);
prefs_ColorManagement->restoreDefaults(&localPrefs);
prefs_ColorManagement->setProfiles(&localPrefs, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
159,6 → 184,8
prefs_UserInterface->saveGuiToPrefs(&localPrefs);
prefs_Paths->saveGuiToPrefs(&localPrefs);
prefs_DocumentSetup->saveGuiToPrefs(&localPrefs);
if (prefs_DocumentInformation)
prefs_DocumentInformation->saveGuiToPrefs(&localPrefs);
prefs_Guides->saveGuiToPrefs(&localPrefs);
prefs_Typography->saveGuiToPrefs(&localPrefs);
prefs_ItemTools->saveGuiToPrefs(&localPrefs);
170,6 → 197,8
prefs_PreflightVerifier->saveGuiToPrefs(&localPrefs);
prefs_DocumentItemAttributes->saveGuiToPrefs(&localPrefs);
prefs_TableOfContents->saveGuiToPrefs(&localPrefs);
if (prefs_DocumentSections)
prefs_DocumentSections->saveGuiToPrefs(&localPrefs);
prefs_KeyboardShortcuts->saveGuiToPrefs(&localPrefs);
prefs_ColorManagement->saveGuiToPrefs(&localPrefs);
prefs_Scrapbook->saveGuiToPrefs(&localPrefs);
/trunk/Scribus/scribus/ui/prefs_documentinformation.cpp
7,8 → 7,9
 
#include "prefs_documentinformation.h"
#include "prefsstructs.h"
#include "scribusdoc.h"
 
Prefs_DocumentInformation::Prefs_DocumentInformation(QWidget* parent)
Prefs_DocumentInformation::Prefs_DocumentInformation(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
13,7 → 13,7
#include "commonstrings.h"
#include "util.h"
 
Prefs_TableOfContents::Prefs_TableOfContents(QWidget* parent)
Prefs_TableOfContents::Prefs_TableOfContents(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent),
currDoc(NULL)
{
/trunk/Scribus/scribus/ui/prefs_keyboardshortcuts.cpp
24,7 → 24,7
#include "util.h"
#include "util_icon.h"
 
Prefs_KeyboardShortcuts::Prefs_KeyboardShortcuts(QWidget* parent)
Prefs_KeyboardShortcuts::Prefs_KeyboardShortcuts(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
9,7 → 9,7
#include "prefsstructs.h"
#include "util.h"
 
Prefs_PreflightVerifier::Prefs_PreflightVerifier(QWidget* parent)
Prefs_PreflightVerifier::Prefs_PreflightVerifier(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_plugins.cpp
15,10 → 15,11
#include "scraction.h"
#include "scplugin.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribus.h"
#include "commonstrings.h"
 
Prefs_Plugins::Prefs_Plugins(QWidget* parent)
Prefs_Plugins::Prefs_Plugins(QWidget* parent, ScribusDoc* doc)
: Prefs_Pane(parent)
{
setupUi(this);
/trunk/Scribus/scribus/ui/prefs_fonts.h
23,7 → 23,7
Q_OBJECT
 
public:
Prefs_Fonts(QWidget* parent=0);
Prefs_Fonts(QWidget* parent, ScribusDoc* doc=NULL);
~Prefs_Fonts();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;