-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 | |||
@@ -4,2 +4,4 @@ | |||
4 | #include <qlayout.h> | 4 | #include <qlayout.h> |
5 | #include <qtooltip.h> | ||
6 | #include <qwhatsthis.h> | ||
5 | 7 | ||
@@ -15,4 +17,4 @@ using namespace MediumMountSetting; | |||
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 | ||
@@ -21,5 +23,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags ) | |||
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(); |
@@ -29,4 +34,4 @@ MainWindow::~MainWindow() | |||
29 | { | 34 | { |
30 | |||
31 | } | 35 | } |
36 | |||
32 | void MainWindow::init() | 37 | void MainWindow::init() |
@@ -49,2 +54,15 @@ void MainWindow::init() | |||
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 ) |
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 | |||
@@ -6,3 +6,3 @@ | |||
6 | #include <qlist.h> | 6 | #include <qlist.h> |
7 | #include <qmainwindow.h> | 7 | #include <qdialog.h> |
8 | 8 | ||
@@ -14,6 +14,6 @@ namespace MediumMountSetting { | |||
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(); |
@@ -23,2 +23,3 @@ namespace MediumMountSetting { | |||
23 | void slotCheckingChanged(int ); | 23 | void slotCheckingChanged(int ); |
24 | void accept(); | ||
24 | private: | 25 | private: |
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 | |||
@@ -18,3 +18,3 @@ using namespace MediumMountSetting; | |||
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 | { |
@@ -28,4 +28,4 @@ void MediumGlobalWidget::initGUI() | |||
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 | ||
@@ -63,3 +63,3 @@ void MediumGlobalWidget::initGUI() | |||
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 | ||
@@ -86,4 +86,4 @@ void MediumGlobalWidget::initGUI() | |||
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 | ||
@@ -142,3 +142,2 @@ MediumGlobalWidget::~MediumGlobalWidget() | |||
142 | { | 142 | { |
143 | writeConfig(); | ||
144 | delete m_config; | 143 | delete m_config; |
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 | |||
@@ -25,2 +25,4 @@ namespace MediumMountSetting { | |||
25 | ~MediumGlobalWidget(); | 25 | ~MediumGlobalWidget(); |
26 | |||
27 | void writeConfig(); | ||
26 | signals: | 28 | signals: |
@@ -37,3 +39,2 @@ namespace MediumMountSetting { | |||
37 | void readConfig(); | 39 | void readConfig(); |
38 | void writeConfig(); | ||
39 | Config *m_config; | 40 | Config *m_config; |
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 | |||
@@ -173,3 +173,2 @@ MediumMountWidget::~MediumMountWidget() | |||
173 | { | 173 | { |
174 | writeConfig(); | ||
175 | delete m_config; | 174 | delete m_config; |
@@ -177,3 +176,2 @@ MediumMountWidget::~MediumMountWidget() | |||
177 | 176 | ||
178 | |||
179 | void MediumMountWidget::slotAdd() | 177 | void MediumMountWidget::slotAdd() |
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 | |||
@@ -29,2 +29,4 @@ namespace MediumMountSetting { | |||
29 | 29 | ||
30 | void writeConfig(); | ||
31 | |||
30 | private slots: | 32 | private slots: |
@@ -36,3 +38,2 @@ namespace MediumMountSetting { | |||
36 | void initGUI(); | 38 | void initGUI(); |
37 | void writeConfig(); | ||
38 | 39 | ||