diff --git a/changelog b/changelog index 9aedcbb..9621a95 100644 --- a/changelog +++ b/changelog @@ -2,9 +2,11 @@ 0.2.2 --------------- -fixed crash when parsing config file under Win32 --fixed loss of entry icons when saving a database which - was not created with KeePassX (no KPX_CUSTOM_ICONS metastream) - +-fixed loss of entry icons when saving a database which was not created + with KeePassX (no KPX_CUSTOM_ICONS metastream) +-when canceling the file dialog for the opening of an existing database a already + openend database will not longer be closed +-same for the creation of a new database --------------- 0.2.1 @@ -15,7 +17,8 @@ -when saving an attachment the original filename is adopted by the file dialog -fixed strange sorting behavior of entries (Bug #7083) -sorting by dates now works as expected --the 'Expires' column and the detailed entry view now also show the string 'never' for entries which don't expire +-the 'Expires' column and the detailed entry view now also show the string 'never' + for entries which don't expire -entry view now gets updated after changing the column setup -added menu entry to change the size of the toolbar icons --------------- diff --git a/src/PwManager.cpp b/src/PwManager.cpp index bb80ff6..37508b2 100755 --- a/src/PwManager.cpp +++ b/src/PwManager.cpp @@ -769,6 +769,20 @@ if(!file->isOpen()){ } } + +/* This is only a fix for a bug in the implementation of the metastream creation + in KeePassX 0.2.1. to restore lost icons. + It should be removed after a while. + --------------------------------------------------*/ + for(int i=0;i MetaStreams; diff --git a/src/dialogs/SettingsDlg.cpp b/src/dialogs/SettingsDlg.cpp index 25a9b88..71b33e4 100755 --- a/src/dialogs/SettingsDlg.cpp +++ b/src/dialogs/SettingsDlg.cpp @@ -29,8 +29,8 @@ #include "SettingsDlg.h" -CSettingsDlg::CSettingsDlg(QWidget* parent, const char* name, bool modal, Qt::WFlags fl) -: QDialog(parent,name, modal,fl) +CSettingsDlg::CSettingsDlg(QWidget* parent) +: QDialog(parent,Qt::Dialog) { setupUi(this); connect(ButtonOK, SIGNAL( clicked() ), this, SLOT( OnOK() ) ); diff --git a/src/dialogs/SettingsDlg.h b/src/dialogs/SettingsDlg.h index 99496c4..4129c37 100755 --- a/src/dialogs/SettingsDlg.h +++ b/src/dialogs/SettingsDlg.h @@ -28,7 +28,7 @@ class CSettingsDlg : public QDialog, public Ui_SettingsDialog Q_OBJECT public: - CSettingsDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 ); + CSettingsDlg(QWidget* parent /*, Qt::WFlags fl*/); ~CSettingsDlg(); public slots: diff --git a/src/forms/SettingsDlg.ui b/src/forms/SettingsDlg.ui index 8b0bb8d..bd4ffbc 100644 --- a/src/forms/SettingsDlg.ui +++ b/src/forms/SettingsDlg.ui @@ -27,6 +27,9 @@ Settings + + true + @@ -541,6 +544,19 @@ + + + + 30 + 40 + 501 + 22 + + + + Remember last key type and location + + @@ -551,25 +567,12 @@ - Remember last opend file + Remember last opened file Alt+Ö - - - - 30 - 40 - 501 - 22 - - - - Remember last key type and location - - diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e087ba4..1fc6f84 100755 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -344,12 +344,12 @@ return true; void KeepassMainWindow::OnFileNew(){ -if(FileOpen) - if(!closeDatabase())return; CPasswordDialog dlg(this,"PasswordDlg",true,false,true); dlg.setCaption("New Database"); -db=new PwDatabase(); if(dlg.exec()==1){ + if(FileOpen) + if(!closeDatabase())return; + db=new PwDatabase(); db->newDatabase(); if(dlg.KeyType==BOTH || dlg.KeyType==KEYFILE){ if(!db->createKeyFile(dlg.keyfile)){ @@ -374,15 +374,14 @@ if(dlg.exec()==1){ FileOpen=true; setupDatabaseConnections(db); } -else delete db; } void KeepassMainWindow::OnFileOpen(){ -if(FileOpen) - if(!closeDatabase())return; QString filename=QFileDialog::getOpenFileName(this,tr("Open Database..."),QDir::homePath(),"*.kdb"); if(filename!=QString()){ - openDatabase(filename); + if(FileOpen) + if(!closeDatabase())return; + openDatabase(filename); } } @@ -1000,7 +999,7 @@ SearchResults.clear(); void KeepassMainWindow::OnExtrasSettings(){ -CSettingsDlg dlg(this,"SettingsDlg"); +CSettingsDlg dlg(this); dlg.exec(); EntryView->setAlternatingRowColors(config.AlternatingRowColors); CGroup::UI_ExpandByDefault=config.ExpandGroupTree; diff --git a/src/translations/keepass-de_DE.ts b/src/translations/keepass-de_DE.ts index 41dcc31..fd92919 100644 --- a/src/translations/keepass-de_DE.ts +++ b/src/translations/keepass-de_DE.ts @@ -3,7 +3,7 @@ Could not open file (FileError=%1) - Datei konnte nicht geöffnet werden. (FileError=%1) + Datei konnte nicht geöffnet werden. (FileError=%1) @@ -655,6 +655,13 @@ Bitter prüfen Sie Ihre Zugriffsrechte. + + Export_Txt + + Could not open file (FileError=%1) + Datei konnte nicht geöffnet werden. (FileError=%1) + + GenPwDlg @@ -1015,15 +1022,15 @@ die Änderungen speichern? File - Datei + Datei Import from... - Importieren aus... + Importieren aus... View - Ansicht + Ansicht Columns @@ -1031,43 +1038,43 @@ die Änderungen speichern? Extras - Extras + Extras Help - Hilfe + Hilfe New Database... - Neue Datenbank... + Neue Datenbank... Open Database... - Datenbank öffnen... + Datenbank öffnen... Close Database - Datenbank schließen + Datenbank schließen Save Database - Datenbank speichern + Datenbank speichern Save Database As... - Datenbank speichern unter... + Datenbank speichern unter... Database Settings... - Datenbankeinstellungen... + Datenbankeinstellungen... Change Master Key... - Hauptschlüssel ändern... + Hauptschlüssel ändern... Exit - Beenden + Beenden PwManager File (*.pwm) @@ -1187,15 +1194,15 @@ die Änderungen speichern? Settings... - Einstellungen... + Einstellungen... About... - Über... + Über... Edit - Bearbeiten + Bearbeiten Show Statusbar @@ -1203,11 +1210,11 @@ die Änderungen speichern? Export to... - Exportieren nach... + Exportieren nach... KeePassX Handbook... - KeePassX Handbuch... + KeePassX Handbuch... Plain Text (*.txt) @@ -1241,6 +1248,78 @@ die Änderungen speichern? 28x28 + + &View + Ansicht + + + &File + Datei + + + &Import from... + + + + &Export to... + + + + &Edit + + + + E&xtras + + + + &Help + + + + &New Database... + + + + &Open Database... + + + + &Close Database + + + + &Save Database + + + + Save Database &As... + + + + &Database Settings... + + + + Change &Master Key... + + + + E&xit + + + + &Settings... + + + + &About... + + + + &KeePassX Handbook... + + PasswordDlg @@ -1664,7 +1743,7 @@ Stellen Sie sicher, dass Sie Schreibzugriff auf '~/.keepass' haben. Remember last opend file - Zuletzt geöffnete Datei beim Starten öffnen + Zuletzt geöffnete Datei beim Starten öffnen Browser Command: @@ -1690,6 +1769,10 @@ Stellen Sie sicher, dass Sie Schreibzugriff auf '~/.keepass' haben.Mounting Root: Datenträgerwurzelverzeichnis: + + Remember last opened file + + SimplePasswordDialog diff --git a/src/translations/keepass-es_ES.ts b/src/translations/keepass-es_ES.ts index 1d26450..c8f0dda 100644 --- a/src/translations/keepass-es_ES.ts +++ b/src/translations/keepass-es_ES.ts @@ -3,7 +3,7 @@ Could not open file (FileError=%1) - No se pudo abrir el archivo (FileError=%1) + No se pudo abrir el archivo (FileError=%1) @@ -642,6 +642,13 @@ Please check your permissions. + + Export_Txt + + Could not open file (FileError=%1) + No se pudo abrir el archivo (FileError=%1) + + GenPwDlg @@ -1002,15 +1009,15 @@ to save the changes? File - Archivo + Archivo Import from... - Importar desde... + Importar desde... View - Ver + Ver Columns @@ -1018,43 +1025,43 @@ to save the changes? Extras - Preferencias + Preferencias Help - Ayuda + Ayuda New Database... - Nueva Base de Datos... + Nueva Base de Datos... Open Database... - Abrir Base de Datos... + Abrir Base de Datos... Close Database - Cerrar Base de Datos + Cerrar Base de Datos Save Database - Guardar Base de Datos + Guardar Base de Datos Save Database As... - Guardar Base de Datos Como... + Guardar Base de Datos Como... Database Settings... - Preferencias de Base de Datos... + Preferencias de Base de Datos... Change Master Key... - Cambiar Clave Maestra... + Cambiar Clave Maestra... Exit - Salir + Salir PwManager File (*.pwm) @@ -1174,15 +1181,15 @@ to save the changes? Settings... - Preferencias... + Preferencias... About... - Acerca de... + Acerca de... Edit - Editar + Editar Show Statusbar @@ -1190,11 +1197,11 @@ to save the changes? Export to... - Exportar a... + Exportar a... KeePassX Handbook... - Manual de KeePassX... + Manual de KeePassX... Plain Text (*.txt) @@ -1228,6 +1235,78 @@ to save the changes? 28x28 + + &View + + + + &File + + + + &Import from... + + + + &Export to... + + + + &Edit + + + + E&xtras + + + + &Help + + + + &New Database... + + + + &Open Database... + + + + &Close Database + + + + &Save Database + + + + Save Database &As... + + + + &Database Settings... + + + + Change &Master Key... + + + + E&xit + + + + &Settings... + + + + &About... + + + + &KeePassX Handbook... + + PasswordDlg @@ -1650,7 +1729,7 @@ Asegúrese de tener acceso para escritura en '~/.keepass'. Remember last opend file - Recordar último archivo abierto + Recordar último archivo abierto Browser Command: @@ -1676,6 +1755,10 @@ Asegúrese de tener acceso para escritura en '~/.keepass'.Mounting Root: + + Remember last opened file + + SimplePasswordDialog diff --git a/src/translations/keepass-fr_FR.ts b/src/translations/keepass-fr_FR.ts index 72d8404..cda6424 100644 --- a/src/translations/keepass-fr_FR.ts +++ b/src/translations/keepass-fr_FR.ts @@ -3,7 +3,7 @@ Could not open file (FileError=%1) - Ne peut ouvrir le fichier (FileError=%1) + Ne peut ouvrir le fichier (FileError=%1) @@ -662,6 +662,13 @@ S'il vous plait, vérifier vos permissions. > + + Export_Txt + + Could not open file (FileError=%1) + Ne peut ouvrir le fichier (FileError=%1) + + GenPwDlg @@ -1022,15 +1029,15 @@ Désirez-vous enregistrer le changement ? File - Fichier + Fichier Import from... - Importer d'un... + Importer d'un... View - Affichage + Affichage Columns @@ -1038,43 +1045,43 @@ Désirez-vous enregistrer le changement ? Extras - Extras + Extras Help - Aide + Aide New Database... - Nouvelle BD... + Nouvelle BD... Open Database... - Ouvrir une BD... + Ouvrir une BD... Close Database - Fermer la BD + Fermer la BD Save Database - Enregistrer la BD + Enregistrer la BD Save Database As... - Enregistrer la BD sous... + Enregistrer la BD sous... Database Settings... - Paramétrage de la BD... + Paramétrage de la BD... Change Master Key... - Changer la clé maitresse... + Changer la clé maitresse... Exit - Quitter + Quitter PwManager File (*.pwm) @@ -1194,15 +1201,15 @@ Désirez-vous enregistrer le changement ? Settings... - Préférences... + Préférences... About... - À propos... + À propos... Edit - Édition + Édition Show Statusbar @@ -1210,11 +1217,11 @@ Désirez-vous enregistrer le changement ? Export to... - Exporter vers... + Exporter vers... KeePassX Handbook... - Le manuel de KeePassX... + Le manuel de KeePassX... Plain Text (*.txt) @@ -1248,6 +1255,78 @@ Désirez-vous enregistrer le changement ? 28x28 + + &View + + + + &File + + + + &Import from... + + + + &Export to... + + + + &Edit + + + + E&xtras + + + + &Help + + + + &New Database... + + + + &Open Database... + + + + &Close Database + + + + &Save Database + + + + Save Database &As... + + + + &Database Settings... + + + + Change &Master Key... + + + + E&xit + + + + &Settings... + + + + &About... + + + + &KeePassX Handbook... + + PasswordDlg @@ -1671,7 +1750,7 @@ Make sure you have write access to '~/.keepass'. Remember last opend file - Se souvenir du dernier fichier ouvert + Se souvenir du dernier fichier ouvert Browser Command: @@ -1697,6 +1776,10 @@ Make sure you have write access to '~/.keepass'. Mounting Root: Point de montage: + + Remember last opened file + + SimplePasswordDialog diff --git a/src/translations/keepass-ru_RU.ts b/src/translations/keepass-ru_RU.ts index 79bfbb5..58292d3 100644 --- a/src/translations/keepass-ru_RU.ts +++ b/src/translations/keepass-ru_RU.ts @@ -1,10 +1,6 @@ - - Could not open file (FileError=%1) - - AboutDlg @@ -614,6 +610,13 @@ Please check your permissions. + + Export_Txt + + Could not open file (FileError=%1) + + + GenPwDlg @@ -969,231 +972,231 @@ to save the changes? - File + Columns - Import from... + PwManager File (*.pwm) - View + KWallet XML-File (*.xml) - Columns + Add New Group... - Extras + Edit Group... - Help + Delete Group - New Database... + Copy Password to Clipboard - Open Database... + Copy Username to Clipboard - Close Database + Open URL - Save Database + Save Attachment As... - Save Database As... + Add New Entry... - Database Settings... + View/Edit Entry... - Change Master Key... + Delete Entry - Exit + Clone Entry - PwManager File (*.pwm) + Search In Database... - KWallet XML-File (*.xml) + Search in this group... - Add New Group... + Show Toolbar - Edit Group... + Show Entry Details - Delete Group + Hide Usernames - Copy Password to Clipboard + Hide Passwords - Copy Username to Clipboard + Title - Open URL + Username - Save Attachment As... + URL - Add New Entry... + Password - View/Edit Entry... + Comment - Delete Entry + Expires - Clone Entry + Creation - Search In Database... + Last Change - Search in this group... + Last Access - Show Toolbar + Attachment - Show Entry Details + Show Statusbar - Hide Usernames + Plain Text (*.txt) - Hide Passwords + Hide - Title + Perform AutoType - Username + Type Here - URL + Toolbar Icon Size - Password + 16x16 - Comment + 22x22 - Expires + 28x28 - Creation + &View - Last Change + &File - Last Access + &Import from... - Attachment + &Export to... - Settings... + &Edit - About... + E&xtras - Edit + &Help - Show Statusbar + &New Database... - Export to... + &Open Database... - KeePassX Handbook... + &Close Database - Plain Text (*.txt) + &Save Database - Hide + Save Database &As... - Perform AutoType + &Database Settings... - Type Here + Change &Master Key... - Toolbar Icon Size + E&xit - 16x16 + &Settings... - 22x22 + &About... - 28x28 + &KeePassX Handbook... @@ -1614,10 +1617,6 @@ Make sure you have write access to '~/.keepass'. &Other - - Remember last opend file - - Browser Command: @@ -1642,6 +1641,10 @@ Make sure you have write access to '~/.keepass'. Mounting Root: + + Remember last opened file + + SimplePasswordDialog diff --git a/src/translations/keepass-xx_XX.ts b/src/translations/keepass-xx_XX.ts index 79bfbb5..58292d3 100644 --- a/src/translations/keepass-xx_XX.ts +++ b/src/translations/keepass-xx_XX.ts @@ -1,10 +1,6 @@ - - Could not open file (FileError=%1) - - AboutDlg @@ -614,6 +610,13 @@ Please check your permissions. + + Export_Txt + + Could not open file (FileError=%1) + + + GenPwDlg @@ -969,231 +972,231 @@ to save the changes? - File + Columns - Import from... + PwManager File (*.pwm) - View + KWallet XML-File (*.xml) - Columns + Add New Group... - Extras + Edit Group... - Help + Delete Group - New Database... + Copy Password to Clipboard - Open Database... + Copy Username to Clipboard - Close Database + Open URL - Save Database + Save Attachment As... - Save Database As... + Add New Entry... - Database Settings... + View/Edit Entry... - Change Master Key... + Delete Entry - Exit + Clone Entry - PwManager File (*.pwm) + Search In Database... - KWallet XML-File (*.xml) + Search in this group... - Add New Group... + Show Toolbar - Edit Group... + Show Entry Details - Delete Group + Hide Usernames - Copy Password to Clipboard + Hide Passwords - Copy Username to Clipboard + Title - Open URL + Username - Save Attachment As... + URL - Add New Entry... + Password - View/Edit Entry... + Comment - Delete Entry + Expires - Clone Entry + Creation - Search In Database... + Last Change - Search in this group... + Last Access - Show Toolbar + Attachment - Show Entry Details + Show Statusbar - Hide Usernames + Plain Text (*.txt) - Hide Passwords + Hide - Title + Perform AutoType - Username + Type Here - URL + Toolbar Icon Size - Password + 16x16 - Comment + 22x22 - Expires + 28x28 - Creation + &View - Last Change + &File - Last Access + &Import from... - Attachment + &Export to... - Settings... + &Edit - About... + E&xtras - Edit + &Help - Show Statusbar + &New Database... - Export to... + &Open Database... - KeePassX Handbook... + &Close Database - Plain Text (*.txt) + &Save Database - Hide + Save Database &As... - Perform AutoType + &Database Settings... - Type Here + Change &Master Key... - Toolbar Icon Size + E&xit - 16x16 + &Settings... - 22x22 + &About... - 28x28 + &KeePassX Handbook... @@ -1614,10 +1617,6 @@ Make sure you have write access to '~/.keepass'. &Other - - Remember last opend file - - Browser Command: @@ -1642,6 +1641,10 @@ Make sure you have write access to '~/.keepass'. Mounting Root: + + Remember last opened file + + SimplePasswordDialog diff --git a/todo b/todo index eadbea0..66f260f 100644 --- a/todo +++ b/todo @@ -1,2 +1 @@ -- remember selection states after add/remove actions -- menu 'View': option for toolbar icons size \ No newline at end of file +- no taskbar entry for modal dialog under gnome? \ No newline at end of file