summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-01-08 22:46:40 (UTC)
committer llornkcor <llornkcor>2004-01-08 22:46:40 (UTC)
commitb52dbdb9e992bd891d69601a6425086099e2ea04 (patch) (side-by-side diff)
tree16f57fb5e0063c5095161b30a898287e22e318b5
parent5862ce131c780c38d5df7d336ec5d8fb8f62a0bc (diff)
downloadopie-b52dbdb9e992bd891d69601a6425086099e2ea04.zip
opie-b52dbdb9e992bd891d69601a6425086099e2ea04.tar.gz
opie-b52dbdb9e992bd891d69601a6425086099e2ea04.tar.bz2
make quicklaunch again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp10
-rw-r--r--noncore/apps/advancedfm/advancedfm.h5
-rw-r--r--noncore/apps/advancedfm/advancedfm.pro28
-rw-r--r--noncore/apps/advancedfm/main.cpp6
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
@@ -49,7 +49,11 @@
#include <sys/vfs.h>
#include <mntent.h>
+#ifdef NOQUICKLAUNCH
AdvancedFm::AdvancedFm( )
+#else
+AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
+#endif
: QMainWindow( ) {
init();
renameBox = 0;
@@ -103,13 +107,13 @@ void AdvancedFm::tabChanged(QWidget *) {
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);
@@ -813,7 +817,7 @@ QListView * AdvancedFm::OtherView() {
}
void AdvancedFm::setOtherTabCurrent() {
- qWarning("setOtherTabCurrent() %d", whichTab);
+// qWarning("setOtherTabCurrent() %d", whichTab);
if ( whichTab == 1) {
TabWidget->setCurrentWidget(1);
} else {
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
@@ -55,7 +55,12 @@ 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);
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
@@ -16,6 +16,7 @@
#include "advancedfm.h"
+#ifdef NOQUICKLAUNCH
int main(int argc, char *argv[])
{
QPEApplication a(argc, argv);
@@ -24,4 +25,9 @@ int main(int argc, char *argv[])
a.showMainWidget( &advencedFm);
return a.exec();
}
+#else
+#include <opie/oapplicationfactory.h>
+OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
+
+#endif