summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-23 14:17:43 (UTC)
committer harlekin <harlekin>2003-03-23 14:17:43 (UTC)
commitdca448bad29f0afbab1fc0ffe493560fd927c1b5 (patch) (side-by-side diff)
tree178ab4781f5952f6e333659531cb7e0db0276f24
parent013194659dde417767c62ab2fe18b09ea21558eb (diff)
downloadopie-dca448bad29f0afbab1fc0ffe493560fd927c1b5.zip
opie-dca448bad29f0afbab1fc0ffe493560fd927c1b5.tar.gz
opie-dca448bad29f0afbab1fc0ffe493560fd927c1b5.tar.bz2
a dialog now x does not save ok saves, also some layout changes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/mediummount/mainwindow.cc28
-rw-r--r--noncore/settings/mediummount/mainwindow.h7
-rw-r--r--noncore/settings/mediummount/mediumglobal.cc13
-rw-r--r--noncore/settings/mediummount/mediumglobal.h3
-rw-r--r--noncore/settings/mediummount/mediumwidget.cc2
-rw-r--r--noncore/settings/mediummount/mediumwidget.h3
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 @@
#include <qlayout.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
@@ -15,4 +17,4 @@ using namespace MediumMountSetting;
-MainWindow::MainWindow( QWidget *parent, const char *name, WFlags )
- : QMainWindow( parent, name, WStyle_ContextHelp )
+MainWindow::MainWindow( QWidget *parent, const char *name, bool modal, WFlags )
+ : QDialog( parent, name, modal, WStyle_ContextHelp )
@@ -21,5 +23,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags )
- // m_lay = new QVBoxLayout( this );
+ m_lay = new QVBoxLayout( this );
+
m_tab = new QTabWidget( this );
- setCentralWidget( m_tab );
+
+ m_lay->addWidget( m_tab );
+
init();
@@ -29,4 +34,4 @@ MainWindow::~MainWindow()
{
-
}
+
void MainWindow::init()
@@ -49,2 +54,15 @@ void MainWindow::init()
+void MainWindow::accept()
+{
+ m_global->writeConfig();
+
+ MediumMountWidget *confWidget;
+ for ( confWidget = m_mediums.first(); confWidget != 0;
+ confWidget = m_mediums.next() ) {
+ confWidget->writeConfig();
+ }
+
+ QDialog::accept();
+}
+
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 @@
#include <qlist.h>
-#include <qmainwindow.h>
+#include <qdialog.h>
@@ -14,6 +14,6 @@ namespace MediumMountSetting {
class MediumGlobalWidget;
- class MainWindow : public QMainWindow {
+ class MainWindow : public QDialog {
Q_OBJECT
public:
- MainWindow(QWidget *parent = 0, const char *name = 0 , WFlags = 0);
+ MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0);
~MainWindow();
@@ -23,2 +23,3 @@ namespace MediumMountSetting {
void slotCheckingChanged(int );
+ void accept();
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;
MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name )
- : QWidget( wid, name )
+ : QWidget( wid, name, WStyle_ContextHelp )
{
@@ -28,4 +28,4 @@ void MediumGlobalWidget::initGUI()
m_layout = new QVBoxLayout(this );
- m_layout->setMargin( 10 );
- m_layout->setSpacing( 10 );
+ // m_layout->setMargin( 10 );
+ // m_layout->setSpacing( 10 );
@@ -63,3 +63,3 @@ void MediumGlobalWidget::initGUI()
m_frameLay = new QGridLayout(m_global, 4, 3 );
- m_frameLay->setMargin( 12 );
+ m_frameLay->setMargin( 6 );
@@ -86,4 +86,4 @@ void MediumGlobalWidget::initGUI()
- m_frameLay->addRowSpacing( 0, 8 );
- m_frameLay->addColSpacing( 1, 2 );
+// m_frameLay->addRowSpacing( 0, 8 );
+// m_frameLay->addColSpacing( 1, 2 );
@@ -142,3 +142,2 @@ MediumGlobalWidget::~MediumGlobalWidget()
{
- writeConfig();
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 {
~MediumGlobalWidget();
+
+ void writeConfig();
signals:
@@ -37,3 +39,2 @@ namespace MediumMountSetting {
void readConfig();
- void writeConfig();
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()
{
- writeConfig();
delete m_config;
@@ -177,3 +176,2 @@ MediumMountWidget::~MediumMountWidget()
-
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 {
+ void writeConfig();
+
private slots:
@@ -36,3 +38,2 @@ namespace MediumMountSetting {
void initGUI();
- void writeConfig();