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

Compare commits

base: thooge:v0.4.4
Branches Tags
thooge:master
thooge:qt5
thooge:v0.4.4
thooge:v0.4.3
...
compare: thooge:master
Branches Tags
thooge:qt5
thooge:master
thooge:v0.4.4
thooge:v0.4.3

2 Commits
v0.4.4 ... master

Author SHA1 Message Date
Thomas Hooge e78117f906 Display correct title for edit dialog (new vs. edit) 2018-04-06 13:33:41 +02:00
Thomas Hooge d30b9c4bb9 Added resize event to about dialog, some minor layout fixes 2018-04-06 10:49:43 +02:00
3 changed files with 14 additions and 7 deletions
Show Stats Expand all files Collapse all files

18
src/dialogs/AboutDlg.cpp
View File

@ -26,8 +26,8 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
setupUi(this);
createBanner(&BannerPixmap,getPixmap("keepassx"),QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION),width());
labelAppName->setText(APP_DISPLAY_NAME);
labelAppFunc->setText(QString(" - ").append(APP_LONG_FUNC));
labelAppName->setText(APP_DISPLAY_NAME);
labelAppFunc->setText(QString(" - ").append(APP_LONG_FUNC));
QString AboutTr=QString("<b>%1: %2</b><br><br>").arg(tr("Current Translation")).arg(tr("None","Please replace 'None' with the language of your translation"));
if(isTranslationActive()){
@ -53,13 +53,14 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
str+="<br>";
str+="<u>Juan J Gonz&aacute;lez C&aacute;rdenas [Jota Jota]</u><br>"+tr("Developer")+"<br>myxelf@users.sf.net<br>";
str+="</div><br><div style='margin-left:0px;'>";
str+="<b>"+tr("Thanks To")+"</b><br>";
str+="<b>"+tr("Thanks To")+"</b><br>";
str+="</div><div style='margin-left:10px;'>";
str+="<u>Matthias Miller</u><br>"+tr("Patches for better MacOS X support")+"<br>www.outofhanwell.com<br></div>";
str+="<u>Matthias Miller</u><br>"+tr("Patches for better MacOS X support")+"<br>www.outofhanwell.com<br>";
str+="<br>";
str+="<u>James Nicholls</u><br>"+tr("Main Application Icon")/*+"<br>"+tr("mailto:???")*/+"<br></div>";
str+="<u>James Nicholls</u><br>"+tr("Main Application Icon")/*+"<br>"+tr("mailto:???")*/+"<br>";
str+="<br>";
str+="<u>Constantin Makshin</u><br>"+tr("Various fixes and improvements")+"<br>dinosaur-rus@users.sourceforge.net<br></div>";
str+="<u>Constantin Makshin</u><br>"+tr("Various fixes and improvements")+"<br>dinosaur-rus@users.sourceforge.net<br>";
str+="</div>";
Edit_Thanks->setHtml(str);
QFile gpl(DataDir+"/license.html");
@ -80,3 +81,8 @@ void AboutDialog::paintEvent(QPaintEvent *event){
painter.setClipRegion(event->region());
painter.drawPixmap(QPoint(0,0),BannerPixmap);
}
void AboutDialog::resizeEvent(QResizeEvent* event){
createBanner(&BannerPixmap, getPixmap("keepassx"), QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION), width());
QDialog::resizeEvent(event);
}

1
src/dialogs/AboutDlg.h
View File

@ -32,6 +32,7 @@ class AboutDialog : public QDialog, private Ui_AboutDlg
private:
QPixmap BannerPixmap;
virtual void paintEvent(QPaintEvent*);
virtual void resizeEvent(QResizeEvent*);
};
#endif

2
src/lib/EntryView.cpp
View File

@ -338,7 +338,7 @@ void KeepassEntryView::editEntry(EntryViewItem* item){
IEntryHandle* handle = item->EntryHandle;
CEntry old = handle->data();
CEditEntryDlg dlg(db,handle,this,true);
CEditEntryDlg dlg(db,handle,this,false);
int result = dlg.exec();
switch(result){
case 0: //canceled or no changes