| -rw-r--r-- | noncore/apps/zsafe/main.cpp | 27 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 12 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe.pro | 14 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe_win32.pro | 2 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe_x86.pro | 19 |
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 @@ -51,5 +51,5 @@ int main( int argc, char ** argv ) { -#ifndef WIN32 +#ifndef Q_WS_WIN // install signal handler - signal (SIGSTOP, suspend); +// signal (SIGSTOP, suspend); #endif @@ -66,3 +66,3 @@ int main( int argc, char ** argv ) { -#ifndef WIN32 +#ifndef Q_WS_WIN DeskW = atoi(argv[1]); @@ -86,4 +86,5 @@ int main( int argc, char ** argv ) +#ifndef NO_OPIE owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; - +#endif #ifdef JPATCH_HDE @@ -95,3 +96,5 @@ int main( int argc, char ** argv ) DeskH += 25; +#ifndef NO_OPIE owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; +#endif } @@ -101,14 +104,16 @@ int main( int argc, char ** argv ) - ZSafe mw; - zs = &mw; + ZSafe *mw = new ZSafe( 0, 0, QWidget::WDestructiveClose ); +// ZSafe mw; +// zs = &mw; + zs = mw; -#ifndef WIN32 - signal (SIGCONT, resume); +#ifndef Q_WS_WIN +// signal (SIGCONT, resume); #endif #ifdef DESKTOP - a.setMainWidget(&mw); - mw.show(); + a.setMainWidget(mw); + mw->show(); #else // a.showMainWidget( &mw ); - a.showMainDocumentWidget( &mw ); + a.showMainDocumentWidget( mw ); #endif 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 @@ -376,3 +376,3 @@ static const char* const general_data[] = { conf = new Config (cfgFile, Config::File); - conf->setGroup ("zsafe"); + conf->setGroup ("zsafePrefs"); #endif @@ -494,3 +494,3 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe"; - QString filename = conf->readEntry(APP_KEY+"document"); + filename = conf->readEntry(APP_KEY+"document"); if ( !QFileInfo(filename).exists() || !QDir(zsafeAppDirPath).exists() ) @@ -807,3 +807,3 @@ void ZSafe::editPwd() int result = dialog->exec(); -// result = QDialog::Accepted; + result = QDialog::Accepted; #endif @@ -840,3 +840,3 @@ void ZSafe::newPwd() return; - + qWarning("new item"); if (!isCategory(selectedItem)) @@ -847,3 +847,3 @@ void ZSafe::newPwd() QString cat = selectedItem->text(0); - + qWarning(cat); // open the 'New Entry' dialog @@ -876,3 +876,3 @@ retype: int result = dialog->exec(); -// result = QDialog::Accepted; + result = QDialog::Accepted; #endif 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 @@ -17 +17,15 @@ include ( $(OPIEDIR)/include.pro ) +QWS { +message( "Configuring for multi-threaded Qt..." ) + +} + +win32 { + TEMPLATE = app + DEFINES += DESKTOP QT_DLL QT_THREAD_SUPPORT + SOURCES += extra/qsettings.cpp + HEADERS += extra/qsettings.h + INCLUDEPATH += extra + DEPENDPATH += extra + RC_FILE = zsafe.rc +} 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 @@ -3,3 +3,3 @@ TEMPLATE = app CONFIG = qt warn_on thread release
-DEFINES = DESKTOP WIN32
+DEFINES = DESKTOP
DEFINES += QT_DLL QT_THREAD_SUPPORT
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 @@ -2,4 +2,4 @@ TEMPLATE = app #CONFIG = qt warn_on debug -CONFIG = qt warn_on release thread -DEFINES = DESKTOP QT_THREAD_SUPPORT +CONFIG = qt warn_on release +DEFINES = DESKTOP NO_OPIE HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h shadedlistitem.h @@ -9,4 +9,2 @@ INCLUDEPATH += . DEPENDPATH += $(QTDIR)/include -#LIBS +=-L$(QPEDIR)/lib -lqt -LIBS +=-Wl,-rpath,/usr/lib/qt3/lib -L/usr/lib/qt3/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui @@ -16 +14,14 @@ TARGET = zsafe TRANSLATIONS = i18n/de/zsafe.ts +MOC_DIR=.x11 +OBJECTS_DIR=.x11 + +isEmpty(OPIEDIR) { + message( "Configuring for multi-threaded Qt..." ) +} + +win32 { +HEADERS+=extra/qsettings.h +SOURCES+=extra/qsettings.cpp +INCLUDEPATH += extra +DEPENDPATH += extra +} |