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
@@ -44,17 +44,21 @@
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
+#ifdef NOQUICKLAUNCH
 AdvancedFm::AdvancedFm( )
+#else
+AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
+#endif
    : QMainWindow( ) {
    init();
    renameBox = 0;
 
    unknownXpm = Resource::loadImage(  "UnknownDocument" ).smoothScale( AppLnk::smallIconSize(),  AppLnk::smallIconSize() );
 
    initConnections();
    whichTab=1;
@@ -98,23 +102,23 @@ void AdvancedFm::tabChanged(QWidget *) {
    setCaption(tr("AdvancedFm :: ")+fs+" :: "
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    chdir( path.latin1());
 }
 
 
 void AdvancedFm::populateView() {
 
-qWarning("PopulateView");
+// qWarning("PopulateView");
 		QPixmap pm;
 		QListView *thisView = CurrentView();
 		QDir *thisDir = CurrentDir();
 		QString path = thisDir->canonicalPath();
 
-qWarning("path is "+path);
+//qWarning("path is "+path);
 		thisView->clear();
 		thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
 		thisDir->setMatchAllDirs(TRUE);
 		thisDir->setNameFilter(filterStr);
 		QString fileL, fileS, fileDate;
 		QString fs= getFileSystemType((const QString &) path);
 		setCaption(tr("AdvancedFm :: ")+fs+" :: "
 							 +checkDiskSpace((const QString &) path)+ tr(" kB free") );
@@ -808,17 +812,17 @@ QListView * AdvancedFm::CurrentView() {
 QListView * AdvancedFm::OtherView() {
    if ( whichTab == 1)
       return Remote_View;
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-   qWarning("setOtherTabCurrent() %d", whichTab);
+//   qWarning("setOtherTabCurrent() %d", whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
    OtherView()->setFocus();
    OtherView()->setSelected( CurrentView()->firstChild(), true);      
 }
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
@@ -50,17 +50,22 @@ class MenuButton;
 
 class QToolButton;
 class Ir;
 
 class AdvancedFm : public QMainWindow
 {
     Q_OBJECT
 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();
 protected slots:
    void slotSwitchMenu(int);
    void selectAll();
    void addToDocs();
    void doDirChange();
    void mkDir();
    void del();
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,11 +1,35 @@
 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
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 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
@@ -11,17 +11,23 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include <qpe/qpeapplication.h>
 
 
 
 #include "advancedfm.h"
 
+#ifdef NOQUICKLAUNCH
 int main(int argc, char *argv[])
 {
     QPEApplication a(argc, argv);
 
     AdvancedFm advencedFm;
     a.showMainWidget( &advencedFm);
     return a.exec();
 }
+#else
+#include <opie/oapplicationfactory.h>
 
+OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
+
+#endif