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

Don't depend on Qt 4.4 anymore

Browse Source 
Updated changelog

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@209 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer
2008-06-26 16:47:37 +00:00
parent dc43c39ece
commit 3839c091a3
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Database.cpp
View File

@@ -76,7 +76,7 @@ bool KpxUuid::operator!=(const KpxUuid& other)const{
QString KpxDateTime::toString(Qt::DateFormat format) const{
if (*this==Date_Never)
return QCoreApplication::translate("Database","Never");
else if (format==Qt::DefaultLocaleShortDate){
else if (format==Qt::SystemLocaleDate){
QString strFormat = QLocale::system().dateFormat(QLocale::ShortFormat);
if (!strFormat.contains("dd")) strFormat.replace("d", "dd");
if (!strFormat.contains("MM")) strFormat.replace("M", "MM");
@@ -94,7 +94,7 @@ QString KpxDateTime::toString(Qt::DateFormat format) const{
QString KpxDateTime::dateToString(Qt::DateFormat format) const{
if (*this==Date_Never)
return QCoreApplication::translate("Database","Never");
else if (format==Qt::DefaultLocaleShortDate){
else if (format==Qt::SystemLocaleDate){
QString strFormat = QLocale::system().dateFormat(QLocale::ShortFormat);
if (!strFormat.contains("dd")) strFormat.replace("d", "dd");
if (!strFormat.contains("MM")) strFormat.replace("M", "MM");

2
src/dialogs/ExpiredEntriesDlg.cpp
View File

@@ -30,7 +30,7 @@ ExpiredEntriesDialog::ExpiredEntriesDialog(QWidget* parent,IDatabase* database,c
item->setText(0,Entries[i]->group()->title());
item->setText(1,Entries[i]->title());
item->setText(2,Entries[i]->username());
item->setText(3,Entries[i]->expire().dateToString(Qt::DefaultLocaleShortDate));
item->setText(3,Entries[i]->expire().dateToString(Qt::SystemLocaleDate));
item->setIcon(0,database->icon(Entries[i]->group()->image()));
item->setIcon(1,database->icon(Entries[i]->image()));

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::DefaultLocaleShortDate));}
item->setText(j++,entry->expire().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(6)){
item->setText(j++,entry->creation().dateToString(Qt::DefaultLocaleShortDate));}
item->setText(j++,entry->creation().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(7)){
item->setText(j++,entry->lastMod().dateToString(Qt::DefaultLocaleShortDate));}
item->setText(j++,entry->lastMod().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(8)){
item->setText(j++,entry->lastAccess().dateToString(Qt::DefaultLocaleShortDate));}
item->setText(j++,entry->lastAccess().dateToString(Qt::SystemLocaleDate));}
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::DefaultLocaleShortDate));}
item->setText(j++,entries[i]->expire().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(6)){
item->setText(j++,entries[i]->creation().dateToString(Qt::DefaultLocaleShortDate));}
item->setText(j++,entries[i]->creation().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(7)){
item->setText(j++,entries[i]->lastMod().dateToString(Qt::DefaultLocaleShortDate));}
item->setText(j++,entries[i]->lastMod().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(8)){
item->setText(j++,entries[i]->lastAccess().dateToString(Qt::DefaultLocaleShortDate));}
item->setText(j++,entries[i]->lastAccess().dateToString(Qt::SystemLocaleDate));}
if (Columns.at(9)){
item->setText(j++,entries[i]->binaryDesc());}
if(Columns.at(10) && ViewMode==ShowSearchResults){

8
src/mainwindow.cpp
View File

@@ -656,10 +656,10 @@ void KeepassMainWindow::updateDetailView(){
}
else templ.replace("%password%","****");
templ.replace("%url%",entry->url());
templ.replace("%creation%",entry->creation().toString(Qt::DefaultLocaleShortDate));
templ.replace("%lastmod%",entry->lastMod().toString(Qt::DefaultLocaleShortDate));
templ.replace("%lastaccess%",entry->lastAccess().toString(Qt::DefaultLocaleShortDate));
templ.replace("%expire%",entry->expire().toString(Qt::DefaultLocaleShortDate));
templ.replace("%creation%",entry->creation().toString(Qt::SystemLocaleDate));
templ.replace("%lastmod%",entry->lastMod().toString(Qt::SystemLocaleDate));
templ.replace("%lastaccess%",entry->lastAccess().toString(Qt::SystemLocaleDate));
templ.replace("%expire%",entry->expire().toString(Qt::SystemLocaleDate));
templ.replace("%comment%",entry->comment().replace("\n","<br/>"));
templ.replace("%attachment%",entry->binaryDesc());