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

finished quick-search, "View"-Menu (qt4 reimpl.)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@37 b624d157-de02-0410-bad0-e51aec6abb33
master
tariq 19 years ago
parent 0bd327b0a7
commit e304c11c57
5 changed files with 403 additions and 34 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. 159
      src/forms/MainWindow.ui
  2. 18
      src/mainwindow.cpp
  3. 1
      src/mainwindow.h
  4. 78
      src/translations/english.ts
  5. 181
      src/translations/russian.ts

159
src/forms/MainWindow.ui
Unescape View File

@ -105,7 +105,7 @@
<x>0</x>
<y>0</y>
<width>724</width>
<height>29</height>
<height>31</height>
</rect>
</property>
<widget class="QMenu" name="menuHilfe" >
@ -143,11 +143,6 @@
<string>Extras</string>
</property>
</widget>
<widget class="QMenu" name="menuAnsicht" >
<property name="title" >
<string>Ansicht</string>
</property>
</widget>
<widget class="QMenu" name="menuBearbeiten" >
<property name="title" >
<string>Bearbeiten</string>
@ -169,6 +164,34 @@
<addaction name="EditSearchAction" />
<addaction name="EditGroupSearchAction" />
</widget>
<widget class="QMenu" name="menuAnsicht" >
<property name="title" >
<string>Ansicht</string>
</property>
<widget class="QMenu" name="menuSpalten" >
<property name="title" >
<string>Spalten</string>
</property>
<addaction name="ViewColumnTitleAction" />
<addaction name="ViewColumnUsernameAction" />
<addaction name="ViewColumnUrlAction" />
<addaction name="ViewColumnPasswordAction" />
<addaction name="ViewColumnCommentAction" />
<addaction name="separator" />
<addaction name="ViewColumnExpireAction" />
<addaction name="ViewColumnCreationAction" />
<addaction name="ViewColumnLastChangeAction" />
<addaction name="ViewColumnLastAccessAction" />
<addaction name="ViewColumnAttachmentAction" />
</widget>
<addaction name="ViewShowToolbarAction" />
<addaction name="ViewShowEntryDetailsAction" />
<addaction name="separator" />
<addaction name="ViewHideUsernamesAction" />
<addaction name="ViewHidePasswordsAction" />
<addaction name="separator" />
<addaction name="menuSpalten" />
</widget>
<addaction name="menuDatei" />
<addaction name="menuBearbeiten" />
<addaction name="menuAnsicht" />
@ -186,8 +209,8 @@
</property>
<property name="minimumSize" >
<size>
<width>51</width>
<height>31</height>
<width>15</width>
<height>6</height>
</size>
</property>
<property name="maximumSize" >
@ -324,20 +347,132 @@
<string>In dieser Gruppe suchen...</string>
</property>
</action>
<action name="ViewShowToolbarAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Werkzeugleiste anzeigen</string>
</property>
</action>
<action name="ViewShowEntryDetailsAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Eintragsansicht anzeigen</string>
</property>
</action>
<action name="ViewHideUsernamesAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Benutzernamen verbergen</string>
</property>
</action>
<action name="ViewHidePasswordsAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Passwörter verbergen</string>
</property>
</action>
<action name="ViewColumnTitleAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Titel</string>
</property>
</action>
<action name="ViewColumnUsernameAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Benutzername</string>
</property>
</action>
<action name="ViewColumnUrlAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>URL</string>
</property>
</action>
<action name="ViewColumnPasswordAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Passwort</string>
</property>
</action>
<action name="ViewColumnCommentAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Kommentar</string>
</property>
</action>
<action name="ViewColumnExpireAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Ablaufdatum</string>
</property>
</action>
<action name="ViewColumnCreationAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Erstellungsdatum</string>
</property>
</action>
<action name="ViewColumnLastChangeAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Letzte Änderung</string>
</property>
</action>
<action name="ViewColumnLastAccessAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Letzter Zugriff</string>
</property>
</action>
<action name="ViewColumnAttachmentAction" >
<property name="checkable" >
<bool>true</bool>
</property>
<property name="text" >
<string>Anhang</string>
</property>
</action>
</widget>
<pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>KeepassGroupView</class>
<class>KeepassEntryView</class>
<extends>QTreeWidget</extends>
<header>../../src/lib/GroupView.h</header>
<header>../../src/lib/EntryView.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
<customwidget>
<class>KeepassEntryView</class>
<class>KeepassGroupView</class>
<extends>QTreeWidget</extends>
<header>../../src/lib/EntryView.h</header>
<header>../../src/lib/GroupView.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>

18
src/mainwindow.cpp
Unescape View File

