[Scstudio-commits] SF.net SVN: scstudio:[1065] trunk/src/view/visio/addon

[<mbe...@us...>]

Revision: 1065
          http://scstudio.svn.sourceforge.net/scstudio/?rev=1065&view=rev
Author:   mbezdeka
Date:     2011-03-18 00:43:24 +0000 (Fri, 18 Mar 2011)

Log Message:
-----------
Menu reconfiguration:
- new buttons for beutify, tighten time, flip msg direction, add instances, message sequence, select numbering group
- Fixed bug #3198234 - Shortcut changed to Ctrl-Atl-C
- Shortcuts for beautify, select numbering group

Modified Paths:
--------------
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/document.h
    trunk/src/view/visio/addon/resource.h
    trunk/src/view/visio/addon/scstudio.vcproj

Added Paths:
-----------
    trunk/src/view/visio/addon/icon_add_instances.ico
    trunk/src/view/visio/addon/icon_beautify.ico
    trunk/src/view/visio/addon/icon_message_sequence.ico
    trunk/src/view/visio/addon/icon_reverse_message.ico
    trunk/src/view/visio/addon/icon_tighten_time.ico

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2011-03-17 13:42:42 UTC (rev 1064)
+++ trunk/src/view/visio/addon/dllmodule.rc	2011-03-18 00:43:24 UTC (rev 1065)
@@ -399,6 +399,11 @@
 IDI_ICON_JUMP_LEFT_COPY ICON                    "icon_jump_left_messages_copy.ico"
 IDI_ICON_JUMP_RIGHT_COPY ICON                    "icon_jump_right_messages_copy.ico"
 IDI_ICON_SELECT_GROUP   ICON                    "icon_message_select_group.ico"
+IDI_ICON_BEAUTIFY       ICON                    "icon_beautify.ico"
+IDI_ICON_MESSAGE_SEQUENCE ICON                    "icon_message_sequence.ico"
+IDI_ICON_REVERSE_MESSAGE ICON                    "icon_reverse_message.ico"
+IDI_ICON_TIGHTEN_TIME   ICON                    "icon_tighten_time.ico"
+IDI_ICON_ADD_INSTANCES  ICON                    "icon_add_instances.ico"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -529,7 +534,7 @@
     CONTROL         251,IDC_STATIC,"Static",SS_BITMAP,21,34,236,228
     GROUPBOX        "    arranging messages and coregions, setting the length of incomplete",IDC_STATIC,264,7,248,75
     LTEXT           "message (a) and setting the instances length to",IDC_STATIC,276,18,154,8
-    CONTROL         "",IDC_ARRANGING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,266,6,10,10
+    CONTROL         "",IDC_ARRANGING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,266,7,10,10
     CONTROL         "constant value (b)",IDC_CONST_INSTANCE_RDO,"Button",BS_AUTORADIOBUTTON | WS_GROUP,276,29,75,10
     CONTROL         "the first occurrence in diagram",IDC_FIRST_INSTANCE_RDO,
                     "Button",BS_AUTORADIOBUTTON,276,42,113,10
@@ -598,7 +603,7 @@
         VERTGUIDE, 264
         VERTGUIDE, 266
         VERTGUIDE, 276
-        TOPMARGIN, 6
+        TOPMARGIN, 7
         BOTTOMMARGIN, 301
     END
 END

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2011-03-17 13:42:42 UTC (rev 1064)
+++ trunk/src/view/visio/addon/document.cpp	2011-03-18 00:43:24 UTC (rev 1065)
@@ -78,6 +78,9 @@
   m_reportVisible = false;
   m_reportView = new CReportView(this);
 
+  beautifyIndex = -1;
+  tightenTimeIndex = -1;
+
   m_configProvider = new RegistryConfigProvider();
 
   LoadModulesFromRegistry(HKEY_LOCAL_MACHINE);
@@ -415,12 +418,23 @@
   itemAddInstances->AddOnName = ADDON_NAME;
   itemAddInstances->AddOnArgs = stringize() << L"/event=" << MENU_ADD_INSTANCES;
   itemAddInstances->BeginGroup = true;
