make quicklaunch again

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 @@
 
+#ifdef NOQUICKLAUNCH
 AdvancedFm::AdvancedFm( )
+#else
+AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
+#endif
    : QMainWindow( ) {
@@ -105,3 +109,3 @@ void AdvancedFm::populateView() {
 
-qWarning("PopulateView");
+// qWarning("PopulateView");
 		QPixmap pm;
@@ -111,3 +115,3 @@ qWarning("PopulateView");
 
-qWarning("path is "+path);
+//qWarning("path is "+path);
 		thisView->clear();
@@ -815,3 +819,3 @@ QListView * AdvancedFm::OtherView() {
 void AdvancedFm::setOtherTabCurrent() {
-   qWarning("setOtherTabCurrent() %d", whichTab);
+//   qWarning("setOtherTabCurrent() %d", whichTab);
    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
 public:
+    static QString appName() { return QString::fromLatin1("advancedfm"); }
+#ifdef NOQUICKLAUNCH
    AdvancedFm();
+#else
+   AdvancedFm(QWidget *p = 0, const char* name = 0, WFlags fl = 0);
+#endif
    ~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 @@
 TEMPLATE  = app
-CONFIG    += qt warn_on release
+CONFIG    += qt warn_on release quick-app
+# CONFIG    += qt warn_on release
 HEADERS   = advancedfm.h filePermissions.h output.h
@@ -7,5 +8,28 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-DESTDIR = $(OPIEDIR)/bin
 LIBS            += -lqpe -lopie
 
+TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
+	 ../../../i18n/nl/advancedfm.ts \
+	 ../../../i18n/da/advancedfm.ts \
+	 ../../../i18n/xx/advancedfm.ts \
+   ../../../i18n/en/advancedfm.ts \
+   ../../../i18n/es/advancedfm.ts \
+   ../../../i18n/fr/advancedfm.ts \
+   ../../../i18n/hu/advancedfm.ts \
+   ../../../i18n/ja/advancedfm.ts \
+   ../../../i18n/ko/advancedfm.ts \
+   ../../../i18n/no/advancedfm.ts \
+   ../../../i18n/pl/advancedfm.ts \
+   ../../../i18n/pt/advancedfm.ts \
+   ../../../i18n/pt_BR/advancedfm.ts \
+   ../../../i18n/sl/advancedfm.ts \
+   ../../../i18n/zh_CN/advancedfm.ts \
+   ../../../i18n/zh_TW/advancedfm.ts
+
+
+!contains(CONFIG,quick-app) {	
+ DESTDIR = $(OPIEDIR)/bin
+ DEFINES += NOQUICKLAUNCH
+}
+
 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 @@
 
+#ifdef NOQUICKLAUNCH
 int main(int argc, char *argv[])
@@ -26,2 +27,7 @@ int main(int argc, char *argv[])
 }
+#else
+#include <opie/oapplicationfactory.h>
 
+OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
+
+#endif