| -rw-r--r-- | noncore/apps/zsafe/config.in | 2 | ||||
| -rw-r--r-- | noncore/apps/zsafe/opie-zsafe.control | 2 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe.cpp | 989 | ||||
| -rw-r--r-- | noncore/apps/zsafe/zsafe.pro | 16 |
4 files changed, 506 insertions, 503 deletions
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in index 4b1e968..6e321f3 100644 --- a/noncore/apps/zsafe/config.in +++ b/noncore/apps/zsafe/config.in @@ -2,4 +2,4 @@ config ZSAFE boolean "zsafe (Zaurus Password Manager)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI diff --git a/noncore/apps/zsafe/opie-zsafe.control b/noncore/apps/zsafe/opie-zsafe.control index b58a987..6288fac 100644 --- a/noncore/apps/zsafe/opie-zsafe.control +++ b/noncore/apps/zsafe/opie-zsafe.control @@ -5,5 +5,5 @@ Section: opie/applications Version: $QPE_VERSION$EXTRAVERSION Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopieui2 Maintainer: Carsten Schneider <zcarsten@gmx.net> Description: This is a password manager program for Opie. diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp index bdd2aed..f43a206 100644 --- a/noncore/apps/zsafe/zsafe.cpp +++ b/noncore/apps/zsafe/zsafe.cpp @@ -29,5 +29,8 @@ #ifndef DESKTOP #ifndef NO_OPIE -#include <opie/ofiledialog.h> +#include <opie2/ofiledialog.h> + +using Opie::OFileDialog; +using Opie::OFileSelector; #else #include "scqtfileedit.h" @@ -135,5 +138,5 @@ const QString APP_KEY=""; #include "pics/zsafe/zsafe.xpm" -static const char* const bank_cards_data[] = { +static const char* const bank_cards_data[] = { "14 14 16 1", ". c None", @@ -169,5 +172,5 @@ static const char* const bank_cards_data[] = { -static const char* const passwords_data[] = { +static const char* const passwords_data[] = { "16 16 20 1", ". c None", @@ -208,5 +211,5 @@ static const char* const passwords_data[] = { "############...."}; -static const char* const software_data[] = { +static const char* const software_data[] = { "16 16 5 1", ". c None", @@ -232,5 +235,5 @@ static const char* const software_data[] = { "................"}; -static const char* const general_data[] = { +static const char* const general_data[] = { "14 14 98 2", "Qt c None", @@ -380,7 +383,7 @@ static const char* const general_data[] = { -/* - * Constructs a ZSafe which is a child of 'parent', with the - * name 'name' and widget flags set to 'f' +/* + * 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 @@ -388,5 +391,5 @@ static const char* const general_data[] = { */ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ), + : QDialog( parent, name, modal, fl ), Edit(0l), Delete(0l), Find(0l), New(0l), ListView(0l) { @@ -410,5 +413,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) if (qpedir.isEmpty()) iconPath = "/home/QtPalmtop/pics/"; - else + else iconPath = qpedir + "/pics/"; #endif @@ -459,11 +462,11 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) QPixmap general( ( const char** ) general_data ); if ( !name ) - setName( "ZSafe" ); + setName( "ZSafe" ); #ifdef DESKTOP #ifdef WIN32 - setGeometry(100, 150, DeskW, DeskH-30 ); + setGeometry(100, 150, DeskW, DeskH-30 ); #else - resize( DeskW, DeskH-30 ); + resize( DeskW, DeskH-30 ); #endif @@ -499,5 +502,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) // QString d1("Documents/application"); // #else - QString d1(QDir::homeDirPath() + "/Documents/application"); + QString d1(QDir::homeDirPath() + "/Documents/application"); // #endif QDir pd1(d1); @@ -516,5 +519,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) } } - QString d2(QDir::homeDirPath() + "/Documents/application/zsafe"); + QString d2(QDir::homeDirPath() + "/Documents/application/zsafe"); QDir pd2(d2); if (!pd2.exists()) @@ -532,5 +535,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) } } - + // set the default filename @@ -577,5 +580,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) file->insertItem( save_img, tr("&Save document"), this, SLOT(saveDocumentWithoutPwd()) ); - file->insertItem( save_img, tr("S&ave document with new Password"), this, + file->insertItem( save_img, tr("S&ave document with new Password"), this, SLOT(saveDocumentWithPwd()) ); file->insertSeparator(); @@ -584,5 +587,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) file->insertItem( trash_img, tr("&Remove text file"), this, SLOT(removeAsciiFile()) ); file->insertSeparator(); - file->insertItem( expand_img, tr("&Open entries expanded"), this, + file->insertItem( expand_img, tr("&Open entries expanded"), this, SLOT(setExpandFlag()), 0, 'o'); file->setItemChecked('o', expandTree); @@ -615,5 +618,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) New = new QToolButton( menu, "New" ); - New->setGeometry( QRect( DeskW-84, 2, 20, 20 ) ); + New->setGeometry( QRect( DeskW-84, 2, 20, 20 ) ); New->setMouseTracking( TRUE ); New->setText( tr( "" ) ); @@ -622,5 +625,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) Edit = new QToolButton( menu, "Edit" ); - Edit->setGeometry( QRect( DeskW-64, 2, 20, 20 ) ); + Edit->setGeometry( QRect( DeskW-64, 2, 20, 20 ) ); Edit->setText( tr( "" ) ); Edit->setPixmap( edit_img ); @@ -628,5 +631,5 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) Delete = new QToolButton( menu, "Delete" ); - Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); + Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); Delete->setText( tr( "" ) ); Delete->setPixmap( trash_img ); @@ -634,5 +637,5 @@ 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->setGeometry( QRect( DeskW-24, 2, 20, 20 ) ); Find->setText( tr( "" ) ); Find->setPixmap( find_img ); @@ -659,9 +662,9 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl ) #ifdef DESKTOP ListView->setResizePolicy(QScrollView::AutoOneFit); - // ListView->setGeometry( QRect( 0, 22, this->width(), this->height() - 30 ) ); + // 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->setGeometry( QRect( 0, 22, + // this->width(), this->height() - 30 ) ); // ListView->setMaximumSize( QSize( 440, 290 ) ); #endif @@ -702,5 +705,5 @@ const QColor *ZSafe::evenRowColor = &Qt::white; const QColor *ZSafe::oddRowColor = new QColor(216,240,255); -/* +/* * Destroys the object and frees any allocated resources */ @@ -726,5 +729,5 @@ void ZSafe::deletePwd() switch( QMessageBox::information( this, tr("ZSafe"), tr("Do you want to delete?"), - tr("&Delete"), tr("D&on't Delete"), + tr("&Delete"), tr("D&on't Delete"), 0 // Enter == button 0 ) ) { // Escape == button 2 @@ -755,7 +758,7 @@ void ZSafe::editPwd() #ifdef WIN32 dialog->setCaption ("Qt " + tr("Edit Entry")); - dialog->setGeometry(200, 250, 220, 310 ); + dialog->setGeometry(200, 250, 220, 310 ); #endif - + // set the labels dialog->Name->setText(getFieldLabel (selectedItem, "1", tr("Name"))); @@ -786,16 +789,16 @@ void ZSafe::editPwd() modified = true; // edit the selected item - QString name = dialog->NameField->text(); + QString name = dialog->NameField->text(); selectedItem->setText (0, tr (name)); - QString user = dialog->UsernameField->text(); + QString user = dialog->UsernameField->text(); selectedItem->setText (1, tr (user)); - QString pwd = dialog->PasswordField->text(); + QString pwd = dialog->PasswordField->text(); selectedItem->setText (2, tr (pwd)); - QString comment = dialog->CommentField->text(); + QString comment = dialog->CommentField->text(); comment.replace (QRegExp("\n"), "<br>"); selectedItem->setText (3, tr (comment)); - QString f5 = dialog->Field5->text(); + QString f5 = dialog->Field5->text(); selectedItem->setText (4, tr (f5)); - QString f6 = dialog->Field6->text(); + QString f6 = dialog->Field6->text(); selectedItem->setText (5, tr (f6)); } @@ -803,5 +806,5 @@ void ZSafe::editPwd() delete dialog; } - else + else { editCategory(); @@ -825,5 +828,5 @@ void ZSafe::newPwd() #ifdef WIN32 dialog->setCaption ("Qt " + tr("New Entry")); - dialog->setGeometry(200, 250, 220, 310 ); + dialog->setGeometry(200, 250, 220, 310 ); #endif // set the labels @@ -844,5 +847,5 @@ retype: { - QString name = dialog->NameField->text(); + QString name = dialog->NameField->text(); if (cat == name) { @@ -858,14 +861,14 @@ retype: i->setText (0, tr (name)); - QString user = dialog->UsernameField->text(); + QString user = dialog->UsernameField->text(); i->setText (1, tr (user)); - QString pwd = dialog->PasswordField->text(); + QString pwd = dialog->PasswordField->text(); i->setText (2, tr (pwd)); - QString comment = dialog->CommentField->text(); + QString comment = dialog->CommentField->text(); comment.replace (QRegExp("\n"), "<br>"); i->setText (3, tr (comment)); - QString f5 = dialog->Field5->text(); + QString f5 = dialog->Field5->text(); i->setText (4, tr (f5)); - QString f6 = dialog->Field6->text(); + QString f6 = dialog->Field6->text(); i->setText (5, tr (f6)); } @@ -953,5 +956,5 @@ void ZSafe::findPwd() else i = ListView->firstChild(); - for (; + for (; i != NULL; i = i->nextSibling()) @@ -966,5 +969,5 @@ void ZSafe::findPwd() else si = i->firstChild(); - // for (si = i->firstChild(); + // for (si = i->firstChild(); for (; si != NULL; @@ -1019,7 +1022,7 @@ void ZSafe::findPwd() delete dialog; update(); - QMessageBox::information( this, tr("ZSafe"), + QMessageBox::information( this, tr("ZSafe"), tr("Entry not found"), tr("&OK"), 0); - + } @@ -1077,5 +1080,5 @@ QString ZSafe::getFieldLabel (QString category, QString field, QString def) #endif // #ifndef WIN32 - QString label = conf->readEntry(app_key+category+"-field"+field, + QString label = conf->readEntry(app_key+category+"-field"+field, def); // #else @@ -1094,5 +1097,5 @@ void ZSafe::showInfo( QListViewItem *_item) if (selectedItem != NULL) selectedItem->setSelected(FALSE); - + selectedItem = _item; selectedItem->setSelected(TRUE); @@ -1239,5 +1242,5 @@ void ZSafe::removeAsciiFile() tr ("Remove text file")); #else - QString fn = ScQtFileEdit::getOpenFileName(this, + QString fn = ScQtFileEdit::getOpenFileName(this, tr ("Remove text file"), QDir::homeDirPath() + "/Documents/application/zsafe", @@ -1246,5 +1249,5 @@ void ZSafe::removeAsciiFile() #else QString fn = QFileDialog::getOpenFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", + QDir::homeDirPath() + "/Documents/application/zsafe", "ZSafe (*.txt)", this, @@ -1256,5 +1259,5 @@ void ZSafe::removeAsciiFile() { QFile f( fn ); - if ( !f.remove() ) + if ( !f.remove() ) { qWarning( QString("Could not remove file %1").arg(fn), @@ -1289,5 +1292,5 @@ void ZSafe::writeAllEntries() tr ("Export text file")); #else - QString fn = ScQtFileEdit::getSaveAsFileName(this, + QString fn = ScQtFileEdit::getSaveAsFileName(this, tr ("Export text file"), QDir::homeDirPath() + "/Documents/application/zsafe", @@ -1296,5 +1299,5 @@ void ZSafe::writeAllEntries() #else QString fn = QFileDialog::getSaveFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", + QDir::homeDirPath() + "/Documents/application/zsafe", "ZSafe (*.txt)", this, @@ -1318,5 +1321,5 @@ void ZSafe::writeAllEntries() QListViewItem *i; // step through all categories - for (i = ListView->firstChild(); + for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) @@ -1324,5 +1327,5 @@ void ZSafe::writeAllEntries() // step through all subitems QListViewItem *si; - for (si = i->firstChild(); + for (si = i->firstChild(); si != NULL; si = si->nextSibling()) @@ -1384,5 +1387,5 @@ void ZSafe::readAllEntries() tr ("Import text file")); #else - QString fn = ScQtFileEdit::getOpenFileName(this, + QString fn = ScQtFileEdit::getOpenFileName(this, tr ("Import text file"), QDir::homeDirPath() + "/Documents/application/zsafe", @@ -1391,5 +1394,5 @@ void ZSafe::readAllEntries() #else QString fn = QFileDialog::getOpenFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", + QDir::homeDirPath() + "/Documents/application/zsafe", "ZSafe (*.txt)", this, @@ -1436,5 +1439,5 @@ void ZSafe::readAllEntries() QTextStream t(&f); - while ( !t.eof() ) + while ( !t.eof() ) { QString s = t.readLine(); @@ -1442,12 +1445,12 @@ void ZSafe::readAllEntries() // char buffer[1024]; #ifndef WIN32 - char buffer[s.length()+1]; + char buffer[s.length()+1]; #else - char buffer[4048]; + char buffer[4048]; #endif /* modify QString -> QCString::utf8 */ - + strcpy (buffer, s.utf8()); @@ -1500,5 +1503,5 @@ void ZSafe::readAllEntries() break; } - idx++; + idx++; } @@ -1594,5 +1597,5 @@ void ZSafe::writeAllEntries() QListViewItem *i; // step through all categories - for (i = ListView->firstChild(); + for (i = ListView->firstChild(); i != NULL; i = i->nextSibling()) @@ -1600,5 +1603,5 @@ void ZSafe::writeAllEntries() // step through all subitems QListViewItem *si; - for (si = i->firstChild(); + for (si = i->firstChild(); si != NULL; si = si->nextSibling()) @@ -1671,12 +1674,12 @@ void ZSafe::readAllEntries() QTextStream t(&f); - while ( !t.eof() ) + while ( !t.eof() ) { QString s = t.readLine(); s.replace (QRegExp("\";\""), "\"|\""); // char buffer[1024]; - int len=s.length()+1; + int len=s.length()+1; #ifdef WIN32 - char buffer[512]; + char buffer[512]; #else char buffer[len]; @@ -1720,5 +1723,5 @@ void ZSafe::readAllEntries() break; } - idx++; + idx++; } @@ -1833,5 +1836,5 @@ bool ZSafe::openDocument(const char* _filename, const char* ) int validationFlag = conf->readNumEntry(APP_KEY+"valzsafe", 1); // #else - // int validationFlag = 1; + // int validationFlag = 1; // #endif @@ -1844,7 +1847,7 @@ bool ZSafe::openDocument(const char* _filename, const char* ) { // ask with a dialog for the password - if (m_password.isEmpty()) - getDocPassword(tr("Enter Password")); - if (m_password.isEmpty() && validationFlag == 0) + if (m_password.isEmpty()) + getDocPassword(tr("Enter Password")); + if (m_password.isEmpty() && validationFlag == 0) { qWarning ("Wrong password"); @@ -1854,10 +1857,10 @@ bool ZSafe::openDocument(const char* _filename, const char* ) } - retval = loadInit(_filename, m_password); - if (retval != PWERR_GOOD) + retval = loadInit(_filename, m_password); + if (retval != PWERR_GOOD) { qWarning ("Error loading Document"); - return false; - } + return false; + } } else @@ -1880,5 +1883,5 @@ bool ZSafe::openDocument(const char* _filename, const char* ) } - retval = loadEntry(entry); + retval = loadEntry(entry); if (retval == 1 && !strcmp (entry[0], "ZSAFECATEGORY") && @@ -1888,11 +1891,11 @@ bool ZSafe::openDocument(const char* _filename, const char* ) !strcmp (entry[4], "comment") ) { - for (int count = 0; count < FIELD_SIZE; count++) free(entry[count]); + for (int count = 0; count < FIELD_SIZE; count++) free(entry[count]); pwdOk = 1; break; } else - // for (int count = 0; count < FIELD_SIZE; count++) free(entry[count]); - fclose (fd); + // for (int count = 0; count < FIELD_SIZE; count++) free(entry[count]); + fclose (fd); m_password = ""; @@ -1901,8 +1904,8 @@ bool ZSafe::openDocument(const char* _filename, const char* ) switch( QMessageBox::warning( this, tr("ZSafe"), tr("Wrong password.\nEnter again?"), - tr("&Yes"), tr("&No."), - 0 - ) ) - { + tr("&Yes"), tr("&No."), + 0 + ) ) + { case 1: // No exitZs (1); @@ -1924,8 +1927,8 @@ bool ZSafe::openDocument(const char* _filename, const char* ) - retval = loadEntry(entry); - + retval = loadEntry(entry); + int numberOfEntries=0; - while (retval == 1) { + while (retval == 1) { QString category( QString::fromUtf8(entry[0]) ); @@ -2009,23 +2012,23 @@ bool ZSafe::openDocument(const char* _filename, const char* ) } - for (int count = 0; count < FIELD_SIZE; count++) { - free(entry[count]); - } - retval = loadEntry(entry); - if (retval == 2) { - // m_parent->slotStatusHelpMsg("Last entry loaded"); - } - } // end while + for (int count = 0; count < FIELD_SIZE; count++) { + free(entry[count]); + } + retval = loadEntry(entry); + if (retval == 2) { + // m_parent->slotStatusHelpMsg("Last entry loaded"); + } + } // end while if (numberOfEntries == 0) { - + switch( QMessageBox::warning( this, tr("ZSafe"), tr("Empty document or\nwrong password.\nContinue?"), - tr("&No"), tr("&Yes."), - 0 - ) ) { + tr("&No"), tr("&Yes."), + 0 + ) ) { case 0: // No - retval = loadFinalize(); + retval = loadFinalize(); exitZs (1); break; @@ -2033,22 +2036,22 @@ bool ZSafe::openDocument(const char* _filename, const char* ) break; } - } + } - retval = loadFinalize(); + retval = loadFinalize(); - return true; + return true; } int ZSafe::loadInit(const char* _filename, const char *password) { - unsigned int j = 0; - unsigned int keylength=0; - int count=0, count2=0, count3=0; - unsigned char charbuf[8]; - unsigned short ciphertext[4]; - char key[128]; - Krc2* krc2 = new Krc2(); + unsigned int j = 0; + unsigned int keylength=0; + int count=0, count2=0, count3=0; + unsigned char charbuf[8]; + unsigned short ciphertext[4]; + char key[128]; + Krc2* krc2 = new Krc2(); - fd = fopen (_filename, "rb"); + fd = fopen (_filename, "rb"); QFileInfo f (_filename); @@ -2056,108 +2059,108 @@ int ZSafe::loadInit(const char* _filename, const char *password) load_buffer_length = ((load_buffer_length / 1024)+1) * 1024 * 2; - if (fd == NULL) - return PWERR_OPEN; + if (fd == NULL) + return PWERR_OPEN; - buffer = (char *)malloc(load_buffer_length); - for (j = 0; password[j] != '\0'; j++) { - key[j] = password[j]; - } - keylength = j; - krc2->rc2_expandkey (key, keylength, 128); + buffer = (char *)malloc(load_buffer_length); + for (j = 0; password[j] != '\0'; j++) { + key[j] = password[j]; + } + keylength = j; + krc2->rc2_expandkey (key, keylength, 128); #ifndef WIN32 - size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); + size = read(fileno (fd), (unsigned char *) (charbuf + count), 8); #else - printf ("LoadInit() read1"); + printf ("LoadInit() read1"); size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); #endif - if (size < 8) - return PWERR_DATA; + if (size < 8) + return PWERR_DATA; - for (count = 0; count < 4; count++) { - count2 = count << 1; - iv[count] = charbuf[count2] << 8; - iv[count] += charbuf[count2 + 1]; - } + for (count = 0; count < 4; count++) { + count2 = count << 1; + iv[count] = charbuf[count2] << 8; + iv[count] += charbuf[count2 + 1]; + } - size = 0; - bufferIndex = 0; + size = 0; + bufferIndex = 0; #ifndef WIN32 - while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { - while (count < 8) { - count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); + while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) { + while (count < 8) { + count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8); #else - printf ("LoadInit() read2"); + printf ("LoadInit() read2"); while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) { - while (count < 8) { - count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); -#endif - if (count2 == 0) { - return PWERR_DATA; - } - count += count2; - } /* while (count < 8) */ - - size += 8; - for (count2 = 0; count2 < 8; count2 += 2) { - count3 = count2 >> 1; - ciphertext[count3] = charbuf[count2] << 8; - ciphertext[count3] += charbuf[count2 + 1]; - - plaintext[count3] = ciphertext[count3] ^ iv[count3]; - iv[count3] = plaintext[count3]; - } /* for (count2) */ - - krc2->rc2_decrypt (plaintext); - memcpy ((unsigned char *) (buffer + bufferIndex), plaintext, 8); - bufferIndex += 8; - buffer[bufferIndex + 1] = '\0'; - } /* while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) */ - size -= buffer[size - 1]; - lastcount = 0; - - /* This will point to the starting index */ - bufferIndex = 0; - return PWERR_GOOD; + while (count < 8) { + count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd); +#endif + if (count2 == 0) { + return PWERR_DATA; + } + count += count2; + } /* while (count < 8) */ + + size += 8; + for (count2 = 0; count2 < 8; count2 += 2) { + count3 = count2 >> 1; + ciphertext[count3] = charbuf[count2] << 8; + ciphertext[count3] += charbuf[count2 + 1]; + + plaintext[count3] = ciphertext[count3] ^ iv[count3]; + iv[count3] = plaintext[count3]; + } /* for (count2) */ + + krc2->rc2_decrypt (plaintext); + memcpy ((unsigned char *) (buffer + bufferIndex), plaintext, 8); + bufferIndex += 8; + buffer[bufferIndex + 1] = '\0'; + } /* while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) */ + size -= buffer[size - 1]; + lastcount = 0; + + /* This will point to the starting index */ + bufferIndex = 0; + return PWERR_GOOD; } int ZSafe::loadEntry(char *entry[FIELD_SIZE]) { - /* Strip off PKCS 5 padding - * Should check to make sure it's good here - */ - int count, count1=0; - - for (count = lastcount; count < size; count++) { - if ((unsigned char) (buffer[count]) == 255) { - if (buffer[bufferIndex] == '\0') { - bufferIndex++; - } - entry[count1] = (char *) malloc (count - bufferIndex + 1); - memcpy (entry[count1], (unsigned char *) (buffer + bufferIndex), count - bufferIndex); - entry[count1][count - bufferIndex] = '\0'; - count++; - bufferIndex = count; - count1++; - if (count1 == FIELD_SIZE) { - lastcount = count; - return 1; - } - } /* if ((unsigned char) (buffer[count]) == 255) */ - } /* for (count = 0; count < size; count++) */ - - return 2; + /* Strip off PKCS 5 padding + * Should check to make sure it's good here + */ + int count, count1=0; + + for (count = lastcount; count < size; count++) { + if ((unsigned char) (buffer[count]) == 255) { + if (buffer[bufferIndex] == '\0') { + bufferIndex++; + } + entry[count1] = (char *) malloc (count - bufferIndex + 1); + memcpy (entry[count1], (unsigned char *) (buffer + bufferIndex), count - bufferIndex); + entry[count1][count - bufferIndex] = '\0'; + count++; + bufferIndex = count; + count1++; + if (count1 == FIELD_SIZE) { + lastcount = count; + return 1; + } + } /* if ((unsigned char) (buffer[count]) == 255) */ + } /* for (count = 0; count < size; count++) */ + + return 2; } int ZSafe::loadFinalize(void) { - fclose (fd); + fclose (fd); if (buffer) free(buffer); - return PWERR_GOOD; + return PWERR_GOOD; } -bool ZSafe::saveDocument(const char* _filename, - bool withPwd, +bool ZSafe::saveDocument(const char* _filename, + bool withPwd, const char* ) { @@ -2176,19 +2179,19 @@ bool ZSafe::saveDocument(const char* _filename, while (!pwdOk) { - getDocPassword(tr("Enter Password")); - if (m_password.isEmpty()) + getDocPassword(tr("Enter Password")); + if (m_password.isEmpty()) { - - QMessageBox::critical( 0, tr("ZSafe"), + + QMessageBox::critical( 0, tr("ZSafe"), tr("Password is empty.\nPlease enter again.")); continue; } - + QString firstPasswd = m_password; - - getDocPassword(tr("Reenter Password")); - if (m_password.isEmpty()) + + getDocPassword(tr("Reenter Password")); + if (m_password.isEmpty()) { - QMessageBox::critical( 0, tr("ZSafe"), + QMessageBox::critical( 0, tr("ZSafe"), tr("Password is empty.\nPlease enter again.")); continue; @@ -2196,13 +2199,13 @@ bool ZSafe::saveDocument(const char* _filename, if (firstPasswd != m_password) { - - QMessageBox::critical( 0, tr("ZSafe"), + + QMessageBox::critical( 0, tr("ZSafe"), tr("Passwords must be identical.\nPlease enter again.")); continue; } - pwdOk = TRUE; + pwdOk = TRUE; modified = false; } - } + } else if (modified) { @@ -2211,8 +2214,8 @@ bool ZSafe::saveDocument(const char* _filename, switch( QMessageBox::information( this, tr("ZSafe"), tr("Do you want to save ") + fns + tr("\nbefore continuing?"), - tr("&Save"), - tr("&Don't Save"), + tr("&Save"), + tr("&Don't Save"), 0 // Enter == button 0 - ) ) + ) ) { // Escape == button 2 case 0: // Save clicked, Alt-S or Enter pressed. @@ -2225,36 +2228,36 @@ bool ZSafe::saveDocument(const char* _filename, } modified = false; - + if (m_password.isEmpty()) return false; int retval = saveInit(_filename, m_password); - // int retval = saveInit(_filename, "test"); - if (retval != PWERR_GOOD) { - return false; + // int retval = saveInit(_filename, "test"); + if (retval != PWERR_GOOD) { + return false; } - - char* entry[FIELD_SIZE]; + + char* entry[FIELD_SIZE]; // save the validation entry { int i=0; - entry[i] = (char*)malloc(strlen("ZSAFECATEGORY")+1); - strcpy(entry[i++], "ZSAFECATEGORY"); - entry[i] = (char*)malloc(strlen("name")+1); - strcpy(entry[i++], "name"); - entry[i] = (char*)malloc(strlen("username")+1); - strcpy(entry[i++], "username"); - entry[i] = (char*)malloc(strlen("password")+1); - strcpy(entry[i++], "password"); - entry[i] = (char*)malloc(strlen("comment")+1); - strcpy(entry[i++], "comment"); - - entry[i] = (char*)malloc(strlen("field5")+1); - strcpy(entry[i++], "field5"); - entry[i] = (char*)malloc(strlen("field6")+1); - strcpy(entry[i++], "field6"); - - retval = saveEntry(entry); + entry[i] = (char*)malloc(strlen("ZSAFECATEGORY")+1); + strcpy(entry[i++], "ZSAFECATEGORY"); + entry[i] = (char*)malloc(strlen("name")+1); + strcpy(entry[i++], "name"); + entry[i] = (char*)malloc(strlen("username")+1); + strcpy(entry[i++], "username"); + entry[i] = (char*)malloc(strlen("password")+1); + strcpy(entry[i++], "password"); + entry[i] = (char*)malloc(strlen("comment")+1); + strcpy(entry[i++], "comment"); + + entry[i] = (char*)malloc(strlen("field5")+1); + strcpy(entry[i++], "field5"); + entry[i] = (char*)malloc(strlen("field6")+1); + strcpy(entry[i++], "field6"); + + retval = saveEntry(entry); for (int z=0; z<i; z++) free(entry[z]); if (retval == PWERR_DATA) { @@ -2297,5 +2300,5 @@ bool ZSafe::saveDocument(const char* _filename, strcpy(entry[j++], si->text(5).utf8()); - retval = saveEntry(entry); + retval = saveEntry(entry); for (int z=0; z<j; z++) { @@ -2311,14 +2314,14 @@ bool ZSafe::saveDocument(const char* _filename, } - if (saveFinalize() == PWERR_DATA) { + if (saveFinalize() == PWERR_DATA) { qWarning("2: Error writing file, contents not saved"); - return false; - } else { + return false; + } else { #ifndef DESKTOP Global::statusMessage (tr("Password file saved.")); #endif modified = false; - return true; - } + return true; + } } @@ -2371,25 +2374,25 @@ qWarning ("getDocPassword"); 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 */ + 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; - } else + if (QFile::exists(_filename)) { + val = checkFile(_filename); + if (val != PWERR_GOOD) + return val; + } else { - val = creat (_filename, (S_IRUSR | S_IWUSR)); - if (val == -1) - return PWERR_OPEN; - else - close(val); - } + val = creat (_filename, (S_IRUSR | S_IWUSR)); + if (val == -1) + return PWERR_OPEN; + else + close(val); + } */ QFileInfo f (_filename); @@ -2397,26 +2400,26 @@ int ZSafe::saveInit(const char *_filename, const char *password) save_buffer_length = ((save_buffer_length / 1024)+1) * 1024; - fd = fopen (_filename, "wb"); - if (fd == NULL) - return PWERR_OPEN; - - buffer = (char*)malloc(save_buffer_length); - - /* make the key ready */ - for (j = 0; password[j] != '\0'; j++) { - key[j] = password[j]; - } - keylength = j; - krc2->rc2_expandkey (key, keylength, 128); - - /* First, we make the IV */ - for (count2 = 0; count2 < 4; count2++) { - iv[count2] = rand (); - putc ((unsigned char) (iv[count2] >> 8), fd); - putc ((unsigned char) (iv[count2] & 0xff), fd); - } - - bufferIndex = 0; - return PWERR_GOOD; + fd = fopen (_filename, "wb"); + if (fd == NULL) + return PWERR_OPEN; + + buffer = (char*)malloc(save_buffer_length); + + /* make the key ready */ + for (j = 0; password[j] != '\0'; j++) { + key[j] = password[j]; + } + keylength = j; + krc2->rc2_expandkey (key, keylength, 128); + + /* First, we make the IV */ + for (count2 = 0; count2 < 4; count2++) { + iv[count2] = rand (); + putc ((unsigned char) (iv[count2] >> 8), fd); + putc ((unsigned char) (iv[count2] & 0xff), fd); + } + + bufferIndex = 0; + return PWERR_GOOD; } @@ -2424,88 +2427,88 @@ int ZSafe::saveInit(const char *_filename, const char *password) int ZSafe::saveEntry(char *entry[FIELD_SIZE]) { - char *text1; - int count2, count3; - unsigned short ciphertext[4]; - Krc2* krc2 = new Krc2(); - - buffer = (char*)memset(buffer, '\0', save_buffer_length); - - for (count2 = 0; count2 < FIELD_SIZE; count2++) { - text1 = entry[count2]; - if (strlen (text1) == 0) { - strncat(buffer, " ", strlen(" ")); - } else { - strncat(buffer, text1, strlen(text1)); - } - /* Use 255 as the marker. \n is too tough to test for */ - buffer[strlen (buffer)] = 255; - } /*for (count2 = 0; count2 < 5; count2++)*/ - count2 = 0; - /* I'm using CBC mode and encrypting the data straight from top down. - * At the bottom, encrypted, I will append an MD5 hash of the file, eventually. - * PKCS 5 padding (explained at the code section - */ - while (count2 < (int)strlen (buffer)) { + char *text1; + int count2, count3; + unsigned short ciphertext[4]; + Krc2* krc2 = new Krc2(); + + buffer = (char*)memset(buffer, '\0', save_buffer_length); + + for (count2 = 0; count2 < FIELD_SIZE; count2++) { + text1 = entry[count2]; + if (strlen (text1) == 0) { + strncat(buffer, " ", strlen(" ")); + } else { + strncat(buffer, text1, strlen(text1)); + } + /* Use 255 as the marker. \n is too tough to test for */ + buffer[strlen (buffer)] = 255; + } /*for (count2 = 0; count2 < 5; count2++)*/ + count2 = 0; + /* I'm using CBC mode and encrypting the data straight from top down. + * At the bottom, encrypted, I will append an MD5 hash of the file, eventually. + * PKCS 5 padding (explained at the code section + */ + while (count2 < (int)strlen (buffer)) { #ifndef WORDS_BIGENDIAN - plaintext[bufferIndex] = buffer[count2 + 1] << 8; - plaintext[bufferIndex] += buffer[count2] & 0xff; + plaintext[bufferIndex] = buffer[count2 + 1] << 8; + plaintext[bufferIndex] += buffer[count2] & 0xff; #endif #ifdef WORDS_BIGENDIAN - plaintext[bufferIndex] = buffer[count2] << 8; - plaintext[bufferIndex] += buffer[count2 + 1] & 0xff; -#endif - bufferIndex++; - if (bufferIndex == 4) { - krc2->rc2_encrypt (plaintext); - - for (count3 = 0; count3 < 4; count3++) { - ciphertext[count3] = iv[count3] ^ plaintext[count3]; - - /* Now store the ciphertext as the iv */ - iv[count3] = plaintext[count3]; - - /* reset the buffer index */ - bufferIndex = 0; - if (putc ((unsigned char) (ciphertext[count3] >> 8), fd) == EOF) return PWERR_DATA; - if (putc ((unsigned char) (ciphertext[count3] & 0xff), fd) == EOF) return PWERR_DATA; - } /*for (count3 = 0; count3 < 5; count3++)*/ - } /*if (bufferIndex == 5)*/ - /* increment a short, not a byte */ - count2 += 2; - } /*while (count2 < strlen (buffer))*/ + plaintext[bufferIndex] = buffer[count2] << 8; + plaintext[bufferIndex] += buffer[count2 + 1] & 0xff; +#endif + bufferIndex++; + if (bufferIndex == 4) { + krc2->rc2_encrypt (plaintext); + + for (count3 = 0; count3 < 4; count3++) { + ciphertext[count3] = iv[count3] ^ plaintext[count3]; + + /* Now store the ciphertext as the iv */ + iv[count3] = plaintext[count3]; + + /* reset the buffer index */ + bufferIndex = 0; + if (putc ((unsigned char) (ciphertext[count3] >> 8), fd) == EOF) return PWERR_DATA; + if (putc ((unsigned char) (ciphertext[count3] & 0xff), fd) == EOF) return PWERR_DATA; + } /*for (count3 = 0; count3 < 5; count3++)*/ + } /*if (bufferIndex == 5)*/ + /* increment a short, not a byte */ + count2 += 2; + } /*while (count2 < strlen (buffer))*/ int ret = PWERR_GOOD; - return ret; + return ret; } int ZSafe::saveFinalize(void) { - int count1, retval = PWERR_GOOD; - unsigned short ciphertext[4]; - Krc2* krc2 = new Krc2(); - - /* Tack on the PKCS 5 padding - * How it works is we fill up the last n bytes with the value n - * - * So, if we have, say, 13 bytes, 8 of which are used, we have 5 left - * 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; + int count1, retval = PWERR_GOOD; + unsigned short ciphertext[4]; + Krc2* krc2 = new Krc2(); + + /* Tack on the PKCS 5 padding + * How it works is we fill up the last n bytes with the value n + * + * So, if we have, say, 13 bytes, 8 of which are used, we have 5 left + * 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; } @@ -2518,9 +2521,9 @@ void ZSafe::quitMe () switch( QMessageBox::information( this, tr("ZSafe"), tr("Do you want to save\nbefore exiting?"), - tr("&Save"), + tr("&Save"), tr("S&ave with\nnew\npassword"), - tr("&Don't Save"), + tr("&Don't Save"), 0 // Enter == button 0 - ) ) + ) ) { // Escape == button 2 case 0: // Save clicked, Alt-S or Enter pressed. @@ -2530,5 +2533,5 @@ void ZSafe::quitMe () exitZs (1); break; - case 1: // + case 1: // // Save with new password modified = false; @@ -2577,5 +2580,5 @@ void ZSafe::addCategory() #endif dialog = categoryDialog; - connect( dialog->CategoryField, + connect( dialog->CategoryField, SIGNAL( activated ( const QString &)), this, SLOT( categoryFieldActivated( const QString & ) ) ); @@ -2602,5 +2605,5 @@ void ZSafe::addCategory() } #endif -#else +#else // read all categories from the config file and store // into a list @@ -2621,9 +2624,9 @@ void ZSafe::addCategory() QString firstCategory; dialog->CategoryField->clear(); // remove all items - while( it != list.end() ) + while( it != list.end() ) { QString *cat = new QString (*it); if (cat->contains("-field1", FALSE)) - { + { #ifdef DESKTOP #ifndef WIN32 @@ -2631,5 +2634,5 @@ void ZSafe::addCategory() #else int pos = cat->find ("-field1"); - categ = cat->left (pos); + categ = cat->left (pos); #endif #else @@ -2658,41 +2661,41 @@ void ZSafe::addCategory() if (initIcons) { - Wait waitDialog(this, tr("Wait dialog")); - waitDialog.waitLabel->setText(tr("Gathering icons...")); - waitDialog.show(); - qApp->processEvents(); + Wait waitDialog(this, tr("Wait dialog")); + waitDialog.waitLabel->setText(tr("Gathering icons...")); + waitDialog.show(); + qApp->processEvents(); #ifdef DESKTOP - QDir d(iconPath); + QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "/pics/"); #endif - d.setFilter( QDir::Files); + d.setFilter( QDir::Files); - const QFileInfoList *list = d.entryInfoList(); - QFileInfoListIterator it( *list ); // create list iterator - QFileInfo *fi; // pointer for traversing + 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); + 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; + 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(); + 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 WIN32 dialog->show(); @@ -2728,5 +2731,5 @@ void ZSafe::addCategory() fullIconPath = iconPath + icon; pix = new QPixmap (fullIconPath); - // pix->resize(14, 14); + // pix->resize(14, 14); if (pix) { @@ -2777,5 +2780,5 @@ void ZSafe::delCategory() switch( QMessageBox::information( this, tr("ZSafe"), tr("Do you want to delete?"), - tr("&Delete"), tr("D&on't Delete"), + tr("&Delete"), tr("D&on't Delete"), 0 // Enter == button 0 ) ) { // Escape == button 2 @@ -2818,5 +2821,5 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) QString icon; - if (selectedItem) + if (selectedItem) { dialog->Field1->setText(getFieldLabel (selectedItem, "1", tr("Name"))); @@ -2846,14 +2849,14 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) #ifdef DESKTOP - QDir d(iconPath); + QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "/pics/"); #endif - d.setFilter( QDir::Files); + d.setFilter( QDir::Files); - const QFileInfoList *list = d.entryInfoList(); - int i=0; - QFileInfoListIterator it( *list ); // create list iterator - QFileInfo *fi; // pointer for traversing + const QFileInfoList *list = d.entryInfoList(); + int i=0; + QFileInfoListIterator it( *list ); // create list iterator + QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { @@ -2862,21 +2865,21 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog) else { - while ( (fi=it.current()) ) + while ( (fi=it.current()) ) { // for each file... - QString fileName = fi->fileName(); - if(fileName.right(4) == ".png") + QString fileName = fi->fileName(); + if(fileName.right(4) == ".png") { - fileName = fileName.mid(0,fileName.length()-4); + fileName = fileName.mid(0,fileName.length()-4); - if(fileName+".png"==icon) + if(fileName+".png"==icon) { dialog->IconField->setCurrentItem(i+1); break; } - ++i; - } - ++it; - } - } + ++i; + } + ++it; + } + } } @@ -2903,14 +2906,14 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) #ifdef DESKTOP - QDir d(iconPath); + QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "/pics/"); #endif - d.setFilter( QDir::Files); + d.setFilter( QDir::Files); - const QFileInfoList *list = d.entryInfoList(); - int i=0; - QFileInfoListIterator it( *list ); // create list iterator - QFileInfo *fi; // pointer for traversing + const QFileInfoList *list = d.entryInfoList(); + int i=0; + QFileInfoListIterator it( *list ); // create list iterator + QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { @@ -2919,21 +2922,21 @@ void ZSafe::setCategoryDialogFields(CategoryDialog *dialog, QString category) else { - while ( (fi=it.current()) ) + while ( (fi=it.current()) ) { // for each file... - QString fileName = fi->fileName(); - if(fileName.right(4) == ".png") + QString fileName = fi->fileName(); + if(fileName.right(4) == ".png") { - fileName = fileName.mid(0,fileName.length()-4); + fileName = fileName.mid(0,fileName.length()-4); - if(fileName+".png"==icon) + if(fileName+".png"==icon) { dialog->IconField->setCurrentItem(i+1); break; } - ++i; - } - ++it; - } - } + ++i; + } + ++it; + } + } } @@ -2984,5 +2987,5 @@ void ZSafe::editCategory() #endif dialog = categoryDialog; - connect( dialog->CategoryField, + connect( dialog->CategoryField, SIGNAL( activated ( const QString &)), this, SLOT( categoryFieldActivated( const QString & ) ) ); @@ -3030,15 +3033,15 @@ void ZSafe::editCategory() int i=0; bool foundCategory = false; - while( it != list.end() ) + while( it != list.end() ) { QString *cat = new QString (*it); if (cat->contains("-field1", FALSE)) - { + { #ifdef DESKTOP #ifndef WIN32 categ = cat->section ("-field1", 0, 0); #else - int pos = cat->find ("-field1"); - categ = cat->left (pos); + int pos = cat->find ("-field1"); + categ = cat->left (pos); #endif #else @@ -3076,20 +3079,20 @@ void ZSafe::editCategory() { - Wait waitDialog(this, tr("Wait dialog")); - waitDialog.waitLabel->setText(tr("Gathering icons...")); - waitDialog.show(); - qApp->processEvents(); + Wait waitDialog(this, tr("Wait dialog")); + waitDialog.waitLabel->setText(tr("Gathering icons...")); + waitDialog.show(); + qApp->processEvents(); #ifdef DESKTOP - QDir d(iconPath); + QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "/pics/"); #endif - d.setFilter( QDir::Files); + d.setFilter( QDir::Files); - const QFileInfoList *list = d.entryInfoList(); - int i=0; - QFileInfoListIterator it( *list ); // create list iterator - QFileInfo *fi; // pointer for traversing + const QFileInfoList *list = d.entryInfoList(); + int i=0; + QFileInfoListIterator it( *list ); // create list iterator + QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { @@ -3097,42 +3100,42 @@ void ZSafe::editCategory() } - dialog->IconField->insertItem("predefined"); - while ( (fi=it.current()) ) { // for each file... - QString fileName = fi->fileName(); - if(fileName.right(4) == ".png") + 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); + fileName = fileName.mid(0,fileName.length()-4); #ifdef DESKTOP - QPixmap imageOfFile; + QPixmap imageOfFile; imageOfFile.load(iconPath + fi->fileName()); #else - QPixmap imageOfFile(Resource::loadPixmap(fileName)); + 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) + 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(); + ++i; + } + ++it; + } + waitDialog.hide(); } else { #ifdef DESKTOP - // QDir d(QDir::homeDirPath() + "/pics/"); - QDir d(iconPath); + // QDir d(QDir::homeDirPath() + "/pics/"); + QDir d(iconPath); #else - QDir d(QPEApplication::qpeDir() + "/pics/"); + QDir d(QPEApplication::qpeDir() + "/pics/"); #endif - d.setFilter( QDir::Files); + d.setFilter( QDir::Files); - const QFileInfoList *list = d.entryInfoList(); - int i=0; - QFileInfoListIterator it( *list ); // create list iterator - QFileInfo *fi; // pointer for traversing + const QFileInfoList *list = d.entryInfoList(); + int i=0; + QFileInfoListIterator it( *list ); // create list iterator + QFileInfo *fi; // pointer for traversing if (icon.isEmpty() || icon.isNull()) { @@ -3142,22 +3145,22 @@ void ZSafe::editCategory() { - while ( (fi=it.current()) ) + while ( (fi=it.current()) ) { // for each file... - QString fileName = fi->fileName(); - if(fileName.right(4) == ".png") + QString fileName = fi->fileName(); + if(fileName.right(4) == ".png") { - fileName = fileName.mid(0,fileName.length()-4); + fileName = fileName.mid(0,fileName.length()-4); - if(fileName+".png"==icon) + if(fileName+".png"==icon) { dialog->IconField->setCurrentItem(i+1); break; } - ++i; - } - ++it; - } - } + ++i; + } + ++it; + } + } } @@ -3331,5 +3334,5 @@ void ZSafe::newDocument() tr ("Create new ZSafe document")); #else - QString newFile = ScQtFileEdit::getSaveAsFileName(this, + QString newFile = ScQtFileEdit::getSaveAsFileName(this, tr ("Create new ZSafe document"), QDir::homeDirPath() + "/Documents/application/zsafe", @@ -3338,5 +3341,5 @@ void ZSafe::newDocument() #else QString newFile = QFileDialog::getSaveFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", + QDir::homeDirPath() + "/Documents/application/zsafe", "ZSafe (*.zsf)", this, @@ -3396,5 +3399,5 @@ void ZSafe::newDocument() // openDocument(filename); - QMessageBox::information( this, tr("ZSafe"), + QMessageBox::information( this, tr("ZSafe"), tr("Now you have to enter\na password twice for your\nnewly created document."), tr("&OK"), 0); @@ -3419,5 +3422,5 @@ void ZSafe::loadDocument() tr ("Open ZSafe document")); #else - QString newFile = ScQtFileEdit::getOpenFileName(this, + QString newFile = ScQtFileEdit::getOpenFileName(this, tr ("Open ZSafe document"), QDir::homeDirPath() + "/Documents/application/zsafe", @@ -3426,5 +3429,5 @@ void ZSafe::loadDocument() #else QString newFile = QFileDialog::getOpenFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", + QDir::homeDirPath() + "/Documents/application/zsafe", "ZSafe (*.zsf)", this, @@ -3497,5 +3500,5 @@ void ZSafe::saveDocumentAs() tr ("Save ZSafe document as..")); #else - QString newFile = ScQtFileEdit::getSaveAsFileName(this, + QString newFile = ScQtFileEdit::getSaveAsFileName(this, tr ("Save ZSafe document as.."), QDir::homeDirPath() + "/Documents/application/zsafe", @@ -3505,5 +3508,5 @@ void ZSafe::saveDocumentAs() // open the file dialog QString newFile = QFileDialog::getSaveFileName( - QDir::homeDirPath() + "/Documents/application/zsafe", + QDir::homeDirPath() + "/Documents/application/zsafe", "ZSafe (*.zsf)", this, @@ -3532,5 +3535,5 @@ void ZSafe::saveDocumentAs() #endif - QMessageBox::information( this, tr("ZSafe"), + QMessageBox::information( this, tr("ZSafe"), tr("Now you have to enter\na password twice for your\nnewly created document."), tr("&OK"), 0); @@ -3623,5 +3626,5 @@ void ZSafe::paintEvent( QPaintEvent * ) } -void ZSafe::resizeEvent ( QResizeEvent * ) +void ZSafe::resizeEvent ( QResizeEvent * ) { // qWarning ("resizeEvent"); @@ -3635,11 +3638,11 @@ void ZSafe::resizeEvent ( QResizeEvent * ) if (New) - New->setGeometry ( QRect( DeskW-84, 2, 20, 20 ) ); + New->setGeometry ( QRect( DeskW-84, 2, 20, 20 ) ); if (Edit) - Edit->setGeometry ( QRect( DeskW-64, 2, 20, 20 ) ); + Edit->setGeometry ( QRect( DeskW-64, 2, 20, 20 ) ); if (Delete) - Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); + Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) ); if (Find) - Find->setGeometry ( QRect( DeskW-24, 2, 20, 20 ) ); + Find->setGeometry ( QRect( DeskW-24, 2, 20, 20 ) ); } @@ -3723,5 +3726,5 @@ void ZSafe::setDocument(const QString& fileref) m_password = ""; selectedItem = NULL; - + openDocument(filename); #endif diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro index 65bcb79..1e8e4ac 100644 --- a/noncore/apps/zsafe/zsafe.pro +++ b/noncore/apps/zsafe/zsafe.pro @@ -1,16 +1,16 @@ -TEMPLATE = app -CONFIG = qt warn_on release +TEMPLATE = app +CONFIG = qt warn_on release DESTDIR = $(OPIEDIR)/bin HEADERS = zsafe.h krc2.h category.h categorylist.h zlistview.h \ - scqtfiledlg.h + scqtfiledlg.h SOURCES = main.cpp zsafe.cpp krc2.cpp category.cpp \ categorylist.cpp zlistview.cpp shadedlistitem.cpp\ scqtfileedit.cpp scqtfileedit.moc.cpp \ scqtfiledlg.cpp -INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui -INCLUDEPATH += $(OPIEDIR)/include -DEPENDPATH += $(OPIEDIR)/include -LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopie -TARGET = zsafe +INTERFACES = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include +LIBS += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopieui2 +TARGET = zsafe include ( $(OPIEDIR)/include.pro ) |