Diffstat (limited to 'noncore/graphics/drawpad/newpagedialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/newpagedialog.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/noncore/graphics/drawpad/newpagedialog.cpp b/noncore/graphics/drawpad/newpagedialog.cpp index b1b26ef..5c31978 100644 --- a/noncore/graphics/drawpad/newpagedialog.cpp +++ b/noncore/graphics/drawpad/newpagedialog.cpp | |||
@@ -20,14 +20,14 @@ | |||
20 | #include <qradiobutton.h> | 20 | #include <qradiobutton.h> |
21 | #include <qspinbox.h> | 21 | #include <qspinbox.h> |
22 | 22 | ||
23 | NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundColor, | 23 | NewPageDialog::NewPageDialog(uint width, uint height, const QColor& penColor, |
24 | const QColor& backgroundColor, QWidget* parent, const char* name) | 24 | const QColor& brushColor, QWidget* parent, const char* name) |
25 | : QDialog(parent, name, true) | 25 | : QDialog(parent, name, true) |
26 | { | 26 | { |
27 | setCaption(tr("New Page")); | 27 | setCaption(tr("New Page")); |
28 | 28 | ||
29 | m_foregroundColor = foregroundColor; | 29 | m_penColor = penColor; |
30 | m_backgroundColor = backgroundColor; | 30 | m_brushColor = brushColor; |
31 | 31 | ||
32 | QGroupBox* sizeGroupBox = new QGroupBox(0, Qt::Vertical, tr("Page Size"), this); | 32 | QGroupBox* sizeGroupBox = new QGroupBox(0, Qt::Vertical, tr("Page Size"), this); |
33 | 33 | ||
@@ -40,11 +40,11 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo | |||
40 | m_pWidthSpinBox->setValue(width); | 40 | m_pWidthSpinBox->setValue(width); |
41 | m_pHeightSpinBox->setValue(height); | 41 | m_pHeightSpinBox->setValue(height); |
42 | 42 | ||
43 | m_pContentButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Contents"), this); | 43 | m_pContentButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Background"), this); |
44 | 44 | ||
45 | QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup); | 45 | QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup); |
46 | QRadioButton* foregroundColorRadioButton = new QRadioButton(tr("Foreground Color"), m_pContentButtonGroup); | 46 | QRadioButton* penColorRadioButton = new QRadioButton(tr("Pen Color"), m_pContentButtonGroup); |
47 | QRadioButton* backgroundColorRadioButton = new QRadioButton(tr("Background Color"), m_pContentButtonGroup); | 47 | QRadioButton* brushColorRadioButton = new QRadioButton(tr("Brush Color"), m_pContentButtonGroup); |
48 | 48 | ||
49 | m_pContentButtonGroup->setButton(0); | 49 | m_pContentButtonGroup->setButton(0); |
50 | 50 | ||
@@ -62,8 +62,8 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& foregroundCo | |||
62 | sizeLayout->setColStretch(1, 1); | 62 | sizeLayout->setColStretch(1, 1); |
63 | 63 | ||
64 | contentLayout->addWidget(whiteColorRadioButton); | 64 | contentLayout->addWidget(whiteColorRadioButton); |
65 | contentLayout->addWidget(foregroundColorRadioButton); | 65 | contentLayout->addWidget(penColorRadioButton); |
66 | contentLayout->addWidget(backgroundColorRadioButton); | 66 | contentLayout->addWidget(brushColorRadioButton); |
67 | 67 | ||
68 | mainLayout->addWidget(sizeGroupBox); | 68 | mainLayout->addWidget(sizeGroupBox); |
69 | mainLayout->addWidget(m_pContentButtonGroup); | 69 | mainLayout->addWidget(m_pContentButtonGroup); |
@@ -90,10 +90,10 @@ const QColor& NewPageDialog::selectedColor() | |||
90 | return (Qt::white); | 90 | return (Qt::white); |
91 | break; | 91 | break; |
92 | case 1: | 92 | case 1: |
93 | return (m_foregroundColor); | 93 | return (m_penColor); |
94 | break; | 94 | break; |
95 | case 2: | 95 | case 2: |
96 | return (m_backgroundColor); | 96 | return (m_brushColor); |
97 | break; | 97 | break; |
98 | default: | 98 | default: |
99 | return (Qt::white); | 99 | return (Qt::white); |