summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/main.cpp29
-rw-r--r--noncore/apps/zsafe/zsafe.cpp20
-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.pro21
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
@@ -40,79 +40,84 @@ void suspend (int signum)
40{ 40{
41 printf ("Suspend signal %d received\n", signum); 41 printf ("Suspend signal %d received\n", signum);
42} 42}
43 43
44void resume (int signum) 44void resume (int signum)
45{ 45{
46 printf ("Resume signal %d received\n", signum); 46 printf ("Resume signal %d received\n", signum);
47 zs->resume(signum); 47 zs->resume(signum);
48} 48}
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
58 QApplication a( argc, argv ); 58 QApplication a( argc, argv );
59#else 59#else
60 QPEApplication a( argc, argv ); 60 QPEApplication a( argc, argv );
61#endif 61#endif
62 appl = &a; 62 appl = &a;
63 63
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
71 int w, h; 71 int w, h;
72 sscanf (argv[1], "%d", &w); 72 sscanf (argv[1], "%d", &w);
73 sscanf (argv[2], "%d", &h); 73 sscanf (argv[2], "%d", &h);
74 DeskW = w; 74 DeskW = w;
75 DeskH = h; 75 DeskH = h;
76#endif 76#endif
77 } 77 }
78 else 78 else
79 { 79 {
80 DeskW = 600; 80 DeskW = 600;
81 DeskH = 400; 81 DeskH = 400;
82 } 82 }
83#else 83#else
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
92 if (DeskW > 240) 93 if (DeskW > 240)
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;
104 107// zs = &mw;
105#ifndef WIN32 108 zs = mw;
106 signal (SIGCONT, resume); 109
110#ifndef Q_WS_WIN
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
117 return ret; 122 return ret;
118} 123}
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
@@ -365,25 +365,25 @@ static const char* const general_data[] = {
365 delete conf; 365 delete conf;
366 366
367#ifdef DESKTOP 367#ifdef DESKTOP
368#ifndef Q_WS_WIN 368#ifndef Q_WS_WIN
369 conf = new QSettings(); 369 conf = new QSettings();
370 conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); 370 conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath());
371#else 371#else
372 conf = new QSettings (cfgFile); 372 conf = new QSettings (cfgFile);
373 conf->insertSearchPath (QSettings::Unix, cfgFile); 373 conf->insertSearchPath (QSettings::Unix, cfgFile);
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 }
381 381
382 382
383/* 383/*
384 * Constructs a ZSafe which is a child of 'parent', with the 384 * Constructs a ZSafe which is a child of 'parent', with the
385 * name 'name' and widget flags set to 'f' 385 * name 'name' and widget flags set to 'f'
386 * 386 *
387 * The dialog will by default be modeless, unless you set 'modal' to 387 * The dialog will by default be modeless, unless you set 'modal' to
388 * TRUE to construct a modal dialog. 388 * TRUE to construct a modal dialog.
389 */ 389 */
@@ -483,25 +483,25 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
483 DeskS = DeskH; 483 DeskS = DeskH;
484 } 484 }
485 resize( DeskW, DeskH ); 485 resize( DeskW, DeskH );
486 setMinimumSize( QSize( DeskS, DeskS ) ); 486 setMinimumSize( QSize( DeskS, DeskS ) );
487 setMaximumSize( QSize( DeskS, DeskS ) ); 487 setMaximumSize( QSize( DeskS, DeskS ) );
488#else 488#else
489 resize( DeskW, DeskH-30 ); 489 resize( DeskW, DeskH-30 );
490#endif 490#endif
491 491
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
499 // create it 499 // create it
500// #ifndef Q_WS_WIN 500// #ifndef Q_WS_WIN
501 // QString d1("Documents/application"); 501 // QString d1("Documents/application");
502// #else 502// #else
503 QString d1(QDir::homeDirPath() + "/Documents/application"); 503 QString d1(QDir::homeDirPath() + "/Documents/application");
504// #endif 504// #endif
505 QDir pd1(d1); 505 QDir pd1(d1);
506 if (!pd1.exists()) 506 if (!pd1.exists())
507 { 507 {
@@ -753,26 +753,26 @@ void ZSafe::deletePwd()
753 case 1: // Don't delete 753 case 1: // Don't delete
754 break; 754 break;
755 } 755 }
756 } 756 }
757 else 757 else
758 { 758 {
759 delCategory(); 759 delCategory();
760 } 760 }
761} 761}
762 762
763void ZSafe::editPwd() 763void ZSafe::editPwd()
764{ 764{
765 if (!selectedItem) 765 if (!selectedItem)
766 return; 766 return;
767 if (!isCategory(selectedItem)) 767 if (!isCategory(selectedItem))
768 { 768 {
769 // open the 'New Entry' dialog 769 // open the 'New Entry' dialog
770 NewDialog *dialog = new NewDialog(this, "edit_entry", TRUE); 770 NewDialog *dialog = new NewDialog(this, "edit_entry", TRUE);
771#ifdef Q_WS_WIN 771#ifdef Q_WS_WIN
772 dialog->setCaption ("Qt " + tr("Edit Entry")); 772 dialog->setCaption ("Qt " + tr("Edit Entry"));
773 dialog->setGeometry(200, 250, 220, 310 ); 773 dialog->setGeometry(200, 250, 220, 310 );
774#endif 774#endif
775 775
776 // set the labels 776 // set the labels
777 dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); 777 dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name")));
778 dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username"))); 778 dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username")));
@@ -796,25 +796,25 @@ void ZSafe::editPwd()
796 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); 796 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
797#endif 797#endif
798 798
799#ifdef DESKTOP 799#ifdef DESKTOP
800#ifndef Q_QW_QWIN 800#ifndef Q_QW_QWIN
801 dialog->show(); 801 dialog->show();
802#endif 802#endif
803#else 803#else
804 dialog->showMaximized(); 804 dialog->showMaximized();
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 {
812 modified = true; 812 modified = true;
813 // edit the selected item 813 // edit the selected item
814 QString name = dialog->NameField->text(); 814 QString name = dialog->NameField->text();
815 selectedItem->setText (0, tr (name)); 815 selectedItem->setText (0, tr (name));
816 QString user = dialog->UsernameField->text(); 816 QString user = dialog->UsernameField->text();
817 selectedItem->setText (1, tr (user)); 817 selectedItem->setText (1, tr (user));
818 QString pwd = dialog->PasswordField->text(); 818 QString pwd = dialog->PasswordField->text();
819 selectedItem->setText (2, tr (pwd)); 819 selectedItem->setText (2, tr (pwd));
820 QString comment = dialog->CommentField->text(); 820 QString comment = dialog->CommentField->text();
@@ -827,34 +827,34 @@ void ZSafe::editPwd()
827 } 827 }
828 828
829 delete dialog; 829 delete dialog;
830 } 830 }
831 else 831 else
832 { 832 {
833 editCategory(); 833 editCategory();
834 } 834 }
835} 835}
836 836
837void ZSafe::newPwd() 837void 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
852 dialog->setCaption ("Qt " + tr("New Entry")); 852 dialog->setCaption ("Qt " + tr("New Entry"));
853 dialog->setGeometry(200, 250, 220, 310 ); 853 dialog->setGeometry(200, 250, 220, 310 );
854#endif 854#endif
855 // set the labels 855 // set the labels
856 dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); 856 dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name")));
857 dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username"))); 857 dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username")));
858 dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password"))); 858 dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password")));
859 dialog->Comment->setText(getFieldLabel (selectedItem, "4", tr("Comment"))); 859 dialog->Comment->setText(getFieldLabel (selectedItem, "4", tr("Comment")));
860 dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4"))); 860 dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4")));
@@ -865,25 +865,25 @@ retype:
865 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); 865 DialogCode result = (DialogCode) QPEApplication::execDialog( dialog );
866#endif 866#endif
867 867
868#ifdef DESKTOP 868#ifdef DESKTOP
869#ifndef Q_QW_QWIN 869#ifndef Q_QW_QWIN
870 dialog->show(); 870 dialog->show();
871#endif 871#endif
872#else 872#else
873 dialog->showMaximized(); 873 dialog->showMaximized();
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)
881 { 881 {
882 882
883 QString name = dialog->NameField->text(); 883 QString name = dialog->NameField->text();
884 if (cat == name) 884 if (cat == name)
885 { 885 {
886 QMessageBox::critical( 0, tr("ZSafe"), 886 QMessageBox::critical( 0, tr("ZSafe"),
887 tr("Entry name must be different\nfrom the category name.") ); 887 tr("Entry name must be different\nfrom the category name.") );
888 goto retype; // it's not a good programming style :-) 888 goto retype; // it's not a good programming style :-)
889 } 889 }
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
@@ -6,12 +6,26 @@ HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h \
6SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \ 6SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \
7 categorylist.cpp zlistview.cpp shadedlistitem.cpp\ 7 categorylist.cpp zlistview.cpp shadedlistitem.cpp\
8 scqtfileedit.cpp scqtfileedit.moc.cpp \ 8 scqtfileedit.cpp scqtfileedit.moc.cpp \
9 scqtfiledlg.cpp 9 scqtfiledlg.cpp
10INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui 10INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
11INCLUDEPATH += $(OPIEDIR)/include 11INCLUDEPATH += $(OPIEDIR)/include
12DEPENDPATH += $(OPIEDIR)/include 12DEPENDPATH += $(OPIEDIR)/include
13LIBS += -lqpe -lopiecore2 -lopieui2 13LIBS += -lqpe -lopiecore2 -lopieui2
14TARGET = zsafe 14TARGET = 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,16 +1,16 @@
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 \
8 categorylist.cpp zlistview.cpp qsettings.cpp shadedlistitem.cpp 8 categorylist.cpp zlistview.cpp qsettings.cpp shadedlistitem.cpp
9 #INCLUDEPATH+= $(QTDIR)/include 9 #INCLUDEPATH+= $(QTDIR)/include
10 #INCLUDEPATH+= . 10 #INCLUDEPATH+= .
11 #DEPENDPATH+= $(QTDIR)/include 11 #DEPENDPATH+= $(QTDIR)/include
12#LIBS += -lqt 12#LIBS += -lqt
13 INTERFACES= newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui 13 INTERFACES= newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui
14INTERFACES += infoform.ui wait.ui 14INTERFACES += infoform.ui wait.ui
15 TARGET = zsafe 15 TARGET = zsafe
16#DESTDIR = ../bin 16#DESTDIR = ../bin
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}