|
From: <got...@us...> - 2010-02-08 23:29:01
|
Revision: 579
http://scstudio.svn.sourceforge.net/scstudio/?rev=579&view=rev
Author: gotthardp
Date: 2010-02-08 23:28:51 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
Added custom toolbar icons.
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.cpp
trunk/src/view/visio/addon/dllmodule.h
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/resource.h
trunk/src/view/visio/addon/scstudio.vcproj
Added Paths:
-----------
trunk/src/view/visio/addon/icon_select_instances.ico
trunk/src/view/visio/addon/icon_select_messages.ico
Modified: trunk/src/view/visio/addon/dllmodule.cpp
===================================================================
--- trunk/src/view/visio/addon/dllmodule.cpp 2010-02-08 10:35:55 UTC (rev 578)
+++ trunk/src/view/visio/addon/dllmodule.cpp 2010-02-08 23:28:51 UTC (rev 579)
@@ -79,6 +79,17 @@
static const int _FILE_PATH_SIZE = _MAX_PATH * 4;
+std::basic_string<TCHAR> GetVisioModuleFileName()
+{
+ TCHAR szPath[_FILE_PATH_SIZE];
+
+ // get the full path including the Addon name
+ GetModuleFileName(GetModuleHandle(LoadStringResource(IDS_VSL_NAME).c_str()),
+ szPath, sizeof(szPath) / sizeof(TCHAR));
+
+ return szPath;
+}
+
std::basic_string<TCHAR> GetVisioModulePath()
{
TCHAR szPath[_FILE_PATH_SIZE];
Modified: trunk/src/view/visio/addon/dllmodule.h
===================================================================
--- trunk/src/view/visio/addon/dllmodule.h 2010-02-08 10:35:55 UTC (rev 578)
+++ trunk/src/view/visio/addon/dllmodule.h 2010-02-08 23:28:51 UTC (rev 579)
@@ -25,6 +25,7 @@
std::wstring LoadStringResource(UINT uiID);
std::wstring GetVersionInfo(const LPWSTR block);
+std::basic_string<TCHAR> GetVisioModuleFileName();
std::basic_string<TCHAR> GetVisioModulePath();
DWORD GetRegistryDWORD(const TCHAR* root, const TCHAR* path, const TCHAR* parameter, DWORD default_value);
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-02-08 10:35:55 UTC (rev 578)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-02-08 23:28:51 UTC (rev 579)
@@ -179,6 +179,16 @@
/////////////////////////////////////////////////////////////////////////////
//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON_SELECT_INSTANCES ICON "icon_select_instances.ico"
+IDI_ICON_SELECT_MESSAGES ICON "icon_select_messages.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
// String Table
//
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-02-08 10:35:55 UTC (rev 578)
+++ trunk/src/view/visio/addon/document.cpp 2010-02-08 23:28:51 UTC (rev 579)
@@ -430,17 +430,22 @@
// disable verification functions when opened from OLE window
toolbar->Enabled = !vsoDocument->InPlace;
+ std::basic_string<TCHAR> vslFileName = GetVisioModuleFileName();
+ std::basic_string<TCHAR> vslIconFile;
+
Visio::IVToolbarItemPtr toolbarItem1 = toolbar->ToolbarItems->Add();
toolbarItem1->Caption = "Select All Instances";
toolbarItem1->AddOnName = ADDON_NAME;
toolbarItem1->AddOnArgs = "/event=208";
- toolbarItem1->FaceID = visIconIXSINGLETILE;
+ vslIconFile = vslFileName+_T(",0");
+ toolbarItem1->IconFileName(vslIconFile.c_str());
Visio::IVToolbarItemPtr toolbarItem2 = toolbar->ToolbarItems->Add();
toolbarItem2->Caption = "Select All Messages";
toolbarItem2->AddOnName = ADDON_NAME;
toolbarItem2->AddOnArgs = "/event=209";
- toolbarItem2->FaceID = visIconIXCONNPOINTS;
+ vslIconFile = vslFileName+_T(",1");
+ toolbarItem2->IconFileName(vslIconFile.c_str());
vsoDocument->SetCustomToolbars(vsoToolbars);
}
Added: trunk/src/view/visio/addon/icon_select_instances.ico
===================================================================
(Binary files differ)
Property changes on: trunk/src/view/visio/addon/icon_select_instances.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/src/view/visio/addon/icon_select_messages.ico
===================================================================
(Binary files differ)
Property changes on: trunk/src/view/visio/addon/icon_select_messages.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h 2010-02-08 10:35:55 UTC (rev 578)
+++ trunk/src/view/visio/addon/resource.h 2010-02-08 23:28:51 UTC (rev 579)
@@ -17,12 +17,14 @@
#define IDC_OUTPUTLEVEL 207
#define IDC_DRAWING1 208
#define IDC_DRAWING2 209
+#define IDI_ICON_SELECT_INSTANCES 209
+#define IDI_ICON_SELECT_MESSAGES 210
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 207
+#define _APS_NEXT_RESOURCE_VALUE 211
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 209
#define _APS_NEXT_SYMED_VALUE 105
Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj 2010-02-08 10:35:55 UTC (rev 578)
+++ trunk/src/view/visio/addon/scstudio.vcproj 2010-02-08 23:28:51 UTC (rev 579)
@@ -373,6 +373,14 @@
RelativePath=".\dllmodule.rgs"
>
</File>
+ <File
+ RelativePath=".\icon_select_instances.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\icon_select_messages.ico"
+ >
+ </File>
</Filter>
<Filter
Name="Generated Files"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|