summaryrefslogtreecommitdiff
authorzcarsten <zcarsten>2003-08-14 07:10:23 (UTC)
committer zcarsten <zcarsten>2003-08-14 07:10:23 (UTC)
commit1ff9232b95b7f8ea0d841a3b9219eaa7e82f1d62 (patch) (side-by-side diff)
tree953026506eca01ba05fbee7a97e6c321750587f0
parent7812d22080064f97d964dcbc3b085fde586a97d7 (diff)
downloadopie-1ff9232b95b7f8ea0d841a3b9219eaa7e82f1d62.zip
opie-1ff9232b95b7f8ea0d841a3b9219eaa7e82f1d62.tar.gz
opie-1ff9232b95b7f8ea0d841a3b9219eaa7e82f1d62.tar.bz2
code clean up against previous version
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/zsafe.cpp106
1 files changed, 19 insertions, 87 deletions
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index d55624b..43565ee 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -102,4 +102,8 @@ extern QPEApplication *appl;
#endif
+#ifdef JPATCH_HDE
+#define tr(arg) arg
+#endif
+
#ifdef DESKTOP
@@ -498,5 +502,9 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
{
QMessageBox::critical( 0, tr("ZSafe"),
+#ifdef JPATCH_HDE
+ tr("Can't create directory\n.../Documents/application\n\nZSafe will now exit."));
+#else
tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d1));
+#endif
exitZs (1);
}
@@ -514,5 +522,9 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
{
QMessageBox::critical( 0, tr("ZSafe"),
+#ifdef JPATCH_HDE
+ tr("Can't create directory\n...//Documents/application/zsafe\n\nZSafe will now exit."));
+#else
tr("Can't create directory\n%1\n\nZSafe will now exit.").arg(d2));
+#endif
exitZs (1);
}
@@ -776,20 +788,4 @@ void ZSafe::editPwd()
if (result == Accepted)
{
-#ifdef JPATCH_HDE
- // edit the selected item
- QString name = dialog->NameField->text();
- selectedItem->setText (0, name);
- QString user = dialog->UsernameField->text();
- selectedItem->setText (1, user);
- QString pwd = dialog->PasswordField->text();
- selectedItem->setText (2, pwd);
- QString comment = dialog->CommentField->text();
- comment.replace (QRegExp("\n"), "<br>");
- selectedItem->setText (3, comment);
- QString f5 = dialog->Field5->text();
- selectedItem->setText (4, f5);
- QString f6 = dialog->Field6->text();
- selectedItem->setText (5, f6);
-#else
modified = true;
// edit the selected item
@@ -807,5 +803,4 @@ void ZSafe::editPwd()
QString f6 = dialog->Field6->text();
selectedItem->setText (5, tr (f6));
-#endif
}
@@ -872,18 +867,4 @@ retype:
i->setOpen (TRUE);
-#ifdef JPATCH_HDE
- i->setText (0, name);
- QString user = dialog->UsernameField->text();
- i->setText (1, user);
- QString pwd = dialog->PasswordField->text();
- i->setText (2, pwd);
- QString comment = dialog->CommentField->text();
- comment.replace (QRegExp("\n"), "<br>");
- i->setText (3, comment);
- QString f5 = dialog->Field5->text();
- i->setText (4, f5);
- QString f6 = dialog->Field6->text();
- i->setText (5, f6);
-#else
i->setText (0, tr (name));
QString user = dialog->UsernameField->text();
@@ -898,5 +879,4 @@ retype:
QString f6 = dialog->Field6->text();
i->setText (5, tr (f6));
-#endif
}
@@ -1546,12 +1526,4 @@ void ZSafe::readAllEntries()
{
QListViewItem * item = new ShadedListItem( 0, catItem );
-#ifdef JPATCH_HDE
- item->setText( 0, name );
- item->setText( 1, user );
- item->setText( 2, password );
- item->setText( 3, comment );
- item->setText( 4, field5 );
- item->setText( 5, field6 );
-#else
item->setText( 0, tr( name ) );
item->setText( 1, tr( user ) );
@@ -1561,5 +1533,4 @@ void ZSafe::readAllEntries()
item->setText( 5, tr( field6 ) );
catItem->setOpen( TRUE );
-#endif
}
}
@@ -1569,12 +1540,4 @@ void ZSafe::readAllEntries()
// create and insert a new item
QListViewItem * item = new ShadedListItem( 0, catI );
-#ifdef JPATCH_HDE
- item->setText( 0, name );
- item->setText( 1, user );
- item->setText( 2, password );
- item->setText( 3, comment );
- item->setText( 4, field5 );
- item->setText( 5, field6 );
-#else
item->setText( 0, tr( name ) );
item->setText( 1, tr( user ) );
@@ -1583,5 +1546,5 @@ void ZSafe::readAllEntries()
item->setText( 4, tr( field5 ) );
item->setText( 5, tr( field6 ) );
-#endif
+
catI->setOpen( TRUE );
@@ -1783,15 +1746,9 @@ void ZSafe::readAllEntries()
{
QListViewItem * item = new ShadedListItem( 0, catItem );
-#ifdef JPATCH_HDE
- item->setText( 0, name );
- item->setText( 1, user );
- item->setText( 2, password );
- item->setText( 3, comment );
-#else
item->setText( 0, tr( name ) );
item->setText( 1, tr( user ) );
item->setText( 2, tr( password ) );
item->setText( 3, tr( comment ) );
-#endif
+
catItem->setOpen( TRUE );
}
@@ -1802,15 +1759,9 @@ void ZSafe::readAllEntries()
// create and insert a new item
QListViewItem * item = new ShadedListItem( 0, catI );
-#ifdef JPATCH_HDE
- item->setText( 0, name );
- item->setText( 1, user );
- item->setText( 2, password );
- item->setText( 3, comment );
-#else
item->setText( 0, tr( name ) );
item->setText( 1, tr( user ) );
item->setText( 2, tr( password ) );
item->setText( 3, tr( comment ) );
-#endif
+
catI->setOpen( TRUE );
@@ -2010,12 +1961,4 @@ bool ZSafe::openDocument(const char* _filename, const char* )
{
QListViewItem * item = new ShadedListItem( 0, catItem );
-#ifdef JPATCH_HDE
- item->setText( 0, name );
- item->setText( 1, user );
- item->setText( 2, password );
- item->setText( 3, comment );
- item->setText( 4, field5 );
- item->setText( 5, field6 );
-#else
item->setText( 0, tr( name ) );
item->setText( 1, tr( user ) );
@@ -2024,5 +1967,5 @@ bool ZSafe::openDocument(const char* _filename, const char* )
item->setText( 4, tr( field5 ) );
item->setText( 5, tr( field6 ) );
-#endif
+
if (expandTree)
catItem->setOpen( TRUE );
@@ -2035,12 +1978,5 @@ bool ZSafe::openDocument(const char* _filename, const char* )
// create and insert a new item
QListViewItem * item = new ShadedListItem( 0, catI );
-#ifdef JPATCH_HDE
- item->setText( 0, name );
- item->setText( 1, user );
- item->setText( 2, password );
- item->setText( 3, comment );
- item->setText( 4, field5 );
- item->setText( 5, field6 );
-#else
+
item->setText( 0, tr( name ) );
item->setText( 1, tr( user ) );
@@ -2049,5 +1985,5 @@ bool ZSafe::openDocument(const char* _filename, const char* )
item->setText( 4, tr( field5 ) );
item->setText( 5, tr( field6 ) );
-#endif
+
if (expandTree)
catI->setOpen( TRUE );
@@ -3304,11 +3240,7 @@ void ZSafe::editCategory()
{
qWarning (category);
-#ifdef JPATCH_HDE
- catItem->setText( 0, category );
- cat->setCategoryName (category);
-#else
catItem->setText( 0, tr( category ) );
cat->setCategoryName (tr(category));
-#endif
+
cat->initListItem();
categories.insert (category, cat);