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/sound | |
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/sound/main.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/sound/sound.pro | 4 | ||||
-rw-r--r-- | noncore/settings/sound/soundsettings.h | 1 |
3 files changed, 5 insertions, 10 deletions
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp index 33b0523..d919ce4 100644 --- a/noncore/settings/sound/main.cpp +++ b/noncore/settings/sound/main.cpp | |||
@@ -12,22 +12,18 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "soundsettings.h" | 21 | #include "soundsettings.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
25 | |||
26 | OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) | ||
24 | 27 | ||
25 | 28 | ||
26 | int main(int argc, char** argv) | ||
27 | { | ||
28 | QPEApplication a(argc,argv); | ||
29 | SoundSettings dlg; | ||
30 | a.showMainWidget(&dlg); | ||
31 | return a.exec(); | ||
32 | } | ||
33 | 29 | ||
diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 48c612e..c0a1ed3 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro | |||
@@ -1,15 +1,13 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = soundsettings.h soundsettingsbase.h | 2 | HEADERS = soundsettings.h soundsettingsbase.h |
5 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp | 3 | SOURCES = soundsettings.cpp soundsettingsbase.cpp main.cpp |
6 | #INTERFACES = soundsettingsbase.ui | 4 | #INTERFACES = soundsettingsbase.ui |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | TARGET = sound | 8 | TARGET = sound |
11 | 9 | ||
12 | TRANSLATIONS = ../../../i18n/de/sound.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/sound.ts \ |
13 | ../../../i18n/nl/sound.ts \ | 11 | ../../../i18n/nl/sound.ts \ |
14 | ../../../i18n/da/sound.ts \ | 12 | ../../../i18n/da/sound.ts \ |
15 | ../../../i18n/xx/sound.ts \ | 13 | ../../../i18n/xx/sound.ts \ |
diff --git a/noncore/settings/sound/soundsettings.h b/noncore/settings/sound/soundsettings.h index 71ce6f5..57a360f 100644 --- a/noncore/settings/sound/soundsettings.h +++ b/noncore/settings/sound/soundsettings.h | |||
@@ -20,24 +20,25 @@ | |||
20 | #ifndef SOUNDSETTINGS_H | 20 | #ifndef SOUNDSETTINGS_H |
21 | #define SOUNDSETTINGS_H | 21 | #define SOUNDSETTINGS_H |
22 | 22 | ||
23 | 23 | ||
24 | #include "soundsettingsbase.h" | 24 | #include "soundsettingsbase.h" |
25 | 25 | ||
26 | 26 | ||
27 | class SoundSettings : public SoundSettingsBase | 27 | class SoundSettings : public SoundSettingsBase |
28 | { | 28 | { |
29 | Q_OBJECT | 29 | Q_OBJECT |
30 | 30 | ||
31 | public: | 31 | public: |
32 | static QString appName() { return QString::fromLatin1("sound"); } | ||
32 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 33 | SoundSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
33 | 34 | ||
34 | protected: | 35 | protected: |
35 | bool noWarning; | 36 | bool noWarning; |
36 | /* void accept(); */ | 37 | /* void accept(); */ |
37 | /* void reject(); */ | 38 | /* void reject(); */ |
38 | void updateStorageCombo(); | 39 | void updateStorageCombo(); |
39 | void updateLocationCombo(); | 40 | void updateLocationCombo(); |
40 | 41 | ||
41 | private slots: | 42 | private slots: |
42 | void setKeyButton( int); | 43 | void setKeyButton( int); |
43 | void setSizeLimitButton(const QString &); | 44 | void setSizeLimitButton(const QString &); |