| -rw-r--r-- | noncore/apps/zsafe/main.cpp | 29 |
1 files changed, 17 insertions, 12 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 @@ -48,11 +48,11 @@ 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 #ifdef DESKTOP QApplication a( argc, argv ); @@ -63,9 +63,9 @@ int main( int argc, char ** argv ) #ifdef DESKTOP if (argc >= 3) { -#ifndef WIN32 +#ifndef Q_WS_WIN DeskW = atoi(argv[1]); DeskH = atoi(argv[2]); #else int w, h; @@ -83,35 +83,40 @@ int main( int argc, char ** argv ) #else DeskW = a.desktop()->width(); DeskH = a.desktop()->height(); +#ifndef NO_OPIE owarn << "Width: " << DeskW << " Height: " << DeskH << oendl; - +#endif #ifdef JPATCH_HDE // nothings #else if (DeskW > 240) { DeskW -= 20; DeskH += 25; +#ifndef NO_OPIE owarn << "Changed width: " << DeskW << " Height: " << DeskH << oendl; +#endif } #endif #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(); return ret; |