@ -80,9 +80,9 @@ KeepassMainWindow::KeepassMainWindow(QWidget *parent, Qt::WFlags flags):QMainWin
EditGroupSearchAction->setShortcut(tr("Shift+Ctrl+F"));
#endif
QuickSearchEdit=new QLineEdit(toolBar);
QuickSearchEdit->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
//QuickSearchEdit->
setupConnections();
setupIcons();
setupToolbar();
@ -124,6 +124,8 @@ void KeepassMainWindow::setupConnections(){
SLOT(OnEntryItemDoubleClicked(QTreeWidgetItem*,int)));
connect(EntryView,SIGNAL(itemSelectionChanged()), this, SLOT(OnEntrySelectionChanged()));
connect(GroupView,SIGNAL(itemSelectionChanged()), this, SLOT(OnGroupSelectionChanged()));
connect(QuickSearchEdit,SIGNAL(returnPressed()), this, SLOT(OnQuickSearch()));
}
void KeepassMainWindow::setupToolbar(){
@ -267,6 +269,7 @@ FileChangeKeyAction->setEnabled(IsOpen);
EditSearchAction->setEnabled(IsOpen);
GroupView->setEnabled(IsOpen);
EntryView->setEnabled(IsOpen);
QuickSearchEdit->setEnabled(IsOpen);
if(!IsOpen){
EditNewGroupAction->setEnabled(false);
EditEditGroupAction->setEnabled(false);
@ -623,6 +626,19 @@ void KeepassMainWindow::OnEditGroupSearch(){
search(currentGroup());
}
void KeepassMainWindow::OnQuickSearch(){
// TODO: solution without a hidden CSearchDlg window-----
CSearchDlg dlg(db,NULL,this,"SearchDialog",false);
dlg.Edit_Search->setText(QuickSearchEdit->text());
dlg.OnButtonSearch();
SearchResults=dlg.Hits;
//-------------------------------------------------------
GroupView->ShowSearchGroup=true;
GroupView->updateItems();
GroupView->selectSearchGroup();
EntryView->showSearchResults(SearchResults);
}
CGroup* KeepassMainWindow::currentGroup(){
Q_ASSERT(GroupView->selectedItems().size());
return static_cast<GroupViewItem*>(GroupView->selectedItems()[0])->pGroup;

1
src/mainwindow.h
Unescape View File

@ -80,6 +80,7 @@ private slots:
void OnEntrySelectionChanged();
void OnGroupSelectionChanged();
void OnClipboardTimeOut();
void OnQuickSearch();
private:
enum SelectionState{NONE,SINGLE,MULTIPLE,SEARCHGROUP};

78
src/translations/english.ts
Unescape View File

@ -278,11 +278,11 @@ Sind Sie sicher, dass Sie dies tun wollen?</source>
</message>
<message>
<source>Hinweis</source>
<translation type="obsolete">Information</translation>
<translation type="unfinished">Information</translation>
</message>
<message>
<source>Bitte geben Sie einen Suchbegriff ein.</source>
<translation type="obsolete">Please enter at least one charakter.</translation>
<translation type="unfinished">Please enter at least one charakter.</translation>
</message>
</context>
<context>
@ -676,6 +676,10 @@ Sind Sie sicher, dass Sie dies tun wollen?</source>
<source>Gruppen</source>
<translation>Groups</translation>
</message>
<message>
<source>Suchergebnisse</source>
<translation type="unfinished">Search Results</translation>
</message>
</context>
<context>
<name>KeepassMainWindow</name>
@ -976,6 +980,66 @@ Sie Schreibrechte im Verzeichnis ~/.keepass besitzen.</source>
<source>Einträge löschen</source>
<translation>Delete Entry</translation>
</message>
<message>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+O</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+G</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+B</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Y</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+K</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shift+Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shift+Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LanguageDlg</name>
@ -1755,7 +1819,7 @@ Sie Schreibrechte im Verzeichnis ~/.keepass besitzen.</source>
</message>
<message encoding="UTF-8">
<source>Alt+ä</source>
<translation>Alt+R</translation>
<translation type="obsolete">Alt+R</translation>
</message>
<message encoding="UTF-8">
<source>Gro&amp;ß- und Kleinschreibung beachten</source>
@ -1765,6 +1829,14 @@ Sie Schreibrechte im Verzeichnis ~/.keepass besitzen.</source>
<source>Alt+ß</source>
<translation>Alt+S</translation>
</message>
<message encoding="UTF-8">
<source>Alt+Ä</source>
<translation type="unfinished">Alt+B</translation>
</message>
<message>
<source>Untergruppen einbeziehen</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsDialog</name>

181
src/translations/russian.ts
Unescape View File

@ -390,11 +390,11 @@ Sind Sie sicher, dass Sie dies tun wollen?</source>
</message>
<message>
<source>Hinweis</source>
<translation type="obsolete">Информация</translation>
<translation type="unfinished">Информация</translation>
</message>
<message>
<source>Bitte geben Sie einen Suchbegriff ein.</source>
<translation type="obsolete">Пожалуйста, введите хотя-бы один символ.</translation>
<translation type="unfinished">Пожалуйста, введите хотя-бы один символ.</translation>
</message>
</context>
<context>
@ -484,15 +484,19 @@ Sind Sie sicher, dass Sie dies tun wollen?</source>
</message>
<message encoding="UTF-8">
<source>Passwort &lt;b&gt;und&lt;/b&gt; Schlüsseldatei verwenden</source>
<translation>Использовать пароль &lt;b&gt;и&lt;/b&gt; ключевой файл</translation>
<translation type="obsolete">Использовать пароль &lt;b&gt;и&lt;/b&gt; ключевой файл</translation>
</message>
<message encoding="UTF-8">
<source>W&amp;ählen...</source>
<translation>&amp;Обзор...</translation>
</message>
<message encoding="UTF-8">
<source>Alt+ä</source>
<translation></translation>
<source>Passwort UND Schlüsseldatei verwenden</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Alt+Ä</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
@ -836,6 +840,10 @@ Sind Sie sicher, dass Sie dies tun wollen?</source>
<source>Gruppen</source>
<translation type="unfinished">Категории</translation>
</message>
<message>
<source>Suchergebnisse</source>
<translation type="unfinished">Результаты поиска</translation>
</message>
</context>
<context>
<name>KeepassMainWindow</name>
@ -1016,7 +1024,7 @@ Soll sie &#xfc;berschrieben werden?</source>
</message>
<message>
<source>Eintrag duplizieren</source>
<translation type="obsolete">Повторяющаяся запись</translation>
<translation type="unfinished">Повторяющаяся запись</translation>
</message>
<message>
<source>Eintrag l&#xf6;schen</source>
@ -1119,7 +1127,7 @@ Soll sie überschrieben werden?</source>
</message>
<message encoding="UTF-8">
<source>Eintrag löschen</source>
<translation type="obsolete">Удалить запись</translation>
<translation type="unfinished">Удалить запись</translation>
</message>
<message encoding="UTF-8">
<source>Untergruppe hinzufügen...</source>
@ -1189,21 +1197,94 @@ Sie Schreibrechte im Verzeichnis ~/.keepass besitzen.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Speichern?</source>
<source>Ctrl+N</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+O</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+G</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+C</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+B</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+U</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+Y</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+D</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+K</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Ctrl+W</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shift+Ctrl+S</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shift+Ctrl+F</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Geänderte Datei speichern?</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Sollen die Änderungen an der aktuellen Datenbank gespeichert werden?</source>
<source>Die aktuell geöffnete Datei wurde verändert. Sollen die Änderungen vor dem Schließen gespeichert werden?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Speichern fehlgeschlagen</source>
<source>[neu]</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Einträge duplizieren</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Einträge löschen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Die Datei konnte nicht gespeichert werden.</source>
<source>Die Datei konnte nicht gespeichert werden.
%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Datenbank speichern unter...</source>
<translation type="unfinished">Сохранить базу как...</translation>
</message>
</context>
<context>
<name>LanguageDlg</name>
@ -1633,10 +1714,6 @@ als Übersetzung für Keepass fest.</source>
<source>Datenbank öffnen...</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Datenbank schließen...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Datenbank speichern</source>
<translation type="unfinished">Сохранить базу</translation>
@ -1665,6 +1742,62 @@ als Übersetzung für Keepass fest.</source>
<source>KWallet XML-Datei (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Datenbank schließen</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Neue Gruppe hinzufügen...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Gruppe bearbeiten...</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Gruppe löschen</source>
<translation type="unfinished">Удалить группу</translation>
</message>
<message>
<source>Passwort in Zwischenablage kopieren</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Benutzername in Zwischenablage kopieren</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>URL öffnen</source>
<translation type="unfinished">Открыть URL</translation>
</message>
<message>
<source>Anhang speichern unter...</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Neuen Eintrag hinzufügen...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Eintrag anzeigen/bearbeiten...</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Eintrag löschen</source>
<translation type="unfinished">Удалить запись</translation>
</message>
<message>
<source>Eintrag duplizieren</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In Datenbank suchen...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>In dieser Gruppe suchen...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PasswordDlg</name>
@ -1795,8 +1928,12 @@ als Übersetzung für Keepass fest.</source>
<source>AES-Initialisierung fehlgeschlagen</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unbekannter Fehler</source>
<translation type="unfinished"></translation>
</message>
<message encoding="UTF-8">
<source>Unerwarteter Wert für &apos;crypto_size&apos;</source>
<source>Entschlüsselung nicht möglich - der Schlüssel ist falsch oder die Datei beschädigt.</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -1840,7 +1977,7 @@ als Übersetzung für Keepass fest.</source>
</message>
<message>
<source>Standardgruppe</source>
<translation>по умолчанию</translation>
<translation type="obsolete">по умолчанию</translation>
</message>
<message>
<source>Standartgruppe</source>
@ -2049,7 +2186,7 @@ Sie Schreibrechte im Verzeichnis ~/.keepass besitzen.</source>
</message>
<message encoding="UTF-8">
<source>Alt+ä</source>
<translation>Alt+R</translation>
<translation type="obsolete">Alt+R</translation>
</message>
<message encoding="UTF-8">
<source>Gro&amp;ß- und Kleinschreibung beachten</source>
@ -2059,6 +2196,14 @@ Sie Schreibrechte im Verzeichnis ~/.keepass besitzen.</source>
<source>Alt+ß</source>
<translation>Alt+S</translation>
</message>
<message encoding="UTF-8">
<source>Alt+Ä</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Untergruppen einbeziehen</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SettingsDialog</name>