1 | --- bookmarks_dialog.h 2015-12-08 12:26:04.320333604 -0500
|
---|
2 | +++ bookmarks_dialog_new.h 2015-12-08 12:24:52.820352593 -0500
|
---|
3 | @@ -2,6 +2,13 @@
|
---|
4 | #define __BOOKMARKS_DIALOG_H__
|
---|
5 |
|
---|
6 | #include "dialogex.h"
|
---|
7 | +#include <vector>
|
---|
8 | +using namespace std;
|
---|
9 | +
|
---|
10 | +struct Category{
|
---|
11 | + wxTreeItemId cate;
|
---|
12 | + wxString name;
|
---|
13 | +};
|
---|
14 |
|
---|
15 | class CNewBookmarkDialog : public wxDialogEx
|
---|
16 | {
|
---|
17 | @@ -19,10 +26,14 @@
|
---|
18 | DECLARE_EVENT_TABLE()
|
---|
19 | void OnOK(wxCommandEvent&);
|
---|
20 | void OnBrowse(wxCommandEvent&);
|
---|
21 | +
|
---|
22 | + //void OnMenu(wxCommandEvent&);
|
---|
23 | +
|
---|
24 | };
|
---|
25 |
|
---|
26 | class CBookmarksDialog final : public wxDialogEx
|
---|
27 | {
|
---|
28 | +
|
---|
29 | public:
|
---|
30 | CBookmarksDialog(wxWindow* parent, wxString& site_path, const CServer* server);
|
---|
31 | virtual ~CBookmarksDialog() {}
|
---|
32 | @@ -33,6 +44,8 @@
|
---|
33 | static bool GetBookmark(const wxString& name, wxString &local_dir, CServerPath &remote_dir, bool &sync, bool &comparison);
|
---|
34 | static bool AddBookmark(const wxString& name, const wxString &local_dir, const CServerPath &remote_dir, bool sync, bool comparison);
|
---|
35 |
|
---|
36 | +
|
---|
37 | +
|
---|
38 | protected:
|
---|
39 | bool Verify();
|
---|
40 | void UpdateBookmark();
|
---|
41 | @@ -43,14 +56,19 @@
|
---|
42 |
|
---|
43 | void SaveSiteSpecificBookmarks();
|
---|
44 | void SaveGlobalBookmarks();
|
---|
45 | +
|
---|
46 |
|
---|
47 | wxWindow* m_parent;
|
---|
48 | wxString &m_site_path;
|
---|
49 | CServer const* m_server;
|
---|
50 |
|
---|
51 | + wxMenu* ctmu;
|
---|
52 | + wxMenu* Move;
|
---|
53 | +
|
---|
54 | wxTreeCtrl *m_pTree{};
|
---|
55 | wxTreeItemId m_bookmarks_global;
|
---|
56 | wxTreeItemId m_bookmarks_site;
|
---|
57 | + vector<Category> cate_list;
|
---|
58 |
|
---|
59 | bool m_is_deleting{};
|
---|
60 |
|
---|
61 | @@ -65,6 +83,10 @@
|
---|
62 | void OnCopy(wxCommandEvent& event);
|
---|
63 | void OnBeginLabelEdit(wxTreeEvent& event);
|
---|
64 | void OnEndLabelEdit(wxTreeEvent& event);
|
---|
65 | + void OnMenu(wxCommandEvent&);
|
---|
66 | + void saveCategory(wxCommandEvent&);
|
---|
67 | + void MoveCategory(wxCommandEvent& event);
|
---|
68 | + void Uncategorize(wxCommandEvent&);
|
---|
69 | };
|
---|
70 |
|
---|
71 | #endif //__BOOKMARKS_DIALOG_H__
|
---|