summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (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
@@ -1,37 +1,42 @@
#include <qtabwidget.h>
#include <qlayout.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
#include <qpe/storage.h>
#include "mediumwidget.h"
#include "mediumglobal.h"
#include "mainwindow.h"
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 )
{
setCaption ( tr( "Medium Mount Settings" ));
- // m_lay = new QVBoxLayout( this );
+ m_lay = new QVBoxLayout( this );
+
m_tab = new QTabWidget( this );
- setCentralWidget( m_tab );
+
+ m_lay->addWidget( m_tab );
+
init();
}
MainWindow::~MainWindow()
{
-
}
+
void MainWindow::init()
{
m_global = new MediumGlobalWidget( m_tab, "test drive" );
m_tab->addTab( m_global, tr("Global") );
StorageInfo storage;
@@ -44,12 +49,25 @@ void MainWindow::init()
m_mediums.append( wid );
m_tab->addTab( wid, (*it)->name() );
}
}
}
+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 )
{
}
void MainWindow::slotCheckingChanged(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
@@ -1,29 +1,30 @@
#ifndef MediumMountMainwindow_h
#define MediumMountMainwindow_h
#include <qlist.h>
-#include <qmainwindow.h>
+#include <qdialog.h>
class QVBoxLayout;
class QTabWidget;
namespace MediumMountSetting {
class MediumMountWidget;
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();
private slots:
void slotGlobalChanged(int );
void slotCheckingChanged(int );
+ void accept();
private:
void init();
QTabWidget *m_tab;
QVBoxLayout *m_lay;
MediumGlobalWidget *m_global;
QList<MediumMountWidget> m_mediums;
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
@@ -13,24 +13,24 @@
#include "mediumglobal.h"
using namespace MediumMountSetting;
MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name )
- : QWidget( wid, name )
+ : QWidget( wid, name, WStyle_ContextHelp )
{
m_config = 0;
initGUI();
readConfig();
}
void MediumGlobalWidget::initGUI()
{
m_layout = new QVBoxLayout(this );
- m_layout->setMargin( 10 );
- m_layout->setSpacing( 10 );
+ // m_layout->setMargin( 10 );
+ // m_layout->setSpacing( 10 );
m_label = new QLabel( this );
m_label->setTextFormat( Qt::RichText );
m_label->setText( tr("") );
QWhatsThis::add( this, tr("If a medium gets inserted into this device Opie "
@@ -58,13 +58,13 @@ void MediumGlobalWidget::initGUI()
this, SLOT( slotGlobalChanged() ) );
m_box->addWidget( m_useglobal );
m_global = new QGroupBox( tr("Which media files"), m_frame );
m_frameLay = new QGridLayout(m_global, 4, 3 );
- m_frameLay->setMargin( 12 );
+ m_frameLay->setMargin( 6 );
QSpacerItem *item2 = new QSpacerItem( 5, 8,
QSizePolicy::Fixed,
QSizePolicy::Fixed );
m_audio = new QCheckBox( tr("Audio"), m_global );
m_all = new QCheckBox( tr("All") , m_global );
@@ -81,14 +81,14 @@ void MediumGlobalWidget::initGUI()
m_frameLay->addWidget( m_image, 2, 0 );
m_frameLay->addWidget( m_all, 3, 0 );
m_frameLay->addWidget( m_text, 1, 2 );
m_frameLay->addWidget( m_video, 2, 2 );
- m_frameLay->addRowSpacing( 0, 8 );
- m_frameLay->addColSpacing( 1, 2 );
+// m_frameLay->addRowSpacing( 0, 8 );
+// m_frameLay->addColSpacing( 1, 2 );
m_box->addWidget( m_global );
m_layout->addWidget( m_frame );
@@ -137,13 +137,12 @@ void MediumGlobalWidget::writeConfig()
m_config->writeEntry("video", m_video->isChecked() );
m_config->writeEntry("text", m_text->isChecked() );
m_config->writeEntry("image", m_image->isChecked() );
}
MediumGlobalWidget::~MediumGlobalWidget()
{
- writeConfig();
delete m_config;
}
void MediumGlobalWidget::slotGlobalChanged()
{
int mode = GLOBAL_DISABLED;
bool enabled = false;
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
@@ -20,25 +20,26 @@ namespace MediumMountSetting {
class MediumGlobalWidget : public QWidget {
Q_OBJECT
public:
MediumGlobalWidget(QWidget *parent = 0, const char *name =0 );
~MediumGlobalWidget();
+
+ void writeConfig();
signals:
// the global status changed
void globalStateChanged( int );
void enableStateChanged( int );
private slots:
void slotGlobalChanged();
void slotEnableChecking();
void slotAllChanged();
private:
void initGUI();
void readConfig();
- void writeConfig();
Config *m_config;
QCheckBox *m_check;
QCheckBox *m_useglobal;
QGroupBox *m_global;
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
@@ -168,17 +168,15 @@ void MediumMountWidget::writeConfig()
m_config->writeEntry("text" , m_text->isChecked() );
m_config->writeEntry("video", m_video->isChecked() );
}
}
MediumMountWidget::~MediumMountWidget()
{
- writeConfig();
delete m_config;
}
-
void MediumMountWidget::slotAdd()
{
}
void MediumMountWidget::slotStateChanged()
{
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
@@ -24,20 +24,21 @@ namespace MediumMountSetting {
class MediumMountWidget : public QWidget {
Q_OBJECT
public:
MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 );
~MediumMountWidget();
+ void writeConfig();
+
private slots:
void slotAdd();
void slotStateChanged();
private:
void readConfig();
void initGUI();
- void writeConfig();
bool m_dirty : 1;
class MediumMountWidgetPrivate;
MediumMountWidgetPrivate *d;