summaryrefslogtreecommitdiffabout
path: root/pwmanager
authorMichael Krelin <hacker@klever.net>2007-07-10 22:35:13 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-10 22:35:13 (UTC)
commit1c5369f3785b118ff4d18c4940913b800dd201fb (patch) (unidiff)
treefa2927b679af83e9fe70f5333d05a88484dbb8bf /pwmanager
parentde61d6005b51bc62f01786e06cd964e530c1bf83 (diff)
downloadkdepimpi-1c5369f3785b118ff4d18c4940913b800dd201fb.zip
kdepimpi-1c5369f3785b118ff4d18c4940913b800dd201fb.tar.gz
kdepimpi-1c5369f3785b118ff4d18c4940913b800dd201fb.tar.bz2
pwmanager: look in proper directoriesp2
Diffstat (limited to 'pwmanager') (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/main.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index acb0011..a39d983 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -129,32 +129,33 @@ static void addAuthors(KAboutData *aboutData)
129 I18N_NOOP("Blowfish and SHA1 algorithms"), 129 I18N_NOOP("Blowfish and SHA1 algorithms"),
130 0, "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/"); 130 0, "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/");
131 aboutData->addCredit("Troy Engel", 131 aboutData->addCredit("Troy Engel",
132 I18N_NOOP("kpasman"), 132 I18N_NOOP("kpasman"),
133 "tengel@sonic.net"); 133 "tengel@sonic.net");
134 aboutData->addCredit("Wickey", 134 aboutData->addCredit("Wickey",
135 I18N_NOOP("graphics-design in older versions."), 135 I18N_NOOP("graphics-design in older versions."),
136 "wickey@gmx.at"); 136 "wickey@gmx.at");
137 aboutData->addCredit("Ian MacGregor", 137 aboutData->addCredit("Ian MacGregor",
138 I18N_NOOP( 138 I18N_NOOP(
139 "original documentation author.")); 139 "original documentation author."));
140} 140}
141#endif 141#endif
142 142
143int main(int argc, char *argv[]) 143int main(int argc, char *argv[])
144{ 144{
145 if(!getenv("KDEPIMPIDIR")) putenv("KDEPIMPIDIR=/usr/lib/kdepimpi");
145 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi"); 146 if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
146 printDebugConfigureInfo(); 147 printDebugConfigureInfo();
147#ifndef PWM_EMBEDDED 148#ifndef PWM_EMBEDDED
148 KAboutData aboutData(PACKAGE_NAME, PROG_NAME, 149 KAboutData aboutData(PACKAGE_NAME, PROG_NAME,
149 PACKAGE_VER, description, KAboutData::License_File, 150 PACKAGE_VER, description, KAboutData::License_File,
150 "(c) 2003, 2004 Michael Buesch and the PwManager Team", 0, 151 "(c) 2003, 2004 Michael Buesch and the PwManager Team", 0,
151 "http://passwordmanager.sourceforge.net/", 152 "http://passwordmanager.sourceforge.net/",
152 "mbuesch@freenet.de"); 153 "mbuesch@freenet.de");
153 addAuthors(&aboutData); 154 addAuthors(&aboutData);
154 155
155 KCmdLineArgs::init(argc, argv, &aboutData); 156 KCmdLineArgs::init(argc, argv, &aboutData);
156 KCmdLineArgs::addCmdLineOptions(options); 157 KCmdLineArgs::addCmdLineOptions(options);
157 158
158 KUniqueApplication::addCmdLineOptions(); 159 KUniqueApplication::addCmdLineOptions();
159 if (!KUniqueApplication::start()) { 160 if (!KUniqueApplication::start()) {
160 printInfo("already running."); 161 printInfo("already running.");
@@ -176,33 +177,37 @@ int main(int argc, char *argv[])
176 exitHelp = true; 177 exitHelp = true;
177 } 178 }
178 } 179 }
179 if ( ! exitHelp ) { 180 if ( ! exitHelp ) {
180 181
181 PwMApplication a(argc, argv); 182 PwMApplication a(argc, argv);
182 183
183 KGlobal::setAppName( "pwmanager" ); 184 KGlobal::setAppName( "pwmanager" );
184#ifndef DESKTOP_VERSION 185#ifndef DESKTOP_VERSION
185 //qDebug("width %d ",QApplication::desktop()->width() ); 186 //qDebug("width %d ",QApplication::desktop()->width() );
186 if ( QApplication::desktop()->width() > 320 ) 187 if ( QApplication::desktop()->width() > 320 )
187 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/"); 188 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons22/");
188 else 189 else
189 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/"); 190 KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/pwmanager/icons16/");
190#else 191#else
191 QString fileName ; 192 QString fileName ;
192 fileName = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/"; 193 const char *kpd = ::getenv("KDEPIMPIDIR");
194 if(kpd)
195 fileName = QString(kpd) + "/pwmanager/icons22/";
196 else
197 fileName = qApp->applicationDirPath () + "/kdepim/pwmanager/icons22/";
193 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); 198 KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
194 QApplication::addLibraryPath ( qApp->applicationDirPath () ); 199 QApplication::addLibraryPath ( qApp->applicationDirPath () );
195 200
196#endif 201#endif
197 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager"))); 202 KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "pwmanager")));
198 KPimGlobalPrefs::instance()->setGlobalConfig(); 203 KPimGlobalPrefs::instance()->setGlobalConfig();
199 QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); 204 QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont );
200 205
201 a.newInstance(); 206 a.newInstance();
202 207
203 //US KAddressBookMain m ; 208 //US KAddressBookMain m ;
204 209
205 //US QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); 210 //US QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
206 /*US 211 /*US
207#ifndef DESKTOP_VERSION 212#ifndef DESKTOP_VERSION
208 a.showMainWidget( &m ); 213 a.showMainWidget( &m );