summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pwmanager/pwmanager/pwmview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/pwmanager/pwmanager/pwmview.cpp b/pwmanager/pwmanager/pwmview.cpp
index e53124f..5aaf66e 100644
--- a/pwmanager/pwmanager/pwmview.cpp
+++ b/pwmanager/pwmanager/pwmview.cpp
@@ -208,96 +208,97 @@ void PwMView::updateCategories()
208 QString oldSel(getCurrentCategory()); 208 QString oldSel(getCurrentCategory());
209 delAllCategories(); 209 delAllCategories();
210 QStringList catList; 210 QStringList catList;
211 document()->getCategoryList(&catList); 211 document()->getCategoryList(&catList);
212 catList.sort(); 212 catList.sort();
213#ifndef PWM_EMBEDDED 213#ifndef PWM_EMBEDDED
214 QStringList::iterator i = catList.begin(), 214 QStringList::iterator i = catList.begin(),
215 end = catList.end(); 215 end = catList.end();
216#else 216#else
217 QStringList::Iterator i = catList.begin(), 217 QStringList::Iterator i = catList.begin(),
218 end = catList.end(); 218 end = catList.end();
219#endif 219#endif
220 while (i != end) { 220 while (i != end) {
221 addCategory(*i); 221 addCategory(*i);
222 ++i; 222 ++i;
223 } 223 }
224 selectCategory(oldSel); 224 selectCategory(oldSel);
225} 225}
226 226
227void PwMView::shiftToView() 227void PwMView::shiftToView()
228{ 228{
229 int cX = lv->contentsX(); 229 int cX = lv->contentsX();
230 int cY = lv->contentsY(); 230 int cY = lv->contentsY();
231 commentBox->clear(); 231 commentBox->clear();
232 232
233 unsigned int catDocIndex; 233 unsigned int catDocIndex;
234 if (unlikely( 234 if (unlikely(
235 !(document()->findCategory(getCurrentCategory(), 235 !(document()->findCategory(getCurrentCategory(),
236 &catDocIndex)))) { 236 &catDocIndex)))) {
237 BUG(); 237 BUG();
238 } 238 }
239 239
240 // ensure all listViewPos are set 240 // ensure all listViewPos are set
241 doc->ensureLvp(); 241 doc->ensureLvp();
242 242
243 // clear all tmp-data vectors 243 // clear all tmp-data vectors
244 unsigned int i, entries = doc->numEntries(catDocIndex); 244 unsigned int i, entries = doc->numEntries(catDocIndex);
245 if (entries) { 245 if (entries) {
246 mainClass->setVirgin(false); 246 mainClass->setVirgin(false);
247 } 247 }
248 vector<PwMDataItem> tmpSorted; 248 vector<PwMDataItem> tmpSorted;
249 PwMDataItem currItem; 249 PwMDataItem currItem;
250 currItem.clear(); 250 currItem.clear();
251 tmpSorted.insert(tmpSorted.begin(), entries, currItem); 251 tmpSorted.insert(tmpSorted.begin(), entries, currItem);
252 252
253 // Sort items and store them in tempoary tmpSorted. 253 // Sort items and store them in tempoary tmpSorted.
254 for (i = 0; i < entries; ++i) { 254 for (i = 0; i < entries; ++i) {
255 doc->getEntry(catDocIndex, i, &currItem); 255 doc->getEntry(catDocIndex, i, &currItem);
256 //qDebug("PwMView::shiftToView: %s, %i", currItem.desc.c_str(), currItem.listViewPos);
256 tmpSorted[currItem.listViewPos] = currItem; 257 tmpSorted[currItem.listViewPos] = currItem;
257 } 258 }
258 259
259 // shift tempoary data to ListView. 260 // shift tempoary data to ListView.
260 tmpDisableSort(); 261 tmpDisableSort();
261 lv->clear(); 262 lv->clear();
262 QCheckListItem *newItem; 263 QCheckListItem *newItem;
263 vector<PwMDataItem>::iterator it = tmpSorted.begin(), 264 vector<PwMDataItem>::iterator it = tmpSorted.begin(),
264 end = tmpSorted.end(); 265 end = tmpSorted.end();
265 while (it != end) { 266 while (it != end) {
266 newItem = new ListViewItemPwM(lv); 267 newItem = new ListViewItemPwM(lv);
267 newItem->setText(COLUMN_DESC, (*it).desc.c_str()); 268 newItem->setText(COLUMN_DESC, (*it).desc.c_str());
268 if ((*it).binary) { 269 if ((*it).binary) {
269 newItem->setText(COLUMN_NAME, ""); 270 newItem->setText(COLUMN_NAME, "");
270 newItem->setText(COLUMN_PW, i18n("<BINARY ENTRY>")); 271 newItem->setText(COLUMN_PW, i18n("<BINARY ENTRY>"));
271 newItem->setText(COLUMN_URL, ""); 272 newItem->setText(COLUMN_URL, "");
272 newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str()); 273 newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str());
273 } else { 274 } else {
274 newItem->setText(COLUMN_NAME, (*it).name.c_str()); 275 newItem->setText(COLUMN_NAME, (*it).name.c_str());
275 if ((*it).lockStat) { 276 if ((*it).lockStat) {
276 newItem->setText(COLUMN_PW, QString((*it).pw.c_str()) 277 newItem->setText(COLUMN_PW, QString((*it).pw.c_str())
277 + " " 278 + " "
278 + i18n("To unlock click the icon on the left.")); 279 + i18n("To unlock click the icon on the left."));
279 } else { 280 } else {
280 newItem->setText(COLUMN_PW, (*it).pw.c_str()); 281 newItem->setText(COLUMN_PW, (*it).pw.c_str());
281 } 282 }
282 newItem->setText(COLUMN_URL, (*it).url.c_str()); 283 newItem->setText(COLUMN_URL, (*it).url.c_str());
283 newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str()); 284 newItem->setText(COLUMN_LAUNCHER, (*it).launcher.c_str());
284 } 285 }
285 newItem->setOn(!((*it).lockStat)); 286 newItem->setOn(!((*it).lockStat));
286 lv->insertItem(newItem); 287 lv->insertItem(newItem);
287 ++it; 288 ++it;
288 } 289 }
289 tmpReEnableSort(); 290 tmpReEnableSort();
290 291
291 if (cY || cX) 292 if (cY || cX)
292 lv->setContentsPos(cX, cY); 293 lv->setContentsPos(cX, cY);
293} 294}
294 295
295void PwMView::reorgLp() 296void PwMView::reorgLp()
296{ 297{
297 if (!lv->childCount()) 298 if (!lv->childCount())
298 return; 299 return;
299 PWM_ASSERT(doc); 300 PWM_ASSERT(doc);
300 PWM_ASSERT(!doc->isDocEmpty()); 301 PWM_ASSERT(!doc->isDocEmpty());
301 QListViewItem *currItem; 302 QListViewItem *currItem;
302 vector<unsigned int> foundPos; 303 vector<unsigned int> foundPos;
303 /* This searchIn _should_ be: 304 /* This searchIn _should_ be:
@@ -447,96 +448,100 @@ void PwMView::copyLauncherToClip()
447void PwMView::copyCommentToClip() 448void PwMView::copyCommentToClip()
448{ 449{
449 if (doc->isDeepLocked()) 450 if (doc->isDeepLocked())
450 return; 451 return;
451 unsigned int curIndex = 0; 452 unsigned int curIndex = 0;
452 if (!getCurEntryIndex(&curIndex)) 453 if (!getCurEntryIndex(&curIndex))
453 return; 454 return;
454 PwMDataItem d; 455 PwMDataItem d;
455 document()->getEntry(getCurrentCategory(), curIndex, &d); 456 document()->getEntry(getCurrentCategory(), curIndex, &d);
456 PwM::copyToClipboard(d.comment.c_str()); 457 PwM::copyToClipboard(d.comment.c_str());
457} 458}
458 459
459/************************************************************************ 460/************************************************************************
460 * 461 *
461 * 462 *
462 * 463 *
463 ************************************************************************/ 464 ************************************************************************/
464 465
465 466
466PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name ) 467PwMDataItemView::PwMDataItemView( QWidget *parent, const char *name )
467 : QTextBrowser( parent, name ) 468 : QTextBrowser( parent, name )
468 469
469 470
470{ 471{
471//US setWrapPolicy( QTextEdit::AtWordBoundary ); 472//US setWrapPolicy( QTextEdit::AtWordBoundary );
472 setLinkUnderline( false ); 473 setLinkUnderline( false );
473 // setVScrollBarMode( QScrollView::AlwaysOff ); 474 // setVScrollBarMode( QScrollView::AlwaysOff );
474 //setHScrollBarMode( QScrollView::AlwaysOff ); 475 //setHScrollBarMode( QScrollView::AlwaysOff );
475 476
476//US QStyleSheet *sheet = styleSheet(); 477//US QStyleSheet *sheet = styleSheet();
477//US QStyleSheetItem *link = sheet->item( "a" ); 478//US QStyleSheetItem *link = sheet->item( "a" );
478//US link->setColor( KGlobalSettings::linkColor() ); 479//US link->setColor( KGlobalSettings::linkColor() );
479 480
480} 481}
481 482
482void PwMDataItemView::setPwMDataItem( const PwMDataItem& a ) 483void PwMDataItemView::setPwMDataItem( const PwMDataItem& a )
483 484
484{ 485{
485 mItem = a; 486 mItem = a;
486 // clear view 487 // clear view
487 setText( QString::null ); 488 setText( QString::null );
488 489
489 490
490 QString dynamicPart; 491 QString dynamicPart;
491 QString format = "<tr><td align=\"right\"><b>%1</b></td>" 492 QString format = "<tr><td align=\"right\"><b>%1</b></td>"
492 "<td align=\"left\">%2</td></tr>"; 493 "<td align=\"left\">%2</td></tr>";
493 494
494 dynamicPart += format 495 dynamicPart += format
496 .arg( i18n("LastUpdate") )
497 .arg( mItem.meta.update.toString().latin1() );
498
499 dynamicPart += format
495 .arg( i18n("Description") ) 500 .arg( i18n("Description") )
496 .arg( mItem.desc.c_str() ); 501 .arg( mItem.desc.c_str() );
497 502
498 dynamicPart += format 503 dynamicPart += format
499 .arg( i18n("Name") ) 504 .arg( i18n("Name") )
500 .arg( mItem.name.c_str() ); 505 .arg( mItem.name.c_str() );
501 506
502 dynamicPart += format 507 dynamicPart += format
503 .arg( i18n("Password") ) 508 .arg( i18n("Password") )
504 .arg( mItem.pw.c_str() ); 509 .arg( mItem.pw.c_str() );
505 510
506 QString comment(mItem.pw.c_str()); 511 QString comment(mItem.pw.c_str());
507 dynamicPart += format 512 dynamicPart += format
508 .arg( i18n("Comment") ) 513 .arg( i18n("Comment") )
509 .arg( comment.replace( QRegExp("\n"), "<br>" ) ); 514 .arg( comment.replace( QRegExp("\n"), "<br>" ) );
510 515
511 dynamicPart += format 516 dynamicPart += format
512 .arg( i18n("URL") ) 517 .arg( i18n("URL") )
513 .arg( mItem.url.c_str() ); 518 .arg( mItem.url.c_str() );
514 519
515 dynamicPart += format 520 dynamicPart += format
516 .arg( i18n("Launcher") ) 521 .arg( i18n("Launcher") )
517 .arg( mItem.launcher.c_str() ); 522 .arg( mItem.launcher.c_str() );
518 523
519 QString mText = "<table><td colspan=\"2\">&nbsp;</td>"; 524 QString mText = "<table><td colspan=\"2\">&nbsp;</td>";
520 525
521 mText += dynamicPart; 526 mText += dynamicPart;
522 mText += "</table>"; 527 mText += "</table>";
523 528
524 // at last display it... 529 // at last display it...
525 setText( mText ); 530 setText( mText );
526 531
527} 532}
528 533
529PwMDataItem PwMDataItemView::pwmdataitem() const 534PwMDataItem PwMDataItemView::pwmdataitem() const
530{ 535{
531 return mItem; 536 return mItem;
532} 537}
533 538
534/************************************************************************ 539/************************************************************************
535 * 540 *
536 * 541 *
537 * 542 *
538 ************************************************************************/ 543 ************************************************************************/
539 544
540 545
541PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool takeloc, QWidget *parent, const char *name ) 546PwMDataItemChooser::PwMDataItemChooser( PwMDataItem loc, PwMDataItem rem, bool takeloc, QWidget *parent, const char *name )
542 : KDialogBase(parent, name, true , 547 : KDialogBase(parent, name, true ,