author | zecke <zecke> | 2004-03-13 23:00:19 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 23:00:19 (UTC) |
commit | 874af2f5ce2d48a460d5d9fa1d6535b68e5966da (patch) (unidiff) | |
tree | 50c2f0dbe0b0aa4b0ef53c537d6005a4afcf210d /noncore | |
parent | 8f5b7d0ee495901cdd9aa7901c445d82827e99b1 (diff) | |
download | opie-874af2f5ce2d48a460d5d9fa1d6535b68e5966da.zip opie-874af2f5ce2d48a460d5d9fa1d6535b68e5966da.tar.gz opie-874af2f5ce2d48a460d5d9fa1d6535b68e5966da.tar.bz2 |
ODP namespace adjustment
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 4 | ||||
-rw-r--r-- | noncore/graphics/drawpad/exportdialog.cpp | 5 | ||||
-rw-r--r-- | noncore/graphics/drawpad/importdialog.cpp | 7 | ||||
-rw-r--r-- | noncore/graphics/drawpad/importdialog.h | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/main.cpp | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index 55b23cc..3331193 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp | |||
@@ -26,37 +26,39 @@ | |||
26 | #include "page.h" | 26 | #include "page.h" |
27 | #include "pageinformationdialog.h" | 27 | #include "pageinformationdialog.h" |
28 | #include "pointtool.h" | 28 | #include "pointtool.h" |
29 | #include "rectangletool.h" | 29 | #include "rectangletool.h" |
30 | #include "texttool.h" | 30 | #include "texttool.h" |
31 | #include "thumbnailview.h" | 31 | #include "thumbnailview.h" |
32 | 32 | ||
33 | #include <opie2/qcolordialog.h> | 33 | #include <opie2/qcolordialog.h> |
34 | #include <opie2/ocolorpopupmenu.h> | 34 | #include <opie2/ocolorpopupmenu.h> |
35 | 35 | ||
36 | #include <qpe/applnk.h> | 36 | #include <qpe/applnk.h> |
37 | #include <qpe/config.h> | 37 | #include <qpe/config.h> |
38 | #include <qpe/qpetoolbar.h> | 38 | #include <qtoolbar.h> |
39 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
40 | #include <qpe/qpeapplication.h> | 40 | #include <qpe/qpeapplication.h> |
41 | 41 | ||
42 | #include <qmenubar.h> | 42 | #include <qmenubar.h> |
43 | #include <qaction.h> | 43 | #include <qaction.h> |
44 | #include <qfile.h> | 44 | #include <qfile.h> |
45 | #include <qmessagebox.h> | 45 | #include <qmessagebox.h> |
46 | #include <qspinbox.h> | 46 | #include <qspinbox.h> |
47 | #include <qtoolbutton.h> | 47 | #include <qtoolbutton.h> |
48 | #include <qtooltip.h> | 48 | #include <qtooltip.h> |
49 | #include <qwhatsthis.h> | 49 | #include <qwhatsthis.h> |
50 | 50 | ||
51 | using namespace Opie::Ui; | ||
52 | using namespace Opie::Ui; | ||
51 | DrawPad::DrawPad(QWidget* parent, const char* name, WFlags /*fl*/ ) | 53 | DrawPad::DrawPad(QWidget* parent, const char* name, WFlags /*fl*/ ) |
52 | : QMainWindow(parent, name, WStyle_ContextHelp) | 54 | : QMainWindow(parent, name, WStyle_ContextHelp) |
53 | { | 55 | { |
54 | // init members | 56 | // init members |
55 | 57 | ||
56 | m_pDrawPadCanvas = new DrawPadCanvas(this, this); | 58 | m_pDrawPadCanvas = new DrawPadCanvas(this, this); |
57 | 59 | ||
58 | connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateView())); | 60 | connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateView())); |
59 | 61 | ||
60 | setCentralWidget(m_pDrawPadCanvas); | 62 | setCentralWidget(m_pDrawPadCanvas); |
61 | 63 | ||
62 | // init menu | 64 | // init menu |
diff --git a/noncore/graphics/drawpad/exportdialog.cpp b/noncore/graphics/drawpad/exportdialog.cpp index 169acef..f053bb5 100644 --- a/noncore/graphics/drawpad/exportdialog.cpp +++ b/noncore/graphics/drawpad/exportdialog.cpp | |||
@@ -17,24 +17,25 @@ | |||
17 | 17 | ||
18 | #include <qbuttongroup.h> | 18 | #include <qbuttongroup.h> |
19 | #include <qcombobox.h> | 19 | #include <qcombobox.h> |
20 | #include <qimage.h> | 20 | #include <qimage.h> |
21 | #include <qlabel.h> | 21 | #include <qlabel.h> |
22 | #include <qlayout.h> | 22 | #include <qlayout.h> |
23 | #include <qlineedit.h> | 23 | #include <qlineedit.h> |
24 | #include <qradiobutton.h> | 24 | #include <qradiobutton.h> |
25 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
26 | 26 | ||
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | 28 | ||
29 | using namespace Opie::Ui; | ||
29 | ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const char* name) | 30 | ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const char* name) |
30 | : QDialog(parent, name, true) | 31 | : QDialog(parent, name, true) |
31 | { | 32 | { |
32 | setCaption(tr("DrawPad - Export")); | 33 | setCaption(tr("DrawPad - Export")); |
33 | 34 | ||
34 | m_pageAt = pageAt; | 35 | m_pageAt = pageAt; |
35 | m_pageCount = pageCount; | 36 | m_pageCount = pageCount; |
36 | 37 | ||
37 | QButtonGroup* selectionButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Page Selection"), this); | 38 | QButtonGroup* selectionButtonGroup = new QButtonGroup(0, Qt::Vertical, tr("Page Selection"), this); |
38 | connect(selectionButtonGroup, SIGNAL(pressed(int)), this, SLOT(selectionChanged(int))); | 39 | connect(selectionButtonGroup, SIGNAL(pressed(int)), this, SLOT(selectionChanged(int))); |
39 | 40 | ||
40 | QRadioButton* selectAllRadioButton = new QRadioButton(tr("All"), selectionButtonGroup); | 41 | QRadioButton* selectAllRadioButton = new QRadioButton(tr("All"), selectionButtonGroup); |
@@ -57,26 +58,26 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c | |||
57 | 58 | ||
58 | QGroupBox* exportGroupBox = new QGroupBox(0, Qt::Vertical, tr("Export As"), this); | 59 | QGroupBox* exportGroupBox = new QGroupBox(0, Qt::Vertical, tr("Export As"), this); |
59 | 60 | ||
60 | QLabel* nameLabel = new QLabel(tr("Name:"), exportGroupBox); | 61 | QLabel* nameLabel = new QLabel(tr("Name:"), exportGroupBox); |
61 | QLabel* formatLabel = new QLabel(tr("Format:"), exportGroupBox); | 62 | QLabel* formatLabel = new QLabel(tr("Format:"), exportGroupBox); |
62 | 63 | ||
63 | m_pNameLineEdit = new QLineEdit(exportGroupBox); | 64 | m_pNameLineEdit = new QLineEdit(exportGroupBox); |
64 | 65 | ||
65 | m_pFormatComboBox = new QComboBox(exportGroupBox); | 66 | m_pFormatComboBox = new QComboBox(exportGroupBox); |
66 | m_pFormatComboBox->insertStrList(QImageIO::outputFormats()); | 67 | m_pFormatComboBox->insertStrList(QImageIO::outputFormats()); |
67 | 68 | ||
68 | MimeTypes types; types.insert( tr("All Images"), "image/*" ); | 69 | MimeTypes types; types.insert( tr("All Images"), "image/*" ); |
69 | Opie::OFileSelector* fileSelector = new Opie::OFileSelector(this, Opie::OFileSelector::FileSelector, | 70 | OFileSelector* fileSelector = new OFileSelector(this, OFileSelector::FileSelector, |
70 | Opie::OFileSelector::Normal, | 71 | OFileSelector::Normal, |
71 | QString::null, QString::null, | 72 | QString::null, QString::null, |
72 | types ); | 73 | types ); |
73 | fileSelector->setNameVisible( false ); | 74 | fileSelector->setNameVisible( false ); |
74 | 75 | ||
75 | QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); | 76 | QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); |
76 | selectionButtonGroup->layout()->setSpacing(4); | 77 | selectionButtonGroup->layout()->setSpacing(4); |
77 | exportGroupBox->layout()->setSpacing(4); | 78 | exportGroupBox->layout()->setSpacing(4); |
78 | QGridLayout* selectionLayout = new QGridLayout(selectionButtonGroup->layout(), 2, 2); | 79 | QGridLayout* selectionLayout = new QGridLayout(selectionButtonGroup->layout(), 2, 2); |
79 | QHBoxLayout* rangeLayout = new QHBoxLayout(); | 80 | QHBoxLayout* rangeLayout = new QHBoxLayout(); |
80 | QGridLayout* exportLayout = new QGridLayout(exportGroupBox->layout(), 2, 2); | 81 | QGridLayout* exportLayout = new QGridLayout(exportGroupBox->layout(), 2, 2); |
81 | 82 | ||
82 | selectionLayout->addWidget(selectAllRadioButton, 0, 0); | 83 | selectionLayout->addWidget(selectAllRadioButton, 0, 0); |
diff --git a/noncore/graphics/drawpad/importdialog.cpp b/noncore/graphics/drawpad/importdialog.cpp index 4fc0a0e..a2f4c40 100644 --- a/noncore/graphics/drawpad/importdialog.cpp +++ b/noncore/graphics/drawpad/importdialog.cpp | |||
@@ -12,33 +12,34 @@ | |||
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | 13 | ||
14 | #include "importdialog.h" | 14 | #include "importdialog.h" |
15 | 15 | ||
16 | #include <qpe/mimetype.h> | 16 | #include <qpe/mimetype.h> |
17 | 17 | ||
18 | #include <qcheckbox.h> | 18 | #include <qcheckbox.h> |
19 | #include <qimage.h> | 19 | #include <qimage.h> |
20 | #include <qlabel.h> | 20 | #include <qlabel.h> |
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qpushbutton.h> | 22 | #include <qpushbutton.h> |
23 | 23 | ||
24 | using namespace Opie::Ui; | ||
24 | ImportDialog::ImportDialog(QWidget* parent, const char* name) | 25 | ImportDialog::ImportDialog(QWidget* parent, const char* name) |
25 | : QDialog(parent, name, true) | 26 | : QDialog(parent, name, true) |
26 | { | 27 | { |
27 | setCaption(tr("DrawPad - Import")); | 28 | setCaption(tr("DrawPad - Import")); |
28 | 29 | ||
29 | MimeTypes types; types.insert( tr("All images"),"image/*" ); | 30 | MimeTypes types; types.insert( tr("All images"),"image/*" ); |
30 | m_pFileSelector = new Opie::OFileSelector(this, | 31 | m_pFileSelector = new OFileSelector(this, |
31 | Opie::OFileSelector::FileSelector, | 32 | OFileSelector::FileSelector, |
32 | Opie::OFileSelector::Normal, | 33 | OFileSelector::Normal, |
33 | QString::null, | 34 | QString::null, |
34 | QString::null, types ); | 35 | QString::null, types ); |
35 | m_pFileSelector->setNameVisible( false ); | 36 | m_pFileSelector->setNameVisible( false ); |
36 | connect(m_pFileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(fileChanged())); | 37 | connect(m_pFileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(fileChanged())); |
37 | 38 | ||
38 | m_pPreviewLabel = new QLabel(this); | 39 | m_pPreviewLabel = new QLabel(this); |
39 | m_pPreviewLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken); | 40 | m_pPreviewLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken); |
40 | m_pPreviewLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); | 41 | m_pPreviewLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); |
41 | m_pPreviewLabel->setFixedSize(114, 114); | 42 | m_pPreviewLabel->setFixedSize(114, 114); |
42 | m_pPreviewLabel->setBackgroundMode(QWidget::PaletteMid); | 43 | m_pPreviewLabel->setBackgroundMode(QWidget::PaletteMid); |
43 | 44 | ||
44 | m_pAutomaticPreviewCheckBox = new QCheckBox(tr("Automatic preview"), this); | 45 | m_pAutomaticPreviewCheckBox = new QCheckBox(tr("Automatic preview"), this); |
diff --git a/noncore/graphics/drawpad/importdialog.h b/noncore/graphics/drawpad/importdialog.h index 16227d2..0e0727a 100644 --- a/noncore/graphics/drawpad/importdialog.h +++ b/noncore/graphics/drawpad/importdialog.h | |||
@@ -29,18 +29,18 @@ class ImportDialog : public QDialog | |||
29 | 29 | ||
30 | public: | 30 | public: |
31 | ImportDialog(QWidget* parent = 0, const char* name = 0); | 31 | ImportDialog(QWidget* parent = 0, const char* name = 0); |
32 | ~ImportDialog(); | 32 | ~ImportDialog(); |
33 | 33 | ||
34 | const DocLnk* selected(); | 34 | const DocLnk* selected(); |
35 | 35 | ||
36 | private slots: | 36 | private slots: |
37 | void fileChanged(); | 37 | void fileChanged(); |
38 | void preview(); | 38 | void preview(); |
39 | 39 | ||
40 | private: | 40 | private: |
41 | Opie::OFileSelector* m_pFileSelector; | 41 | Opie::Ui::OFileSelector* m_pFileSelector; |
42 | QLabel* m_pPreviewLabel; | 42 | QLabel* m_pPreviewLabel; |
43 | QCheckBox* m_pAutomaticPreviewCheckBox; | 43 | QCheckBox* m_pAutomaticPreviewCheckBox; |
44 | }; | 44 | }; |
45 | 45 | ||
46 | #endif // IMPORTDIALOG_H | 46 | #endif // IMPORTDIALOG_H |
diff --git a/noncore/graphics/drawpad/main.cpp b/noncore/graphics/drawpad/main.cpp index a6c666b..e48bb2e 100644 --- a/noncore/graphics/drawpad/main.cpp +++ b/noncore/graphics/drawpad/main.cpp | |||
@@ -6,13 +6,15 @@ | |||
6 | * * | 6 | * * |
7 | * This program is free software; you can redistribute it and/or modify * | 7 | * This program is free software; you can redistribute it and/or modify * |
8 | * it under the terms of the GNU General Public License as published by * | 8 | * it under the terms of the GNU General Public License as published by * |
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | * * | 11 | * * |
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | 13 | ||
14 | #include "drawpad.h" | 14 | #include "drawpad.h" |
15 | 15 | ||
16 | #include <opie2/oapplicationfactory.h> | 16 | #include <opie2/oapplicationfactory.h> |
17 | 17 | ||
18 | using namespace Opie::Core; | ||
19 | using namespace Opie::Core; | ||
18 | OPIE_EXPORT_APP( OApplicationFactory<DrawPad> ) | 20 | OPIE_EXPORT_APP( OApplicationFactory<DrawPad> ) |