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

22 files changed, 41 insertions, 31 deletions

diff --git a/plugins/NewStory/res/09 copy.ico b/plugins/NewStory/res/copy.ico
index a363893ee1..a363893ee1 100644
--- a/plugins/NewStory/res/09 copy.ico
+++ b/plugins/NewStory/res/copy.ico
diff --git a/plugins/NewStory/res/07 export.ico b/plugins/NewStory/res/export.ico
index 6d92c50cd5..6d92c50cd5 100644
--- a/plugins/NewStory/res/07 export.ico
+++ b/plugins/NewStory/res/export.ico
diff --git a/plugins/NewStory/res/16 file.ico b/plugins/NewStory/res/file.ico
index ecb62a63b5..ecb62a63b5 100644
--- a/plugins/NewStory/res/16 file.ico
+++ b/plugins/NewStory/res/file.ico
diff --git a/plugins/NewStory/res/06 filter.ico b/plugins/NewStory/res/filter.ico
index 12b80aca48..12b80aca48 100644
--- a/plugins/NewStory/res/06 filter.ico
+++ b/plugins/NewStory/res/filter.ico
diff --git a/plugins/NewStory/res/20 findnext.ico b/plugins/NewStory/res/findnext.ico
index 86558d7130..86558d7130 100644
--- a/plugins/NewStory/res/20 findnext.ico
+++ b/plugins/NewStory/res/findnext.ico
diff --git a/plugins/NewStory/res/19 findprev.ico b/plugins/NewStory/res/findprev.ico
index 33ccdfc7a3..33ccdfc7a3 100644
--- a/plugins/NewStory/res/19 findprev.ico
+++ b/plugins/NewStory/res/findprev.ico
diff --git a/plugins/NewStory/res/12 msgin.ico b/plugins/NewStory/res/msgin.ico
index 38af9f78f1..38af9f78f1 100644
--- a/plugins/NewStory/res/12 msgin.ico
+++ b/plugins/NewStory/res/msgin.ico
diff --git a/plugins/NewStory/res/13 msgout.ico b/plugins/NewStory/res/msgout.ico
index d3d169e45b..d3d169e45b 100644
--- a/plugins/NewStory/res/13 msgout.ico
+++ b/plugins/NewStory/res/msgout.ico
diff --git a/plugins/NewStory/res/01 newstory.ico b/plugins/NewStory/res/newstory.ico
index c11f93bebc..c11f93bebc 100644
--- a/plugins/NewStory/res/01 newstory.ico
+++ b/plugins/NewStory/res/newstory.ico
diff --git a/plugins/NewStory/res/05 options.ico b/plugins/NewStory/res/options.ico
index ab07d2a23b..ab07d2a23b 100644
--- a/plugins/NewStory/res/05 options.ico
+++ b/plugins/NewStory/res/options.ico
diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 82eb607d46..04e2d80019 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -26,28 +26,29 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICO_NEWSTORY                       ICON         "01 newstory.ico"
-ICO_USERINFO                       ICON         "02 userinfo.ico"
-ICO_USERMENU                       ICON         "03 usermenu.ico"
-ICO_SEARCH                       ICON         "04 search.ico"
-ICO_OPTIONS                       ICON         "05 options.ico"
-ICO_FILTER                       ICON         "06 filter.ico"
-ICO_EXPORT                       ICON         "07 export.ico"
-ICO_COPY                       ICON         "09 copy.ico"
-ICO_SENDMSG                       ICON         "10 sendmsg.ico"
-ICO_MSGIN                      ICON         "12 msgin.ico"
-ICO_MSGOUT                      ICON         "13 msgout.ico"
-ICO_SIGNIN                      ICON         "14 signin.ico"
-ICO_FILE                      ICON         "16 file.ico"
-ICO_URL                      ICON         "17 url.ico"
-ICO_UNKNOWN                      ICON         "18 unknown.ico"
-ICO_FINDPREV                      ICON         "19 findprev.ico"
-ICO_FINDNEXT                      ICON         "20 findnext.ico"
-ICO_CALENDAR                      ICON         "Calendar.ico"
-ICO_RESET                      ICON         "reset.ico"
-ICO_PREVIEW                      ICON         "reload.ico"
-ICO_VARHELP                      ICON         "vars.ico"
-ICO_TPLGROUP                      ICON         "folder.ico"
+ICO_NEWSTORY                       ICON         "newstory.ico"
+ICO_USERINFO                       ICON         "userinfo.ico"
+ICO_USERMENU                       ICON         "usermenu.ico"
+ICO_SEARCH                         ICON         "search.ico"
+ICO_OPTIONS                        ICON         "options.ico"
+ICO_FILTER                         ICON         "filter.ico"
+ICO_EXPORT                         ICON         "export.ico"
+ICO_COPY                           ICON         "copy.ico"
+ICO_SENDMSG                        ICON         "sendmsg.ico"
+ICO_MSGIN                          ICON         "msgin.ico"
+ICO_MSGOUT                         ICON         "msgout.ico"
+ICO_SIGNIN                         ICON         "signin.ico"
+ICO_FILE                           ICON         "file.ico"
+ICO_URL                            ICON         "url.ico"
+ICO_UNKNOWN                        ICON         "unknown.ico"
+ICO_FINDPREV                       ICON         "findprev.ico"
+ICO_FINDNEXT                       ICON         "findnext.ico"
+ICO_CALENDAR                       ICON         "calendar.ico"
+ICO_RESET                          ICON         "reset.ico"
+ICO_PREVIEW                        ICON         "reload.ico"
+ICO_VARHELP                        ICON         "vars.ico"
+ICO_TPLGROUP                       ICON         "folder.ico"
+ICO_TIMETREE                       ICON         "timetree.ico"
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -97,13 +98,14 @@ BEGIN
     CONTROL         "",IDC_COPY,"MButtonClass",WS_TABSTOP,74,99,16,14
     CONTROL         "",IDC_EXPORT,"MButtonClass",WS_TABSTOP,90,99,16,14
     CONTROL         "",IDC_DELETE,"MButtonClass",WS_TABSTOP,104,99,16,14
