author | harlekin <harlekin> | 2003-03-23 14:17:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-23 14:17:43 (UTC) |
commit | dca448bad29f0afbab1fc0ffe493560fd927c1b5 (patch) (unidiff) | |
tree | 178ab4781f5952f6e333659531cb7e0db0276f24 | |
parent | 013194659dde417767c62ab2fe18b09ea21558eb (diff) | |
download | opie-dca448bad29f0afbab1fc0ffe493560fd927c1b5.zip opie-dca448bad29f0afbab1fc0ffe493560fd927c1b5.tar.gz opie-dca448bad29f0afbab1fc0ffe493560fd927c1b5.tar.bz2 |
a dialog now x does not save ok saves, also some layout changes
-rw-r--r-- | noncore/settings/mediummount/mainwindow.cc | 28 | ||||
-rw-r--r-- | noncore/settings/mediummount/mainwindow.h | 7 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumglobal.cc | 13 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumglobal.h | 3 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumwidget.cc | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumwidget.h | 3 |
6 files changed, 37 insertions, 19 deletions
diff --git a/noncore/settings/mediummount/mainwindow.cc b/noncore/settings/mediummount/mainwindow.cc index 6d9bb80..bfd1e21 100644 --- a/noncore/settings/mediummount/mainwindow.cc +++ b/noncore/settings/mediummount/mainwindow.cc | |||
@@ -2,6 +2,8 @@ | |||
2 | 2 | ||
3 | #include <qtabwidget.h> | 3 | #include <qtabwidget.h> |
4 | #include <qlayout.h> | 4 | #include <qlayout.h> |
5 | #include <qtooltip.h> | ||
6 | #include <qwhatsthis.h> | ||
5 | 7 | ||
6 | #include <qpe/storage.h> | 8 | #include <qpe/storage.h> |
7 | 9 | ||
@@ -13,22 +15,25 @@ | |||
13 | using namespace MediumMountSetting; | 15 | using namespace MediumMountSetting; |
14 | 16 | ||
15 | 17 | ||
16 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags ) | 18 | MainWindow::MainWindow( QWidget *parent, const char *name, bool modal, WFlags ) |
17 | : QMainWindow( parent, name, WStyle_ContextHelp ) | 19 | : QDialog( parent, name, modal, WStyle_ContextHelp ) |
18 | 20 | ||
19 | { | 21 | { |
20 | setCaption ( tr( "Medium Mount Settings" )); | 22 | setCaption ( tr( "Medium Mount Settings" )); |
21 | 23 | ||
22 | // m_lay = new QVBoxLayout( this ); | 24 | m_lay = new QVBoxLayout( this ); |
25 | |||
23 | m_tab = new QTabWidget( this ); | 26 | m_tab = new QTabWidget( this ); |
24 | setCentralWidget( m_tab ); | 27 | |
28 | m_lay->addWidget( m_tab ); | ||
29 | |||
25 | init(); | 30 | init(); |
26 | } | 31 | } |
27 | 32 | ||
28 | MainWindow::~MainWindow() | 33 | MainWindow::~MainWindow() |
29 | { | 34 | { |
30 | |||
31 | } | 35 | } |
36 | |||
32 | void MainWindow::init() | 37 | void MainWindow::init() |
33 | { | 38 | { |
34 | m_global = new MediumGlobalWidget( m_tab, "test drive" ); | 39 | m_global = new MediumGlobalWidget( m_tab, "test drive" ); |
@@ -47,6 +52,19 @@ void MainWindow::init() | |||
47 | } | 52 | } |
48 | } | 53 | } |
49 | 54 | ||
55 | void MainWindow::accept() | ||
56 | { | ||
57 | m_global->writeConfig(); | ||
58 | |||
59 | MediumMountWidget *confWidget; | ||
60 | for ( confWidget = m_mediums.first(); confWidget != 0; | ||
61 | confWidget = m_mediums.next() ) { | ||
62 | confWidget->writeConfig(); | ||
63 | } | ||
64 | |||
65 | QDialog::accept(); | ||
66 | } | ||
67 | |||
50 | void MainWindow::slotGlobalChanged(int ) | 68 | void MainWindow::slotGlobalChanged(int ) |
51 | { | 69 | { |
52 | 70 | ||
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h index ce54674..9c648ef 100644 --- a/noncore/settings/mediummount/mainwindow.h +++ b/noncore/settings/mediummount/mainwindow.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #define MediumMountMainwindow_h | 4 | #define MediumMountMainwindow_h |
5 | 5 | ||
6 | #include <qlist.h> | 6 | #include <qlist.h> |
7 | #include <qmainwindow.h> | 7 | #include <qdialog.h> |
8 | 8 | ||
9 | class QVBoxLayout; | 9 | class QVBoxLayout; |
10 | class QTabWidget; | 10 | class QTabWidget; |
@@ -12,15 +12,16 @@ class QTabWidget; | |||
12 | namespace MediumMountSetting { | 12 | namespace MediumMountSetting { |
13 | class MediumMountWidget; | 13 | class MediumMountWidget; |
14 | class MediumGlobalWidget; | 14 | class MediumGlobalWidget; |
15 | class MainWindow : public QMainWindow { | 15 | class MainWindow : public QDialog { |
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | public: | 17 | public: |
18 | MainWindow(QWidget *parent = 0, const char *name = 0 , WFlags = 0); | 18 | MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); |
19 | ~MainWindow(); | 19 | ~MainWindow(); |
20 | 20 | ||
21 | private slots: | 21 | private slots: |
22 | void slotGlobalChanged(int ); | 22 | void slotGlobalChanged(int ); |
23 | void slotCheckingChanged(int ); | 23 | void slotCheckingChanged(int ); |
24 | void accept(); | ||
24 | private: | 25 | private: |
25 | void init(); | 26 | void init(); |
26 | QTabWidget *m_tab; | 27 | QTabWidget *m_tab; |
diff --git a/noncore/settings/mediummount/mediumglobal.cc b/noncore/settings/mediummount/mediumglobal.cc index fa4171c..46d3343 100644 --- a/noncore/settings/mediummount/mediumglobal.cc +++ b/noncore/settings/mediummount/mediumglobal.cc | |||
@@ -16,7 +16,7 @@ | |||
16 | using namespace MediumMountSetting; | 16 | using namespace MediumMountSetting; |
17 | 17 | ||
18 | MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name ) | 18 | MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name ) |
19 | : QWidget( wid, name ) | 19 | : QWidget( wid, name, WStyle_ContextHelp ) |
20 | { | 20 | { |
21 | m_config = 0; | 21 | m_config = 0; |
22 | initGUI(); | 22 | initGUI(); |
@@ -26,8 +26,8 @@ MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name ) | |||
26 | void MediumGlobalWidget::initGUI() | 26 | void MediumGlobalWidget::initGUI() |
27 | { | 27 | { |
28 | m_layout = new QVBoxLayout(this ); | 28 | m_layout = new QVBoxLayout(this ); |
29 | m_layout->setMargin( 10 ); | 29 | // m_layout->setMargin( 10 ); |
30 | m_layout->setSpacing( 10 ); | 30 | // m_layout->setSpacing( 10 ); |
31 | 31 | ||
32 | 32 | ||
33 | m_label = new QLabel( this ); | 33 | m_label = new QLabel( this ); |
@@ -61,7 +61,7 @@ void MediumGlobalWidget::initGUI() | |||
61 | 61 | ||
62 | m_global = new QGroupBox( tr("Which media files"), m_frame ); | 62 | m_global = new QGroupBox( tr("Which media files"), m_frame ); |
63 | m_frameLay = new QGridLayout(m_global, 4, 3 ); | 63 | m_frameLay = new QGridLayout(m_global, 4, 3 ); |
64 | m_frameLay->setMargin( 12 ); | 64 | m_frameLay->setMargin( 6 ); |
65 | 65 | ||
66 | QSpacerItem *item2 = new QSpacerItem( 5, 8, | 66 | QSpacerItem *item2 = new QSpacerItem( 5, 8, |
67 | QSizePolicy::Fixed, | 67 | QSizePolicy::Fixed, |
@@ -84,8 +84,8 @@ void MediumGlobalWidget::initGUI() | |||
84 | m_frameLay->addWidget( m_text, 1, 2 ); | 84 | m_frameLay->addWidget( m_text, 1, 2 ); |
85 | m_frameLay->addWidget( m_video, 2, 2 ); | 85 | m_frameLay->addWidget( m_video, 2, 2 ); |
86 | 86 | ||
87 | m_frameLay->addRowSpacing( 0, 8 ); | 87 | // m_frameLay->addRowSpacing( 0, 8 ); |
88 | m_frameLay->addColSpacing( 1, 2 ); | 88 | // m_frameLay->addColSpacing( 1, 2 ); |
89 | 89 | ||
90 | m_box->addWidget( m_global ); | 90 | m_box->addWidget( m_global ); |
91 | 91 | ||
@@ -140,7 +140,6 @@ void MediumGlobalWidget::writeConfig() | |||
140 | } | 140 | } |
141 | MediumGlobalWidget::~MediumGlobalWidget() | 141 | MediumGlobalWidget::~MediumGlobalWidget() |
142 | { | 142 | { |
143 | writeConfig(); | ||
144 | delete m_config; | 143 | delete m_config; |
145 | } | 144 | } |
146 | void MediumGlobalWidget::slotGlobalChanged() | 145 | void MediumGlobalWidget::slotGlobalChanged() |
diff --git a/noncore/settings/mediummount/mediumglobal.h b/noncore/settings/mediummount/mediumglobal.h index 7b3cea0..ea1f0df 100644 --- a/noncore/settings/mediummount/mediumglobal.h +++ b/noncore/settings/mediummount/mediumglobal.h | |||
@@ -23,6 +23,8 @@ namespace MediumMountSetting { | |||
23 | public: | 23 | public: |
24 | MediumGlobalWidget(QWidget *parent = 0, const char *name =0 ); | 24 | MediumGlobalWidget(QWidget *parent = 0, const char *name =0 ); |
25 | ~MediumGlobalWidget(); | 25 | ~MediumGlobalWidget(); |
26 | |||
27 | void writeConfig(); | ||
26 | signals: | 28 | signals: |
27 | // the global status changed | 29 | // the global status changed |
28 | void globalStateChanged( int ); | 30 | void globalStateChanged( int ); |
@@ -35,7 +37,6 @@ namespace MediumMountSetting { | |||
35 | private: | 37 | private: |
36 | void initGUI(); | 38 | void initGUI(); |
37 | void readConfig(); | 39 | void readConfig(); |
38 | void writeConfig(); | ||
39 | Config *m_config; | 40 | Config *m_config; |
40 | QCheckBox *m_check; | 41 | QCheckBox *m_check; |
41 | QCheckBox *m_useglobal; | 42 | QCheckBox *m_useglobal; |
diff --git a/noncore/settings/mediummount/mediumwidget.cc b/noncore/settings/mediummount/mediumwidget.cc index 04e4e7c..f98e637 100644 --- a/noncore/settings/mediummount/mediumwidget.cc +++ b/noncore/settings/mediummount/mediumwidget.cc | |||
@@ -171,11 +171,9 @@ void MediumMountWidget::writeConfig() | |||
171 | } | 171 | } |
172 | MediumMountWidget::~MediumMountWidget() | 172 | MediumMountWidget::~MediumMountWidget() |
173 | { | 173 | { |
174 | writeConfig(); | ||
175 | delete m_config; | 174 | delete m_config; |
176 | } | 175 | } |
177 | 176 | ||
178 | |||
179 | void MediumMountWidget::slotAdd() | 177 | void MediumMountWidget::slotAdd() |
180 | { | 178 | { |
181 | 179 | ||
diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h index 7a801eb..7f7b755 100644 --- a/noncore/settings/mediummount/mediumwidget.h +++ b/noncore/settings/mediummount/mediumwidget.h | |||
@@ -27,6 +27,8 @@ namespace MediumMountSetting { | |||
27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); | 27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); |
28 | ~MediumMountWidget(); | 28 | ~MediumMountWidget(); |
29 | 29 | ||
30 | void writeConfig(); | ||
31 | |||
30 | private slots: | 32 | private slots: |
31 | void slotAdd(); | 33 | void slotAdd(); |
32 | void slotStateChanged(); | 34 | void slotStateChanged(); |
@@ -34,7 +36,6 @@ namespace MediumMountSetting { | |||
34 | private: | 36 | private: |
35 | void readConfig(); | 37 | void readConfig(); |
36 | void initGUI(); | 38 | void initGUI(); |
37 | void writeConfig(); | ||
38 | 39 | ||
39 | bool m_dirty : 1; | 40 | bool m_dirty : 1; |
40 | 41 | ||