Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1040] trunk/src/view/visio/addon
|
From: <mbe...@us...> - 2011-02-15 17:34:58
|
Revision: 1040
http://scstudio.svn.sourceforge.net/scstudio/?rev=1040&view=rev
Author: mbezdeka
Date: 2011-02-15 17:34:51 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
Menu reconfiguration started...
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/instancesfielddlg.cpp
trunk/src/view/visio/addon/instancesfielddlg.h
trunk/src/view/visio/addon/resource.h
trunk/src/view/visio/addon/scstudio.vcproj
Added Paths:
-----------
trunk/src/view/visio/addon/icon_message_select_group.ico
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2011-02-15 17:15:11 UTC (rev 1039)
+++ trunk/src/view/visio/addon/dllmodule.rc 2011-02-15 17:34:51 UTC (rev 1040)
@@ -165,35 +165,33 @@
CONTROL "Diff",IDC_DIFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,253,56,24,10
END
-IDD_INSTANCES_FIELD_OPTIONS DIALOGEX 0, 0, 210, 127
+IDD_INSTANCES_FIELD_OPTIONS DIALOGEX 0, 0, 215, 115
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Add Instances Options"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK",IDOK,155,5,50,14
- PUSHBUTTON "Cancel",IDCANCEL,155,25,50,14
+ DEFPUSHBUTTON "OK",IDOK,158,5,52,14
+ PUSHBUTTON "Cancel",IDCANCEL,158,25,52,14
LTEXT "Number of instances:",IDC_STATIC,5,5,70,12,SS_CENTERIMAGE
EDITTEXT IDC_IF_INSTANCES_CNT,80,5,43,14,ES_AUTOHSCROLL
- GROUPBOX "",IDC_OPTIONS_GROUP_BOX,5,73,200,50
- LTEXT " Options ",IDC_OPTIONS_SWITCH_LBL,19,73,30,8
+ GROUPBOX "",IDC_OPTIONS_GROUP_BOX,5,70,205,40
LTEXT "Instance length:",IDC_STATIC,5,23,70,12,SS_CENTERIMAGE
EDITTEXT IDC_IF_INSTANCE_LENGTH,80,23,43,14,ES_AUTOHSCROLL
LTEXT "Start position:",IDC_STATIC,5,40,50,12,SS_CENTERIMAGE
EDITTEXT IDC_IF_START_POS_X,80,40,43,14,ES_AUTOHSCROLL
- EDITTEXT IDC_IF_START_POS_Y,80,54,43,14,ES_AUTOHSCROLL
- PUSHBUTTON "+",IDC_OPTIONS_SWITCH_BTN,5,73,10,10
- CONTROL "Total width:",IDC_TOTAL_WIDTH_RDO,"Button",BS_AUTORADIOBUTTON,10,89,54,10
- CONTROL "Spacing:",IDC_SPACING_RDO,"Button",BS_AUTORADIOBUTTON,10,104,43,10
- EDITTEXT IDC_IF_TOTAL_WIDTH,63,88,40,14,ES_AUTOHSCROLL
- EDITTEXT IDC_IF_SPACING,63,103,40,14,ES_AUTOHSCROLL
- PUSHBUTTON "Default values",IDC_DEFAULT_BTN,140,88,58,14
+ EDITTEXT IDC_IF_START_POS_Y,80,55,43,14,ES_AUTOHSCROLL
+ CONTROL "Total width:",IDC_TOTAL_WIDTH_RDO,"Button",BS_AUTORADIOBUTTON,10,79,54,10
+ CONTROL "Spacing:",IDC_SPACING_RDO,"Button",BS_AUTORADIOBUTTON,10,94,43,10
+ EDITTEXT IDC_IF_TOTAL_WIDTH,80,78,43,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_IF_SPACING,80,93,43,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Default values",IDC_DEFAULT_BTN,158,47,52,14
LTEXT "x:",IDC_STATIC,64,40,9,12,SS_CENTERIMAGE
- LTEXT "y:",IDC_STATIC,64,54,9,12,SS_CENTERIMAGE
+ LTEXT "y:",IDC_STATIC,64,55,9,12,SS_CENTERIMAGE
LTEXT "<units>",IDC_IF_UNITS0,127,24,27,8
LTEXT "<units>",IDC_IF_UNITS1,127,41,27,8
- LTEXT "<units>",IDC_IF_UNITS2,127,55,27,8
- LTEXT "<units>",IDC_IF_UNITS3,107,90,27,8
- LTEXT "<units>",IDC_IF_UNITS4,107,104,27,8
+ LTEXT "<units>",IDC_IF_UNITS2,127,56,27,8
+ LTEXT "<units>",IDC_IF_UNITS3,128,81,27,8
+ LTEXT "<units>",IDC_IF_UNITS4,127,95,27,8
END
IDD_ENUMERATION_OPTIONS DIALOGEX 0, 0, 236, 63
@@ -320,7 +318,7 @@
IDD_INSTANCES_FIELD_OPTIONS, DIALOG
BEGIN
LEFTMARGIN, 5
- RIGHTMARGIN, 205
+ RIGHTMARGIN, 210
VERTGUIDE, 10
VERTGUIDE, 19
VERTGUIDE, 48
@@ -328,7 +326,7 @@
VERTGUIDE, 123
VERTGUIDE, 130
TOPMARGIN, 5
- BOTTOMMARGIN, 122
+ BOTTOMMARGIN, 110
HORZGUIDE, 54
END
@@ -400,6 +398,7 @@
IDI_ICON_JUMP_RIGHT ICON "icon_jump_right_messages.ico"
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"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2011-02-15 17:15:11 UTC (rev 1039)
+++ trunk/src/view/visio/addon/document.cpp 2011-02-15 17:34:51 UTC (rev 1040)
@@ -377,7 +377,7 @@
Visio::IVMenuSetPtr menuSet = vsoMenus->MenuSets->ItemAtID[Visio::visUIObjSetDrawing];
Visio::IVMenuPtr menu = menuSet->Menus->AddAt(5);
- menu->Caption = "&Check";
+ menu->Caption = "&SCStudio";
// many functions are not working in OLE window: repaint, import, error display
// disable verification functions when opened from OLE window
menu->Enabled = !m_vsoDocument->InPlace;
@@ -385,12 +385,7 @@
std::basic_string<TCHAR> vslFileName = GetVisioModuleFileName();
std::basic_string<TCHAR> vslIconFile;
- Visio::IVMenuItemPtr itemWindows = menu->MenuItems->Add();
- itemWindows->Caption = "&Windows";
- itemWindows->BeginGroup = true;
- itemWindows->CmdNum = Visio::visCmdHierarchical;
-
- m_reportMenuItem = itemWindows->MenuItems->Add();
+ m_reportMenuItem = menu->MenuItems->Add();
m_reportMenuItem->Caption = "Verification &Report";
m_reportMenuItem->AddOnName = ADDON_NAME;
m_reportMenuItem->AddOnArgs = stringize() << L"/event=" << MENU_WINDOWS_REPORTER;
@@ -455,6 +450,8 @@
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++)
{
@@ -464,6 +461,9 @@
// 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)
+ if(!strcmp(menuItem3x->Caption,"Beautify"))
+ beautify = menuItem3x->CmdNum;
}
Visio::IVMenuItemPtr itemEnableEnumerating = itemMessageEnumerating->MenuItems->Add();
@@ -480,6 +480,14 @@
vslIconFile = vslFileName+_T(",9");
itemDisableEnumerating->IconFileName(vslIconFile.c_str());
+ Visio::IVMenuItemPtr itemSelectNumberingGroup = itemMessageEnumerating->MenuItems->Add();
+ 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());
+
Visio::IVMenuItemPtr itemFindFlow = menu->MenuItems->Add();
itemFindFlow->Caption = "&Find Flow...";
itemFindFlow->AddOnName = ADDON_NAME;
@@ -550,42 +558,63 @@
// note: the accelerators must be created in this custom menu set
// note: the accelerators are bound with menu items via CmdNum property
Visio::IVAccelTablePtr accelTable = vsoMenus->AccelTables->ItemAtID[Visio::visUIObjSetDrawing];
-
+ //Select Instances
Visio::IVAccelItemPtr accelItemSelectInstances = accelTable->AccelItems->Add();
accelItemSelectInstances->CmdNum = itemSelectInstances->CmdNum;
accelItemSelectInstances->Key = 'I';
accelItemSelectInstances->Control = true;
accelItemSelectInstances->Alt = true;
-
+ //Select Messages
Visio::IVAccelItemPtr accelItemSelectMessages = accelTable->AccelItems->Add();
accelItemSelectMessages->CmdNum = itemSelectMessages->CmdNum;
accelItemSelectMessages->Key = 'M';
accelItemSelectMessages->Control = true;
accelItemSelectMessages->Alt = true;
-
+ //Add Instances
Visio::IVAccelItemPtr accelItemAddInstances = accelTable->AccelItems->Add();
accelItemAddInstances->CmdNum = itemAddInstances->CmdNum;
accelItemAddInstances->Key = 'F';
accelItemAddInstances->Control = true;
accelItemAddInstances->Alt = true;
-
+ //Message Sequence
Visio::IVAccelItemPtr accelItemMessageSequence = accelTable->AccelItems->Add();
accelItemMessageSequence->CmdNum = itemMessageSequence->CmdNum;
accelItemMessageSequence->Key = 'S';
accelItemMessageSequence->Control = true;
accelItemMessageSequence->Alt = true;
-
+ //Enable message numbering
accelItemMessageEnumeration = accelTable->AccelItems->Add();
accelItemMessageEnumeration->CmdNum = itemEnableEnumerating->CmdNum;
accelItemMessageEnumeration->Key = 'E';
accelItemMessageEnumeration->Control = true;
accelItemMessageEnumeration->Alt = true;
-
+ //Disable message numbering
accelItemMessageEnumerationDisable = accelTable->AccelItems->Add();
accelItemMessageEnumerationDisable->CmdNum = itemDisableEnumerating->CmdNum;
accelItemMessageEnumerationDisable->Key = 'D';
accelItemMessageEnumerationDisable->Control = true;
accelItemMessageEnumerationDisable->Alt = true;
+ //Select numbering group
+ Visio::IVAccelItemPtr accelItemSelectNumberingGroup = accelTable->AccelItems->Add();
+ accelItemSelectNumberingGroup->CmdNum = itemSelectNumberingGroup->CmdNum;
+ accelItemSelectNumberingGroup->Key = 'N';
+ accelItemSelectNumberingGroup->Control = true;
+ accelItemSelectNumberingGroup->Alt = true;
+ //Verify
+ Visio::IVAccelItemPtr accelItemVerify = accelTable->AccelItems->Add();
+ accelItemVerify->CmdNum = itemVerify->CmdNum;
+ accelItemVerify->Key = 'V';
+ accelItemVerify->Control = true;
+ accelItemVerify->Alt = true;
+ //Transforms shortcuts
+ if(beautify >= 0)
+ {
+ Visio::IVAccelItemPtr accelItemBeutify = accelTable->AccelItems->Add();
+ accelItemBeutify->CmdNum = beautify;
+ accelItemBeutify->Key = 'B';
+ accelItemBeutify->Control = true;
+ accelItemBeutify->Alt = true;
+ }
m_vsoDocument->SetCustomMenus(vsoMenus);
}
@@ -725,6 +754,15 @@
vslIconFile = vslFileName+_T(",9");
m_disableMessageEnumerationToolbarItem->IconFileName(vslIconFile.c_str());
+ Visio::IVToolbarItemPtr selectNumberingGroup = m_toolbar->ToolbarItems->Add();
+ selectNumberingGroup->Caption = "Select Numbering Group";
+ selectNumberingGroup->AddOnName = ADDON_NAME;
+ selectNumberingGroup->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_NUMBERED_GROUP;
+ selectNumberingGroup->Visible = true;
+ selectNumberingGroup->Enabled = true;
+ vslIconFile = vslFileName+_T(",14");
+ selectNumberingGroup->IconFileName(vslIconFile.c_str());
+
Visio::IVToolbarItemPtr itemVerify = m_toolbar->ToolbarItems->Add();
itemVerify->Caption = "Verify";
itemVerify->AddOnName = ADDON_NAME;
@@ -1836,8 +1874,12 @@
VAORC CDocumentMonitor::OnMenuSelectNumberedGroup(Visio::IVApplicationPtr vsoApp)
{
- CEnumerateUtils::selectGroup(vsoApp,vsoApp->ActiveWindow->Selection->Item[1]->Data3);
+ Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
+ if(selection->Count == 0 || !strcmp(selection->Item[1]->Data3,""))
+ return VAORC_FAILURE;
+ CEnumerateUtils::selectGroup(vsoApp,selection->Item[1]->Data3);
+
return VAORC_SUCCESS;
}
Added: trunk/src/view/visio/addon/icon_message_select_group.ico
===================================================================
(Binary files differ)
Property changes on: trunk/src/view/visio/addon/icon_message_select_group.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/view/visio/addon/instancesfielddlg.cpp
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.cpp 2011-02-15 17:15:11 UTC (rev 1039)
+++ trunk/src/view/visio/addon/instancesfielddlg.cpp 2011-02-15 17:34:51 UTC (rev 1040)
@@ -65,7 +65,6 @@
}
DoDataExchange(false);
- SetOptionsVisibility(m_optionsVisible);
UpdateSpacingControls();
// units
@@ -95,13 +94,6 @@
return 0;
}
-LRESULT CInstancesFieldDlg::OnOptionsSwitch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
-{
- m_optionsVisible = !m_optionsVisible;
- SetOptionsVisibility(m_optionsVisible);
- return 0;
-}
-
void CInstancesFieldDlg::UpdateSpacingControls()
{
m_totalWidthRdo.SetCheck(m_use_const_spacing ? BST_UNCHECKED : BST_CHECKED);
@@ -146,44 +138,6 @@
return 0;
}
-
-void CInstancesFieldDlg::SetOptionsVisibility(bool visible)
-{
- m_optionsSwitchBtn.SetWindowText((visible ? _T("-") : _T("+")));
-
- CWindow window = m_optionsGroupBox.GetParent();
- RECT windowRect;
- window.GetWindowRect(&windowRect);
- windowRect.bottom = windowRect.top + (visible ? 225 : 165);
- window.SetWindowPos(0, &windowRect, SWP_SHOWWINDOW | SWP_NOZORDER | SWP_DRAWFRAME);
-
- RECT groupRect;
- m_optionsGroupBox.GetWindowRect(&groupRect);
- m_optionsGroupBox.ScreenToClient(&groupRect);
- // relative to the dialog window
- groupRect.top = 120;
- groupRect.bottom = groupRect.top + (visible ? 76 : 8);
- groupRect.left = 8;
- groupRect.right = 308;
- m_optionsGroupBox.SetWindowPos(0, &groupRect, SWP_SHOWWINDOW | SWP_NOZORDER | SWP_DRAWFRAME);
-
- m_totalWidthRdo.ShowWindow(visible);
- m_spacingRdo.ShowWindow(visible);
- m_totalWidthEdit.ShowWindow(visible);
- m_spacingEdit.ShowWindow(visible);
- m_defaultValuesBtn.ShowWindow(visible);
-
- if (visible) {
- if (m_use_const_spacing) {
- m_spacingRdo.SetFocus();
- } else {
- m_totalWidthRdo.SetFocus();
- }
- } else {
- m_instancesCntEdit.SetFocus();
- }
-}
-
int CInstancesFieldDlg::LoadRegistryData()
{
TRACE("CInstancesFieldDlg::LoadRegistryData() loading options from registry");
@@ -198,7 +152,6 @@
m_use_const_spacing = GetRegistry<bool> (GetRegistryFolder(), NULL, _T("SpacingSwitch"), DEFAULT_IF_SPACING_SWITCH);
m_total_width = _u(GetRegistry<double>(GetRegistryFolder(), NULL, _T("TotalWidth"), DEFAULT_IF_TOTAL_WIDTH));
m_spacing = _u(GetRegistry<double>(GetRegistryFolder(), NULL, _T("Spacing"), DEFAULT_IF_SPACING));
- m_optionsVisible = GetRegistry<bool> (GetRegistryFolder(), NULL, _T("OptionsVisible"), DEFAULT_IF_OPTIONS_VISIBLE);
#undef _u
return 0;
@@ -218,7 +171,6 @@
SetRegistry<bool> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("SpacingSwitch"), m_use_const_spacing);
SetRegistry<double>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("TotalWidth"), _u(m_total_width));
SetRegistry<double>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("Spacing"), _u(m_spacing));
- SetRegistry<bool> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("OptionsVisible"), m_optionsVisible);
#undef _u
return 0;
Modified: trunk/src/view/visio/addon/instancesfielddlg.h
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.h 2011-02-15 17:15:11 UTC (rev 1039)
+++ trunk/src/view/visio/addon/instancesfielddlg.h 2011-02-15 17:34:51 UTC (rev 1040)
@@ -65,7 +65,6 @@
DDX_CONTROL_HANDLE(IDC_IF_INSTANCES_CNT, m_instancesCntEdit)
DDX_CONTROL_HANDLE(IDC_OPTIONS_GROUP_BOX, m_optionsGroupBox)
- DDX_CONTROL_HANDLE(IDC_OPTIONS_SWITCH_BTN, m_optionsSwitchBtn)
DDX_CONTROL_HANDLE(IDC_TOTAL_WIDTH_RDO, m_totalWidthRdo)
DDX_CONTROL_HANDLE(IDC_SPACING_RDO, m_spacingRdo)
DDX_CONTROL_HANDLE(IDC_DEFAULT_BTN, m_defaultValuesBtn)
@@ -82,7 +81,6 @@
MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
COMMAND_ID_HANDLER(IDOK, OnCloseCmd)
COMMAND_ID_HANDLER(IDCANCEL, OnCloseCmd)
- COMMAND_ID_HANDLER(IDC_OPTIONS_SWITCH_BTN, OnOptionsSwitch)
// FIXME: would like to make the label switch the options as well, but the following does not work:
//COMMAND_ID_HANDLER(IDC_OPTIONS_SWITCH_LBL, OnOptionsSwitch)
COMMAND_ID_HANDLER(IDC_TOTAL_WIDTH_RDO, OnTotalWidthRdo)
@@ -99,7 +97,6 @@
LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnCloseCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- LRESULT OnOptionsSwitch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnTotalWidthRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnSpacingRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnDefaultCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
@@ -107,12 +104,9 @@
int LoadRegistryData();
int SaveRegistryData();
- void SetOptionsVisibility(bool visible);
void UpdateSpacingControls();
CStatic m_optionsGroupBox;
- bool m_optionsVisible;
- CButton m_optionsSwitchBtn;
CButton m_totalWidthRdo;
CButton m_spacingRdo;
CButton m_defaultValuesBtn;
@@ -132,7 +126,6 @@
static const int DEFAULT_IF_SPACING_SWITCH = true;
static const double DEFAULT_IF_TOTAL_WIDTH = 7.8740157480314960; // 200 mm
static const double DEFAULT_IF_SPACING = 1.1811023622047244094; // 30 mm
-static const bool DEFAULT_IF_OPTIONS_VISIBLE = false;
static const double IF_BORDER = 0.0787401574803149; // 2 mm border for the default command
// $Id$
Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h 2011-02-15 17:15:11 UTC (rev 1039)
+++ trunk/src/view/visio/addon/resource.h 2011-02-15 17:34:51 UTC (rev 1040)
@@ -94,6 +94,8 @@
#define IDB_IMPORT_DISTANCES_BMP 255
#define IDC_MS_YSTART 256
#define IDC_MS_START_POS_Y 256
+#define IDI_ICON1 256
+#define IDI_ICON_SELECT_GROUP 256
#define IDC_MS_VERTICAL_SPACE 257
#define IDC_MS_DIR_RIGHT_LEFT 258
#define IDC_MS_VERTICAL_SPACE2 259
@@ -178,7 +180,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 256
+#define _APS_NEXT_RESOURCE_VALUE 257
#define _APS_NEXT_COMMAND_VALUE 32768
#define _APS_NEXT_CONTROL_VALUE 341
#define _APS_NEXT_SYMED_VALUE 105
Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj 2011-02-15 17:15:11 UTC (rev 1039)
+++ trunk/src/view/visio/addon/scstudio.vcproj 2011-02-15 17:34:51 UTC (rev 1040)
@@ -602,6 +602,10 @@
>
</File>
<File
+ RelativePath=".\icon_message_select_group.ico"
+ >
+ </File>
+ <File
RelativePath=".\icon_select_add_instances.ico"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
