Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 14091 → Rev 14090

/trunk/Scribus/scribus/ui/preferencesdialog.cpp
104,7 → 104,6
 
void PreferencesDialog::setupGui()
{
prefs_Scrapbook->restoreDefaults(&localPrefs);
prefs_Display->restoreDefaults(&localPrefs);
}
 
229,7 → 228,6
 
void PreferencesDialog::saveGuiToPrefs()
{
prefs_Scrapbook->saveGuiToPrefs(&localPrefs);
prefs_Display->saveGuiToPrefs(&localPrefs);
}
 
/trunk/Scribus/scribus/ui/prefs_scrapbookbase.ui
15,7 → 15,7
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="titleLabel">
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>14</pointsize>
51,7 → 51,7
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="autoSendCopiedToScrapCheckBox">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Send Copied Items Automatically to the Scrapbook</string>
</property>
58,7 → 58,7
</widget>
</item>
<item>
<widget class="QCheckBox" name="keepCopiedAcrossSessionsCheckBox">
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>Keep Copied Items Permanently Across Sessions</string>
</property>
70,17 → 70,14
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QLabel" name="itemCountKeptInScrapbookLabel">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Number of Copied Items to Keep in Scrapbook</string>
</property>
<property name="buddy">
<cstring>itemCountKeptInScrapbookSpinBox</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="itemCountKeptInScrapbookSpinBox"/>
<widget class="QSpinBox" name="spinBox"/>
</item>
<item>
<spacer name="horizontalSpacer">
/trunk/Scribus/scribus/ui/prefs_scrapbook.cpp
6,13 → 6,12
*/
 
#include "prefs_scrapbook.h"
#include "prefsstructs.h"
 
Prefs_Scrapbook::Prefs_Scrapbook(QWidget* parent)
: Prefs_Pane(parent)
: QWidget(parent)
{
setupUi(this);
languageChange();
 
}
 
Prefs_Scrapbook::~Prefs_Scrapbook()
19,26 → 18,3
{
}
 
void Prefs_Scrapbook::languageChange()
{
autoSendCopiedToScrapCheckBox->setToolTip( "<qt>" + tr( "" ) + "</qt>");
keepCopiedAcrossSessionsCheckBox->setToolTip( "<qt>" + tr( "" ) + "</qt>" );
itemCountKeptInScrapbookSpinBox->setToolTip( "<qt>" + tr("") + "</qt>");
}
 
void Prefs_Scrapbook::restoreDefaults(struct ApplicationPrefs *prefsData)
{
 
autoSendCopiedToScrapCheckBox->setChecked(prefsData->scrapbookPrefs.doCopyToScrapbook);
keepCopiedAcrossSessionsCheckBox->setChecked(prefsData->scrapbookPrefs.persistentScrapbook);
itemCountKeptInScrapbookSpinBox->setValue(prefsData->scrapbookPrefs.numScrapbookCopies);
 
}
 
void Prefs_Scrapbook::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
{
prefsData->scrapbookPrefs.doCopyToScrapbook=autoSendCopiedToScrapCheckBox->isChecked();
prefsData->scrapbookPrefs.persistentScrapbook=keepCopiedAcrossSessionsCheckBox->isChecked();
prefsData->scrapbookPrefs.numScrapbookCopies=itemCountKeptInScrapbookSpinBox->value();
}
 
/trunk/Scribus/scribus/ui/prefs_scrapbook.h
9,10 → 9,9
#define PREFS_SCRAPBOOK_H
 
#include "ui_prefs_scrapbookbase.h"
#include "prefs_pane.h"
#include "scribusapi.h"
 
class SCRIBUS_API Prefs_Scrapbook : public Prefs_Pane, Ui::Prefs_Scrapbook
class SCRIBUS_API Prefs_Scrapbook : public QWidget, Ui::Prefs_Scrapbook
{
Q_OBJECT
 
19,11 → 18,6
public:
Prefs_Scrapbook(QWidget* parent=0);
~Prefs_Scrapbook();
virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
 
public slots:
void languageChange();
};
 
#endif // PREFS_SCRAPBOOK_H