author | llornkcor <llornkcor> | 2004-01-08 22:46:40 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-01-08 22:46:40 (UTC) |
commit | b52dbdb9e992bd891d69601a6425086099e2ea04 (patch) (unidiff) | |
tree | 16f57fb5e0063c5095161b30a898287e22e318b5 | |
parent | 5862ce131c780c38d5df7d336ec5d8fb8f62a0bc (diff) | |
download | opie-b52dbdb9e992bd891d69601a6425086099e2ea04.zip opie-b52dbdb9e992bd891d69601a6425086099e2ea04.tar.gz opie-b52dbdb9e992bd891d69601a6425086099e2ea04.tar.bz2 |
make quicklaunch again
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 10 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 5 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.pro | 28 | ||||
-rw-r--r-- | noncore/apps/advancedfm/main.cpp | 6 |
4 files changed, 44 insertions, 5 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index ac16540..9c13e53 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp | |||
@@ -51,3 +51,7 @@ | |||
51 | 51 | ||
52 | #ifdef NOQUICKLAUNCH | ||
52 | AdvancedFm::AdvancedFm( ) | 53 | AdvancedFm::AdvancedFm( ) |
54 | #else | ||
55 | AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) | ||
56 | #endif | ||
53 | : QMainWindow( ) { | 57 | : QMainWindow( ) { |
@@ -105,3 +109,3 @@ void AdvancedFm::populateView() { | |||
105 | 109 | ||
106 | qWarning("PopulateView"); | 110 | // qWarning("PopulateView"); |
107 | QPixmap pm; | 111 | QPixmap pm; |
@@ -111,3 +115,3 @@ qWarning("PopulateView"); | |||
111 | 115 | ||
112 | qWarning("path is "+path); | 116 | //qWarning("path is "+path); |
113 | thisView->clear(); | 117 | thisView->clear(); |
@@ -815,3 +819,3 @@ QListView * AdvancedFm::OtherView() { | |||
815 | void AdvancedFm::setOtherTabCurrent() { | 819 | void AdvancedFm::setOtherTabCurrent() { |
816 | qWarning("setOtherTabCurrent() %d", whichTab); | 820 | // qWarning("setOtherTabCurrent() %d", whichTab); |
817 | if ( whichTab == 1) { | 821 | if ( whichTab == 1) { |
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index be574c4..bfefa77 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h | |||
@@ -57,3 +57,8 @@ class AdvancedFm : public QMainWindow | |||
57 | public: | 57 | public: |
58 | static QString appName() { return QString::fromLatin1("advancedfm"); } | ||
59 | #ifdef NOQUICKLAUNCH | ||
58 | AdvancedFm(); | 60 | AdvancedFm(); |
61 | #else | ||
62 | AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0); | ||
63 | #endif | ||
59 | ~AdvancedFm(); | 64 | ~AdvancedFm(); |
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index 590db6a..70db018 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro | |||
@@ -1,3 +1,4 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release quick-app |
3 | # CONFIG += qt warn_on release | ||
3 | HEADERS = advancedfm.h filePermissions.h output.h | 4 | HEADERS = advancedfm.h filePermissions.h output.h |
@@ -7,5 +8,28 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
7 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
8 | DESTDIR = $(OPIEDIR)/bin | ||
9 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe -lopie |
10 | 10 | ||
11 | TRANSLATIONS = ../../../i18n/de/advancedfm.ts \ | ||
12 | ../../../i18n/nl/advancedfm.ts \ | ||
13 | ../../../i18n/da/advancedfm.ts \ | ||
14 | ../../../i18n/xx/advancedfm.ts \ | ||
15 | ../../../i18n/en/advancedfm.ts \ | ||
16 | ../../../i18n/es/advancedfm.ts \ | ||
17 | ../../../i18n/fr/advancedfm.ts \ | ||
18 | ../../../i18n/hu/advancedfm.ts \ | ||
19 | ../../../i18n/ja/advancedfm.ts \ | ||
20 | ../../../i18n/ko/advancedfm.ts \ | ||
21 | ../../../i18n/no/advancedfm.ts \ | ||
22 | ../../../i18n/pl/advancedfm.ts \ | ||
23 | ../../../i18n/pt/advancedfm.ts \ | ||
24 | ../../../i18n/pt_BR/advancedfm.ts \ | ||
25 | ../../../i18n/sl/advancedfm.ts \ | ||
26 | ../../../i18n/zh_CN/advancedfm.ts \ | ||
27 | ../../../i18n/zh_TW/advancedfm.ts | ||
28 | |||
29 | |||
30 | !contains(CONFIG,quick-app) { | ||
31 | DESTDIR = $(OPIEDIR)/bin | ||
32 | DEFINES += NOQUICKLAUNCH | ||
33 | } | ||
34 | |||
11 | include ( $(OPIEDIR)/include.pro ) | 35 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp index 8cacc4a..51e38dc 100644 --- a/noncore/apps/advancedfm/main.cpp +++ b/noncore/apps/advancedfm/main.cpp | |||
@@ -18,2 +18,3 @@ | |||
18 | 18 | ||
19 | #ifdef NOQUICKLAUNCH | ||
19 | int main(int argc, char *argv[]) | 20 | int main(int argc, char *argv[]) |
@@ -26,2 +27,7 @@ int main(int argc, char *argv[]) | |||
26 | } | 27 | } |
28 | #else | ||
29 | #include <opie/oapplicationfactory.h> | ||
27 | 30 | ||
31 | OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> ) | ||
32 | |||
33 | #endif | ||