--- bookmarks_dialog.h	2015-12-08 12:26:04.320333604 -0500
+++ bookmarks_dialog_new.h	2015-12-08 12:24:52.820352593 -0500
@@ -2,6 +2,13 @@
 #define __BOOKMARKS_DIALOG_H__
 
 #include "dialogex.h"
+#include <vector>
+using namespace std;
+
+struct Category{
+    wxTreeItemId cate;
+    wxString name;
+};
 
 class CNewBookmarkDialog : public wxDialogEx
 {
@@ -19,10 +26,14 @@
 	DECLARE_EVENT_TABLE()
 	void OnOK(wxCommandEvent&);
 	void OnBrowse(wxCommandEvent&);
+    
+    //void OnMenu(wxCommandEvent&);
+
 };
 
 class CBookmarksDialog final : public wxDialogEx
 {
+
 public:
 	CBookmarksDialog(wxWindow* parent, wxString& site_path, const CServer* server);
 	virtual ~CBookmarksDialog() {}
@@ -33,6 +44,8 @@
 	static bool GetBookmark(const wxString& name, wxString &local_dir, CServerPath &remote_dir, bool &sync, bool &comparison);
 	static bool AddBookmark(const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison);
 
+
+
 protected:
 	bool Verify();
 	void UpdateBookmark();
@@ -43,14 +56,19 @@
 
 	void SaveSiteSpecificBookmarks();
 	void SaveGlobalBookmarks();
+    
 
 	wxWindow* m_parent;
 	wxString &m_site_path;
 	CServer const* m_server;
 
+    wxMenu* ctmu;
+    wxMenu* Move;
+
 	wxTreeCtrl *m_pTree{};
 	wxTreeItemId m_bookmarks_global;
 	wxTreeItemId m_bookmarks_site;
+    vector<Category> cate_list;
 
 	bool m_is_deleting{};
 
@@ -65,6 +83,10 @@
 	void OnCopy(wxCommandEvent& event);
 	void OnBeginLabelEdit(wxTreeEvent& event);
 	void OnEndLabelEdit(wxTreeEvent& event);
+    void OnMenu(wxCommandEvent&);
+    void saveCategory(wxCommandEvent&);
+    void MoveCategory(wxCommandEvent& event);
+    void Uncategorize(wxCommandEvent&);
 };
 
 #endif //__BOOKMARKS_DIALOG_H__