summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (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
@@ -97,128 +97,133 @@ static void printDebugConfigureInfo()
97#else // PWM_DEBUG 97#else // PWM_DEBUG
98static inline void printDebugConfigureInfo() { /* nothing */ } 98static inline void printDebugConfigureInfo() { /* nothing */ }
99#endif // PWM_DEBUG 99#endif // PWM_DEBUG
100 100
101#ifndef PWM_EMBEDDED 101#ifndef PWM_EMBEDDED
102static void addAuthors(KAboutData *aboutData) 102static void addAuthors(KAboutData *aboutData)
103{ 103{
104 aboutData->addAuthor("Michael Buesch", 104 aboutData->addAuthor("Michael Buesch",
105 I18N_NOOP( 105 I18N_NOOP(
106 "main programming and current maintainer"), 106 "main programming and current maintainer"),
107 "mbuesch@freenet.de"); 107 "mbuesch@freenet.de");
108 aboutData->addAuthor("Matt Scifo", 108 aboutData->addAuthor("Matt Scifo",
109 I18N_NOOP( 109 I18N_NOOP(
110 "original implementaion of \n" 110 "original implementaion of \n"
111 "\"categories\" and the password-tree \n" 111 "\"categories\" and the password-tree \n"
112 "in the system-tray. Original implementations of \n" 112 "in the system-tray. Original implementations of \n"
113 "numerous view-improvements."), 113 "numerous view-improvements."),
114 "mscifo@o1.com"); 114 "mscifo@o1.com");
115 aboutData->addCredit("Elias Probst", 115 aboutData->addCredit("Elias Probst",
116 I18N_NOOP( 116 I18N_NOOP(
117 "Gentoo ebuild maintainer."), 117 "Gentoo ebuild maintainer."),
118 "elias.probst@gmx.de"); 118 "elias.probst@gmx.de");
119 aboutData->addCredit("George Staikos", 119 aboutData->addCredit("George Staikos",
120 I18N_NOOP("KWallet"), 120 I18N_NOOP("KWallet"),
121 "staikos@kde.org"); 121 "staikos@kde.org");
122 aboutData->addCredit("Matthew Palmer", 122 aboutData->addCredit("Matthew Palmer",
123 I18N_NOOP("rc2 code"), 123 I18N_NOOP("rc2 code"),
124 "mjp16@uow.edu.au"); 124 "mjp16@uow.edu.au");
125 aboutData->addCredit("Olivier Sessink", 125 aboutData->addCredit("Olivier Sessink",
126 I18N_NOOP("gpasman"), 126 I18N_NOOP("gpasman"),
127 "gpasman@nl.linux.org"); 127 "gpasman@nl.linux.org");
128 aboutData->addCredit("The libgcrypt developers", 128 aboutData->addCredit("The libgcrypt developers",
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.");
161 return EXIT_SUCCESS; 162 return EXIT_SUCCESS;
162 } 163 }
163 PwMApplication a; 164 PwMApplication a;
164 aboutData.setLicenseTextFile(LICENSE_FILE); 165 aboutData.setLicenseTextFile(LICENSE_FILE);
165 return a.exec(); 166 return a.exec();
166#else 167#else
167 168
168 bool exitHelp = false; 169 bool exitHelp = false;
169 if ( argc > 1 ) { 170 if ( argc > 1 ) {
170 QString command = argv[1]; 171 QString command = argv[1];
171 if ( command == "-help" ){ 172 if ( command == "-help" ){
172 printf("PWM/PI command line commands:\n"); 173 printf("PWM/PI command line commands:\n");
173 printf(" no command: Start PWM/PI in usual way\n"); 174 printf(" no command: Start PWM/PI in usual way\n");
174 printf(" -help: This output\n"); 175 printf(" -help: This output\n");
175 printf(" PWM/PI is exiting now. Bye!\n"); 176 printf(" PWM/PI is exiting now. Bye!\n");
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 );
209#else 214#else
210 a.setMainWidget( &m ); 215 a.setMainWidget( &m );
211 m.resize (640, 480 ); 216 m.resize (640, 480 );
212 m.show(); 217 m.show();
213#endif 218#endif
214 */ 219 */
215 QObject::connect( &a, SIGNAL( lastWindowClosed()), &a, SLOT (quit())); 220 QObject::connect( &a, SIGNAL( lastWindowClosed()), &a, SLOT (quit()));
216 a.exec(); 221 a.exec();
217 dumpMissing(); 222 dumpMissing();
218 KPimGlobalPrefs::instance()->writeConfig(); 223 KPimGlobalPrefs::instance()->writeConfig();
219 } 224 }
220 qDebug("PWMPI: Bye! "); 225 qDebug("PWMPI: Bye! ");
221 226
222#endif 227#endif
223 228
224} 229}