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

Fix: "Show Toolbar" menu entry not being retranslated

Browse Source 
Fix: Selecting entry opens for editing (Bug #2703031)
Improve .desktop file to make openSUSE happy

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@298 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 15 years ago
parent 192fd4e868
commit 5469666a08
4 changed files with 11 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      share/applications/keepassx.desktop
  2. 9
      src/lib/EntryView.cpp
  3. 1
      src/lib/EntryView.h
  4. 2
      src/mainwindow.cpp

3
share/applications/keepassx.desktop
Unescape View File

@ -12,5 +12,6 @@ Comment[es]=Gestor de contraseñas multiplataforma
Comment[fr]=Gestionnaire de mot de passe
Terminal=false
Type=Application
Categories=Qt;Utility;
Categories=Qt;Utility;Security;
MimeType=application/x-keepass;
X-SuSE-translate=true

9
src/lib/EntryView.cpp
Unescape View File

@ -276,10 +276,9 @@ void KeepassEntryView::OnNewEntry(){
}
void KeepassEntryView::OnEntryActivated(QTreeWidgetItem* item,int Column){
Q_UNUSED(item);
switch (columnListIndex(Column)){
case 0:
editEntry((EntryViewItem*)item);
break;
case 1:
OnUsernameToClipboard();
break;
@ -290,7 +289,11 @@ void KeepassEntryView::OnEntryActivated(QTreeWidgetItem* item,int Column){
OnPasswordToClipboard();
break;
}
}
void KeepassEntryView::OnEntryDblClicked(QTreeWidgetItem* item,int Column){
if (columnListIndex(Column) == 0)
editEntry((EntryViewItem*)item);
}
void KeepassEntryView::OnEditEntry(){

1
src/lib/EntryView.h
Unescape View File

@ -78,6 +78,7 @@ class KeepassEntryView:public QTreeWidget{
void OnGroupChanged(IGroupHandle* group);
void OnShowSearchResults();
void OnEntryActivated(QTreeWidgetItem*,int);
void OnEntryDblClicked(QTreeWidgetItem*,int);
void OnNewEntry();
void OnItemsChanged();
void updateIcons();

2
src/mainwindow.cpp
Unescape View File

@ -190,6 +190,7 @@ void KeepassMainWindow::setupConnections(){
connect(HelpAboutAction,SIGNAL(triggered()),this,SLOT(OnHelpAbout()));
connect(EntryView,SIGNAL(itemActivated(QTreeWidgetItem*,int)),EntryView,SLOT(OnEntryActivated(QTreeWidgetItem*,int)));
connect(EntryView,SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),EntryView,SLOT(OnEntryDblClicked(QTreeWidgetItem*,int)));
connect(QuickSearchEdit,SIGNAL(returnPressed()), this, SLOT(OnQuickSearch()));
connect(GroupView,SIGNAL(groupChanged(IGroupHandle*)),EntryView,SLOT(OnGroupChanged(IGroupHandle*)));
connect(GroupView,SIGNAL(groupChanged(IGroupHandle*)),this,SLOT(OnGroupSelectionChanged(IGroupHandle*)));
@ -1101,6 +1102,7 @@ void KeepassMainWindow::OnExtrasSettings(){
if (config->language() != oldLang){
retranslateUi(this);
WorkspaceLockedWidget.retranslateUi(LockedCentralWidget);
ViewShowToolbarAction->setText(tr("Show &Toolbar"));
EntryView->updateColumns();
if (FileOpen) {
if (db->file())