summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-01-08 22:46:40 (UTC)
committer llornkcor <llornkcor>2004-01-08 22:46:40 (UTC)
commitb52dbdb9e992bd891d69601a6425086099e2ea04 (patch) (unidiff)
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
@@ -50,5 +50,9 @@
50#include <mntent.h> 50#include <mntent.h>
51 51
52#ifdef NOQUICKLAUNCH
52AdvancedFm::AdvancedFm( ) 53AdvancedFm::AdvancedFm( )
54#else
55AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
56#endif
53 : QMainWindow( ) { 57 : QMainWindow( ) {
54 init(); 58 init();
@@ -104,5 +108,5 @@ void AdvancedFm::tabChanged(QWidget *) {
104void AdvancedFm::populateView() { 108void AdvancedFm::populateView() {
105 109
106qWarning("PopulateView"); 110// qWarning("PopulateView");
107 QPixmap pm; 111 QPixmap pm;
108 QListView *thisView = CurrentView(); 112 QListView *thisView = CurrentView();
@@ -110,5 +114,5 @@ qWarning("PopulateView");
110 QString path = thisDir->canonicalPath(); 114 QString path = thisDir->canonicalPath();
111 115
112qWarning("path is "+path); 116//qWarning("path is "+path);
113 thisView->clear(); 117 thisView->clear();
114 thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst); 118 thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
@@ -814,5 +818,5 @@ QListView * AdvancedFm::OtherView() {
814 818
815void AdvancedFm::setOtherTabCurrent() { 819void AdvancedFm::setOtherTabCurrent() {
816 qWarning("setOtherTabCurrent() %d", whichTab); 820// qWarning("setOtherTabCurrent() %d", whichTab);
817 if ( whichTab == 1) { 821 if ( whichTab == 1) {
818 TabWidget->setCurrentWidget(1); 822 TabWidget->setCurrentWidget(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
@@ -56,5 +56,10 @@ class AdvancedFm : public QMainWindow
56 Q_OBJECT 56 Q_OBJECT
57public: 57public:
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();
60protected slots: 65protected slots:
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,4 +1,5 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release quick-app
3# CONFIG += qt warn_on release
3HEADERS = advancedfm.h filePermissions.h output.h 4HEADERS = advancedfm.h filePermissions.h output.h
4SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp 5SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
@@ -6,6 +7,29 @@ TARGET = advancedfm
6INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
7DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
8DESTDIR = $(OPIEDIR)/bin
9LIBS += -lqpe -lopie 9LIBS += -lqpe -lopie
10 10
11TRANSLATIONS = ../../../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
11include ( $(OPIEDIR)/include.pro ) 35include ( $(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
@@ -17,4 +17,5 @@
17#include "advancedfm.h" 17#include "advancedfm.h"
18 18
19#ifdef NOQUICKLAUNCH
19int main(int argc, char *argv[]) 20int main(int argc, char *argv[])
20{ 21{
@@ -25,3 +26,8 @@ int main(int argc, char *argv[])
25 return a.exec(); 26 return a.exec();
26} 27}
28#else
29#include <opie/oapplicationfactory.h>
27 30
31OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
32
33#endif