summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/mediummount/mainwindow.cc34
-rw-r--r--noncore/settings/mediummount/mainwindow.h7
-rw-r--r--noncore/settings/mediummount/mediumglobal.cc19
-rw-r--r--noncore/settings/mediummount/mediumglobal.h3
-rw-r--r--noncore/settings/mediummount/mediumwidget.cc10
-rw-r--r--noncore/settings/mediummount/mediumwidget.h5
6 files changed, 48 insertions, 30 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,8 +1,10 @@
#include <qtabwidget.h>
#include <qlayout.h>
+#include <qtooltip.h>
+#include <qwhatsthis.h>
#include <qpe/storage.h>
#include "mediumwidget.h"
@@ -12,24 +14,27 @@
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" ));
+ setCaption ( tr( "Medium Mount Settings" ));
- // m_lay = new QVBoxLayout( this );
- m_tab = new QTabWidget( this );
- setCentralWidget( m_tab );
- init();
+ m_lay = new QVBoxLayout( this );
+
+ m_tab = new QTabWidget( this );
+
+ 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") );
@@ -46,8 +51,21 @@ 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
@@ -3,25 +3,26 @@
#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;
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
@@ -15,9 +15,9 @@
using namespace MediumMountSetting;
MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name )
- : QWidget( wid, name )
+ : QWidget( wid, name, WStyle_ContextHelp )
{
m_config = 0;
initGUI();
readConfig();
@@ -25,10 +25,10 @@ MediumGlobalWidget::MediumGlobalWidget(QWidget *wid, const char *name )
}
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 );
@@ -38,9 +38,9 @@ void MediumGlobalWidget::initGUI()
"large mediums this can take some time. You can choose "
"if Opie should scan for Documents globally or on a "
"per medium level. You're also able to reconfigure "
"each medium.") );
-
+
m_layout->addWidget( m_label );
m_check = new QCheckBox( tr("Enable medium checking" ), this );
connect( m_check, SIGNAL(stateChanged(int) ),
@@ -60,13 +60,13 @@ void MediumGlobalWidget::initGUI()
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 );
+ QSizePolicy::Fixed );
m_audio = new QCheckBox( tr("Audio"), m_global );
m_all = new QCheckBox( tr("All") , m_global );
m_image = new QCheckBox( tr("Image"), m_global );
m_text = new QCheckBox( tr("Text") , m_global );
@@ -83,13 +83,13 @@ void MediumGlobalWidget::initGUI()
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 );
QSpacerItem *item1 = new QSpacerItem( 1, 24,
@@ -139,9 +139,8 @@ void MediumGlobalWidget::writeConfig()
m_config->writeEntry("image", m_image->isChecked() );
}
MediumGlobalWidget::~MediumGlobalWidget()
{
- writeConfig();
delete m_config;
}
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
@@ -22,8 +22,10 @@ namespace MediumMountSetting {
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 );
@@ -34,9 +36,8 @@ namespace MediumMountSetting {
private:
void initGUI();
void readConfig();
- void writeConfig();
Config *m_config;
QCheckBox *m_check;
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
@@ -35,9 +35,9 @@ MediumMountWidget::MediumMountWidget(const QString &path,
}
m_path = path;
initGUI();
m_label->setPixmap(pix );
- m_config = 0;
+ m_config = 0;
readConfig();
}
// now we fire up the GUI
@@ -80,9 +80,9 @@ void MediumMountWidget::initGUI()
m_image = new QCheckBox( tr("Image"), m_group );
m_text = new QCheckBox( tr("Text") , m_group );
m_video = new QCheckBox( tr("Video"), m_group );
- QSpacerItem *iti1b = new QSpacerItem(2, 10, QSizePolicy::Fixed,
+ QSpacerItem *iti1b = new QSpacerItem(2, 10, QSizePolicy::Fixed,
QSizePolicy::Fixed );
m_checks->addItem( iti1b, 0, 0 );
m_checks->addWidget(m_audio, 1, 0 );
@@ -95,9 +95,9 @@ void MediumMountWidget::initGUI()
m_checks->addRowSpacing(0, 8 );
m_checks->addColSpacing(1, 2 );
m_checks->setColStretch(1, -2 );
- connect(m_all, SIGNAL(stateChanged(int) ),
+ connect(m_all, SIGNAL(stateChanged(int) ),
this, SLOT(slotStateChanged() ) );
m_box->addWidget( m_group );
@@ -142,9 +142,9 @@ void MediumMountWidget::readConfig( )
}else{
m_audio->setEnabled( true );
m_image->setEnabled( true );
m_text->setEnabled ( true );
- m_all->setEnabled ( true );
+ m_all->setEnabled ( true );
m_all->setChecked( false );
m_audio->setChecked( m_config->readBoolEntry("audio", true ) );
@@ -170,13 +170,11 @@ void MediumMountWidget::writeConfig()
}
}
MediumMountWidget::~MediumMountWidget()
{
- writeConfig();
delete m_config;
}
-
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
@@ -25,18 +25,19 @@ namespace MediumMountSetting {
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;