summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/mediummount/mainwindow.cc4
-rw-r--r--noncore/settings/mediummount/mainwindow.h2
-rw-r--r--noncore/settings/mediummount/mediumglobal.cc31
3 files changed, 20 insertions, 17 deletions
diff --git a/noncore/settings/mediummount/mainwindow.cc b/noncore/settings/mediummount/mainwindow.cc
index 88f7c61..cf8ad6c 100644
--- a/noncore/settings/mediummount/mainwindow.cc
+++ b/noncore/settings/mediummount/mainwindow.cc
@@ -10,14 +10,14 @@
10 10
11#include "mainwindow.h" 11#include "mainwindow.h"
12 12
13using namespace MediumMountSetting; 13using namespace MediumMountSetting;
14 14
15 15
16MainWindow::MainWindow( QWidget *parent, const char *name ) 16MainWindow::MainWindow( QWidget *parent, const char *name, WFlags )
17 : QMainWindow( parent, name ) 17 : QMainWindow( parent, name, WStyle_ContextHelp )
18 18
19{ 19{
20 // m_lay = new QVBoxLayout( this ); 20 // m_lay = new QVBoxLayout( this );
21 m_tab = new QTabWidget( this ); 21 m_tab = new QTabWidget( this );
22 setCentralWidget( m_tab ); 22 setCentralWidget( m_tab );
23 init(); 23 init();
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h
index 1e60e12..ce54674 100644
--- a/noncore/settings/mediummount/mainwindow.h
+++ b/noncore/settings/mediummount/mainwindow.h
@@ -12,13 +12,13 @@ class QTabWidget;
12namespace MediumMountSetting { 12namespace MediumMountSetting {
13 class MediumMountWidget; 13 class MediumMountWidget;
14 class MediumGlobalWidget; 14 class MediumGlobalWidget;
15 class MainWindow : public QMainWindow { 15 class MainWindow : public QMainWindow {
16 Q_OBJECT 16 Q_OBJECT
17 public: 17 public:
18 MainWindow(QWidget *parent = 0, const char *name = 0 ); 18 MainWindow(QWidget *parent = 0, const char *name = 0 , 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 private: 24 private:
diff --git a/noncore/settings/mediummount/mediumglobal.cc b/noncore/settings/mediummount/mediumglobal.cc
index 921fcd1..c1ad415 100644
--- a/noncore/settings/mediummount/mediumglobal.cc
+++ b/noncore/settings/mediummount/mediumglobal.cc
@@ -4,12 +4,13 @@
4#include <qcheckbox.h> 4#include <qcheckbox.h>
5#include <qlabel.h> 5#include <qlabel.h>
6#include <qabstractlayout.h> // spacer item 6#include <qabstractlayout.h> // spacer item
7#include <qlayout.h> 7#include <qlayout.h>
8#include <qframe.h> 8#include <qframe.h>
9#include <qgroupbox.h> 9#include <qgroupbox.h>
10#include <qwhatsthis.h>
10 11
11#include <qpe/config.h> 12#include <qpe/config.h>
12 13
13#include "mediumglobal.h" 14#include "mediumglobal.h"
14 15
15using namespace MediumMountSetting; 16using namespace MediumMountSetting;
@@ -28,53 +29,55 @@ void MediumGlobalWidget::initGUI()
28 m_layout->setMargin( 10 ); 29 m_layout->setMargin( 10 );
29 m_layout->setSpacing( 10 ); 30 m_layout->setSpacing( 10 );
30 31
31 32
32 m_label = new QLabel( this ); 33 m_label = new QLabel( this );
33 m_label->setTextFormat( Qt::RichText ); 34 m_label->setTextFormat( Qt::RichText );
34 m_label->setText( tr("If a medium gets inserted into this device Opie " 35 m_label->setText( tr("") );
35 "tries to search the medium for Dcouments. On " 36 QWhatsThis::add( this, ("If a medium gets inserted into this device Opie "
36 "large mediums this can take some time. You can choose " 37 "tries to search the medium for Dcouments. On "
37 "if Opie should scan for Documents globally or on a " 38 "large mediums this can take some time. You can choose "
38 "per medium level. You're also able to reconfigure " 39 "if Opie should scan for Documents globally or on a "
39 "each medium." 40 "per medium level. You're also able to reconfigure "
40 ) ); 41 "each medium."
42 ) );
43
41 m_layout->addWidget( m_label ); 44 m_layout->addWidget( m_label );
42 45
43 m_check = new QCheckBox( tr("Enable medium checking" ), this ); 46 m_check = new QCheckBox( tr("Enable medium checking" ), this );
44 connect( m_check, SIGNAL(stateChanged(int) ), 47 connect( m_check, SIGNAL(stateChanged(int) ),
45 this, SLOT(slotEnableChecking() ) ); 48 this, SLOT(slotEnableChecking() ) );
46 m_layout->addWidget(m_check ); 49 m_layout->addWidget(m_check );
47 50
48 m_frame = new QFrame(this, "Frame" ); 51 m_frame = new QFrame(this, "Frame" );
49 m_frame->setFrameShape( QFrame::Box ); 52 m_frame->setFrameShape( QFrame::Box );
50 m_frame->setFrameShadow( QFrame::Sunken ); 53 m_frame->setFrameShadow( QFrame::Sunken );
51 54
52 m_box = new QVBoxLayout( m_frame ); 55 m_box = new QVBoxLayout( m_frame );
53 m_box->setMargin( 5 ); 56 m_box->setMargin( 5 );
54 m_useglobal = new QCheckBox( tr("Use global settings"), m_frame ); 57 m_useglobal = new QCheckBox( tr("Use global settings"), m_frame );
55 connect( m_useglobal, SIGNAL( stateChanged(int) ), 58 connect( m_useglobal, SIGNAL( stateChanged(int) ),
56 this, SLOT( slotGlobalChanged() ) ); 59 this, SLOT( slotGlobalChanged() ) );
57 60
58 m_box->addWidget( m_useglobal ); 61 m_box->addWidget( m_useglobal );
59 62
60 m_global = new QGroupBox( tr("Which media files"), m_frame ); 63 m_global = new QGroupBox( tr("Which media files"), m_frame );
61 m_frameLay = new QGridLayout(m_global, 4, 3 ); 64 m_frameLay = new QGridLayout(m_global, 4, 3 );
62 m_frameLay->setMargin( 12 ); 65 m_frameLay->setMargin( 12 );
63 66
64 QSpacerItem *item2 = new QSpacerItem( 5, 8, 67 QSpacerItem *item2 = new QSpacerItem( 5, 8,
65 QSizePolicy::Fixed, 68 QSizePolicy::Fixed,
66 QSizePolicy::Fixed ); 69 QSizePolicy::Fixed );
67 m_audio = new QCheckBox( tr("Audio"), m_global ); 70 m_audio = new QCheckBox( tr("Audio"), m_global );
68 m_all = new QCheckBox( tr("All") , m_global ); 71 m_all = new QCheckBox( tr("All") , m_global );
69 m_image = new QCheckBox( tr("Image"), m_global ); 72 m_image = new QCheckBox( tr("Image"), m_global );
70 m_text = new QCheckBox( tr("Text") , m_global ); 73 m_text = new QCheckBox( tr("Text") , m_global );
71 m_video = new QCheckBox( tr("Video"), m_global ); 74 m_video = new QCheckBox( tr("Video"), m_global );
72 75
73 connect(m_all, SIGNAL(stateChanged(int) ), 76 connect(m_all, SIGNAL(stateChanged(int) ),
74 this, SLOT(slotAllChanged() ) ); 77 this, SLOT(slotAllChanged() ) );
75 78
76 m_frameLay->addItem( item2, 0, 0 ); 79 m_frameLay->addItem( item2, 0, 0 );
77 80
78 m_frameLay->addWidget( m_audio, 1, 0 ); 81 m_frameLay->addWidget( m_audio, 1, 0 );
79 m_frameLay->addWidget( m_image, 2, 0 ); 82 m_frameLay->addWidget( m_image, 2, 0 );
80 m_frameLay->addWidget( m_all, 3, 0 ); 83 m_frameLay->addWidget( m_all, 3, 0 );
@@ -88,14 +91,14 @@ void MediumGlobalWidget::initGUI()
88 m_box->addWidget( m_global ); 91 m_box->addWidget( m_global );
89 92
90 93
91 m_layout->addWidget( m_frame ); 94 m_layout->addWidget( m_frame );
92 95
93 QSpacerItem *item1 = new QSpacerItem( 1, 24, 96 QSpacerItem *item1 = new QSpacerItem( 1, 24,
94 QSizePolicy::Fixed, 97 QSizePolicy::Fixed,
95 QSizePolicy::Expanding ); 98 QSizePolicy::Expanding );
96 m_layout->addItem( item1 ); 99 m_layout->addItem( item1 );
97} 100}
98void MediumGlobalWidget::readConfig() 101void MediumGlobalWidget::readConfig()
99{ 102{
100 if( m_config == 0 ) 103 if( m_config == 0 )
101 m_config = new Config("medium" ); 104 m_config = new Config("medium" );