thooge/keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved display of date strings in the EntryView

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@204 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer
2008-06-04 19:41:27 +00:00
parent a018fee162
commit 56bc995cc2
15 changed files with 7743 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/AutoType_X11.cpp
View File

@@ -112,8 +112,8 @@ void AutoType::perform(IEntryHandle* entry, QString& err,bool hideWindow,int nr)
bool capsEnabled = HelperX11::keyboardModifiers(pDisplay)&LockMask;
if (capsEnabled){
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),true,CurrentTime);
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),false,CurrentTime);
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),true,0);
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),false,0);
AutoTypePrivate::sleepKeyStrokeDelay();
}
@@ -150,8 +150,8 @@ void AutoType::perform(IEntryHandle* entry, QString& err,bool hideWindow,int nr)
}
if (capsEnabled){
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),true,CurrentTime);
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),false,CurrentTime);
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),true,0);
XTestFakeKeyEvent(pDisplay,XKeysymToKeycode(pDisplay,XK_Caps_Lock),false,0);
}
if (hideWindow && !(config->showSysTrayIcon() && config->minimizeTray()) )

16
src/lib/EntryView.cpp
View File

@@ -183,13 +183,13 @@ void KeepassEntryView::updateEntry(EntryViewItem* item){
if (Columns.at(4)){
item->setText(j++,entry->comment().section('\n',0,0));}
if (Columns.at(5)){
item->setText(j++,entry->expire().dateToString(Qt::LocalDate));}
item->setText(j++,entry->expire().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(6)){
item->setText(j++,entry->creation().dateToString(Qt::LocalDate));}
item->setText(j++,entry->creation().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(7)){
item->setText(j++,entry->lastMod().dateToString(Qt::LocalDate));}
item->setText(j++,entry->lastMod().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(8)){
item->setText(j++,entry->lastAccess().dateToString(Qt::LocalDate));}
item->setText(j++,entry->lastAccess().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(9)){
item->setText(j++,entry->binaryDesc());}
if(Columns.at(10) && ViewMode==ShowSearchResults){
@@ -376,13 +376,13 @@ void KeepassEntryView::createItems(QList<IEntryHandle*>& entries){
if (Columns.at(4)){
item->setText(j++,entries[i]->comment().section('\n',0,0));}
if (Columns.at(5)){
item->setText(j++,entries[i]->expire().dateToString(Qt::LocalDate));}
item->setText(j++,entries[i]->expire().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(6)){
item->setText(j++,entries[i]->creation().dateToString(Qt::LocalDate));}
item->setText(j++,entries[i]->creation().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(7)){
item->setText(j++,entries[i]->lastMod().dateToString(Qt::LocalDate));}
item->setText(j++,entries[i]->lastMod().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(8)){
item->setText(j++,entries[i]->lastAccess().dateToString(Qt::LocalDate));}
item->setText(j++,entries[i]->lastAccess().dateToString(Qt::DefaultLocaleShortDate));}
if (Columns.at(9)){
item->setText(j++,entries[i]->binaryDesc());}
if(Columns.at(10) && ViewMode==ShowSearchResults){

5
src/lib/HelperX11.cpp
View File

@@ -887,9 +887,8 @@ quint16 HelperX11::getKeysym(const QChar& c){
/*if((unicode & 0xFF000000)==0x00)
return (unicode & 0x00FFFFFF)|0x01FFFFFF;*/
int MapSize=sizeof(KeysymMap);
for(int i=0; i<MapSize;i++){
int MapSize = sizeof(KeysymMap) / sizeof(quint16) / 2;
for (int i=0; i<MapSize; i++){
if(unicode==KeysymMap[i][0])
return KeysymMap[i][1];
}