summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-11-29 12:56:57 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-11-29 12:56:57 +0000
commitad099652196b28b4fff4f93ae47d94f6aca7c168 (patch)
tree1eece059e63da1dc9819805ffe30a0337b9c174b
parentb39742edb863597c60db4172fe6a3a4ad86de500 (diff)
CrashDumper: "Copy link to clipboard" item added (patch by person)
- langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@11146 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/Plugins/CrashDumper.txt1
-rw-r--r--langpacks/english/Plugins/LotusNotify.txt2
-rw-r--r--langpacks/english/Plugins/TopToolBar.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt2
-rw-r--r--langpacks/russian/Plugins/CrashDumper.txt2
-rw-r--r--langpacks/russian/Plugins/LotusNotify.txt2
-rw-r--r--langpacks/russian/Plugins/TopToolBar.txt2
-rw-r--r--langpacks/russian/Plugins/VKontakte.txt2
-rw-r--r--langpacks/russian/Untranslated/LotusNotify.txt1
-rw-r--r--plugins/CrashDumper/res/crshdmp.rc1
-rw-r--r--plugins/CrashDumper/src/crshdmp.cpp28
-rw-r--r--plugins/CrashDumper/src/crshdmp_icons.cpp11
-rw-r--r--plugins/CrashDumper/src/resource.h3
-rw-r--r--plugins/CrashDumper/src/utils.h1
14 files changed, 45 insertions, 15 deletions
diff --git a/langpacks/english/Plugins/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt
index eae1a41466..bed97dbbac 100644
--- a/langpacks/english/Plugins/CrashDumper.txt
+++ b/langpacks/english/Plugins/CrashDumper.txt
@@ -38,6 +38,7 @@
[Show]
[Show with DLLs]
[Upload]
+[Copy link to clipboard]
[Open crash report directory]
[Open online Version Info]
[Copy Version Info to clipboard]
diff --git a/langpacks/english/Plugins/LotusNotify.txt b/langpacks/english/Plugins/LotusNotify.txt
index bf5d0cec49..b6e76a79db 100644
--- a/langpacks/english/Plugins/LotusNotify.txt
+++ b/langpacks/english/Plugins/LotusNotify.txt
@@ -53,5 +53,3 @@
[&Check Lotus]
[Lotus Notify]
[New Lotus document detected]
-[LotusNotify.dll cannot work with 64bit Miranda. (Lotus client is 32bit only)]
-[LotusNotify]
diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index a0b9ce50ff..04919306ed 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -2,7 +2,7 @@
;============================================================
; File: TopToolBar.dll
; Plugin: TopToolBar
-; Version: 0.8.0.3
+; Version: 0.8.0.4
; Authors: Bethoven
;============================================================
[ToptoolBar adds buttons in top frame for fast access.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index b26461b55f..c92bd47beb 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.29
+; Version: 0.1.0.30
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/CrashDumper.txt b/langpacks/russian/Plugins/CrashDumper.txt
index 85abfd61b0..b78991890a 100644
--- a/langpacks/russian/Plugins/CrashDumper.txt
+++ b/langpacks/russian/Plugins/CrashDumper.txt
@@ -67,6 +67,8 @@
С библиотеками
[Upload]
Загрузить
+[Copy link to clipboard]
+Копировать ссылку в буфер обмена
[Open crash report directory]
Папка сохранения отчётов
[Open online Version Info]
diff --git a/langpacks/russian/Plugins/LotusNotify.txt b/langpacks/russian/Plugins/LotusNotify.txt
index 3a4a7c54e8..b30483b35a 100644
--- a/langpacks/russian/Plugins/LotusNotify.txt
+++ b/langpacks/russian/Plugins/LotusNotify.txt
@@ -37,5 +37,3 @@
Статус
[Plugins]
Плагины
-[LotusNotify.dll cannot work with 64bit Miranda. (Lotus client is 32bit only)]
-LotusNotify.dll не будет работать с 64-разрядной версией Miranda NG (поскольку клиент Lotus 32-разрядный)
diff --git a/langpacks/russian/Plugins/TopToolBar.txt b/langpacks/russian/Plugins/TopToolBar.txt
index 1c9dc901e1..e76af4f119 100644
--- a/langpacks/russian/Plugins/TopToolBar.txt
+++ b/langpacks/russian/Plugins/TopToolBar.txt
@@ -2,7 +2,7 @@
;============================================================
; File: TopToolBar.dll
; Plugin: TopToolBar
-; Version: 0.8.0.3
+; Version: 0.8.0.4
; Authors: Bethoven
;============================================================
[ToptoolBar adds buttons in top frame for fast access.]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 9e4d3d9eba..426ad304e9 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.29
+; Version: 0.1.0.30
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
diff --git a/langpacks/russian/Untranslated/LotusNotify.txt b/langpacks/russian/Untranslated/LotusNotify.txt
index bda08662f9..843cb476ad 100644
--- a/langpacks/russian/Untranslated/LotusNotify.txt
+++ b/langpacks/russian/Untranslated/LotusNotify.txt
@@ -28,4 +28,3 @@
[&Check Lotus]
[Lotus Notify]
[New Lotus document detected]
-[LotusNotify]
diff --git a/plugins/CrashDumper/res/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc
index 12adc55e38..bc761b6f40 100644
--- a/plugins/CrashDumper/res/crshdmp.rc
+++ b/plugins/CrashDumper/res/crshdmp.rc
@@ -138,6 +138,7 @@ IDI_VISHOW ICON "Vi show.ico"
IDI_VITOCLIP ICON "Vi to clipboard.ico"
IDI_VITOFILE ICON "Vi to file.ico"
IDI_VIUPLOAD ICON "Vi upload.ico"
+IDI_LINKTOCLIP ICON "Vi link to clipboard.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index b9f149c88c..53a0a5a389 100644
--- a/plugins/CrashDumper/src/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
@@ -156,6 +156,26 @@ INT_PTR OpenUrl(WPARAM wParam, LPARAM)
return 0;
}
+INT_PTR CopyLinkToClipboard(WPARAM, LPARAM)
+{
+ TCHAR *tmp;
+ TCHAR buffer[MAX_PATH];
+
+ tmp = db_get_wsa(NULL, PluginName, "Username");
+ mir_sntprintf(buffer, SIZEOF(buffer), _T("http://vi.miranda-ng.org/detail/%s"), tmp);
+ int bufLen = (sizeof(buffer) + 1) * sizeof(TCHAR);
+ HANDLE hData = GlobalAlloc(GMEM_MOVEABLE, bufLen);
+ LPSTR buf = (LPSTR)GlobalLock(hData);
+ memcpy(buf, buffer, bufLen);
+
+ OpenClipboard(NULL);
+ EmptyClipboard();
+
+ SetClipboardData(CF_UNICODETEXT, hData);
+ CloseClipboard();
+ return 0;
+}
+
INT_PTR ServiceModeLaunch(WPARAM, LPARAM)
{
servicemode = true;
@@ -280,6 +300,13 @@ static int ModulesLoaded(WPARAM, LPARAM)
mi.pszService = MS_CRASHDUMPER_UPLOAD;
Menu_AddMainMenuItem(&mi);
+ mi.popupPosition = 0;
+ mi.position = 2000089999;
+ mi.ptszName = LPGENT("Copy link to clipboard");
+ mi.icolibItem = GetIconHandle(IDI_LINKTOCLIP);//need icon
+ mi.pszService = MS_CRASHDUMPER_URLTOCLIP;
+ Menu_AddMainMenuItem(&mi);
+
if (catchcrashes && !needrestart) {
mi.position = 2000099990;
mi.ptszName = LPGENT("Open crash report directory");
@@ -367,6 +394,7 @@ extern "C" int __declspec(dllexport) Load(void)
CreateServiceFunction(MS_CRASHDUMPER_UPLOAD, UploadVersionInfo);
CreateServiceFunction(MS_CRASHDUMPER_URL, OpenUrl);
CreateServiceFunction(MS_SERVICEMODE_LAUNCH, ServiceModeLaunch);
+ CreateServiceFunction(MS_CRASHDUMPER_URLTOCLIP, CopyLinkToClipboard);
return 0;
}
diff --git a/plugins/CrashDumper/src/crshdmp_icons.cpp b/plugins/CrashDumper/src/crshdmp_icons.cpp
index dfead53dd0..ff6f23520a 100644
--- a/plugins/CrashDumper/src/crshdmp_icons.cpp
+++ b/plugins/CrashDumper/src/crshdmp_icons.cpp
@@ -20,11 +20,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static IconItem iconList[] =
{
- { LPGEN("Version Information"), "versionInfo", IDI_VI },
- { LPGEN("Copy To Clipboard"), "storeToClip", IDI_VITOCLIP },
- { LPGEN("Store to file"), "storeToFile", IDI_VITOFILE },
- { LPGEN("Show"), "showInfo", IDI_VISHOW },
- { LPGEN("Upload"), "uploadInfo", IDI_VIUPLOAD },
+ { LPGEN("Version Information"), "versionInfo", IDI_VI },
+ { LPGEN("Copy To Clipboard"), "storeToClip", IDI_VITOCLIP },
+ { LPGEN("Store to file"), "storeToFile", IDI_VITOFILE },
+ { LPGEN("Show"), "showInfo", IDI_VISHOW },
+ { LPGEN("Upload"), "uploadInfo", IDI_VIUPLOAD },
+ { LPGEN("Copy link to clipboard"), "linkToClip", IDI_LINKTOCLIP},
};
void InitIcons(void)
diff --git a/plugins/CrashDumper/src/resource.h b/plugins/CrashDumper/src/resource.h
index ae5e2e260f..8172d99a51 100644
--- a/plugins/CrashDumper/src/resource.h
+++ b/plugins/CrashDumper/src/resource.h
@@ -9,7 +9,8 @@
#define IDI_VITOCLIP 106
#define IDI_VITOFILE 107
#define IDI_VIUPLOAD 108
-#define IDD_OPTIONS 109
+#define IDI_LINKTOCLIP 109
+#define IDD_OPTIONS 110
#define IDC_VIEWVERSIONINFO 1001
#define IDC_FILEVER 1003
#define IDC_CLIPVER 1004
diff --git a/plugins/CrashDumper/src/utils.h b/plugins/CrashDumper/src/utils.h
index 43a6938f78..8eac8158c4 100644
--- a/plugins/CrashDumper/src/utils.h
+++ b/plugins/CrashDumper/src/utils.h
@@ -72,6 +72,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MS_CRASHDUMPER_VIEWINFO "CrashDmp/ViewInfo"
#define MS_CRASHDUMPER_UPLOAD "CrashDmp/UploadInfo"
#define MS_CRASHDUMPER_URL "CrashDmp/StartUrl"
+#define MS_CRASHDUMPER_URLTOCLIP "CrashDmp/CopyToClip"
#define PluginName "Crash Dumper"