NewStory: option to enable picture previews

6 files changed, 12 insertions, 5 deletions

diff --git a/plugins/NewStory/res/resource.rc b/plugins/NewStory/res/resource.rc
index 1c5fec2858..30bcff5f33 100644
--- a/plugins/NewStory/res/resource.rc
+++ b/plugins/NewStory/res/resource.rc
@@ -147,7 +147,7 @@ IDD_OPT_ADVANCED DIALOGEX 0, 0, 307, 223
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Log window",IDC_STATIC,0,0,307,104
+    GROUPBOX        "Log window",IDC_STATIC,0,0,307,119
     CONTROL         "Group messages",IDC_GROUPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,9,289,12
     CONTROL         "Enable vertical scroll bar",IDC_VSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,22,289,12
     CONTROL         "Draw window edge",IDC_DRAWEDGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,35,289,12
@@ -155,6 +155,7 @@ BEGIN
     CONTROL         "History++ compatiblity mode",IDC_HPP_COMPAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,61,289,12
     CONTROL         "Show event type",IDC_SHOW_TYPE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,74,289,12
     CONTROL         "Show event direction",IDC_SHOW_DIRECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,87,289,12
+    CONTROL         "Show picture preview",IDC_SHOW_PREVIEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,100,289,12
 END
 
 IDD_OPT_TEMPLATES DIALOGEX 0, 0, 307, 234
diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index 1708cb50e7..56f70ee37c 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -403,7 +403,7 @@ void ItemData::load(bool bLoadAlways)
 					m_bOfflineDownloaded = 100;

 

 					auto *pwszLocalName = blob.getLocalName();

-					if (ProtoGetAvatarFileFormat(pwszLocalName) != PA_FORMAT_UNKNOWN)

+					if (g_plugin.bShowPreview && ProtoGetAvatarFileFormat(pwszLocalName) != PA_FORMAT_UNKNOWN)

 						buf.AppendFormat(L"[img=file://%s]%s[/img]%s", pwszLocalName, wszDescr.c_str(), wszDescr.c_str());

 					else

 						buf.AppendFormat(L"[url]file://%s[/url] %s", pwszLocalName, wszDescr.c_str());

diff --git a/plugins/NewStory/src/main.cpp b/plugins/NewStory/src/main.cpp
index 82c6b31edd..6917eb31ff 100644
--- a/plugins/NewStory/src/main.cpp
+++ b/plugins/NewStory/src/main.cpp
@@ -23,7 +23,9 @@ CMPlugin g_plugin;
 CMOption<bool> g_bOptGrouping(MODULENAME, "MessageGrouping", false);

 CMOption<bool> g_bOptDrawEdge(MODULENAME, "DrawEdge", true);

 CMOption<bool> g_bOptHppCompat(MODULENAME, "HppCompat", false);

+

 CMOption<bool> g_bShowType(MODULENAME, "ShowType", true);

+CMOption<bool> g_bShowPreview(MODULENAME, "ShowPreview", true);

 CMOption<bool> g_bShowDirection(MODULENAME, "ShowDirection", true);

 

 CMOption<uint32_t> g_clCustom0(MODULENAME, "CustomColor0", -1);

@@ -166,6 +168,7 @@ void CMPlugin::LoadOptions()
 	bShowType = g_bShowType;

 	bDrawEdge = g_bOptDrawEdge;

 	bHppCompat = g_bOptHppCompat;

+	bShowPreview = g_bShowPreview;

 	bMsgGrouping = g_bOptGrouping;

 	bShowDirection = g_bShowDirection;

 

diff --git a/plugins/NewStory/src/options.cpp b/plugins/NewStory/src/options.cpp
index e8a0bae954..a879a54e91 100644
--- a/plugins/NewStory/src/options.cpp
+++ b/plugins/NewStory/src/options.cpp
@@ -42,7 +42,7 @@ protected:
 class CGeneralOptsDlg : public CBaseOptsDlg

 {

 	CCtrlCheck chkGrouping, chkVScroll, chkDrawEdge, chkSortOrder, chkHppCompat;

-	CCtrlCheck chkShowType, chkShowDirection;

+	CCtrlCheck chkShowType, chkShowPreview, chkShowDirection;

 

 public:

 	CGeneralOptsDlg() :

@@ -53,6 +53,7 @@ public:
 		chkGrouping(this, IDC_GROUPING),

 		chkHppCompat(this, IDC_HPP_COMPAT),

 		chkSortOrder(this, IDC_SORT_ASCENDING),

+		chkShowPreview(this, IDC_SHOW_PREVIEW),

 		chkShowDirection(this, IDC_SHOW_DIRECTION)

 	{

 		CreateLink(chkVScroll, g_plugin.bOptVScroll);

@@ -60,6 +61,7 @@ public:
 		CreateLink(chkGrouping, g_bOptGrouping);

 		CreateLink(chkDrawEdge, g_bOptDrawEdge);

 		CreateLink(chkHppCompat, g_bOptHppCompat);

+		CreateLink(chkShowPreview, g_bShowPreview);

 		CreateLink(chkShowDirection, g_bShowDirection);

 

 		CreateLink(chkSortOrder, g_plugin.bSortAscending);

diff --git a/plugins/NewStory/src/resource.h b/plugins/NewStory/src/resource.h
index db0947d98b..9bad09fd13 100644
--- a/plugins/NewStory/src/resource.h
+++ b/plugins/NewStory/src/resource.h
@@ -97,6 +97,7 @@
 #define IDC_SHOW_TYPE                   1060

 #define IDC_SHOW_DIRECTION              1061

 #define IDC_TOPLINE                     1062

+#define IDC_SHOW_PREVIEW                1062

 #define IDC_DELSERVERHISTORY            1063

 #define IDC_BOTH                        1064

 #define IDC_COLOR1                      1065

diff --git a/plugins/NewStory/src/stdafx.h b/plugins/NewStory/src/stdafx.h
index 4040187e0f..f27c7602a1 100644
--- a/plugins/NewStory/src/stdafx.h
+++ b/plugins/NewStory/src/stdafx.h
@@ -106,7 +106,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 

 	// thesw options are a copy of static CMOption to keep performance high

 	bool bMsgGrouping, bDrawEdge, bHppCompat, bDisableDelete = false;

-	bool bShowType, bShowDirection, bHasSmileys;

+	bool bShowType, bShowDirection, bShowPreview, bHasSmileys;

 

 	COLORREF clCustom[5];

 

@@ -118,7 +118,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	int Unload() override;

 };

 

-extern CMOption<bool> g_bOptGrouping, g_bOptDrawEdge, g_bOptHppCompat, g_bShowType, g_bShowDirection;

+extern CMOption<bool> g_bOptGrouping, g_bOptDrawEdge, g_bOptHppCompat, g_bShowType, g_bShowDirection, g_bShowPreview;

 extern CMOption<uint32_t> g_clCustom0, g_clCustom1, g_clCustom2, g_clCustom3, g_clCustom4;

 

 extern wchar_t* months[12];