summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/zsafe/zsafe.cpp30
1 files changed, 17 insertions, 13 deletions
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 43565ee..ee1da77 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -378,35 +378,41 @@ 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'
*
* 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 )
+ : QDialog( parent, name, modal, fl ),
+ Edit(0l), Delete(0l), Find(0l), New(0l), ListView(0l)
{
IsCut = false;
IsCopy = false;
modified = 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
// create a zsafe configuration object
#ifdef DESKTOP
#ifndef WIN32
@@ -500,33 +506,29 @@ ZSafe::ZSafe( QWidget* parent, const char* name, bool modal, WFlags fl )
QDir pd1("Documents");
if (!pd1.mkdir("application", FALSE))
{
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);
}
}
-// #ifndef WIN32
- // QString d2("Documents/application/zsafe");
-// #else
- QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
-// #endif
+ QString d2(QDir::homeDirPath() + "/Documents/application/zsafe");
QDir pd2(d2);
if (!pd2.exists())
{
- QDir pd2("Documents/application");
+ QDir pd2(QDir::homeDirPath() + "Documents/application");
if (!pd2.mkdir("zsafe", FALSE))
{
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);
}
}
@@ -3638,31 +3640,33 @@ void ZSafe::paintEvent( QPaintEvent * )
}
void ZSafe::resizeEvent ( QResizeEvent * )
{
// qWarning ("resizeEvent");
#ifndef DESKTOP
DeskW = appl->desktop()->width();
DeskH = appl->desktop()->height();
#else
DeskW = this->width();
DeskH = this->height();
#endif
- qWarning( QString("Width : %1").arg(DeskW), 2000 );
- qWarning( QString("Height: %1").arg(DeskH), 2000 );
- New->setGeometry ( QRect( DeskW-84, 2, 20, 20 ) );
- Edit->setGeometry ( QRect( DeskW-64, 2, 20, 20 ) );
- Delete->setGeometry( QRect( DeskW-44, 2, 20, 20 ) );
- Find->setGeometry ( QRect( DeskW-24, 2, 20, 20 ) );
+ 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;