author | zecke <zecke> | 2004-11-15 17:08:58 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-11-15 17:08:58 (UTC) |
commit | 6d7b1a9a5f32a0b69c5ee9cc963e8a43a76327cf (patch) (side-by-side diff) | |
tree | 45e30376ec8035174fc5fd9154ed35b4d405d5ed /noncore/apps/zsafe | |
parent | 97fb9b69240d0daa5222fa9264587cde8b25c117 (diff) | |
download | opie-6d7b1a9a5f32a0b69c5ee9cc963e8a43a76327cf.zip opie-6d7b1a9a5f32a0b69c5ee9cc963e8a43a76327cf.tar.gz opie-6d7b1a9a5f32a0b69c5ee9cc963e8a43a76327cf.tar.bz2 |
Remove many many many #ifdefs
"I always knew it would come like this"
-Make it a QWidget instead of a QDialog
-Introduce appName
-rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 671 | ||||
-rw-r--r-- | noncore/apps/zsafe/zsafe.h | 10 |
2 files changed, 62 insertions, 619 deletions
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index 1ae3b15..2b182f9 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp @@ -1,142 +1,100 @@ /**************************************************************************** ** ** Created: Sat Apr 6 17:57:45 2002 ** ** Author: Carsten Schneider <CarstenSchneider@t-online.de> ** ** $Id$ ** ** Homepage: http://home.t-online.de/home/CarstenSchneider/zsafe/index.html ** -** Compile Flags: -** Zaurus arm : -DNO_OPIE -** Zaurus Opie arm: none -** Linux Desktop : -DDESKTOP -DNO_OPIE -** Windows Desktop: -DDESKTOP -DNO_OPIE -** use qmake -** for japanese version additional use: -DJPATCH_HDE ** ****************************************************************************/ #include "zsafe.h" #include "newdialog.h" #include "searchdialog.h" #include "categorydialog.h" #include "passworddialog.h" #include "infoform.h" #include "zlistview.h" #include "shadedlistitem.h" -#ifndef DESKTOP -#ifndef NO_OPIE #include <opie2/ofiledialog.h> #include <opie2/odebug.h> using namespace Opie::Core; using namespace Opie::Ui; -#else -#include "scqtfileedit.h" -#endif -#endif #include <qclipboard.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <stdlib.h> -#ifndef Q_WS_WIN #include <unistd.h> -#endif #include <string.h> #include <errno.h> #include <qmenubar.h> #include <qpopupmenu.h> -#ifdef DESKTOP -#include <qfiledialog.h> -#include <qdragobject.h> -#ifndef Q_WS_WIN -#include <qsettings.h> -#else -#include "qsettings.h" -#endif -#include <qapplication.h> -#else #include <qfile.h> #include <qpe/fileselector.h> #include <qpe/global.h> #include <qpe/qpeapplication.h> #include <qpe/resource.h> #include <qpe/config.h> -#endif #include <qtimer.h> #include <qlayout.h> #include <qmessagebox.h> #include <qfile.h> #include <qtextstream.h> #include <qheader.h> #include <qlistview.h> #include <qtoolbutton.h> #include <qvariant.h> #include <qtooltip.h> #include <qwhatsthis.h> #include <qimage.h> #include <qpixmap.h> #include <qlineedit.h> #include <qmultilineedit.h> #include <qregexp.h> #include <qdir.h> #include <qtextbrowser.h> #include <qlabel.h> #include <qcombobox.h> #include "krc2.h" #include "wait.h" -extern int DeskW, DeskH; -#ifdef DESKTOP -extern QApplication *appl; -#else -extern QPEApplication *appl; -#endif - -#ifdef JPATCH_HDE -#define tr(arg) arg -#endif - +int DeskW, DeskH; +QApplication *appl; +ZSafe *zs; -#ifdef DESKTOP -#ifndef Q_WS_WIN -const QString APP_KEY="/.zsafe/"; -#else -const QString APP_KEY=""; -#endif -#else const QString APP_KEY=""; -#endif // include xmp images #include "pics/zsafe/copy.xpm" #include "pics/zsafe/cut.xpm" #include "pics/zsafe/edit.xpm" #include "pics/zsafe/editdelete.xpm" #include "pics/zsafe/find.xpm" #include "pics/zsafe/folder_open.xpm" #include "pics/zsafe/help_icon.xpm" #include "pics/zsafe/new.xpm" #include "pics/zsafe/paste.xpm" #include "pics/zsafe/quit_icon.xpm" #include "pics/zsafe/save.xpm" #include "pics/zsafe/trash.xpm" #include "pics/zsafe/expand.xpm" #include "pics/zsafe/export.xpm" #include "pics/zsafe/import.xpm" #include "pics/zsafe/zsafe.xpm" static const char* const bank_cards_data[] = { "14 14 16 1", ". c None", "# c #000000", "b c #0000de", @@ -343,267 +301,185 @@ static const char* const general_data[] = { "QtQt#a.X#b#c.5.6#d#e#f#g#h#i", "QtQtQt#j.7#k.6#d#l#m#n#o#p#q", "QtQtQtQt.k#r#s#m#t.H#u#v#w#x", "QtQtQtQtQtQt.k#y#z.v#A#B#C#x", "QtQtQtQtQtQtQtQt.k#D.w#s#E.k", "QtQtQtQtQtQtQtQtQtQtQt#x#FQt"}; // exit ZSafe and clear the clipboard for security reasons void ZSafe::exitZs (int ec) { QClipboard *cb = QApplication::clipboard(); cb->clear(); exit (ec); } // save the configuration into the file void ZSafe::saveConf () { if (conf) { delete conf; -#ifdef DESKTOP -#ifndef Q_WS_WIN - conf = new QSettings(); - conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); -#else - conf = new QSettings (cfgFile); - conf->insertSearchPath (QSettings::Unix, cfgFile); -#endif -#else - conf = new Config (cfgFile, Config::File); - conf->setGroup ("zsafePrefs"); -#endif + conf = new Config ("zsafe"); + conf->setGroup ("zsafe"); } } /* * Constructs a ZSafe which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ), +ZSafe::ZSafe( QWidget* parent, const char* name, WFlags fl ) + : QWidget( parent, name, fl), Edit(0l), Delete(0l), Find(0l), New(0l), ListView(0l) { + zs = this; + appl = qApp; + DeskW = qApp->desktop()->width(); + DeskH = qApp->desktop()->height(); + IsCut = false; IsCopy = false; modified = false; showpwd = false; // set the config file cfgFile=QDir::homeDirPath(); cfgFile += "/.zsafe.cfg"; // set the icon path -#ifdef NO_OPIE - QString qpedir ((const char *)getenv("QPEDIR")); -#else - QString qpedir ((const char *)getenv("OPIEDIR")); -#endif -#ifdef DESKTOP - iconPath = QDir::homeDirPath() + "/pics/"; -#else - if (qpedir.isEmpty()) - iconPath = "/home/QtPalmtop/pics/"; - else - iconPath = qpedir + "/pics/"; -#endif + QString qpeDir = QPEApplication::qpeDir(); - // create a zsafe configuration object -#ifdef DESKTOP -#ifndef Q_WS_WIN - conf = new QSettings (); - conf->insertSearchPath (QSettings::Unix, QDir::homeDirPath()); -#else - conf = new QSettings (cfgFile); - conf->insertSearchPath (QSettings::Unix, cfgFile); -#endif -#else - conf = new Config (cfgFile, Config::File); + conf = new Config ("zsafe"); conf->setGroup ("zsafePrefs"); -#endif -#ifdef DESKTOP -// #ifndef Q_WS_WIN - expandTree = conf->readBoolEntry(APP_KEY+"expandTree", false); -// #endif -#else + expandTree = conf->readNumEntry(APP_KEY+"expandTree", 0); -#endif -#ifndef DESKTOP conf->setGroup ("zsafe"); -#endif QPixmap copy_img((const char**) copy_xpm); QPixmap cut_img((const char**) cut_xpm); QPixmap edit_img((const char**) edit_xpm); QPixmap editdelete_img((const char**) editdelete_xpm); QPixmap find_img((const char**) find_xpm); QPixmap folder_open_img((const char**) folder_open_xpm); QPixmap help_icon_img((const char**) help_icon_xpm); QPixmap new_img((const char**) new_xpm); QPixmap paste_img((const char**) paste_xpm); QPixmap quit_icon_img((const char**) quit_icon_xpm); QPixmap save_img((const char**) save_xpm); QPixmap trash_img((const char**) trash_xpm); QPixmap expand_img((const char**) expand_xpm); QPixmap export_img((const char**) export_xpm); QPixmap import_img((const char**) import_xpm); QPixmap bank_cards( ( const char** ) bank_cards_data ); QPixmap passwords( ( const char** ) passwords_data ); QPixmap software( ( const char** ) software_data ); QPixmap general( ( const char** ) general_data ); QPixmap image0( ( const char** ) zsafe_xpm ); + if ( !name ) setName( "ZSafe" ); -#ifdef DESKTOP -#ifdef Q_WS_WIN - setGeometry(100, 150, DeskW, DeskH-30 ); -#else - resize( DeskW, DeskH-30 ); -#endif - -#else - -#ifdef JPATCH_HDE - int DeskS; - if(DeskW > DeskH) - { - DeskS = DeskW; - } - else - { - DeskS = DeskH; - } - resize( DeskW, DeskH ); - setMinimumSize( QSize( DeskS, DeskS ) ); - setMaximumSize( QSize( DeskS, DeskS ) ); -#else - resize( DeskW, DeskH-30 ); -#endif - -#endif setCaption( tr( "ZSafe" ) ); QString zsafeAppDirPath = QDir::homeDirPath() + "/Documents/application/zsafe"; + filename = conf->readEntry(APP_KEY+"document"); if ( !QFileInfo(filename).exists() || !QDir(zsafeAppDirPath).exists() ) { // check if the directory application exists, if not // create it -// #ifndef Q_WS_WIN - // QString d1("Documents/application"); -// #else QString d1(QDir::homeDirPath() + "/Documents/application"); -// #endif QDir pd1(d1); if (!pd1.exists()) { QDir pd2(QDir::homeDirPath() + "/Documents"); if (!pd2.exists()) { QDir pd3(QDir::homeDirPath()); if (!pd3.mkdir("Documents", FALSE)) { } } if (!pd2.mkdir("application", FALSE)) { QMessageBox::critical( 0, tr("ZSafe"), -#ifdef JPATCH_HDE - tr("<P>Can't create directory ..."+d1+"</P><P>ZSafe will now exit.</P>")); -#else tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d1)); -#endif exitZs (1); } } -// #ifndef Q_WS_WIN - // QString d2("Documents/application/zsafe"); -// #else QString d2(QDir::homeDirPath() + "/Documents/application/zsafe"); -// #endif QDir pd2(d2); if (!pd2.exists()) { if (!pd1.mkdir("zsafe", FALSE)) { QMessageBox::critical( 0, tr("ZSafe"), -#ifdef JPATCH_HDE - tr("<P>Can't create directory ...//Documents/application/zsafe</P><P>ZSafe will now exit.</P")); -#else tr("<P>Can't create directory %1</P><P>ZSafe will now exit.</P>").arg(d2)); -#endif exitZs (1); } } filename = zsafeAppDirPath + "/passwords.zsf"; // save the current filename to the config file conf->writeEntry(APP_KEY+"document", filename); saveConf(); } //if (filename == "INVALIDPWD") //filename = ""; QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); -#ifdef Q_WS_WIN - this->setCaption("Qt ZSafe: " + ti); -#else - this->setCaption("ZSafe: " + ti); -#endif + this->setCaption(tr("ZSafe: ") + ti); selectedItem = NULL; lastSearchedCategory = NULL; lastSearchedItem = NULL; lastSearchedName = ""; lastSearchedUsername = ""; lastSearchedComment = ""; infoForm = new InfoForm(this, "show_info", TRUE); categoryDialog = NULL; infoForm->setIcon( image0); // add a menu bar QMenuBar *menu = new QMenuBar( this ); // add file menu // QPopupMenu *file = new QPopupMenu( this ); file = new QPopupMenu( this ); -// #ifdef DESKTOP file->insertItem( new_img, tr("&New document"), this, SLOT(newDocument()) ); file->insertItem( folder_open_img, tr("&Open document"), this, SLOT(loadDocument()) ); file->insertItem( save_img, tr("&Save document as .."), this, SLOT(saveDocumentAs()) ); file->insertSeparator(); -// #endif file->insertItem( save_img, tr("&Save document"), this, SLOT(saveDocumentWithoutPwd()) ); file->insertItem( save_img, tr("S&ave document with new Password"), this, SLOT(saveDocumentWithPwd()) ); file->insertSeparator(); file->insertItem( export_img, tr("&Export text file"), this, SLOT(writeAllEntries()) ); file->insertItem( import_img, tr("&Import text file"), this, SLOT(readAllEntries()) ); file->insertItem( trash_img, tr("&Remove text file"), this, SLOT(removeAsciiFile()) ); file->insertSeparator(); file->insertItem( expand_img, tr("&Open entries expanded"), this, SLOT(setExpandFlag()), 0, 'o'); file->setItemChecked('o', expandTree); file->insertSeparator(); file->insertItem( quit_icon_img, tr("E&xit"), this, SLOT(quitMe()) ); menu->insertItem( tr("&File"), file ); QPopupMenu *cat = new QPopupMenu( this ); cat->insertItem( new_img, tr("&New"), this, SLOT(addCategory()) ); cat->insertItem( edit_img, tr("&Edit"), this, SLOT(editCategory()) ); cat->insertItem( trash_img, tr("&Delete"), this, SLOT(delCategory()) ); menu->insertItem( tr("&Category"), cat ); QPopupMenu *it = new QPopupMenu( this ); it->insertItem( cut_img, tr("&Cut"), this, SLOT(cutItem()) ); @@ -644,98 +520,82 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) Find = new QToolButton( menu, "Find" ); Find->setGeometry( QRect( DeskW-24, 2, 20, 20 ) ); Find->setText( "" ); Find->setPixmap( find_img ); QToolTip::add( Find, tr( "Find entry" ) ); /* QBoxLayout * h = new QHBoxLayout( this ); h->addWidget (menu); h->addWidget (New); h->addWidget (Edit); h->addWidget (Delete); h->addWidget (Find); */ ListView = new ZListView( this, "ListView" ); ListView->addColumn( tr( "Name" ) ); ListView->addColumn( tr( "Field 2" ) ); ListView->addColumn( tr( "Field 3" ) ); ListView->addColumn( tr( "Comment" ) ); ListView->addColumn( tr( "Field 4" ) ); ListView->addColumn( tr( "Field 5" ) ); ListView->setAllColumnsShowFocus(TRUE); -#ifdef DESKTOP - // ListView->setResizePolicy(QScrollView::AutoOneFit); - // ListView->setGeometry( QRect( 0, 22, this->width(), this->height() - 30 ) ); -#else ListView->setResizePolicy(QScrollView::AutoOneFit); // ListView->setGeometry( QRect( 0, 22, // this->width(), this->height() - 30 ) ); // ListView->setMaximumSize( QSize( 440, 290 ) ); -#endif // ListView->setVScrollBarMode( QListView::Auto ); QBoxLayout * l = new QVBoxLayout( this ); l->addWidget (menu); l->addWidget (ListView); -#ifndef DESKTOP // start a timer (100 ms) to load the default document docuTimer.start( 100, true ); connect( &docuTimer, SIGNAL(timeout()), SLOT( slotLoadDocu() ) ); raiseFlag = true; connect( &raiseTimer, SIGNAL(timeout()), SLOT( slotRaiseTimer() ) ); -#else - // open the default document - openDocument(filename); -#endif // signals and slots connections for QTollButton connect( New, SIGNAL( clicked() ), this, SLOT( newPwd() ) ); connect( Edit, SIGNAL( clicked() ), this, SLOT( editPwd() ) ); connect( Delete, SIGNAL( clicked() ), this, SLOT( deletePwd() ) ); connect( Find, SIGNAL( clicked() ), this, SLOT( findPwd() ) ); // signals and slots connections for QListView connect( ListView, SIGNAL( selectionChanged(QListViewItem*) ), this, SLOT( listViewSelected(QListViewItem*) ) ); connect( ListView, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( showInfo(QListViewItem*) ) ); connect( ListView, SIGNAL( returnPressed(QListViewItem*) ), this, SLOT( showInfo(QListViewItem*) ) ); -#ifndef DESKTOP QPEApplication::setStylusOperation( ListView->viewport(),QPEApplication::RightOnHold); -#endif connect( ListView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); this->setIcon( image0);
-#ifdef Q_WS_WIN
- ListView->setSelected( ListView->firstChild() , true);
- ListView->setSelected( ListView->firstChild() , false);
-#endif } const QColor *ZSafe::evenRowColor = &Qt::white; // const QColor *ZSafe::oddRowColor = &Qt::lightGray; const QColor *ZSafe::oddRowColor = new QColor(216,240,255); /* * Destroys the object and frees any allocated resources */ ZSafe::~ZSafe() { // no need to delete child widgets, Qt does it all for us quitMe(); } // load the default document void ZSafe::slotLoadDocu() { openDocument (filename); } void ZSafe::deletePwd() { @@ -751,319 +611,258 @@ void ZSafe::deletePwd() case 0: // Delete clicked, Alt-S or Enter pressed. // Delete modified = true; selectedItem->parent()->takeItem(selectedItem); selectedItem = NULL; break; case 1: // Don't delete break; } } else { delCategory(); } } void ZSafe::editPwd() { if (!selectedItem) return; if (!isCategory(selectedItem)) { // open the 'New Entry' dialog NewDialog *dialog = new NewDialog(this, "edit_entry", TRUE); -#ifdef Q_WS_WIN - dialog->setCaption ("Qt " + tr("Edit Entry")); - dialog->setGeometry(200, 250, 220, 310 ); -#endif // set the labels dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username"))); dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password"))); dialog->Comment->setText(getFieldLabel (selectedItem, "4", tr("Comment"))); dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4"))); dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5"))); // set the fields dialog->NameField->setText(selectedItem->text (0)); dialog->UsernameField->setText(selectedItem->text (1)); dialog->PasswordField->setText(selectedItem->text (2)); QString comment = selectedItem->text (3); comment.replace (QRegExp("<br>"), "\n"); dialog->Field5->setText(selectedItem->text (4)); dialog->Field6->setText(selectedItem->text (5)); dialog->CommentField->insertLine(comment); dialog->CommentField->setCursorPosition(0,0); -#ifdef Q_WS_QWS - DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); -#endif - -#ifdef DESKTOP -#ifndef Q_QW_QWIN - dialog->show(); -#endif -#else - dialog->showMaximized(); -#endif -#ifdef DESKTOP - int result = dialog->exec(); - result = QDialog::Accepted; -#endif - if (result == Accepted) + QDialog::DialogCode result = (QDialog::DialogCode) QPEApplication::execDialog( dialog ); + if (result == QDialog::Accepted) { modified = true; // edit the selected item QString name = dialog->NameField->text(); selectedItem->setText (0, tr (name)); QString user = dialog->UsernameField->text(); selectedItem->setText (1, tr (user)); QString pwd = dialog->PasswordField->text(); selectedItem->setText (2, tr (pwd)); QString comment = dialog->CommentField->text(); comment.replace (QRegExp("\n"), "<br>"); selectedItem->setText (3, tr (comment)); QString f5 = dialog->Field5->text(); selectedItem->setText (4, tr (f5)); QString f6 = dialog->Field6->text(); selectedItem->setText (5, tr (f6)); } delete dialog; } else { editCategory(); } } void ZSafe::newPwd() { if (!selectedItem) return; qWarning("new item"); if (!isCategory(selectedItem)) selectedItem = selectedItem->parent(); if (isCategory(selectedItem)) { QString cat = selectedItem->text(0); qWarning(cat); // open the 'New Entry' dialog NewDialog *dialog = new NewDialog(this, "new_entry", TRUE); -#ifdef Q_WS_WIN - dialog->setCaption ("Qt " + tr("New Entry")); - dialog->setGeometry(200, 250, 220, 310 ); -#endif // set the labels dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); dialog->Username->setText(getFieldLabel (selectedItem, "2", tr("Username"))); dialog->Password->setText(getFieldLabel (selectedItem, "3", tr("Password"))); dialog->Comment->setText(getFieldLabel (selectedItem, "4", tr("Comment"))); dialog->Field5Label->setText(getFieldLabel (selectedItem,"5", tr("Field 4"))); dialog->Field6Label->setText(getFieldLabel (selectedItem,"6", tr("Field 5"))); retype: #ifdef Q_WS_QWS - DialogCode result = (DialogCode) QPEApplication::execDialog( dialog ); -#endif - -#ifdef DESKTOP -#ifndef Q_QW_QWIN - dialog->show(); -#endif -#else - dialog->showMaximized(); -#endif -#ifdef DESKTOP - int result = dialog->exec(); - result = QDialog::Accepted; + QDialog::DialogCode result = (QDialog::DialogCode) QPEApplication::execDialog( dialog ); #endif - - if (result == Accepted) + if (result == QDialog::Accepted) { QString name = dialog->NameField->text(); if (cat == name) { QMessageBox::critical( 0, tr("ZSafe"), tr("Entry name must be different\nfrom the category name.") ); goto retype; // it's not a good programming style :-) } modified = true; // add the new item QListViewItem *i = new ShadedListItem (0, selectedItem); i->setOpen (TRUE); i->setText (0, tr (name)); QString user = dialog->UsernameField->text(); i->setText (1, tr (user)); QString pwd = dialog->PasswordField->text(); i->setText (2, tr (pwd)); QString comment = dialog->CommentField->text(); comment.replace (QRegExp("\n"), "<br>"); i->setText (3, tr (comment)); QString f5 = dialog->Field5->text(); i->setText (4, tr (f5)); QString f6 = dialog->Field6->text(); i->setText (5, tr (f6)); } delete dialog; } } void ZSafe::findPwd() { // open the 'Search' dialog SearchDialog *dialog = new SearchDialog(this, tr("Search"), TRUE); -#ifdef Q_WS_WIN - dialog->setCaption ("Qt " + tr("Search")); -#endif -#ifdef DESKTOP -#endif if (lastSearchedName) dialog->NameField->setText(lastSearchedName); else dialog->NameField->setText(""); if (lastSearchedUsername) dialog->UsernameField->setText(lastSearchedUsername); else dialog->UsernameField->setText(""); if (lastSearchedComment) dialog->CommentField->setText(lastSearchedComment); else dialog->CommentField->setText(""); - DialogCode result = (DialogCode) dialog->exec(); -#ifdef DESKTOP - result = Accepted; -#endif + QDialog::DialogCode result = (QDialog::DialogCode) dialog->exec(); QString name; QString username; QString comment; - if (result == Accepted) + if (result == QDialog::Accepted) { name = dialog->NameField->text(); username = dialog->UsernameField->text(); comment = dialog->CommentField->text(); -#ifndef NO_OPIE - owarn << name << oendl; -#else - qWarning (name); -#endif } else { delete dialog; return; } if (!name.isEmpty() && name != lastSearchedName || lastSearchedName.isEmpty() && !name.isEmpty()) { // set search at the beginning if a new name is given lastSearchedCategory = NULL; lastSearchedItem = NULL; } lastSearchedName = name; if (!username.isEmpty() && username != lastSearchedUsername || lastSearchedUsername.isEmpty() && !username.isEmpty()) { // set search at the beginning if a new name is given lastSearchedCategory = NULL; lastSearchedItem = NULL; } lastSearchedUsername = username; if (!comment.isEmpty() && comment != lastSearchedComment || lastSearchedComment.isEmpty() && !comment.isEmpty()) { // set search at the beginning if a new name is given lastSearchedCategory = NULL; lastSearchedItem = NULL; } lastSearchedComment = comment; ListView->clearSelection(); bool found=FALSE; // step through all categories QListViewItem *i; if (lastSearchedCategory) i = lastSearchedCategory; else i = ListView->firstChild(); for (; i != NULL; i = i->nextSibling()) { -#ifndef NO_OPIE - owarn << i->text(0) << oendl; -#endif i->setSelected(FALSE); // step through all subitems QListViewItem *si; if (lastSearchedItem) si = lastSearchedItem; else si = i->firstChild(); // for (si = i->firstChild(); for (; si != NULL; si = si->nextSibling()) { -#ifndef NO_OPIE - owarn << si->text(0) << oendl; -#else - qWarning (si->text(0)); -#endif if (si->isSelected()) si->setSelected(FALSE); // ListView->repaintItem(si); bool n=TRUE; bool u=TRUE; bool c=TRUE; if (!name.isEmpty()) n = (si->text(0)).contains (name, FALSE); if (!username.isEmpty()) u = (si->text(1)).contains (username, FALSE); if (!comment.isEmpty()) c = (si->text(3)).contains (comment, FALSE); if ((n && u && c ) && !found) { -#ifndef NO_OPIE - owarn << "Found" << oendl; -#else - qWarning ("Found"); -#endif selectedItem = si; si->setSelected(TRUE); ListView->setCurrentItem(si); ListView->ensureItemVisible(si); ListView->triggerUpdate(); lastSearchedCategory = i; // set to the next item lastSearchedItem = si->nextSibling(); if (!lastSearchedItem) { // no next item within category -> set next category lastSearchedCategory = i->nextSibling(); if (!lastSearchedCategory) lastSearchedItem = NULL; // END } found = TRUE; delete dialog; update(); return; } } lastSearchedCategory = i->nextSibling(); @@ -1078,88 +877,66 @@ void ZSafe::findPwd() } QString ZSafe::getFieldLabel (QListViewItem *_item, QString field, QString def) { QString category; if (_item) { if (isCategory(_item)) { category = _item->text(0); } else { QListViewItem *cat = _item->parent(); category = cat->text(0); } } else { return def; } QString app_key = APP_KEY; -#ifndef DESKTOP -#ifndef Q_WS_WIN + conf->setGroup ("fieldDefs"); -#endif -#else -#ifndef Q_WS_WIN - app_key += "/fieldDefs/"; -#endif -#endif -// #ifndef Q_WS_WIN QString label = conf->readEntry(app_key+category+"-field"+field,def); -// #else -// QString label(def); -// #endif - -#ifndef DESKTOP conf->setGroup ("zsafe"); -#endif return label; } QString ZSafe::getFieldLabel (QString category, QString field, QString def) { QString app_key = APP_KEY; -#ifndef DESKTOP - conf->setGroup ("fieldDefs"); -#else -#ifndef Q_WS_WIN - app_key += "/fieldDefs/"; -#endif -#endif // #ifndef Q_WS_WIN + conf->setGroup( "fieldDefs" ); QString label = conf->readEntry(app_key+category+"-field"+field, def); // #else // QString label(def); // #endif -#ifndef DESKTOP conf->setGroup ("zsafe"); -#endif return label; } void ZSafe::showInfo( QListViewItem *_item) { if (!_item) return; if (selectedItem != NULL) selectedItem->setSelected(FALSE); selectedItem = _item; selectedItem->setSelected(TRUE); if (!isCategory(_item)) { /* QString label=selectedItem->text(0); label+="\n"; label+=selectedItem->text(1); label+="\n"; label+=selectedItem->text(2); label+="\n"; label+=selectedItem->text(3); */ @@ -1214,164 +991,123 @@ void ZSafe::showInfo( QListViewItem *_item) text += "</blockquote>"; // text += "<br>"; } entry = selectedItem->text(3); if (!entry.isEmpty() && entry.compare(" ")) { text += "<u><b>"; text += getFieldLabel (selectedItem, "4", tr("Comment")); text += ":<br> </b></u>"; QString comment = selectedItem->text(3); comment.replace (QRegExp("\n"), "<br>"); text += comment; // text += "<br>"; } text += "</body></html>"; infoForm->InfoText->setText(text); // infoForm->hide(); #ifdef Q_WS_QWS QPEApplication::showDialog( infoForm ); #endif -#ifdef DESKTOP - infoForm->show(); -#endif } } void ZSafe::listViewSelected( QListViewItem *_item) { if (!_item) return; if (selectedItem != NULL) selectedItem->setSelected(FALSE); selectedItem = _item; -#ifndef DESKTOP - // set the column text dependent on the selected item - ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name"))); - ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); - ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3"))); - ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment"))); - ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); - ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5"))); -#endif -#ifdef Q_WS_WIN // set the column text dependent on the selected item ListView->setColumnText(0, getFieldLabel (selectedItem, "1", tr("Name"))); ListView->setColumnText(1, getFieldLabel (selectedItem, "2", tr("Field 2"))); ListView->setColumnText(2, getFieldLabel (selectedItem, "3", tr("Field 3"))); ListView->setColumnText(3, getFieldLabel (selectedItem, "4", tr("Comment"))); ListView->setColumnText(4, getFieldLabel (selectedItem, "5", tr("Field 4"))); ListView->setColumnText(5, getFieldLabel (selectedItem, "6", tr("Field 5"))); -#endif - } bool ZSafe::isCategory(QListViewItem *_item) { if (_item == NULL) return FALSE; QString categoryName = _item->text (0); if (categories.find (categoryName)) return TRUE; else return FALSE; } void ZSafe::removeAsciiFile() { // QString fn = filename + ".txt"; // open the file dialog -#ifndef DESKTOP -#ifndef NO_OPIE QMap<QString, QStringList> mimeTypes; mimeTypes.insert(tr("All"), QStringList() ); mimeTypes.insert(tr("Text"), "text/*" ); QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, QDir::homeDirPath() + "/Documents/application/zsafe", QString::null, mimeTypes, this, tr ("Remove text file")); -#else - QString fn = ScQtFileEdit::getOpenFileName(this, - tr ("Remove text file"), - QDir::homeDirPath() + "/Documents/application/zsafe", - "*.txt"); -#endif -#else - QString fn = QFileDialog::getOpenFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", - "ZSafe (*.txt)", - this, - "ZSafe File Dialog" - "Choose a text file" ); -#endif if (fn && fn.length() > 0 ) { QFile f( fn ); if ( !f.remove() ) { -#ifndef NO_OPIE - owarn << "Could not remove file " << fn << oendl; -#else - qWarning( QString("Could not remove file %1").arg(fn),2000 ); -#endif QMessageBox::critical( 0, tr("ZSafe"), tr("Could not remove text file.") ); return; } } } void ZSafe::writeAllEntries() { if (filename.isEmpty()) { QMessageBox::critical( 0, tr("ZSafe"), tr("No document defined.\nYou have to create a new document")); return; } // open the file dialog QString fn = zsaveDialog(); // open the new document if (fn && fn.length() > 0 ) { QFile f( fn ); if ( !f.open( IO_WriteOnly ) ) { -#ifndef NO_OPIE - owarn << "Could not write to file " << fn << oendl; -#else - qWarning( QString("Could not write to file %1").arg(fn),2000 ); -#endif QMessageBox::critical( 0, "ZSafe", QString("Could not export to text file.") ); return; } QTextStream t( &f ); QListViewItem *i; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; si = si->nextSibling()) { QString oneEntry; oneEntry += "\""; oneEntry += i->text(0); oneEntry += "\";"; oneEntry += "\""; oneEntry += si->text(0); @@ -1392,129 +1128,98 @@ void ZSafe::writeAllEntries() oneEntry += "\";"; oneEntry += "\""; oneEntry += si->text(5); oneEntry += "\""; // owarn << oneEntry << oendl; t << oneEntry << endl; // owarn << si->text(0) << oendl; } } f.close(); } } void ZSafe::readAllEntries() { if (filename.isEmpty()) { QMessageBox::critical( 0, tr("ZSafe"), tr("No document defined.\nYou have to create a new document")); return; } // open the file dialog -#ifndef DESKTOP -#ifndef NO_OPIE QMap<QString, QStringList> mimeTypes; mimeTypes.insert(tr("All"), QStringList() ); mimeTypes.insert(tr("Text"), "text/*" ); QString fn = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, QDir::homeDirPath() + "/Documents/application/zsafe", QString::null, mimeTypes, this, tr ("Import text file")); -#else - QString fn = ScQtFileEdit::getOpenFileName(this, - tr ("Import text file"), - QDir::homeDirPath() + "/Documents/application/zsafe", - "*.txt"); -#endif -#else - QString fn = QFileDialog::getOpenFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", - "ZSafe (*.txt)", - this, - "ZSafe File Dialog" - "Choose a text file" ); -#endif if (fn && fn.length() > 0 ) { QFile f( fn ); if ( !f.open( IO_ReadOnly ) ) { -#ifndef NO_OPIE - owarn << "Could not read file " << fn << oendl; -#else - qWarning( QString("Could not read file %1").arg(fn), 2000 ); -#endif QMessageBox::critical( 0, "ZSafe", QString("Could not import text file.") ); return; } modified = true; // clear the password list selectedItem = NULL; QListViewItem *i; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; ) // si = si->nextSibling()) { QListViewItem *_si = si; si = si->nextSibling(); i->takeItem(_si); // remove from view list if (_si) delete _si; } } -#ifndef NO_OPIE - owarn << "ReadAllEntries(): " << oendl; -#else - qWarning ("ReadAllEntries(): "); -#endif - QTextStream t(&f); while ( !t.eof() ) { QString s = t.readLine(); s.replace (QRegExp("\";\""), "\"|\""); // char buffer[1024]; -#ifndef Q_WS_WIN char buffer[s.length()+1]; -#else - char buffer[4048]; -#endif /* modify QString -> QCString::utf8 */ strcpy (buffer, s.utf8()); QString name; QString user; QString password; QString comment; QString field5=""; QString field6=""; // separete the entries char *i = strtok (buffer, "|"); QString category(QString::fromUtf8(&i[1])); category.truncate(category.length() -1); int idx=0; while ((i = strtok (NULL, "|")) != NULL) { switch (idx) { case 0: @@ -1618,53 +1323,48 @@ void ZSafe::readAllEntries() } f.close(); } else { } } #ifdef UNUSED void ZSafe::writeAllEntries() { if (filename.isEmpty()) { QMessageBox::critical( 0, tr("ZSafe"), tr("<P>No document defined. You have to create a new document</P>")); return; } // open the file for writing QString fn = filename + ".txt"; QFile f( fn ); if ( !f.open( IO_WriteOnly ) ) { -#ifndef NO_OPIE - owarn << "Could not write to file " << fn << oendl; -#else - qWarning( QString("Could not write to file %1").arg(fn), 2000 ); -#endif QMessageBox::critical( 0, tr("ZSafe"), tr("Could not export to text file.") ); return; } QTextStream t( &f ); QListViewItem *i; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; si = si->nextSibling()) { QString oneEntry; oneEntry += "\""; oneEntry += i->text(0); oneEntry += "\";"; oneEntry += "\""; oneEntry += si->text(0); @@ -1675,98 +1375,84 @@ void ZSafe::writeAllEntries() oneEntry += "\""; oneEntry += si->text(2); oneEntry += "\";"; oneEntry += "\""; // oneEntry += si->text(3); QString comment = si->text(3); comment.replace (QRegExp("\n"), "<br>"); oneEntry += comment; oneEntry += "\""; // owarn << oneEntry << oendl; t << oneEntry << endl; // owarn << si->text(0) << oendl; } } f.close(); } void ZSafe::readAllEntries() { QString fn = filename + ".txt"; QFile f( fn ); if ( !f.open( IO_ReadOnly ) ) { -#ifndef NO_OPIE - owarn << "Could not read file " << fn << oendl; -#else - qWarning( QString("Could not read file %1").arg(fn), 2000 ); -#endif QMessageBox::critical( 0, tr("ZSafe"), tr("Could not import text file.") ); return; } modified = true; // clear the password list selectedItem = NULL; QListViewItem *i; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; ) // si = si->nextSibling()) { QListViewItem *_si = si; si = si->nextSibling(); i->takeItem(_si); // remove from view list if (_si) delete _si; } } -#ifndef NO_OPIE - owarn << "ReadAllEntries(): " << oendl; -#else - qWarning ("ReadAllEntries(): "); -#endif QTextStream t(&f); while ( !t.eof() ) { QString s = t.readLine(); s.replace (QRegExp("\";\""), "\"|\""); // char buffer[1024]; int len=s.length()+1; -#ifdef Q_WS_WIN - char buffer[512]; -#else char buffer[len]; -#endif strcpy (buffer, s); QString name; QString user; QString password; QString comment; // separete the entries char *i = strtok (buffer, "|"); QString category(&i[1]); category.truncate(category.length() -1); int idx=0; while (i = strtok (NULL, "|")) { switch (idx) { case 0: name = &i[1]; name.truncate(name.length() -1); // name break; case 1: // user @@ -1835,51 +1521,48 @@ void ZSafe::readAllEntries() QImage img = pix->convertToImage(); pix->convertFromImage(img.smoothScale(14,14)); c1->setIconName (icon); c1->setIcon (*pix); isIconAv = true; } } if (!isIconAv) { c1->setIcon (*getPredefinedIcon(category)); } c1->setListItem (catI); c1->initListItem(); categories.insert (c1->getCategoryName(), c1); } } f.close(); } #endif // UNUSED void ZSafe::resume(int) { -#ifndef NO_OPIE - owarn << "Resume" << oendl; -#endif // hide the main window if ( !showpwd ) { infoForm->hide(); // open zsafe again m_password = ""; selectedItem = NULL; // clear the password list QListViewItem *i; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; ) { QListViewItem *_si = si; si = si->nextSibling(); i->takeItem(_si); // remove from view list @@ -1898,76 +1581,62 @@ void ZSafe::resume(int) bool ZSafe::openDocument(const char* _filename, const char* ) { QString name= _filename; qWarning("openDocument "+name); int retval; char* entry[FIELD_SIZE]; // #ifndef Q_WS_WIN int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1); // #else // int validationFlag = 1; // #endif int pwdOk = 0; int numberOfTries = 3; for (int i=0; i < numberOfTries; i++) { QFile f(_filename); if (f.exists()) { // ask with a dialog for the password if (m_password.isEmpty()) getDocPassword(tr("Enter Password")); if (m_password.isEmpty() && validationFlag == 0) { -#ifndef NO_OPIE - owarn << "Wrong password" << oendl; -#else - qWarning ("Wrong password"); -#endif QMessageBox::critical( 0, tr("ZSafe"), tr("Wrong password.\n\nZSafe will now exit.") ); exitZs (1); } retval = loadInit(_filename, m_password); if (retval != PWERR_GOOD) { -#ifndef NO_OPIE - owarn << "Error loading Document" << oendl; -#else - qWarning ("Error loading Document"); -#endif return false; } } else { -#ifdef Q_WS_WIN - this->setCaption("Qt ZSafe"); -#else - this->setCaption("ZSafe"); -#endif + this->setCaption(tr("ZSafe")); filename = ""; switch( QMessageBox::warning( this, tr("ZSafe"), tr("<P>You must create a new document first. Ok to create?</P>"), tr("&Yes"), tr("&No."), 0 ) ) { case 1: // No return false; break; case 0: // Yes newDocument(); return false; break; } } // load the validation entry if (validationFlag == 0) { pwdOk = 1; break; @@ -2415,80 +2084,70 @@ bool ZSafe::saveDocument(const char* _filename, owarn << "2: Error writing file, contents not saved" << oendl; #else qWarning("2: Error writing file, contents not saved"); #endif return false; } else { #ifndef DESKTOP Global::statusMessage (tr("Password file saved.")); #endif modified = false; return true; } } PasswordForm *newPwdDialog; bool newPwdDialogResult = false; void ZSafe::setPasswordDialogDone() { newPwdDialogResult = true; newPwdDialog->close(); } void ZSafe::getDocPassword(QString title) { -#ifndef NO_OPIE - owarn << "getDocPassword" << oendl; -#endif // open the 'Password' dialog PasswordForm *dialog = new PasswordForm(this, title, TRUE); newPwdDialog = dialog; newPwdDialogResult = false; QPixmap image0( ( const char** ) zsafe_xpm ); dialog->setIcon( image0); connect( dialog->PasswordField, SIGNAL( returnPressed() ), this, SLOT( setPasswordDialogDone() ) ); // CS: !!! // int pos = filename.findRev ('/'); QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); -#ifdef Q_WS_WIN - dialog->setCaption("Qt " + ti); -#else dialog->setCaption(ti); -#endif // dialog->setCaption(title); dialog->PasswordField->setFocus(); - DialogCode result = (DialogCode) dialog->exec(); -#ifdef DESKTOP - result = Accepted; -#endif + QDialog::DialogCode result = (QDialog::DialogCode) dialog->exec(); QString password; - if (result == Accepted || newPwdDialogResult) + if (result == QDialog::Accepted || newPwdDialogResult) { m_password = dialog->PasswordField->text(); } else { exitZs (1); } } int ZSafe::saveInit(const char *_filename, const char *password) { char key[128]; unsigned int j = 0; unsigned int keylength; // int val; int count2; Krc2* krc2 = new Krc2(); /* first we should check the permissions of the filename */ /* if (QFile::exists(_filename)) { val = checkFile(_filename); if (val != PWERR_GOOD) return val; @@ -2599,52 +2258,48 @@ int ZSafe::saveFinalize(void) * over, leaving us 3 short, so we fill it in with 3's. * * If we come out even, we fill it with 8 8s * * um, except that in this instance we are using 4 shorts instead of 8 bytes. * so, half everything */ for (count1 = bufferIndex; count1 < 4; count1++) { plaintext[count1] = (4 - bufferIndex); } krc2->rc2_encrypt (plaintext); for (count1 = 0; count1 < 4; count1++) { ciphertext[count1] = iv[count1] ^ plaintext[count1]; if (putc ((unsigned char) (ciphertext[count1] >> 8), fd) == EOF) retval = PWERR_DATA; if (putc ((unsigned char) (ciphertext[count1] & 0xff), fd) == EOF) retval = PWERR_DATA; } fclose (fd); free(buffer); return retval; } void ZSafe::quitMe () { -#ifndef NO_OPIE - owarn << "QUIT..." << oendl; -#endif - if (modified) { switch( QMessageBox::information( this, tr("ZSafe"), tr("Do you want to save\nbefore exiting?"), tr("&Save"), tr("S&ave with\nnew\npassword"), tr("&Don't Save"), 0 // Enter == button 0 ) ) { // Escape == button 2 case 0: // Save clicked, Alt-S or Enter pressed. // save modified = false; saveDocument(filename, FALSE); exitZs (1); break; case 1: // // Save with new password modified = false; saveDocument(filename, TRUE); exitZs (1); break; case 2: // Don't Save clicked or Alt-D pressed // don't save but exitZs @@ -2662,195 +2317,139 @@ void ZSafe::categoryFieldActivated( const QString& category) setCategoryDialogFields(categoryDialog, category); } void ZSafe::addCategory() { if (filename.isEmpty()) { QMessageBox::critical( 0, tr("ZSafe"), tr("No document defined.\nYou have to create a new document")); return; } else { // open the 'Category' dialog bool initIcons = false; // open the 'Category' dialog CategoryDialog *dialog; if (categoryDialog) { dialog = categoryDialog; } else { categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); -#ifdef Q_WS_WIN - categoryDialog->setCaption ("Qt " + tr("Category")); -#endif dialog = categoryDialog; connect( dialog->CategoryField, SIGNAL( activated(const QString&)), this, SLOT( categoryFieldActivated(const QString&) ) ); initIcons = true; } -#ifdef DESKTOP -#ifndef Q_WS_WIN - QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); -#else // read all categories from the config file and store // into a list QFile f (cfgFile); QStringList list; if ( f.open(IO_ReadOnly) ) { // file opened successfully QTextStream t( &f ); // use a text stream QString s; - int n = 1; while ( !t.eof() ) { // until end of file... s = t.readLine(); // line of text excluding '\n' list.append(s); } f.close(); } -#endif -#else - // read all categories from the config file and store - // into a list - QFile f (cfgFile); - QStringList list; - if ( f.open(IO_ReadOnly) ) { // file opened successfully - QTextStream t( &f ); // use a text stream - QString s; - while ( !t.eof() ) { // until end of file... - s = t.readLine(); // line of text excluding '\n' - list.append(s); - } - f.close(); - } -#endif QStringList::Iterator it = list.begin(); QString categ; QString firstCategory; dialog->CategoryField->clear(); // remove all items while( it != list.end() ) { QString *cat = new QString (*it); if (cat->contains("-field1", FALSE)) { -#ifdef DESKTOP -#ifndef Q_WS_WIN - categ = cat->section ("-field1", 0, 0); -#else - int pos = cat->find ("-field1"); - categ = cat->left (pos); -#endif -#else int pos = cat->find ("-field1"); cat->truncate(pos); categ = *cat; -#endif if (!categ.isEmpty()) { dialog->CategoryField->insertItem (categ, -1); if (firstCategory.isEmpty()) firstCategory = categ; } } ++it; } if (firstCategory.isEmpty()) setCategoryDialogFields(dialog); else setCategoryDialogFields(dialog, firstCategory); // CategoryDialog *dialog = new CategoryDialog(this, "Category", TRUE); if (initIcons) { Wait waitDialog(this, tr("Wait dialog")); waitDialog.waitLabel->setText(tr("Gathering icons...")); waitDialog.show(); qApp->processEvents(); -#ifdef DESKTOP - QDir d(iconPath); -#else QDir d(QPEApplication::qpeDir() + "pics/"); -#endif d.setFilter( QDir::Files); const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); // create list iterator QFileInfo *fi; // pointer for traversing dialog->IconField->insertItem("predefined"); while ( (fi=it.current()) ) { // for each file... QString fileName = fi->fileName(); if(fileName.right(4) == ".png"){ fileName = fileName.mid(0,fileName.length()-4); -#ifdef DESKTOP - QPixmap imageOfFile; - imageOfFile.load(iconPath + fi->fileName()); -#else QPixmap imageOfFile(Resource::loadPixmap(fileName)); -#endif QImage foo = imageOfFile.convertToImage(); foo = foo.smoothScale(16,16); imageOfFile.convertFromImage(foo); dialog->IconField->insertItem(imageOfFile,fileName); } ++it; } waitDialog.hide(); } -#ifndef Q_WS_WIN - dialog->show(); -#endif -#ifndef DESKTOP - // dialog->move (20, 100); -#endif - DialogCode result = (DialogCode) dialog->exec(); -#ifdef DESKTOP - result = Accepted; -#endif - + QDialog::DialogCode result = (QDialog::DialogCode) dialog->exec(); QString category; QString icon; QString fullIconPath; QPixmap *pix; - if (result == Accepted) + if (result == QDialog::Accepted) { modified = true; category = dialog->CategoryField->currentText(); icon = dialog->IconField->currentText()+".png"; -#ifndef NO_OPIE - owarn << category << oendl; -#endif - QListViewItem *li = new ShadedListItem( 1, ListView ); Category *c1 = new Category(); c1->setCategoryName(category); // if (!icon.isEmpty() && !icon.isNull()) if (icon != "predefined.png") { // build the full path fullIconPath = iconPath + icon; pix = new QPixmap (fullIconPath); // pix->resize(14, 14); if (!pix->isNull()) { // save the full pixmap name into the config file // #ifndef Q_WS_WIN conf->writeEntry(APP_KEY+category, icon); // #endif saveConf(); QImage img = pix->convertToImage(); pix->convertFromImage(img.smoothScale(14,14)); c1->setIcon (*pix); c1->setIconName(icon); } else @@ -2936,53 +2535,49 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) dialog->Field2->setText(getFieldLabel (selectedItem, "2", tr("Username"))); dialog->Field3->setText(getFieldLabel (selectedItem, "3", tr("Password"))); dialog->Field4->setText(getFieldLabel (selectedItem, "4", tr("Comment"))); dialog->Field5->setText(getFieldLabel (selectedItem, "5", tr("Field 4"))); dialog->Field6->setText(getFieldLabel (selectedItem, "6", tr("Field 5"))); Category *cat= categories.find (selectedItem->text(0)); if (cat) { icon = cat->getIconName(); } else icon = conf->readEntry(APP_KEY+selectedItem->text(0)); } else { dialog->Field1->setText(tr("Name")); dialog->Field2->setText(tr("Username")); dialog->Field3->setText(tr("Password")); dialog->Field4->setText(tr("Comment")); dialog->Field5->setText(tr("Field 4")); dialog->Field6->setText(tr("Field 5")); } -#ifdef DESKTOP - QDir d(iconPath); -#else QDir d(QPEApplication::qpeDir() + "pics/"); -#endif d.setFilter( QDir::Files); const QFileInfoList *list = d.entryInfoList(); int i=0; QFileInfoListIterator it( *list ); // create list iterator QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { dialog->IconField->setCurrentItem(0); } else { while ( (fi=it.current()) ) { // for each file... QString fileName = fi->fileName(); if(fileName.right(4) == ".png") { fileName = fileName.mid(0,fileName.length()-4); if(fileName+".png"==icon) { dialog->IconField->setCurrentItem(i+1); break; } @@ -2993,379 +2588,303 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) } } void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) { if (!dialog) return; dialog->Field1->setText(getFieldLabel (category, "1", tr("Name"))); dialog->Field2->setText(getFieldLabel (category, "2", tr("Username"))); dialog->Field3->setText(getFieldLabel (category, "3", tr("Password"))); dialog->Field4->setText(getFieldLabel (category, "4", tr("Comment"))); dialog->Field5->setText(getFieldLabel (category, "5", tr("Field 4"))); dialog->Field6->setText(getFieldLabel (category, "6", tr("Field 5"))); QString icon; Category *cat= categories.find (category); if (cat) { icon = cat->getIconName(); } else icon = conf->readEntry(APP_KEY+category); -#ifdef DESKTOP - QDir d(iconPath); -#else QDir d(QPEApplication::qpeDir() + "pics/"); -#endif d.setFilter( QDir::Files); const QFileInfoList *list = d.entryInfoList(); int i=0; QFileInfoListIterator it( *list ); // create list iterator QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { dialog->IconField->setCurrentItem(0); } else { while ( (fi=it.current()) ) { // for each file... QString fileName = fi->fileName(); if(fileName.right(4) == ".png") { fileName = fileName.mid(0,fileName.length()-4); if(fileName+".png"==icon) { dialog->IconField->setCurrentItem(i+1); break; } ++i; } ++it; } } } void ZSafe::saveCategoryDialogFields(CategoryDialog *dialog) { QString app_key = APP_KEY; -#ifndef DESKTOP conf->setGroup ("fieldDefs"); -#else -#ifndef Q_WS_WIN - app_key += "/fieldDefs/"; -#endif -#endif QString category = dialog->CategoryField->currentText(); // #ifndef Q_WS_WIN conf->writeEntry(app_key+category+"-field1", dialog->Field1->text()); conf->writeEntry(app_key+category+"-field2", dialog->Field2->text()); conf->writeEntry(app_key+category+"-field3", dialog->Field3->text()); conf->writeEntry(app_key+category+"-field4", dialog->Field4->text()); conf->writeEntry(app_key+category+"-field5", dialog->Field5->text()); conf->writeEntry(app_key+category+"-field6", dialog->Field6->text()); // #endif saveConf(); -#ifndef DESKTOP conf->setGroup ("zsafe"); -#endif } void ZSafe::editCategory() { if (!selectedItem) return; if (isCategory(selectedItem)) { QString category = selectedItem->text(0); bool initIcons = false; // open the 'Category' dialog CategoryDialog *dialog; if (categoryDialog) { dialog = categoryDialog; } else { categoryDialog = new CategoryDialog(this, tr("Category"), TRUE); -#ifdef Q_WS_WIN - categoryDialog->setCaption ("Qt " + tr("Category")); -#endif dialog = categoryDialog; connect( dialog->CategoryField, SIGNAL( activated(const QString&)), this, SLOT( categoryFieldActivated(const QString&) ) ); initIcons = true; } setCategoryDialogFields(dialog); -#ifdef DESKTOP -#ifndef Q_WS_WIN - QStringList list = conf->entryList( APP_KEY+"/fieldDefs" ); -#else - // read all categories from the config file and store - // into a list - QFile f (cfgFile); - QStringList list; - if ( f.open(IO_ReadOnly) ) { // file opened successfully - QTextStream t( &f ); // use a text stream - QString s; - int n = 1; - while ( !t.eof() ) { // until end of file... - s = t.readLine(); // line of text excluding '\n' - list.append(s); - } - f.close(); - } -#endif -#else // read all categories from the config file and store // into a list QFile f (cfgFile); QStringList list; if ( f.open(IO_ReadOnly) ) { // file opened successfully QTextStream t( &f ); // use a text stream QString s; while ( !t.eof() ) { // until end of file... s = t.readLine(); // line of text excluding '\n' list.append(s); } f.close(); } -#endif QStringList::Iterator it = list.begin(); QString categ; dialog->CategoryField->clear(); // remove all items int i=0; bool foundCategory = false; while( it != list.end() ) { QString *cat = new QString (*it); if (cat->contains("-field1", FALSE)) { -#ifdef DESKTOP -#ifndef Q_WS_WIN - categ = cat->section ("-field1", 0, 0); -#else - int pos = cat->find ("-field1"); - categ = cat->left (pos); -#endif -#else int pos = cat->find ("-field1"); cat->truncate(pos); categ = *cat; -#endif if (!categ.isEmpty()) { dialog->CategoryField->insertItem (categ, i); if (category.compare(categ) == 0) { dialog->CategoryField->setCurrentItem(i); foundCategory = true; } i++; } } ++it; } if (!foundCategory) { dialog->CategoryField->insertItem (category, i); dialog->CategoryField->setCurrentItem(i); } QString icon; Category *cat= categories.find (selectedItem->text(0)); if (cat) { icon = cat->getIconName(); } if (initIcons) { Wait waitDialog(this, tr("Wait dialog")); waitDialog.waitLabel->setText(tr("Gathering icons...")); waitDialog.show(); qApp->processEvents(); -#ifdef DESKTOP - QDir d(iconPath); -#else QDir d(QPEApplication::qpeDir() + "pics/"); -#endif d.setFilter( QDir::Files); const QFileInfoList *list = d.entryInfoList(); int i=0; QFileInfoListIterator it( *list ); // create list iterator QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { dialog->IconField->setCurrentItem(0); } dialog->IconField->insertItem("predefined"); while ( (fi=it.current()) ) { // for each file... QString fileName = fi->fileName(); if(fileName.right(4) == ".png") { fileName = fileName.mid(0,fileName.length()-4); -#ifdef DESKTOP - QPixmap imageOfFile; - imageOfFile.load(iconPath + fi->fileName()); -#else QPixmap imageOfFile(Resource::loadPixmap(fileName)); -#endif QImage foo = imageOfFile.convertToImage(); foo = foo.smoothScale(16,16); imageOfFile.convertFromImage(foo); dialog->IconField->insertItem(imageOfFile,fileName); if(fileName+".png"==icon) dialog->IconField->setCurrentItem(i+1); ++i; } ++it; } waitDialog.hide(); } else { -#ifdef DESKTOP - // QDir d(QDir::homeDirPath() + "/pics/"); - QDir d(iconPath); -#else QDir d(QPEApplication::qpeDir() + "pics/"); -#endif d.setFilter( QDir::Files); const QFileInfoList *list = d.entryInfoList(); int i=0; QFileInfoListIterator it( *list ); // create list iterator QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { dialog->IconField->setCurrentItem(0); } else { while ( (fi=it.current()) ) { // for each file... QString fileName = fi->fileName(); if(fileName.right(4) == ".png") { fileName = fileName.mid(0,fileName.length()-4); if(fileName+".png"==icon) { dialog->IconField->setCurrentItem(i+1); break; } ++i; } ++it; } } } // dialog->show(); -#ifndef DESKTOP - // dialog->move (20, 100); -#endif - DialogCode result = (DialogCode) dialog->exec(); -#ifdef DESKTOP - result = Accepted; -#endif + QDialog::DialogCode result = (QDialog::DialogCode) dialog->exec(); QString fullIconPath; QPixmap *pix; - if (result == Accepted) + if (result == QDialog::Accepted) { modified = true; if (category != dialog->CategoryField->currentText()) { categories.remove (category); // #ifndef Q_WS_WIN conf->removeEntry(category); // #endif saveConf(); } category = dialog->CategoryField->currentText(); icon = dialog->IconField->currentText()+".png"; if (cat) { -#ifndef NO_OPIE - owarn << "Category found" << oendl; -#else - qWarning("Category found"); -#endif - // if (!icon.isEmpty() && !icon.isNull()) if (icon != "predefined.png") { // build the full path fullIconPath = iconPath + icon; pix = new QPixmap (fullIconPath); if (!pix->isNull()) { // save the full pixmap name into the config file // #ifndef Q_WS_WIN conf->writeEntry(APP_KEY+category, icon); // #endif saveConf(); QImage img = pix->convertToImage(); pix->convertFromImage(img.smoothScale(14,14)); cat->setIconName (icon); cat->setIcon (*pix); } } else { // #ifndef Q_WS_WIN conf->removeEntry (category); // #endif saveConf(); cat->setIcon (*getPredefinedIcon(category)); } // change the category name of the selected category QListViewItem *catItem = cat->getListItem(); if (catItem) { -#ifndef NO_OPIE - owarn << category << oendl; -#else - qWarning (category); -#endif catItem->setText( 0, tr( category ) ); cat->setCategoryName (tr(category)); cat->initListItem(); categories.insert (category, cat); } } saveCategoryDialogFields(dialog); } else { // delete dialog; dialog->hide(); return; } } } void ZSafe::cutItem() { if (!selectedItem) return; if (!isCategory(selectedItem)) @@ -3460,420 +2979,338 @@ void ZSafe::newDocument() { if (c) delete c; // delete the previous category c = i; // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; ) { QListViewItem *_si = si; si = si->nextSibling(); i->takeItem(_si); // remove from view list if (_si) delete _si; } } if (c) delete c; // delete the previous category categories.clear(); // m_password = ""; selectedItem = NULL; filename = newFile; // save the current filename to the config file + conf->setGroup("zsafe"); conf->writeEntry(APP_KEY+"document", filename); saveConf(); QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); -#ifdef Q_WS_WIN - this->setCaption("Qt ZSafe: " + ti); -#else - this->setCaption("ZSafe: " + ti); -#endif + this->setCaption(tr("ZSafe: ") + ti); // openDocument(filename); QMessageBox::information( this, tr("ZSafe"), tr("Now you have to enter\na password twice for your\nnewly created document."), tr("&OK"), 0); saveDocumentWithPwd(); } } void ZSafe::loadDocument() { // open the file dialog -#ifndef DESKTOP -#ifndef NO_OPIE QMap<QString, QStringList> mimeTypes; mimeTypes.insert(tr("All"), QStringList() ); mimeTypes.insert(tr("ZSafe"), "zsafe/*" ); QString newFile = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, QDir::homeDirPath() + "/Documents/application/zsafe", QString::null, mimeTypes, this, tr ("Open ZSafe document")); -#else - QString newFile = ScQtFileEdit::getOpenFileName(this, - tr ("Open ZSafe document"), - QDir::homeDirPath() + "/Documents/application/zsafe", - "*.zsf"); -#endif -#else - QString newFile = QFileDialog::getOpenFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", - "ZSafe (*.zsf)", - this, - "ZSafe File Dialog" - "Choose a ZSafe file" ); -#endif // open the new document if (newFile && newFile.length() > 0 ) { // save the previous opened document if (!filename.isEmpty()) saveDocument(filename, FALSE); // clear the password list QListViewItem *i; QListViewItem *c = NULL; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { if (c) delete c; // delete the previous category c = i; // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; ) { QListViewItem *_si = si; si = si->nextSibling(); i->takeItem(_si); // remove from view list if (_si) delete _si; } } if (c) delete c; // delete the previous category categories.clear(); m_password = ""; selectedItem = NULL; filename = newFile; // save the current filename to the config file + conf->setGroup("zsafe"); conf->writeEntry(APP_KEY+"document", filename); saveConf(); QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); -#ifdef Q_WS_WIN - this->setCaption("Qt ZSafe: " + ti); -#else - this->setCaption("ZSafe: " + ti); -#endif + this->setCaption(tr("ZSafe: ") + ti); openDocument(filename); } } void ZSafe::saveDocumentAs() { QString newFile = zsaveDialog(); // open the new document if (newFile && newFile.length() > 0 ) { // save the previous opened document if (!filename.isEmpty()) saveDocument(filename, FALSE); selectedItem = NULL; filename = newFile; // save the current filename to the config file + conf->setGroup("zsafe"); conf->writeEntry(APP_KEY+"document", filename); saveConf(); QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); -#ifdef Q_WS_WIN - this->setCaption("Qt ZSafe: " + ti); -#else - this->setCaption("ZSafe: " + ti); -#endif + this->setCaption(tr("ZSafe: ") + ti); QMessageBox::information( this, tr("ZSafe"), tr("Now you have to enter\na password twice for your\nnewly created document."), tr("&OK"), 0); saveDocumentWithPwd(); } } void ZSafe::saveDocumentWithoutPwd() { saveDocument(filename, FALSE); } void ZSafe::saveDocumentWithPwd() { saveDocument(filename, TRUE); } void ZSafe::about() { QString info; -#ifdef JPATCH_HDE - info = "<html><body><div align=""center"">"; - info += "<b>"; - info += tr("Zaurus Password Manager<br>"); - info += tr("ZSafe version 2.1.2-jv01b<br>"); - info += "</b>"; - info += tr("by Carsten Schneider<br>"); - info += "zcarsten@gmx.net<br>"; - info += "http://z-soft.z-portal.info/zsafe"; - info += "<br>"; - info += tr("Translations by Robert Ernst<br>"); - info += "robert.ernst@linux-solutions.at<br>"; - - info += "<br><br>"; - info += QString::fromUtf8("æ~W¥æ~\\¬èª~^/VGA Zaurus対å¿~\\ã~C~Qã~C~Cã~C~Aä½~\\æ ~H~P<br>"); - info += "HADECO R&D<br>"; - info += "r&d@hadeco.co.jp<br>"; - info += "http://www.hadeco.co.jp/r&d/<br>"; - info += "<br></div>"; - info += "</body></html>"; -#else - info = "<html><body><div align=""center"">"; - info += "<b>"; - info += tr("Zaurus Password Manager<br>"); - info += tr("ZSafe version 2.1.2<br>"); - info += "</b>"; - info += tr("by Carsten Schneider<br>"); - info += "zcarsten@gmx.net<br>"; - info += "http://z-soft.z-portal.info/zsafe"; - info += "<br>"; - info += tr("Translations by Robert Ernst<br>"); - info += "robert.ernst@linux-solutions.at<br>"; - info += "<br></div>"; - info += "</body></html>"; -#endif + info = tr("<html><body><div align=""center"">" + "<b>" + "Zaurus Password Manager<br>" + "ZSafe version 2.1.2<br>" + "</b>" + "by Carsten Schneider<br>" + "zcarsten@gmx.net<br>" + "http://z-soft.z-portal.info/zsafe" + "<br>" + "Translations by Robert Ernst<br>" + "robert.ernst@linux-solutions.at<br>" + "<br></div>" + "</body></html>"); // QMessageBox::information( this, tr("ZSafe"), info, tr("&OK"), 0); QMessageBox mb( this, tr("ZSafe")); mb.setText (info); mb.setButtonText (QMessageBox::Ok, tr ("&OK")); QPixmap zsafe_img((const char**) zsafe_xpm); mb.setIconPixmap (zsafe_img); mb.exec(); } void ZSafe::setExpandFlag() { expandTree = !expandTree; file->setItemChecked('o', expandTree); -#ifndef DESKTOP conf->setGroup ("zsafePrefs"); -#endif // #ifndef Q_WS_WIN conf->writeEntry (APP_KEY+"expandTree", expandTree); // #endif saveConf(); } void ZSafe::paintEvent( QPaintEvent * ) { if (raiseFlag) { raiseFlag = false; raiseTimer.start (1, true); if (infoForm->isVisible()) infoForm->raise(); } } void ZSafe::resizeEvent ( QResizeEvent * ) { // owarn << "resizeEvent" << oendl; -#ifndef DESKTOP DeskW = appl->desktop()->width(); DeskH = appl->desktop()->height(); -#else - DeskW = this->width(); - DeskH = this->height(); -#endif if (New) New->setGeometry ( QRect( DeskW-84, 2, 20, 20 ) ); if (Edit) Edit->setGeometry ( QRect( DeskW-64, 2, 20, 20 ) ); if (Delete) Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); if (Find) Find->setGeometry ( QRect( DeskW-24, 2, 20, 20 ) ); } void ZSafe::slotRaiseTimer() { if (infoForm->isVisible()) infoForm->raise(); raiseFlag = true; } QPixmap * ZSafe::getPredefinedIcon(QString category) { QPixmap *pm; if (category == "Bank cards") pm = new QPixmap((const char**)bank_cards_data); else if (category == "Passwords") pm = new QPixmap((const char**)passwords_data); else if (category == "Software") pm = new QPixmap((const char**)software_data); else if (category == "General") pm = new QPixmap((const char**)general_data); else pm = new QPixmap((const char**)general_data); return pm; } void ZSafe::setDocument(const QString& fileref) { -#ifndef DESKTOP // stop the timer to prevent loading of the default document docuTimer.stop(); DocLnk link(fileref); if ( link.isValid() ) { // if (filename != link.file()) // saveDocument(filename, FALSE); filename = link.file(); } else { // if (filename != fileref) // saveDocument(filename, FALSE); filename = fileref; } // save the current filename to the config file + conf->setGroup("zsafe"); conf->writeEntry(APP_KEY+"document", filename); saveConf(); QString ti = filename.right (filename.length() - filename.findRev ('/') - 1); -#ifdef Q_WS_WIN - this->setCaption("Qt ZSafe: " + ti); -#else - this->setCaption("ZSafe: " + ti); -#endif + this->setCaption(tr("ZSafe: ") + ti); // clear the password list QListViewItem *i; QListViewItem *c = NULL; // step through all categories for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) { if (c) delete c; // delete the previous category c = i; // step through all subitems QListViewItem *si; for (si = i->firstChild(); si != NULL; ) { QListViewItem *_si = si; si = si->nextSibling(); i->takeItem(_si); // remove from view list if (_si) delete _si; } } if (c) delete c; // delete the previous category categories.clear(); m_password = ""; selectedItem = NULL; openDocument(filename); -#else -Q_UNUSED(fileref); -#endif } void ZSafe::ListPressed(int mouse, QListViewItem *item, const QPoint&, int column) { if(item ==0) return; switch (mouse) { case 1: - { -#ifdef DESKTOP - QDragObject *d = new QTextDrag( item->text(column) , this ); - d->dragCopy(); -#endif - } break; case 2: { QClipboard *cb = QApplication::clipboard(); QIconSet copy_img((const char**) copy_xpm); QIconSet edit_img((const char**) edit_xpm); QPixmap folder_open_img((const char**) folder_open_xpm); QPixmap editdelete_img((const char**) editdelete_xpm); QPopupMenu *m = new QPopupMenu(this); int copyItem = m->insertItem( copy_img, tr( "Copy to Clipboard" )); int editItem = m->insertItem(edit_img, tr( "Edit" )); int showItem = m->insertItem(folder_open_img, tr( "Show Info" )); int cancelItem = m->insertItem( editdelete_img, tr( "Cancel" )); m->setFocus(); int me=m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y() ) ) ; if(me == copyItem) { copyClip( item->text(column) ) ; } else if (me == cancelItem) { cb->clear(); } else if (me == editItem) { editPwd(); } else if (me == showItem) { showInfo(item); } } break; }; } void ZSafe::copyClip( const QString &text) { QClipboard *cb = QApplication::clipboard(); cb->setText( text); } QString ZSafe::zsaveDialog() { QString fn; -#ifndef DESKTOP -#ifndef NO_OPIE QMap<QString, QStringList> mimeTypes; mimeTypes.insert(tr("All"), QStringList() ); mimeTypes.insert(tr("Text"), "text/*" ); fn = OFileDialog::getSaveFileName( OFileSelector::EXTENDED_ALL, QDir::homeDirPath() + "/Documents/application/zsafe", QString::null, mimeTypes, this, tr ("Export text file")); -#else - fn = ScQtFileEdit::getSaveAsFileName(this, - tr ("Export text file"), - QDir::homeDirPath() + "/Documents/application/zsafe", - "*.txt"); -#endif -#else - fn = QFileDialog::getSaveFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", - "ZSafe (*.txt)", - this, - "ZSafe"); -#endif return fn; } diff --git a/noncore/apps/zsafe/zsafe.h b/noncore/apps/zsafe/zsafe.h index 7419797..3d812f8 100644 --- a/noncore/apps/zsafe/zsafe.h +++ b/noncore/apps/zsafe/zsafe.h @@ -25,62 +25,63 @@ #include <qwidgetstack.h> #include <qtimer.h> class QVBoxLayout; class QHBoxLayout; class QGridLayout; class ZListView; class QListViewItem; class QToolButton; class QTextBrowser; class QPopupMenu; #ifdef DESKTOP // #ifndef WIN32 class QSettings; // #endif #else class Config; #endif class CategoryDialog; class QPixmap; // number of fields for one entry #define FIELD_SIZE 7 -class ZSafe : public QDialog +class ZSafe : public QWidget { Q_OBJECT protected: void paintEvent( QPaintEvent * e ); void resizeEvent ( QResizeEvent * ); bool raiseFlag; QTimer raiseTimer; public: - ZSafe( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = WDestructiveClose ); + ZSafe( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~ZSafe(); + static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); } static const QColor *evenRowColor; static const QColor *oddRowColor; QToolButton* Edit; QToolButton* Delete; QToolButton* Find; QToolButton* New; ZListView* ListView; QString cfgFile; QString iconPath; InfoForm *infoForm; CategoryDialog *categoryDialog; QListViewItem *selectedItem; // current selected item QListViewItem *copiedItem; // copied item bool IsCopy; bool IsCut; bool modified; // true if database is modified bool showpwd; // show PWD Dialog QListViewItem *lastSearchedCategory; @@ -174,25 +175,30 @@ public slots: virtual void cutItem(); virtual void copyItem(); virtual void pasteItem(); virtual void newDocument(); virtual void loadDocument(); virtual void saveDocumentAs(); virtual void saveDocumentWithoutPwd(); virtual void saveDocumentWithPwd(); virtual void about(); virtual void setExpandFlag(); virtual void categoryFieldActivated( const QString& str); virtual void ListPressed(int, QListViewItem *, const QPoint&, int); virtual void copyClip( const QString &text); private slots: void setDocument(const QString& fileref); void slotLoadDocu(); void slotRaiseTimer(); }; + +extern ZSafe *zs; +extern QApplication *appl; +extern int DeskW; +extern int DeskH; #endif // ZSAFE_H |