work on CPasswordDlg (still incomplete),

removed CChangeKeyDlg

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@55 b624d157-de02-0410-bad0-e51aec6abb33

src/lib/EntryView.cpp

@@ -91,18 +91,21 @@ resizeColumns();
 e->accept();
 }
 
+void KeepassEntryView::updateItems(){
+updateItems(CurrentGroup);
+}
+
 
 void KeepassEntryView::updateItems(unsigned int GroupID){
-
 clear();
 Items.clear();
 if(!db)return;
 if(!GroupID)return;
+CurrentGroup=GroupID;
 for(int i=0;i<db->Entries.size();i++){
   if(db->Entries[i].GroupID==GroupID)
   	setEntry(&db->Entries[i]);
 }
-
 }
 
 void KeepassEntryView::showSearchResults(QList<Q_UINT32>& results){

src/lib/EntryView.h

@@ -38,8 +38,8 @@ public:
  KeepassEntryView(QWidget* parent=0);
  ~KeepassEntryView();
  void updateItems(unsigned int group);
- void refreshItems();
  void updateColumns();
+ void refreshItems();
  void showSearchResults(QList<Q_UINT32>& results);
  PwDatabase* db;
  vector<EntryViewItem*>Items;
@@ -57,14 +57,11 @@ protected:
  virtual void contextMenuEvent(QContextMenuEvent *event);
  virtual void paintEvent(QPaintEvent* event);
  virtual void resizeEvent(QResizeEvent* event);
-// virtual void dragEnterEvent ( QDragEnterEvent * event );
-// virtual void dragMoveEvent ( QDragMoveEvent * event );
-// virtual void dragLeaveEvent ( QDragLeaveEvent * event );
-// virtual void dropEvent ( QDropEvent * event );
  virtual void mousePressEvent(QMouseEvent *event);
  virtual void mouseMoveEvent(QMouseEvent *event);
 public slots:
  void OnColumnResized(int index,int OldSize, int NewSize);
+ void updateItems();
 };
 
 

src/lib/GroupView.cpp

@@ -157,18 +157,15 @@ if(DragType==GROUP){
 			}		
 	}
 	else db->moveGroup(DragItem->pGroup,NULL);
+	updateItems();
 }else{
 	Q_ASSERT(item);
 	QList<QTreeWidgetItem*>* pDragItems=(QList<QTreeWidgetItem*>*)*((QList<QTreeWidgetItem*>**)event->mimeData()->data("keepass/entry").data());
 	for(int i=0;i<pDragItems->size();i++){
 		db->moveEntry(((EntryViewItem*)(*pDragItems)[i])->pEntry,item->pGroup);
 	}
-
-
+	emit entryDropped();
 }
-
-
-updateItems();
 }
 
 

src/lib/GroupView.h

@@ -42,6 +42,7 @@ public:
 
 signals:
  void fileModified();
+ void entryDropped();
 
 protected:
  virtual void dragEnterEvent ( QDragEnterEvent * event );

src/lib/random.h

@@ -17,4 +17,4 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-extern void getRandomBytes(void* buffer,int NumBlocks,int BlockSize,bool Strong=false);
+extern void getRandomBytes(void* buffer,int NumBlocks,int BlockSize=1,bool Strong=false);