author | zecke <zecke> | 2004-09-19 19:11:07 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-19 19:11:07 (UTC) |
commit | 13fb1f618aef9c51918a72b6fe998aa4f09f2500 (patch) (unidiff) | |
tree | 30834690c490b11406d560181d595fec4e86b279 | |
parent | 4564befecf3df38911d48f216ab216faf93b9c1d (diff) | |
download | opie-13fb1f618aef9c51918a72b6fe998aa4f09f2500.zip opie-13fb1f618aef9c51918a72b6fe998aa4f09f2500.tar.gz opie-13fb1f618aef9c51918a72b6fe998aa4f09f2500.tar.bz2 |
Change the order of arguments on MainWindow c'tor
-rw-r--r-- | noncore/settings/mediummount/mainwindow.cc | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumwidget.cc | 11 |
3 files changed, 5 insertions, 10 deletions
diff --git a/noncore/settings/mediummount/mainwindow.cc b/noncore/settings/mediummount/mainwindow.cc index eec786c..ebe1c94 100644 --- a/noncore/settings/mediummount/mainwindow.cc +++ b/noncore/settings/mediummount/mainwindow.cc | |||
@@ -7,25 +7,25 @@ | |||
7 | 7 | ||
8 | #include <qpe/storage.h> | 8 | #include <qpe/storage.h> |
9 | 9 | ||
10 | #include "mediumwidget.h" | 10 | #include "mediumwidget.h" |
11 | #include "mediumglobal.h" | 11 | #include "mediumglobal.h" |
12 | 12 | ||
13 | #include "mainwindow.h" | 13 | #include "mainwindow.h" |
14 | 14 | ||
15 | using namespace MediumMountSetting; | 15 | using namespace MediumMountSetting; |
16 | 16 | ||
17 | /* TRANSLATOR MediumMountSetting::MainWindow */ | 17 | /* TRANSLATOR MediumMountSetting::MainWindow */ |
18 | 18 | ||
19 | MainWindow::MainWindow( QWidget *parent, const char *name, bool modal, WFlags ) | 19 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags, bool modal ) |
20 | : QDialog( parent, name, modal, WStyle_ContextHelp ) | 20 | : QDialog( parent, name, modal, WStyle_ContextHelp ) |
21 | 21 | ||
22 | { | 22 | { |
23 | setCaption ( tr( "Medium Mount Settings" )); | 23 | setCaption ( tr( "Medium Mount Settings" )); |
24 | 24 | ||
25 | m_lay = new QVBoxLayout( this ); | 25 | m_lay = new QVBoxLayout( this ); |
26 | 26 | ||
27 | m_tab = new QTabWidget( this ); | 27 | m_tab = new QTabWidget( this ); |
28 | 28 | ||
29 | m_lay->addWidget( m_tab ); | 29 | m_lay->addWidget( m_tab ); |
30 | 30 | ||
31 | init(); | 31 | init(); |
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h index 9649863..7bcb7f5 100644 --- a/noncore/settings/mediummount/mainwindow.h +++ b/noncore/settings/mediummount/mainwindow.h | |||
@@ -6,25 +6,25 @@ | |||
6 | #include <qlist.h> | 6 | #include <qlist.h> |
7 | #include <qdialog.h> | 7 | #include <qdialog.h> |
8 | 8 | ||
9 | class QVBoxLayout; | 9 | class QVBoxLayout; |
10 | class QTabWidget; | 10 | class QTabWidget; |
11 | 11 | ||
12 | namespace MediumMountSetting { | 12 | namespace MediumMountSetting { |
13 | class MediumMountWidget; | 13 | class MediumMountWidget; |
14 | class MediumGlobalWidget; | 14 | class MediumGlobalWidget; |
15 | class MainWindow : public QDialog { | 15 | class MainWindow : public QDialog { |
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | public: | 17 | public: |
18 | MainWindow(QWidget *parent = 0, const char *name = 0 , bool modal = FALSE, WFlags = 0); | 18 | MainWindow(QWidget *parent = 0, const char *name = 0 , WFlags = 0, bool modal=true); |
19 | ~MainWindow(); | 19 | ~MainWindow(); |
20 | static QString appName() { return QString::fromLatin1("mediummount"); } | 20 | static QString appName() { return QString::fromLatin1("mediummount"); } |
21 | 21 | ||
22 | private slots: | 22 | private slots: |
23 | void slotGlobalChanged(int ); | 23 | void slotGlobalChanged(int ); |
24 | void slotCheckingChanged(int ); | 24 | void slotCheckingChanged(int ); |
25 | void accept(); | 25 | void accept(); |
26 | void done( int ); | 26 | void done( int ); |
27 | private: | 27 | private: |
28 | void init(); | 28 | void init(); |
29 | QTabWidget *m_tab; | 29 | QTabWidget *m_tab; |
30 | QVBoxLayout *m_lay; | 30 | QVBoxLayout *m_lay; |
diff --git a/noncore/settings/mediummount/mediumwidget.cc b/noncore/settings/mediummount/mediumwidget.cc index f39a6ed..ec5b9d5 100644 --- a/noncore/settings/mediummount/mediumwidget.cc +++ b/noncore/settings/mediummount/mediumwidget.cc | |||
@@ -22,29 +22,24 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | using namespace MediumMountSetting; | 24 | using namespace MediumMountSetting; |
25 | 25 | ||
26 | /* TRANSLATOR MediumMountSetting::MediumMountWidget */ | 26 | /* TRANSLATOR MediumMountSetting::MediumMountWidget */ |
27 | 27 | ||
28 | MediumMountWidget::MediumMountWidget(const QString &path, | 28 | MediumMountWidget::MediumMountWidget(const QString &path, |
29 | const QPixmap &pix, | 29 | const QPixmap &pix, |
30 | QWidget *parent, | 30 | QWidget *parent, |
31 | const char *name ) | 31 | const char *name ) |
32 | : QWidget( parent, name ) | 32 | : QWidget( parent, name ) |
33 | { | 33 | { |
34 | if(parent == 0){ | ||
35 | resize(QApplication::desktop()->width(), QApplication::desktop()->height() ); | ||
36 | }else{ | ||
37 | resize(parent->width(), parent->height() ); | ||
38 | } | ||
39 | m_path = path; | 34 | m_path = path; |
40 | initGUI(); | 35 | initGUI(); |
41 | m_label->setPixmap(pix ); | 36 | m_label->setPixmap(pix ); |
42 | m_config = 0; | 37 | m_config = 0; |
43 | 38 | ||
44 | readConfig(); | 39 | readConfig(); |
45 | } | 40 | } |
46 | // now we fire up the GUI | 41 | // now we fire up the GUI |
47 | // if I would know what I'm doing ;) | 42 | // if I would know what I'm doing ;) |
48 | void MediumMountWidget::initGUI() | 43 | void MediumMountWidget::initGUI() |
49 | { | 44 | { |
50 | //main layout | 45 | //main layout |
@@ -99,45 +94,45 @@ void MediumMountWidget::initGUI() | |||
99 | m_checks->addColSpacing(1, 2 ); | 94 | m_checks->addColSpacing(1, 2 ); |
100 | m_checks->setColStretch(1, -2 ); | 95 | m_checks->setColStretch(1, -2 ); |
101 | 96 | ||
102 | connect(m_all, SIGNAL(stateChanged(int) ), | 97 | connect(m_all, SIGNAL(stateChanged(int) ), |
103 | this, SLOT(slotStateChanged() ) ); | 98 | this, SLOT(slotStateChanged() ) ); |
104 | 99 | ||
105 | m_box->addWidget( m_group ); | 100 | m_box->addWidget( m_group ); |
106 | 101 | ||
107 | // label | 102 | // label |
108 | m_lblPath = new QLabel(tr("Limit search to:"), this ); | 103 | m_lblPath = new QLabel(tr("Limit search to:"), this ); |
109 | m_box->addWidget( m_lblPath ); | 104 | m_box->addWidget( m_lblPath ); |
110 | 105 | ||
111 | 106 | ||
112 | m_subList = new QComboBox(FALSE,this,"docFolderList"); | 107 | m_subList = new QComboBox(FALSE,this,"docFolderList"); |
113 | m_subList->setDuplicatesEnabled(FALSE); | 108 | m_subList->setDuplicatesEnabled(FALSE); |
114 | m_subList->setEditable(TRUE); | 109 | m_subList->setEditable(TRUE); |
115 | m_box->addWidget(m_subList); | 110 | m_box->addWidget(m_subList); |
116 | 111 | ||
117 | m_hboxAdd = new QHBox( this ); | 112 | m_hboxAdd = new QHBox( this ); |
118 | m_add = new QPushButton(m_hboxAdd ); | 113 | m_add = new QPushButton(m_hboxAdd ); |
119 | m_add->setText( tr("Add") ); | 114 | m_add->setText( tr("Add") ); |
120 | m_del = new QPushButton(m_hboxAdd); | 115 | m_del = new QPushButton(m_hboxAdd); |
121 | m_del->setText(tr("Remove")); | 116 | m_del->setText(tr("Remove")); |
122 | 117 | ||
123 | connect(m_add, SIGNAL(clicked() ), | 118 | connect(m_add, SIGNAL(clicked() ), |
124 | this, SLOT(slotAdd() ) ); | 119 | this, SLOT(slotAdd() ) ); |
125 | connect(m_del, SIGNAL(clicked() ), | 120 | connect(m_del, SIGNAL(clicked() ), |
126 | this, SLOT(slotRemove() ) ); | 121 | this, SLOT(slotRemove() ) ); |
127 | 122 | ||
128 | m_box->addWidget(m_hboxAdd ); | 123 | m_box->addWidget(m_hboxAdd ); |
129 | m_scan_all_check = new QCheckBox( tr("Scan whole media"), this ); | 124 | m_scan_all_check = new QCheckBox( tr("Scan whole media"), this ); |
130 | connect(m_scan_all_check,SIGNAL(stateChanged(int)),this,SLOT(slotScanAllChanged(int))); | 125 | connect(m_scan_all_check,SIGNAL(stateChanged(int)),this,SLOT(slotScanAllChanged(int))); |
131 | 126 | ||
132 | m_box->addWidget(m_scan_all_check); | 127 | m_box->addWidget(m_scan_all_check); |
133 | 128 | ||
134 | m_always = new QCheckBox( tr("Always check this medium"), this ); | 129 | m_always = new QCheckBox( tr("Always check this medium"), this ); |
135 | 130 | ||
136 | m_box->addWidget( m_always ); | 131 | m_box->addWidget( m_always ); |
137 | 132 | ||
138 | QSpacerItem *item = new QSpacerItem(5, 50, | 133 | QSpacerItem *item = new QSpacerItem(5, 50, |
139 | QSizePolicy::Fixed, | 134 | QSizePolicy::Fixed, |
140 | QSizePolicy::Expanding ); | 135 | QSizePolicy::Expanding ); |
141 | m_box->addItem(item ); | 136 | m_box->addItem(item ); |
142 | } | 137 | } |
143 | 138 | ||