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

fixed strange sort order in EntryView (Bug #7083)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@78 b624d157-de02-0410-bad0-e51aec6abb33
master
tariq 19 years ago
parent 931d8374a5
commit 17f2e85420
2 changed files with 5 additions and 7 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. 9
      src/lib/EntryView.cpp
  2. 3
      src/lib/EntryView.h

9
src/lib/EntryView.cpp
Unescape View File

@ -29,6 +29,7 @@
#include <QTime> #include <QTime>
#include <QApplication> #include <QApplication>
#include <QPainter> #include <QPainter>
#include <QPair>
#include "main.h" #include "main.h"
#include "PwmConfig.h" #include "PwmConfig.h"
#include "EntryView.h" #include "EntryView.h"
@ -51,8 +52,8 @@ header()->setStretchLastSection(false);
connect(header(),SIGNAL(sectionResized(int,int,int)),this,SLOT(OnColumnResized(int,int,int))); connect(header(),SIGNAL(sectionResized(int,int,int)),this,SLOT(OnColumnResized(int,int,int)));
ContextMenu=new QMenu(this); ContextMenu=new QMenu(this);
setAlternatingRowColors(config.AlternatingRowColors); setAlternatingRowColors(config.AlternatingRowColors);
disconnect(header(),SIGNAL(sectionClicked(int)),this,SLOT(sortByColumn(int)));
//TODO: connect with custom sort function
} }
KeepassEntryView::~KeepassEntryView(){ KeepassEntryView::~KeepassEntryView(){
@ -358,8 +359,6 @@ drag->setPixmap(DragPixmap);
drag->start(); drag->start();
} }
void KeepassEntryView::sortItems(int column,Qt::SortOrder order){};
void KeepassEntryView::paintEvent(QPaintEvent * event){ void KeepassEntryView::paintEvent(QPaintEvent * event){
QTreeWidget::paintEvent(event); QTreeWidget::paintEvent(event);
@ -383,7 +382,7 @@ EntryViewItem::EntryViewItem(QTreeWidgetItem *parent, QTreeWidgetItem *preceding
} }
bool EntryViewItem::operator<(EntryViewItem& other){ bool EntryViewItem::operator<(const QTreeWidgetItem& other)const{
if(QString::localeAwareCompare( text(treeWidget()->sortColumn()),other.text(treeWidget()->sortColumn())) < 0) if(QString::localeAwareCompare( text(treeWidget()->sortColumn()),other.text(treeWidget()->sortColumn())) < 0)
return true; return true;
else else

3
src/lib/EntryView.h
Unescape View File

@ -41,7 +41,6 @@ public:
void updateColumns(); void updateColumns();
void refreshItems(); void refreshItems();
void showSearchResults(QList<Q_UINT32>& results); void showSearchResults(QList<Q_UINT32>& results);
virtual void sortItems(int column,Qt::SortOrder order);
Database* db; Database* db;
vector<EntryViewItem*>Items; vector<EntryViewItem*>Items;
QMenu *ContextMenu; QMenu *ContextMenu;
@ -74,7 +73,7 @@ EntryViewItem(QTreeWidget *parent, QTreeWidgetItem * preceding);
EntryViewItem(QTreeWidgetItem *parent); EntryViewItem(QTreeWidgetItem *parent);
EntryViewItem(QTreeWidgetItem *parent, QTreeWidgetItem * preceding); EntryViewItem(QTreeWidgetItem *parent, QTreeWidgetItem * preceding);
CEntry* pEntry; CEntry* pEntry;
virtual bool operator<(EntryViewItem& other); virtual bool operator<(const QTreeWidgetItem& other)const;
}; };