Diffstat (limited to 'noncore/graphics/drawpad/newpagedialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/newpagedialog.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/noncore/graphics/drawpad/newpagedialog.cpp b/noncore/graphics/drawpad/newpagedialog.cpp index 0592af2..ff31aad 100644 --- a/noncore/graphics/drawpad/newpagedialog.cpp +++ b/noncore/graphics/drawpad/newpagedialog.cpp | |||
@@ -12,29 +12,35 @@ | |||
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | 13 | ||
14 | #include "newpagedialog.h" | 14 | #include "newpagedialog.h" |
15 | 15 | ||
16 | #include <qbuttongroup.h> | 16 | #include <qbuttongroup.h> |
17 | #include <qgroupbox.h> | 17 | #include <qgroupbox.h> |
18 | #include <qlabel.h> | 18 | #include <qlabel.h> |
19 | #include <qlayout.h> | 19 | #include <qlayout.h> |
20 | #include <qlineedit.h> | ||
20 | #include <qradiobutton.h> | 21 | #include <qradiobutton.h> |
21 | #include <qspinbox.h> | 22 | #include <qspinbox.h> |
22 | 23 | ||
23 | NewPageDialog::NewPageDialog(uint width, uint height, const QColor& penColor, | 24 | NewPageDialog::NewPageDialog(uint width, uint height, const QColor& penColor, |
24 | const QColor& brushColor, QWidget* parent, const char* name) | 25 | const QColor& brushColor, QWidget* parent, const char* name) |
25 | : QDialog(parent, name, true) | 26 | : QDialog(parent, name, true) |
26 | { | 27 | { |
27 | setCaption(tr("New Page")); | 28 | setCaption(tr("New Page")); |
28 | 29 | ||
29 | m_penColor = penColor; | 30 | m_penColor = penColor; |
30 | m_brushColor = brushColor; | 31 | m_brushColor = brushColor; |
31 | 32 | ||
32 | QGroupBox* sizeGroupBox = new QGroupBox(0, Qt::Vertical, tr("Page Size"), this); | 33 | QGroupBox* generalGroupBox = new QGroupBox(0, Qt::Vertical, tr("General"), this); |
34 | |||
35 | QLabel* titleLabel = new QLabel(tr("Title:"), generalGroupBox); | ||
36 | m_pTitleLineEdit = new QLineEdit(generalGroupBox); | ||
37 | |||
38 | QGroupBox* sizeGroupBox = new QGroupBox(0, Qt::Vertical, tr("Size"), this); | ||
33 | 39 | ||
34 | QLabel* widthLabel = new QLabel(tr("Width:"), sizeGroupBox); | 40 | QLabel* widthLabel = new QLabel(tr("Width:"), sizeGroupBox); |
35 | QLabel* heightLabel = new QLabel(tr("Height:"), sizeGroupBox); | 41 | QLabel* heightLabel = new QLabel(tr("Height:"), sizeGroupBox); |
36 | 42 | ||
37 | m_pWidthSpinBox = new QSpinBox(1, 1024, 1, sizeGroupBox); | 43 | m_pWidthSpinBox = new QSpinBox(1, 1024, 1, sizeGroupBox); |
38 | m_pHeightSpinBox = new QSpinBox(1, 1024, 1, sizeGroupBox); | 44 | m_pHeightSpinBox = new QSpinBox(1, 1024, 1, sizeGroupBox); |
39 | 45 | ||
40 | m_pWidthSpinBox->setValue(width); | 46 | m_pWidthSpinBox->setValue(width); |
@@ -44,32 +50,38 @@ NewPageDialog::NewPageDialog(uint width, uint height, const QColor& penColor, | |||
44 | 50 | ||
45 | QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup); | 51 | QRadioButton* whiteColorRadioButton = new QRadioButton(tr("White"), m_pContentButtonGroup); |
46 | QRadioButton* penColorRadioButton = new QRadioButton(tr("Pen Color"), m_pContentButtonGroup); | 52 | QRadioButton* penColorRadioButton = new QRadioButton(tr("Pen Color"), m_pContentButtonGroup); |
47 | QRadioButton* brushColorRadioButton = new QRadioButton(tr("Fill Color"), m_pContentButtonGroup); | 53 | QRadioButton* brushColorRadioButton = new QRadioButton(tr("Fill Color"), m_pContentButtonGroup); |
48 | 54 | ||
49 | m_pContentButtonGroup->setButton(0); | 55 | m_pContentButtonGroup->setButton(0); |
50 | 56 | ||
51 | QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); | 57 | QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); |
58 | generalGroupBox->layout()->setSpacing(4); | ||
52 | sizeGroupBox->layout()->setSpacing(4); | 59 | sizeGroupBox->layout()->setSpacing(4); |
53 | m_pContentButtonGroup->layout()->setSpacing(4); | 60 | m_pContentButtonGroup->layout()->setSpacing(4); |
61 | QGridLayout* generalLayout = new QGridLayout(generalGroupBox->layout(), 1, 1); | ||
54 | QGridLayout* sizeLayout = new QGridLayout(sizeGroupBox->layout(), 2, 2); | 62 | QGridLayout* sizeLayout = new QGridLayout(sizeGroupBox->layout(), 2, 2); |
55 | QVBoxLayout* contentLayout = new QVBoxLayout(m_pContentButtonGroup->layout()); | 63 | QVBoxLayout* contentLayout = new QVBoxLayout(m_pContentButtonGroup->layout()); |
56 | 64 | ||
65 | generalLayout->addWidget(titleLabel, 0, 0); | ||
66 | generalLayout->addWidget(m_pTitleLineEdit, 0, 1); | ||
67 | |||
57 | sizeLayout->addWidget(widthLabel, 0, 0); | 68 | sizeLayout->addWidget(widthLabel, 0, 0); |
58 | sizeLayout->addWidget(heightLabel, 1, 0); | 69 | sizeLayout->addWidget(heightLabel, 1, 0); |
59 | sizeLayout->addWidget(m_pWidthSpinBox, 0, 1); | 70 | sizeLayout->addWidget(m_pWidthSpinBox, 0, 1); |
60 | sizeLayout->addWidget(m_pHeightSpinBox, 1, 1); | 71 | sizeLayout->addWidget(m_pHeightSpinBox, 1, 1); |
61 | 72 | ||
62 | sizeLayout->setColStretch(1, 1); | 73 | sizeLayout->setColStretch(1, 1); |
63 | 74 | ||
64 | contentLayout->addWidget(whiteColorRadioButton); | 75 | contentLayout->addWidget(whiteColorRadioButton); |
65 | contentLayout->addWidget(penColorRadioButton); | 76 | contentLayout->addWidget(penColorRadioButton); |
66 | contentLayout->addWidget(brushColorRadioButton); | 77 | contentLayout->addWidget(brushColorRadioButton); |
67 | 78 | ||
79 | mainLayout->addWidget(generalGroupBox); | ||
68 | mainLayout->addWidget(sizeGroupBox); | 80 | mainLayout->addWidget(sizeGroupBox); |
69 | mainLayout->addWidget(m_pContentButtonGroup); | 81 | mainLayout->addWidget(m_pContentButtonGroup); |
70 | } | 82 | } |
71 | 83 | ||
72 | NewPageDialog::~NewPageDialog() | 84 | NewPageDialog::~NewPageDialog() |
73 | { | 85 | { |
74 | } | 86 | } |
75 | 87 | ||