summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2004-07-21 20:44:12 (UTC)
committer llornkcor <llornkcor>2004-07-21 20:44:12 (UTC)
commit51d06a743940249e34a2bcc970b825bad99819d3 (patch) (unidiff)
tree4c8075a3e3b46146da7630998ee52265e83c0939
parent8d5f46620d92ff1fb9477ada28b6a1aafeed6d16 (diff)
downloadopie-51d06a743940249e34a2bcc970b825bad99819d3.zip
opie-51d06a743940249e34a2bcc970b825bad99819d3.tar.gz
opie-51d06a743940249e34a2bcc970b825bad99819d3.tar.bz2
fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/zsafe/main.cpp27
-rw-r--r--noncore/apps/zsafe/zsafe.cpp12
-rw-r--r--noncore/apps/zsafe/zsafe.pro14
-rw-r--r--noncore/apps/zsafe/zsafe_win32.pro2
-rw-r--r--noncore/apps/zsafe/zsafe_x86.pro19
5 files changed, 52 insertions, 22 deletions
diff --git a/noncore/apps/zsafe/main.cpp b/noncore/apps/zsafe/main.cpp
index c187520..2707730 100644
--- a/noncore/apps/zsafe/main.cpp
+++ b/noncore/apps/zsafe/main.cpp
@@ -49,9 +49,9 @@ void resume (int signum)
49 49
50int main( int argc, char ** argv ) 50int main( int argc, char ** argv )
51{ 51{
52#ifndef WIN32 52#ifndef Q_WS_WIN
53 // install signal handler 53 // install signal handler
54 signal (SIGSTOP, suspend); 54// signal (SIGSTOP, suspend);
55#endif 55#endif
56 56
57#ifdef DESKTOP 57#ifdef DESKTOP
@@ -64,7 +64,7 @@ int main( int argc, char ** argv )
64#ifdef DESKTOP 64#ifdef DESKTOP
65 if (argc >= 3) 65 if (argc >= 3)
66 { 66 {
67#ifndef WIN32 67#ifndef Q_WS_WIN
68 DeskW = atoi(argv[1]); 68 DeskW = atoi(argv[1]);
69 DeskH = atoi(argv[2]); 69 DeskH = atoi(argv[2]);
70#else 70#else
@@ -84,8 +84,9 @@ int main( int argc, char ** argv )
84 DeskW = a.desktop()->width(); 84 DeskW = a.desktop()->width();
85 DeskH = a.desktop()->height(); 85 DeskH = a.desktop()->height();
86 86
87#ifndef NO_OPIE
87 owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; 88 owarn << "Width: " << DeskW << " Height: " << DeskH << oendl;
88 89#endif
89#ifdef JPATCH_HDE 90#ifdef JPATCH_HDE
90 // nothings 91 // nothings
91#else 92#else
@@ -93,24 +94,28 @@ int main( int argc, char ** argv )
93 { 94 {
94 DeskW -= 20; 95 DeskW -= 20;
95 DeskH += 25; 96 DeskH += 25;
97#ifndef NO_OPIE
96 owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; 98 owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl;
99#endif
97 } 100 }
98#endif 101#endif
99 102
100#endif 103#endif
101 104
102 ZSafe mw; 105 ZSafe *mw = new ZSafe( 0, 0, QWidget::WDestructiveClose );
103 zs = &mw; 106// ZSafe mw;
107// zs = &mw;
108 zs = mw;
104 109
105#ifndef WIN32 110#ifndef Q_WS_WIN
106 signal (SIGCONT, resume); 111// signal (SIGCONT, resume);
107#endif 112#endif
108#ifdef DESKTOP 113#ifdef DESKTOP
109 a.setMainWidget(&mw); 114 a.setMainWidget(mw);
110 mw.show(); 115 mw->show();
111#else 116#else
112 // a.showMainWidget( &mw ); 117 // a.showMainWidget( &mw );
113 a.showMainDocumentWidget( &mw ); 118 a.showMainDocumentWidget( mw );
114#endif 119#endif
115 int ret = a.exec(); 120 int ret = a.exec();
116 121
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 1c15852..2dd94aa 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -374,7 +374,7 @@ static const char* const general_data[] = {
374#endif 374#endif
375#else 375#else
376 conf = new Config (cfgFile, Config::File); 376 conf = new Config (cfgFile, Config::File);
377 conf->setGroup ("zsafe"); 377 conf->setGroup ("zsafePrefs");
378#endif 378#endif
379 } 379 }
380 } 380 }
@@ -492,7 +492,7 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
492#endif 492#endif
493 setCaption( tr( "ZSafe" ) ); 493 setCaption( tr( "ZSafe" ) );
494 QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe"; 494 QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe";
495 QString filename = conf->readEntry(APP_KEY+"document"); 495 filename = conf->readEntry(APP_KEY+"document");
496 if ( !QFileInfo(filename).exists() || !QDir(zsafeAppDirPath).exists() ) 496 if ( !QFileInfo(filename).exists() || !QDir(zsafeAppDirPath).exists() )
497 { 497 {
498 // check if the directory application exists, if not 498 // check if the directory application exists, if not
@@ -805,7 +805,7 @@ void ZSafe::editPwd()
805#endif 805#endif
806#ifdef DESKTOP 806#ifdef DESKTOP
807 int result = dialog->exec(); 807 int result = dialog->exec();
808// result = QDialog::Accepted; 808 result = QDialog::Accepted;
809#endif 809#endif
810 if (result == Accepted) 810 if (result == Accepted)
811 { 811 {
@@ -838,14 +838,14 @@ void ZSafe::newPwd()
838{ 838{
839 if (!selectedItem) 839 if (!selectedItem)
840 return; 840 return;
841 841 qWarning("new item");
842 if (!isCategory(selectedItem)) 842 if (!isCategory(selectedItem))
843 selectedItem = selectedItem->parent(); 843 selectedItem = selectedItem->parent();
844 844
845 if (isCategory(selectedItem)) 845 if (isCategory(selectedItem))
846 { 846 {
847 QString cat = selectedItem->text(0); 847 QString cat = selectedItem->text(0);
848 848 qWarning(cat);
849 // open the 'New Entry' dialog 849 // open the 'New Entry' dialog
850 NewDialog *dialog = new NewDialog(this, "new_entry", TRUE); 850 NewDialog *dialog = new NewDialog(this, "new_entry", TRUE);
851#ifdef Q_WS_WIN 851#ifdef Q_WS_WIN
@@ -874,7 +874,7 @@ retype:
874#endif 874#endif
875#ifdef DESKTOP 875#ifdef DESKTOP
876 int result = dialog->exec(); 876 int result = dialog->exec();
877// result = QDialog::Accepted; 877 result = QDialog::Accepted;
878#endif 878#endif
879 879
880 if (result == Accepted) 880 if (result == Accepted)
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index 3cae706..236d11e 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -15,3 +15,17 @@ TARGET = zsafe
15 15
16include ( $(OPIEDIR)/include.pro ) 16include ( $(OPIEDIR)/include.pro )
17 17
18QWS {
19message( "Configuring for multi-threaded Qt..." )
20
21}
22
23win32 {
24 TEMPLATE = app
25 DEFINES += DESKTOP QT_DLL QT_THREAD_SUPPORT
26 SOURCES += extra/qsettings.cpp
27 HEADERS += extra/qsettings.h
28 INCLUDEPATH+= extra
29 DEPENDPATH += extra
30 RC_FILE = zsafe.rc
31}
diff --git a/noncore/apps/zsafe/zsafe_win32.pro b/noncore/apps/zsafe/zsafe_win32.pro
index 5bc2c9e..3289fa0 100644
--- a/noncore/apps/zsafe/zsafe_win32.pro
+++ b/noncore/apps/zsafe/zsafe_win32.pro
@@ -1,7 +1,7 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on thread debug 2 #CONFIG = qt warn_on thread debug
3 CONFIG = qt warn_on thread release 3 CONFIG = qt warn_on thread release
4 DEFINES = DESKTOP WIN32 4 DEFINES = DESKTOP
5DEFINES += QT_DLL QT_THREAD_SUPPORT 5DEFINES += QT_DLL QT_THREAD_SUPPORT
6HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h qsettings.h shadedlistitem.h 6HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h qsettings.h shadedlistitem.h
7SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \ 7SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \
diff --git a/noncore/apps/zsafe/zsafe_x86.pro b/noncore/apps/zsafe/zsafe_x86.pro
index 95eb63f..6bffd23 100644
--- a/noncore/apps/zsafe/zsafe_x86.pro
+++ b/noncore/apps/zsafe/zsafe_x86.pro
@@ -1,16 +1,27 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release thread 3 CONFIG = qt warn_on release
4 DEFINES = DESKTOP QT_THREAD_SUPPORT 4 DEFINES = DESKTOP NO_OPIE
5HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h shadedlistitem.h 5HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h shadedlistitem.h
6SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp categorylist.cpp zlistview.cpp shadedlistitem.cpp 6SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp categorylist.cpp zlistview.cpp shadedlistitem.cpp
7 INCLUDEPATH+= $(QTDIR)/include 7 INCLUDEPATH+= $(QTDIR)/include
8 INCLUDEPATH+= . 8 INCLUDEPATH+= .
9 DEPENDPATH+= $(QTDIR)/include 9 DEPENDPATH+= $(QTDIR)/include
10#LIBS +=-L$(QPEDIR)/lib -lqt
11LIBS +=-Wl,-rpath,/usr/lib/qt3/lib -L/usr/lib/qt3/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm
12 INTERFACES= newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui 10 INTERFACES= newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui
13INTERFACES += infoform.ui wait.ui 11INTERFACES += infoform.ui wait.ui
14 TARGET = zsafe 12 TARGET = zsafe
15#DESTDIR = ../bin 13#DESTDIR = ../bin
16TRANSLATIONS = i18n/de/zsafe.ts 14TRANSLATIONS = i18n/de/zsafe.ts
15MOC_DIR=.x11
16OBJECTS_DIR=.x11
17
18isEmpty(OPIEDIR) {
19 message( "Configuring for multi-threaded Qt..." )
20}
21
22win32 {
23HEADERS+=extra/qsettings.h
24SOURCES+=extra/qsettings.cpp
25 INCLUDEPATH+= extra
26 DEPENDPATH+= extra
27}