+  vslIconFile = vslFileName+_T(",19");
+  itemAddInstances->IconFileName(vslIconFile.c_str());
 
   Visio::IVMenuItemPtr itemMessageSequence = itemDrawing->MenuItems->Add();
   itemMessageSequence->Caption = "&Message Sequence...";
   itemMessageSequence->AddOnName = ADDON_NAME;
   itemMessageSequence->AddOnArgs = stringize() << L"/event=" << MENU_MESSAGE_SEQUENCE;
+  vslIconFile = vslFileName+_T(",16");
+  itemMessageSequence->IconFileName(vslIconFile.c_str());  
 
+  Visio::IVMenuItemPtr itemFlipMsgDirection = itemDrawing->MenuItems->Add();
+  itemFlipMsgDirection->Caption = "&Flip message Direction";
+  itemFlipMsgDirection->AddOnName = ADDON_NAME;
+  itemFlipMsgDirection->AddOnArgs = stringize() << L"/event=" << MENU_FLIP_MESSAGE_DIRECTION;
+  vslIconFile = vslFileName+_T(",17");
+  itemFlipMsgDirection->IconFileName(vslIconFile.c_str());
+
   itemMessageEnumerating = itemDrawing->MenuItems->Add();
   itemMessageEnumerating->Caption = "Message &numbering";
   //itemMessageEnumerating->BeginGroup = true;
@@ -450,8 +464,6 @@
   itemRepaint->AddOnArgs = stringize() << L"/event=" << MENU_REPAINT;
   itemRepaint->BeginGroup = true;
 
-  //Add pointers for accelerators
-  short beautify = -1;
   for(TransformerPtrList::const_iterator tpos = m_transformers.begin();
     tpos != m_transformers.end(); tpos++)
   {
@@ -461,9 +473,20 @@
     // note: event numbers 300-399 are reserved for transformers
     menuItem3x->AddOnArgs =
       stringize() << L"/event=" << 300+(tpos-m_transformers.begin());
-    //Make asociation with accelerator (Do it for every item you wnat shortcut to)
+    //Make asociation with accelerator (Do it for every item you want shortcut to) and toolbar icon index
+    vslIconFile = L"";
     if(!strcmp(menuItem3x->Caption,"Beautify"))
-      beautify = menuItem3x->CmdNum;
+    {
+      beautifyCmdNum = menuItem3x->CmdNum;
+      beautifyIndex = tpos-m_transformers.begin();      
+      vslIconFile = vslFileName+_T(",15");
+    }
+    else if(!strcmp(menuItem3x->Caption,"Tighten Time"))
+    {
+      tightenTimeIndex = tpos-m_transformers.begin();
+      vslIconFile = vslFileName+_T(",18");
+    }
+    menuItem3x->IconFileName(vslIconFile.c_str());
   }
 
   Visio::IVMenuItemPtr itemEnableEnumerating = itemMessageEnumerating->MenuItems->Add();
@@ -484,9 +507,8 @@
   itemSelectNumberingGroup->Caption = "&Select numbering group";
   itemSelectNumberingGroup->AddOnName = ADDON_NAME;
   itemSelectNumberingGroup->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_NUMBERED_GROUP;
-  //TODO: Add icon
-  //vslIconFile = vslFileName+_T(",9"); 
-  //itemDisableEnumerating->IconFileName(vslIconFile.c_str());
+  vslIconFile = vslFileName+_T(",14");
+  itemSelectNumberingGroup->IconFileName(vslIconFile.c_str());
 
   Visio::IVMenuItemPtr itemFindFlow = menu->MenuItems->Add();
   itemFindFlow->Caption = "&Find Flow...";
@@ -600,17 +622,23 @@
   accelItemSelectNumberingGroup->Key = 'N';
   accelItemSelectNumberingGroup->Control = true;
   accelItemSelectNumberingGroup->Alt = true;
