newstory: icons renamed, added timetree icon, timetree item moved from menu to toolbar

3 files changed, 16 insertions, 6 deletions

diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index bc199defb4..b59f17ab63 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -71,13 +71,13 @@ enum
 enum
 {
 	TBTN_USERINFO, TBTN_USERMENU, TBTN_MESSAGE,
-	TBTN_SEARCH, TBTN_FILTER, TBTN_DATEPOPUP,
+	TBTN_TIMEREE, TBTN_SEARCH, TBTN_FILTER, TBTN_DATEPOPUP,
 	TBTN_COPY, TBTN_DELETE, TBTN_EXPORT,
 	TBTN_LOGOPTIONS,
 	TBTN_COUNT
 };
 
-int tbtnSpacing[TBTN_COUNT] = { 0, 0, TBTN_SPACER, 0, 0, TBTN_SPACER, 0, 0, -1, 0 };
+int tbtnSpacing[TBTN_COUNT] = { 0, 0, TBTN_SPACER, 0, 0, 0, TBTN_SPACER, 0, 0, -1, 0 };
 
 struct InfoBarEvents
 {
@@ -326,7 +326,7 @@ class CHistoryDlg : public CDlgBase
 	CCtrlBase m_histControl;
 	CCtrlEdit edtSearchText;
 	CCtrlMButton btnUserInfo, btnSendMsg, btnUserMenu, btnCopy, btnOptions, btnFilter;
-	CCtrlMButton btnCalendar, btnSearch, btnExport, btnFindNext, btnFindPrev, btnDelete;
+	CCtrlMButton btnCalendar, btnSearch, btnExport, btnFindNext, btnFindPrev, btnDelete, btnTimeTree;
 	CCtrlTreeView m_timeTree;
 
 public:
@@ -347,7 +347,8 @@ public:
 		btnUserInfo(this, IDC_USERINFO, g_plugin.getIcon(ICO_USERINFO), LPGEN("User info")),
 		btnUserMenu(this, IDC_USERMENU, g_plugin.getIcon(ICO_USERMENU), LPGEN("User menu")),
 		btnFindNext(this, IDC_FINDNEXT, g_plugin.getIcon(ICO_FINDNEXT), LPGEN("Find next")),
-		btnFindPrev(this, IDC_FINDPREV, g_plugin.getIcon(ICO_FINDPREV), LPGEN("Find previous"))
+		btnFindPrev(this, IDC_FINDPREV, g_plugin.getIcon(ICO_FINDPREV), LPGEN("Find previous")),
+		btnTimeTree(this, IDC_TIMETREE, g_plugin.getIcon(ICO_TIMETREE), LPGEN("Time tree"))
 	{
 		m_timeTree.OnSelChanged = Callback(this, &CHistoryDlg::onSelChanged_TimeTree);
 		
@@ -365,6 +366,7 @@ public:
 		btnFindPrev.OnClick = Callback(this, &CHistoryDlg::onClick_FindPrev);
 		btnUserInfo.OnClick = Callback(this, &CHistoryDlg::onClick_UserInfo);
 		btnUserMenu.OnClick = Callback(this, &CHistoryDlg::onClick_UserMenu);
+		btnTimeTree.OnClick = Callback(this, &CHistoryDlg::onClick_TimeTree);
 
 		showFlags = g_plugin.getDword(m_hContact, "showFlags", 0x7f);
 
@@ -405,6 +407,7 @@ public:
 		m_hwndBtnToolbar[TBTN_LOGOPTIONS] = btnOptions.GetHwnd();
 		m_hwndBtnToolbar[TBTN_FILTER] = btnFilter.GetHwnd();
 		m_hwndBtnToolbar[TBTN_DATEPOPUP] = btnCalendar.GetHwnd();
+		m_hwndBtnToolbar[TBTN_TIMEREE] = btnTimeTree.GetHwnd();
 
 		m_hwndBtnCloseSearch = GetDlgItem(m_hwnd, IDC_SEARCHICON);
 		m_hwndStatus = CreateWindowEx(0, STATUSCLASSNAME, NULL, WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP, 0, 0, 0, 0, m_hwnd, NULL, g_plugin.getInst(), NULL);
@@ -541,6 +544,11 @@ public:
 		UpdateTitle();
 	}
 
+	void onClick_TimeTree(CCtrlButton*)
+	{
+
+	}
+
 	void onClick_Export(CCtrlButton *)
 	{
 		wchar_t FileName[MAX_PATH];
diff --git a/plugins/NewStory/src/main.cpp b/plugins/NewStory/src/main.cpp
index 9f0d2ec58e..3b43192ad3 100644
--- a/plugins/NewStory/src/main.cpp
+++ b/plugins/NewStory/src/main.cpp
@@ -62,6 +62,7 @@ static IconItem icons[] =
 	{ LPGEN("Find previous"),     "findprev",  ICO_FINDPREV   },
 	{ LPGEN("Find next"),         "findnext",  ICO_FINDNEXT   },
 	{ LPGEN("Jump to date"),      "calendar",  ICO_CALENDAR   },
+	{ LPGEN("Time tree"),         "timetree",  ICO_TIMETREE   },
 
 	{ LPGEN("Template group"),    "tplgroup",  ICO_TPLGROUP   },
 	{ LPGEN("Reset"),             "reset",     ICO_RESET      },
diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index 09f898d558..9a9c62d80d 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -32,6 +32,7 @@
 #define ICO_RESET                       149
 #define ICO_PREVIEW                     150
 #define ICO_VARHELP                     151
+#define ICO_TIMETREE                    152
 #define IDC_GPREVIEW                    1000
 #define IDC_ITEMS2                      1001
 #define IDC_PROGRESS                    1002 //!!!
@@ -63,9 +64,10 @@
 #define IDC_ICO_URLS_OUT                1032
 #define IDC_PREVIEW                     1033
 #define IDC_DELETE                      1034
-#define IDC_TIMETREE                    1035
+#define IDC_TIMETREEVIEW                1035
 #define IDC_PROGRESS1                   1037  //!!!
 #define IDC_COMBO1                      1038  //!!!
+#define IDC_TIMETREE                    1039
 #define IDC_CHECK2                      1040  //!!!
 #define IDC_CHECK3                      1041  //!!!
 #define IDC_MONTHCALENDAR1              1044
@@ -123,7 +125,6 @@
 #define ID_CONTEXT_CANCEL               40028  //!!!
 #define ID_EXPORT_SAVEAS                40029  //!!!
 #define ID_EXPORT_SAVESELECTEDAS        40031  //!!!
-#define ID_LOGOPTIONS_SHOWTIMETREE      40032
 #define ID_FILTER_SHOWALLEVENTS         40036  //!!!
 #define ID_FILTER_SHOWINCOMINGEVENTSONLY 40037  //!!!
 #define ID_FILTER_SHOWOUTGOINGEVENTSONLY 40038  //!!!