author | llornkcor <llornkcor> | 2004-07-21 20:44:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2004-07-21 20:44:12 (UTC) |
commit | 51d06a743940249e34a2bcc970b825bad99819d3 (patch) (side-by-side diff) | |
tree | 4c8075a3e3b46146da7630998ee52265e83c0939 /noncore/apps | |
parent | 8d5f46620d92ff1fb9477ada28b6a1aafeed6d16 (diff) | |
download | opie-51d06a743940249e34a2bcc970b825bad99819d3.zip opie-51d06a743940249e34a2bcc970b825bad99819d3.tar.gz opie-51d06a743940249e34a2bcc970b825bad99819d3.tar.bz2 |
fixes
-rw-r--r-- | noncore/apps/zsafe/main.cpp | 29 | ||||
-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 20 | ||||
-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 | 21 |
5 files changed, 58 insertions, 28 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 @@ -50,7 +50,7 @@ void resume (int signum) int main( int argc, char ** argv ) { -#ifndef WIN32 +#ifndef Q_WS_WIN // install signal handler - signal (SIGSTOP, suspend); +// signal (SIGSTOP, suspend); #endif @@ -65,5 +65,5 @@ int main( int argc, char ** argv ) if (argc >= 3) { -#ifndef WIN32 +#ifndef Q_WS_WIN DeskW = atoi(argv[1]); DeskH = atoi(argv[2]); @@ -85,6 +85,7 @@ int main( int argc, char ** argv ) DeskH = a.desktop()->height(); +#ifndef NO_OPIE owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; - +#endif #ifdef JPATCH_HDE // nothings @@ -94,5 +95,7 @@ int main( int argc, char ** argv ) DeskW -= 20; DeskH += 25; +#ifndef NO_OPIE owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; +#endif } #endif @@ -100,16 +103,18 @@ int main( int argc, char ** argv ) #endif - ZSafe mw; - zs = &mw; - -#ifndef WIN32 - signal (SIGCONT, resume); + ZSafe *mw = new ZSafe( 0, 0, QWidget::WDestructiveClose ); +// ZSafe mw; +// zs = &mw; + zs = mw; + +#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 int ret = a.exec(); 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 @@ -375,5 +375,5 @@ static const char* const general_data[] = { #else conf = new Config (cfgFile, Config::File); - conf->setGroup ("zsafe"); + conf->setGroup ("zsafePrefs"); #endif } @@ -493,5 +493,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) setCaption( tr( "ZSafe" ) ); 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() ) { @@ -763,6 +763,6 @@ void ZSafe::deletePwd() void ZSafe::editPwd() { - if (!selectedItem) - return; + if (!selectedItem) + return; if (!isCategory(selectedItem)) { @@ -806,5 +806,5 @@ void ZSafe::editPwd() #ifdef DESKTOP int result = dialog->exec(); -// result = QDialog::Accepted; + result = QDialog::Accepted; #endif if (result == Accepted) @@ -837,7 +837,7 @@ void ZSafe::editPwd() void ZSafe::newPwd() { - if (!selectedItem) - return; - + if (!selectedItem) + return; + qWarning("new item"); if (!isCategory(selectedItem)) selectedItem = selectedItem->parent(); @@ -846,5 +846,5 @@ void ZSafe::newPwd() { QString cat = selectedItem->text(0); - + qWarning(cat); // open the 'New Entry' dialog NewDialog *dialog = new NewDialog(this, "new_entry", TRUE); @@ -875,5 +875,5 @@ retype: #ifdef DESKTOP 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 @@ -16,2 +16,16 @@ TARGET = zsafe 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 @@ -2,5 +2,5 @@ TEMPLATE = app #CONFIG = qt warn_on thread debug
CONFIG = qt warn_on thread release
-DEFINES = DESKTOP WIN32
+DEFINES = DESKTOP
DEFINES += QT_DLL QT_THREAD_SUPPORT
HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h qsettings.h shadedlistitem.h
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,6 +1,6 @@ TEMPLATE = app -#CONFIG = qt warn_on debug -CONFIG = qt warn_on release thread -DEFINES = DESKTOP QT_THREAD_SUPPORT +# CONFIG = qt warn_on debug +CONFIG = qt warn_on release +DEFINES = DESKTOP NO_OPIE HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h shadedlistitem.h SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp categorylist.cpp zlistview.cpp shadedlistitem.cpp @@ -8,6 +8,4 @@ INCLUDEPATH += $(QTDIR)/include 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 INTERFACES += infoform.ui wait.ui @@ -15,2 +13,15 @@ TARGET = zsafe #DESTDIR = ../bin 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 +} |