author | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-29 17:22:08 (UTC) |
commit | 35615947e11575a61456c8483e7f6d67fe59d5ed (patch) (unidiff) | |
tree | 89f834a50b5070767ca0f9c8a90d044f075a9131 /noncore/settings/mediummount | |
parent | 80fc44ae81d88c4cee5ea160818881acb2422a62 (diff) | |
download | opie-35615947e11575a61456c8483e7f6d67fe59d5ed.zip opie-35615947e11575a61456c8483e7f6d67fe59d5ed.tar.gz opie-35615947e11575a61456c8483e7f6d67fe59d5ed.tar.bz2 |
merge noncore/settings/* except networksettings for which tille volunteered (thanks)
-rw-r--r-- | noncore/settings/mediummount/main.cpp | 11 | ||||
-rw-r--r-- | noncore/settings/mediummount/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediummount.pro | 2 | ||||
-rw-r--r-- | noncore/settings/mediummount/mediumwidget.h | 1 |
4 files changed, 5 insertions, 10 deletions
diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp index 118a725..b8cdeaf 100644 --- a/noncore/settings/mediummount/main.cpp +++ b/noncore/settings/mediummount/main.cpp | |||
@@ -1,17 +1,10 @@ | |||
1 | #include "mediumwidget.h" | 1 | #include "mediumwidget.h" |
2 | #include "mediumglobal.h" | 2 | #include "mediumglobal.h" |
3 | #include "mainwindow.h" | 3 | #include "mainwindow.h" |
4 | 4 | ||
5 | #include <qpixmap.h> | 5 | #include <qpixmap.h> |
6 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
7 | #include <opie/oapplicationfactory.h> | ||
7 | 8 | ||
8 | int main( int argc, char ** argv ) | 9 | OPIE_EXPORT_APP( OApplicationFactory<MediumMountSetting::MainWindow> ) |
9 | { | ||
10 | QPEApplication a( argc, argv ); | ||
11 | 10 | ||
12 | MediumMountSetting::MainWindow mw; | ||
13 | a.showMainWidget( &mw ); | ||
14 | mw.showMaximized(); | ||
15 | |||
16 | return a.exec(); | ||
17 | } | ||
diff --git a/noncore/settings/mediummount/mainwindow.h b/noncore/settings/mediummount/mainwindow.h index 71dac79..9649863 100644 --- a/noncore/settings/mediummount/mainwindow.h +++ b/noncore/settings/mediummount/mainwindow.h | |||
@@ -14,12 +14,13 @@ namespace MediumMountSetting { | |||
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 , bool modal = FALSE, WFlags = 0); |
19 | ~MainWindow(); | 19 | ~MainWindow(); |
20 | static QString appName() { return QString::fromLatin1("mediummount"); } | ||
20 | 21 | ||
21 | private slots: | 22 | private slots: |
22 | void slotGlobalChanged(int ); | 23 | void slotGlobalChanged(int ); |
23 | void slotCheckingChanged(int ); | 24 | void slotCheckingChanged(int ); |
24 | void accept(); | 25 | void accept(); |
25 | void done( int ); | 26 | void done( int ); |
diff --git a/noncore/settings/mediummount/mediummount.pro b/noncore/settings/mediummount/mediummount.pro index 97bbbaf..6e29fa5 100644 --- a/noncore/settings/mediummount/mediummount.pro +++ b/noncore/settings/mediummount/mediummount.pro | |||
@@ -1,10 +1,10 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | DESTDIR = $(OPIEDIR)/bin/ | 2 | DESTDIR = $(OPIEDIR)/bin/ |
3 | #CONFIG = qt warn_on debug | 3 | #CONFIG = qt warn_on debug |
4 | CONFIG = qt warn_on release | 4 | CONFIG = qt warn_on release quick-app |
5 | HEADERS = mediumwidget.h mediumglobal.h mainwindow.h | 5 | HEADERS = mediumwidget.h mediumglobal.h mainwindow.h |
6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc | 6 | SOURCES = main.cpp mediumwidget.cc mediumglobal.cc mainwindow.cc |
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | TARGET = mediummount | 10 | TARGET = mediummount |
diff --git a/noncore/settings/mediummount/mediumwidget.h b/noncore/settings/mediummount/mediumwidget.h index 7f7b755..0f27117 100644 --- a/noncore/settings/mediummount/mediumwidget.h +++ b/noncore/settings/mediummount/mediumwidget.h | |||
@@ -24,12 +24,13 @@ namespace MediumMountSetting { | |||
24 | class MediumMountWidget : public QWidget { | 24 | class MediumMountWidget : public QWidget { |
25 | Q_OBJECT | 25 | Q_OBJECT |
26 | public: | 26 | public: |
27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); | 27 | MediumMountWidget(const QString&, const QPixmap &, QWidget *parent, const char *name = 0 ); |
28 | ~MediumMountWidget(); | 28 | ~MediumMountWidget(); |
29 | 29 | ||
30 | |||
30 | void writeConfig(); | 31 | void writeConfig(); |
31 | 32 | ||
32 | private slots: | 33 | private slots: |
33 | void slotAdd(); | 34 | void slotAdd(); |
34 | void slotStateChanged(); | 35 | void slotStateChanged(); |
35 | 36 | ||