+  //Flip message direction
+  Visio::IVAccelItemPtr accelItemFlipMsgDirection = accelTable->AccelItems->Add();
+  accelItemFlipMsgDirection->CmdNum = itemFlipMsgDirection->CmdNum;
+  accelItemFlipMsgDirection->Key = 0x08;
+  accelItemFlipMsgDirection->Control = false;
+  accelItemFlipMsgDirection->Alt = false;
   //Verify
   Visio::IVAccelItemPtr accelItemVerify = accelTable->AccelItems->Add();
   accelItemVerify->CmdNum = itemVerify->CmdNum;
-  accelItemVerify->Key = 'V';
+  accelItemVerify->Key = 'C';
   accelItemVerify->Control = true;
   accelItemVerify->Alt = true;
   //Transforms shortcuts
-  if(beautify >= 0)
+  if(beautifyIndex >= 0)
   {
     Visio::IVAccelItemPtr accelItemBeutify = accelTable->AccelItems->Add();
-    accelItemBeutify->CmdNum = beautify;
+    accelItemBeutify->CmdNum = beautifyCmdNum;
     accelItemBeutify->Key = 'B';
     accelItemBeutify->Control = true;
     accelItemBeutify->Alt = true;
@@ -762,7 +790,53 @@
   selectNumberingGroup->Enabled = true;
   vslIconFile = vslFileName+_T(",14");
   selectNumberingGroup->IconFileName(vslIconFile.c_str());
+  //Beautify
+  if(beautifyIndex >= 0)
+  {
+    Visio::IVToolbarItemPtr itemBeautify = m_toolbar->ToolbarItems->Add();
+    itemBeautify->Caption = "Beautify";
+    itemBeautify->AddOnName = ADDON_NAME;
+    itemBeautify->AddOnArgs = stringize() << L"/event=" << 300 + beautifyIndex;
+    vslIconFile = vslFileName+_T(",15");
+    itemBeautify->IconFileName(vslIconFile.c_str());
+    itemBeautify->BeginGroup = true;
+  }
+  //Tighten time
+  if(tightenTimeIndex >= 0)
+  {
+    Visio::IVToolbarItemPtr itemTightenTime = m_toolbar->ToolbarItems->Add();
+    itemTightenTime->Caption = "Tighten Time";
+    itemTightenTime->AddOnName = ADDON_NAME;
+    itemTightenTime->AddOnArgs = stringize() << L"/event=" << 300 + tightenTimeIndex;
+    vslIconFile = vslFileName+_T(",18");
+    itemTightenTime->IconFileName(vslIconFile.c_str());
+    itemTightenTime->BeginGroup = (beautifyIndex >= 0) ? false : true;
+  }
+  //Flip message direction
+  Visio::IVToolbarItemPtr itemFlipMessageDir = m_toolbar->ToolbarItems->Add();
+  itemFlipMessageDir->Caption = "Flip Message Direction";
+  itemFlipMessageDir->AddOnName = ADDON_NAME;
+  itemFlipMessageDir->AddOnArgs = stringize() << L"/event=" << MENU_FLIP_MESSAGE_DIRECTION;
+  vslIconFile = vslFileName+_T(",17");
+  itemFlipMessageDir->IconFileName(vslIconFile.c_str());
+  itemFlipMessageDir->BeginGroup = true;
 
+  //Message sequence
+  Visio::IVToolbarItemPtr itemMsgSequence = m_toolbar->ToolbarItems->Add();
+  itemMsgSequence->Caption = "Message Sequence";
+  itemMsgSequence->AddOnName = ADDON_NAME;
+  itemMsgSequence->AddOnArgs = stringize() << L"/event=" << MENU_MESSAGE_SEQUENCE;
+  vslIconFile = vslFileName+_T(",16");
+  itemMsgSequence->IconFileName(vslIconFile.c_str());
+
+  //Add instance
+  Visio::IVToolbarItemPtr itemAddInstances = m_toolbar->ToolbarItems->Add();
+  itemAddInstances->Caption = "Add Instances";
+  itemAddInstances->AddOnName = ADDON_NAME;
+  itemAddInstances->AddOnArgs = stringize() << L"/event=" << MENU_ADD_INSTANCES;
+  vslIconFile = vslFileName+_T(",19");
+  itemAddInstances->IconFileName(vslIconFile.c_str());
+
   Visio::IVToolbarItemPtr itemVerify = m_toolbar->ToolbarItems->Add();
   itemVerify->Caption = "Verify";
   itemVerify->AddOnName = ADDON_NAME;

Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h	2011-03-17 13:42:42 UTC (rev 1064)
+++ trunk/src/view/visio/addon/document.h	2011-03-18 00:43:24 UTC (rev 1065)
@@ -190,6 +190,10 @@
   TransformerPtrList m_transformers;
   TransformerPtrList::const_iterator find_transformer(const std::wstring& name) const;
 
+  short beautifyIndex;
+  short beautifyCmdNum;
+  short tightenTimeIndex; 
+
   MscPtr run_transformers(MscPtr& msc, const TransformerPtrList& transformer_list);
 
   MeasurementMap m_marker_measurements;

Added: trunk/src/view/visio/addon/icon_add_instances.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_add_instances.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/view/visio/addon/icon_beautify.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_beautify.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/view/visio/addon/icon_message_sequence.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_message_sequence.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/view/visio/addon/icon_reverse_message.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_reverse_message.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/src/view/visio/addon/icon_tighten_time.ico
===================================================================
(Binary files differ)


Property changes on: trunk/src/view/visio/addon/icon_tighten_time.ico
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h	2011-03-17 13:42:42 UTC (rev 1064)
+++ trunk/src/view/visio/addon/resource.h	2011-03-18 00:43:24 UTC (rev 1065)
@@ -97,10 +97,15 @@
 #define IDI_ICON1                       256
 #define IDI_ICON_SELECT_GROUP           256
 #define IDC_MS_VERTICAL_SPACE           257
+#define IDI_ICON_BEAUTIFY               257
 #define IDC_MS_DIR_RIGHT_LEFT           258
+#define IDI_ICON_MESSAGE_SEQUENCE       258
 #define IDC_MS_VERTICAL_SPACE2          259
 #define IDC_MS_VERTICAL_SPACE_LEFT_RIGHT 259
+#define IDI_ICON_REVERSE_MESSAGE        259
 #define IDC_MS_UNITS0                   260
+#define IDI_ICON6                       260
+#define IDI_ICON_TIGHTEN_TIME           260
 #define IDC_MS_UNITS1                   261
 #define IDC_IF_UNITS0                   261
 #define IDC_MS_UNITS2                   262
@@ -115,6 +120,8 @@
 #define IDC_NEAREST_NUMBERED_MSG        265
 #define IDC_PRESERVE_SLOPE              265
 #define IDC_ORIGINAL_INSTANCE_RDO       265
+#define IDI_ICON3                       265
+#define IDI_ICON_ADD_INSTANCES          265
 #define IDC_IF_UNITS2                   267
 #define IDC_IF_UNITS3                   268
 #define IDC_MS_CONNECT_WITH_LINE        268
@@ -180,9 +187,9 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        257
+#define _APS_NEXT_RESOURCE_VALUE        267
 #define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         341
+#define _APS_NEXT_CONTROL_VALUE         342
 #define _APS_NEXT_SYMED_VALUE           105
 #endif
 #endif

Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj	2011-03-17 13:42:42 UTC (rev 1064)
+++ trunk/src/view/visio/addon/scstudio.vcproj	2011-03-18 00:43:24 UTC (rev 1065)
@@ -570,6 +570,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\icon_add_instances.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\icon_beautify.ico"
+				>
+			</File>
+			<File
 				RelativePath=".\icon_check.ico"
 				>
 			</File>
@@ -606,6 +614,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\icon_message_sequence.ico"
+				>
+			</File>
+			<File
+				RelativePath=".\icon_reverse_message.ico"
+				>
+			</File>
+			<File
 				RelativePath=".\icon_select_add_instances.ico"
 				>
 			</File>
@@ -630,6 +646,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\icon_tighten_time.ico"
+				>
+			</File>
+			<File
 				RelativePath=".\ImportDistancesBmp.bmp"
 				>
 			</File>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.