Fix: "Show Toolbar" menu entry not being retranslated
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
This commit is contained in:
parent
192fd4e868
commit
5469666a08
|
@ -12,5 +12,6 @@ Comment[es]=Gestor de contraseñas multiplataforma
|
||||||
Comment[fr]=Gestionnaire de mot de passe
|
Comment[fr]=Gestionnaire de mot de passe
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Categories=Qt;Utility;
|
Categories=Qt;Utility;Security;
|
||||||
MimeType=application/x-keepass;
|
MimeType=application/x-keepass;
|
||||||
|
X-SuSE-translate=true
|
||||||
|
|
|
@ -276,10 +276,9 @@ void KeepassEntryView::OnNewEntry(){
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeepassEntryView::OnEntryActivated(QTreeWidgetItem* item,int Column){
|
void KeepassEntryView::OnEntryActivated(QTreeWidgetItem* item,int Column){
|
||||||
|
Q_UNUSED(item);
|
||||||
|
|
||||||
switch (columnListIndex(Column)){
|
switch (columnListIndex(Column)){
|
||||||
case 0:
|
|
||||||
editEntry((EntryViewItem*)item);
|
|
||||||
break;
|
|
||||||
case 1:
|
case 1:
|
||||||
OnUsernameToClipboard();
|
OnUsernameToClipboard();
|
||||||
break;
|
break;
|
||||||
|
@ -290,7 +289,11 @@ void KeepassEntryView::OnEntryActivated(QTreeWidgetItem* item,int Column){
|
||||||
OnPasswordToClipboard();
|
OnPasswordToClipboard();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void KeepassEntryView::OnEntryDblClicked(QTreeWidgetItem* item,int Column){
|
||||||
|
if (columnListIndex(Column) == 0)
|
||||||
|
editEntry((EntryViewItem*)item);
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeepassEntryView::OnEditEntry(){
|
void KeepassEntryView::OnEditEntry(){
|
||||||
|
|
|
@ -78,6 +78,7 @@ class KeepassEntryView:public QTreeWidget{
|
||||||
void OnGroupChanged(IGroupHandle* group);
|
void OnGroupChanged(IGroupHandle* group);
|
||||||
void OnShowSearchResults();
|
void OnShowSearchResults();
|
||||||
void OnEntryActivated(QTreeWidgetItem*,int);
|
void OnEntryActivated(QTreeWidgetItem*,int);
|
||||||
|
void OnEntryDblClicked(QTreeWidgetItem*,int);
|
||||||
void OnNewEntry();
|
void OnNewEntry();
|
||||||
void OnItemsChanged();
|
void OnItemsChanged();
|
||||||
void updateIcons();
|
void updateIcons();
|
||||||
|
|
|
@ -190,6 +190,7 @@ void KeepassMainWindow::setupConnections(){
|
||||||
connect(HelpAboutAction,SIGNAL(triggered()),this,SLOT(OnHelpAbout()));
|
connect(HelpAboutAction,SIGNAL(triggered()),this,SLOT(OnHelpAbout()));
|
||||||
|
|
||||||
connect(EntryView,SIGNAL(itemActivated(QTreeWidgetItem*,int)),EntryView,SLOT(OnEntryActivated(QTreeWidgetItem*,int)));
|
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(QuickSearchEdit,SIGNAL(returnPressed()), this, SLOT(OnQuickSearch()));
|
||||||
connect(GroupView,SIGNAL(groupChanged(IGroupHandle*)),EntryView,SLOT(OnGroupChanged(IGroupHandle*)));
|
connect(GroupView,SIGNAL(groupChanged(IGroupHandle*)),EntryView,SLOT(OnGroupChanged(IGroupHandle*)));
|
||||||
connect(GroupView,SIGNAL(groupChanged(IGroupHandle*)),this,SLOT(OnGroupSelectionChanged(IGroupHandle*)));
|
connect(GroupView,SIGNAL(groupChanged(IGroupHandle*)),this,SLOT(OnGroupSelectionChanged(IGroupHandle*)));
|
||||||
|
@ -1101,6 +1102,7 @@ void KeepassMainWindow::OnExtrasSettings(){
|
||||||
if (config->language() != oldLang){
|
if (config->language() != oldLang){
|
||||||
retranslateUi(this);
|
retranslateUi(this);
|
||||||
WorkspaceLockedWidget.retranslateUi(LockedCentralWidget);
|
WorkspaceLockedWidget.retranslateUi(LockedCentralWidget);
|
||||||
|
ViewShowToolbarAction->setText(tr("Show &Toolbar"));
|
||||||
EntryView->updateColumns();
|
EntryView->updateColumns();
|
||||||
if (FileOpen) {
|
if (FileOpen) {
|
||||||
if (db->file())
|
if (db->file())
|
||||||
|
|
Loading…
Reference in New Issue