+    CONTROL         "",IDC_TIMETREE,"MButtonClass",WS_TABSTOP,118,99,16,14
     CONTROL         "",IDC_FILTER,"MButtonClass",WS_TABSTOP,132,99,16,14
     CONTROL         "",IDC_FINDPREV,"MButtonClass",WS_TABSTOP,364,305,16,14
     CONTROL         "",IDC_FINDNEXT,"MButtonClass",WS_TABSTOP,337,305,16,14
     EDITTEXT        IDC_SEARCHTEXT,19,305,305,14,ES_AUTOHSCROLL
     ICON            "",IDC_SEARCHICON,1,298,20,20,SS_CENTERIMAGE
     CONTROL         "",IDC_LOGOPTIONS,"MButtonClass",WS_TABSTOP,116,99,16,14
-    CONTROL         "Tree1",IDC_TIMETREE,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_FULLROWSELECT | TVS_SINGLEEXPAND | NOT WS_VISIBLE | WS_TABSTOP,0,134,84,160,WS_EX_STATICEDGE
+    CONTROL         "Tree1",IDC_TIMETREEVIEW,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_FULLROWSELECT | TVS_SINGLEEXPAND | NOT WS_VISIBLE | WS_TABSTOP,0,134,84,160,WS_EX_STATICEDGE
     CONTROL         "",IDC_DATEPOPUP,"MButtonClass",WS_TABSTOP,148,99,16,14
     CONTROL         "",IDC_ITEMS2,"NewstoryList",WS_TABSTOP,90,132,290,166
     CONTROL         "",IDC_IB_SEPARATOR,"Static",SS_ETCHEDHORZ,21,76,124,1
@@ -340,8 +342,6 @@ BEGIN
     END
     POPUP "Log options"
     BEGIN
-        MENUITEM "Show time tree",              ID_LOGOPTIONS_SHOWTIMETREE
-        MENUITEM SEPARATOR
         MENUITEM "Options...",                  ID_LOGOPTIONS_OPTIONS
         MENUITEM "Templates...",                ID_LOGOPTIONS_TEMPLATES
     END
diff --git a/plugins/NewStory/res/04 search.ico b/plugins/NewStory/res/search.ico
index bbbe115543..bbbe115543 100644
--- a/plugins/NewStory/res/04 search.ico
+++ b/plugins/NewStory/res/search.ico
diff --git a/plugins/NewStory/res/10 sendmsg.ico b/plugins/NewStory/res/sendmsg.ico
index 9824e078c4..9824e078c4 100644
--- a/plugins/NewStory/res/10 sendmsg.ico
+++ b/plugins/NewStory/res/sendmsg.ico
diff --git a/plugins/NewStory/res/14 signin.ico b/plugins/NewStory/res/signin.ico
index 359de2e178..359de2e178 100644
--- a/plugins/NewStory/res/14 signin.ico
+++ b/plugins/NewStory/res/signin.ico
diff --git a/plugins/NewStory/res/timetree.ico b/plugins/NewStory/res/timetree.ico
new file mode 100644
index 0000000000..1408b4e3a1
--- /dev/null
+++ b/plugins/NewStory/res/timetree.ico
diff --git a/plugins/NewStory/res/18 unknown.ico b/plugins/NewStory/res/unknown.ico
index 6b0538ed7a..6b0538ed7a 100644
--- a/plugins/NewStory/res/18 unknown.ico
+++ b/plugins/NewStory/res/unknown.ico
diff --git a/plugins/NewStory/res/17 url.ico b/plugins/NewStory/res/url.ico
index 4da1ade23c..4da1ade23c 100644
--- a/plugins/NewStory/res/17 url.ico
+++ b/plugins/NewStory/res/url.ico
diff --git a/plugins/NewStory/res/02 userinfo.ico b/plugins/NewStory/res/userinfo.ico
index 12580fa153..12580fa153 100644
--- a/plugins/NewStory/res/02 userinfo.ico
+++ b/plugins/NewStory/res/userinfo.ico
diff --git a/plugins/NewStory/res/03 usermenu.ico b/plugins/NewStory/res/usermenu.ico
index 9b6021ea5d..9b6021ea5d 100644
--- a/plugins/NewStory/res/03 usermenu.ico
+++ b/plugins/NewStory/res/usermenu.ico
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  //!!!