Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[776] trunk/src/view/visio/addon
|
From: <mbe...@us...> - 2010-05-13 22:07:00
|
Revision: 776
http://scstudio.svn.sourceforge.net/scstudio/?rev=776&view=rev
Author: mbezdeka
Date: 2010-05-13 22:06:53 +0000 (Thu, 13 May 2010)
Log Message:
-----------
fixed auto numbering when copy messages
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/enumerateUtils.cpp
trunk/src/view/visio/addon/enumerateUtils.h
trunk/src/view/visio/addon/enumerationDlg.cpp
trunk/src/view/visio/addon/enumerationDlg.h
trunk/src/view/visio/addon/numberingGlobalDlg.cpp
trunk/src/view/visio/addon/numberingGlobalDlg.h
trunk/src/view/visio/addon/resource.h
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-05-13 22:06:53 UTC (rev 776)
@@ -188,22 +188,20 @@
LTEXT "<units>",IDC_IF_UNITS4,107,104,27,8
END
-IDD_ENUMERATION_OPTIONS DIALOGEX 0, 0, 236, 75
+IDD_ENUMERATION_OPTIONS DIALOGEX 0, 0, 236, 63
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Message numbering"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,179,10,50,14
PUSHBUTTON "Cancel",IDCANCEL,179,27,50,14
- GROUPBOX "Options",IDC_STATIC,6,7,168,65
+ GROUPBOX "Options",IDC_STATIC,6,7,168,50
COMBOBOX IDC_COMBO_NUMBERING,48,18,71,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
LTEXT "Type:",IDC_STATIC,11,20,24,8,SS_CENTERIMAGE
CTEXT "+",IDC_STATIC,125,18,12,12,SS_CENTERIMAGE
EDITTEXT IDC_ADDITION,143,18,25,14,ES_AUTOHSCROLL | ES_NOHIDESEL
EDITTEXT IDC_STARTING_INDEX,63,36,25,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Starting index:",IDC_STATIC,11,39,50,8,SS_CENTERIMAGE
- CONTROL "automatically enumerate new messages",IDC_CHECK_ENUMERATE_NEW,
- "Button",BS_AUTOCHECKBOX | BS_LEFT | BS_VCENTER | WS_TABSTOP,12,54,144,12
END
IDD_GLOBAL_SETTINGS DIALOGEX 0, 0, 311, 202
@@ -222,17 +220,18 @@
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "",IDC_STATIC,7,7,275,119
- CONTROL "automatic numbering new messages",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,7,126,10
- CONTROL "as nearest message",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,24,26,80,10
- CONTROL "as nearest numbered message",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,24,40,114,10
+ CONTROL "automatic numbering new messages",IDC_ENUM_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,6,128,10
+ CONTROL "as nearest message",IDC_NEAREST_MSG,"Button",BS_AUTORADIOBUTTON,24,26,80,10
+ CONTROL "as nearest numbered message",IDC_NEAREST_NUMBERED_MSG,
+ "Button",BS_AUTORADIOBUTTON,24,40,114,10
GROUPBOX "If no nearest (numbered) message found:",IDC_STATIC,14,65,261,53,WS_GROUP
- CONTROL "don't number",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,24,81,58,10
- CONTROL "use numbering style:",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,24,97,83,10
+ CONTROL "don't number",IDC_DONT_NUMBER,"Button",BS_AUTORADIOBUTTON,24,81,58,10
+ CONTROL "use numbering style:",IDC_USE_NUMBERING_STYLE,"Button",BS_AUTORADIOBUTTON,24,97,83,10
GROUPBOX "",IDC_STATIC,14,16,128,42,WS_GROUP
COMBOBOX IDC_COMBO_NUMBERING_GLOBAL,107,95,71,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CTEXT "+",IDC_STATIC,179,95,12,12,SS_CENTERIMAGE
EDITTEXT IDC_ADDITION_GLOBAL,191,95,25,14,ES_AUTOHSCROLL | ES_NOHIDESEL
- EDITTEXT IDC_STARTING_INDEX,244,95,25,14,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_STARTING_INDEX_GLOBAL,244,95,25,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "Index:",IDC_STATIC,221,97,21,8,SS_CENTERIMAGE
END
@@ -289,7 +288,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 229
TOPMARGIN, 7
- BOTTOMMARGIN, 68
+ BOTTOMMARGIN, 56
END
IDD_GLOBAL_SETTINGS, DIALOG
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/document.cpp 2010-05-13 22:06:53 UTC (rev 776)
@@ -261,24 +261,17 @@
case ST_BMSC_MESSAGE_FOUND:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("NAME");
- //DODELAT!!
- {
- bool bEnumNewMsg = false;
- int temp;
- std::wstring tempString;
-
- Visio::IVShapePtr closestShape = CEnumerateUtils::getClosestMessage(m_vsoApp,vsoShape);
- if(closestShape)
- {
- _bstr_t groupID = closestShape->Data3;
- CEnumerateUtils::loadGroupSettings(m_vsoApp,groupID,temp,temp,bEnumNewMsg,tempString);
-
- if(bEnumNewMsg)
- enumerate(m_vsoApp,groupID,true,true);
- else
- enumerate(m_vsoApp,groupID,false,true);
- }
- }
+
+ //Message numbering
+ // if(m_vsoApp->ActivePage->PageSheet->GetCellExists(_T("User.AutoEnum1"),0))
+ //autoEnumerate(vsoShape);
+ // else if(m_vsoApp->ActivePage->PageSheet->GetCellExists(_T("User.AutoEnum2"),0))
+ // {
+
+ // }
+ if((_tcsicmp(vsoShape->Data3,_T("")) != 0) && (_tcsicmp(vsoShape->Data1,_T("")) != 0))
+ enumerate(m_vsoApp,vsoShape->Data3,false,true);
+
break;
case ST_COMMENT:
@@ -1380,10 +1373,9 @@
{
static int startingIndex = 1;
static int numberingType = 0;
- static bool enumerateNew = false;
static BSTR add = _T(". ");
- CEnumerationDlg options(startingIndex,numberingType, enumerateNew, add);
+ CEnumerationDlg options(startingIndex,numberingType, add);
if(options.DoModal() != IDOK)
return VAORC_FAILURE;
@@ -1393,10 +1385,9 @@
startingIndex = options.getStartingIndex();
numberingType = options.getNumberingType();
- enumerateNew = options.getEnumerateNew();
add = options.getAddition();
- CEnumerateUtils::saveGroupSettings(vsoApp,groupID,startingIndex,numberingType,enumerateNew,add);
+ CEnumerateUtils::saveGroupSettings(vsoApp,groupID,startingIndex,numberingType,add);
if (vsoApp->ActiveWindow->Selection->Count)
{
@@ -1463,6 +1454,33 @@
return VAORC_SUCCESS;
}
+void CDocumentMonitor::autoEnumerate(Visio::IVShapePtr msgShape)
+{
+ Visio::IVShapePtr pageSheet = msgShape->Application->ActivePage->PageSheet;
+ Visio::IVShapePtr closestMsg;
+
+ int autoEnum1 = pageSheet->Cells["User.AutoEnum1"]->ResultInt[visNone][visTruncate];
+
+ switch(autoEnum1)
+ {
+ case 0:
+ closestMsg = CEnumerateUtils::getClosestMessage(msgShape->Application,msgShape,false);
+ if(closestMsg)
+ if(_tcsicmp(closestMsg->Data3,_T("")) != 0)
+ enumerate(msgShape->Application,closestMsg->Data3,true,true);
+ break;
+ case 1:
+ closestMsg = CEnumerateUtils::getClosestMessage(msgShape->Application,msgShape,true);
+ if(closestMsg)
+ enumerate(msgShape->Application,closestMsg->Data3,true,true);
+ break;
+
+ default:
+ enumerate(msgShape->Application,msgShape->Data3,false,true);
+ break;
+ }
+}
+
VAORC CDocumentMonitor::OnMenuSelectNumberedGroup(Visio::IVApplicationPtr vsoApp)
{
CEnumerateUtils::selectGroup(vsoApp,vsoApp->ActiveWindow->Selection->Item[1]->Data3);
@@ -1520,8 +1538,6 @@
Visio::IVSelectionPtr selection = vsoApp->ActiveWindow->Selection;
std::set<_bstr_t> formerGroups;
- /*DWORD start = GetTickCount();*/
-
if(onlySelected)
{
onlySelected = false;
@@ -1558,11 +1574,6 @@
if(formerGroups.size())
for(std::set<_bstr_t>::iterator it = formerGroups.begin(); it != formerGroups.end(); it++)
drawNumbers(shapesOnPage,*it);
-
- //Debug
- //DWORD diff = GetTickCount() - start;
- //std::wstring rozdil = stringize() << std::setprecision(5) << diff/1000.0;
- //MessageBox(GetActiveWindow(),rozdil.c_str(),_T(""),MB_OK);
}
void CDocumentMonitor::drawNumbers(Visio::IVShapesPtr shapesOnPage, _bstr_t groupID)
@@ -1573,9 +1584,8 @@
//Default values
int index = 1;
int enumerationType = 0;
- bool enumNewMsg = false;
std::wstring addition = _T(". ");
- CEnumerateUtils::loadGroupSettings(shapesOnPage->Application,groupID,index,enumerationType,enumNewMsg,addition);
+ CEnumerateUtils::loadGroupSettings(shapesOnPage->Application,groupID,index,enumerationType,addition);
//for all message shapes check whether they are checked as numbered (Data1 == 1)
for(int i=1; i<=shapesOnPage->Count; i++)
@@ -1620,8 +1630,9 @@
VAORC CDocumentMonitor::OnMenuGlobalSettings(Visio::IVApplicationPtr vsoApp)
{
CGlobalSettingsDlg dlg;
+ if(dlg.DoModal() != IDOK)
+ return VAORC_FAILURE;
- dlg.DoModal();
return VAORC_SUCCESS;
}
Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/document.h 2010-05-13 22:06:53 UTC (rev 776)
@@ -320,7 +320,8 @@
void ToogleNumeration(bool enabled);
private:
- void enumerate(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, bool enable, bool onlySelected);
+ void autoEnumerate(Visio::IVShapePtr msgShape);
+ void enumerate(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, bool enable, bool onlySelected);
bool temporaryDisableEnumeration(Visio::IVApplicationPtr vsoApp);
void restoreDisabledEnumeration(Visio::IVApplicationPtr vsoApp, bool UndoEnumNewMsg);
Modified: trunk/src/view/visio/addon/enumerateUtils.cpp
===================================================================
--- trunk/src/view/visio/addon/enumerateUtils.cpp 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/enumerateUtils.cpp 2010-05-13 22:06:53 UTC (rev 776)
@@ -107,7 +107,7 @@
}
}
-bool CEnumerateUtils::loadGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int& startIndex, int& numberingType, bool& enumNewMsg, std::wstring& addition)
+bool CEnumerateUtils::loadGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int& startIndex, int& numberingType, std::wstring& addition)
{
Visio::IVShapePtr page = vsoApp->ActivePage->PageSheet;
if(!page->SectionExists[visSectionUser][0])
@@ -120,7 +120,7 @@
std::wstringstream ss(std::wstringstream::in | std::stringstream::out);
ss << groupCell->ResultStr[visNone];
- ss >> startIndex >> numberingType >> enumNewMsg >> addition;
+ ss >> startIndex >> numberingType >> addition;
//Get spaces in addition back
for(int i=0; i<addition.size(); i++)
@@ -132,7 +132,7 @@
return true;
}
-bool CEnumerateUtils::saveGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int startIndex, int numberingType, bool enumNewMsg, BSTR addition)
+bool CEnumerateUtils::saveGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int startIndex, int numberingType, BSTR addition)
{
Visio::IVShapePtr page = vsoApp->ActivePage->PageSheet;
@@ -157,7 +157,6 @@
groupCell->FormulaU = stringize() << _T("=\"") << startIndex << _T(" ")
<< numberingType << _T(" ")
- << enumNewMsg << _T(" ")
<< additionTemp << _T("\"");
return true;
}
@@ -177,7 +176,7 @@
vsoApp->ActiveWindow->Selection = selection;
}
-Visio::IVShapePtr CEnumerateUtils::getClosestMessage(Visio::IVApplicationPtr vsoApp, const Visio::IVShapePtr shapePtr)
+Visio::IVShapePtr CEnumerateUtils::getClosestMessage(Visio::IVApplicationPtr vsoApp, const Visio::IVShapePtr shapePtr, bool onlyNumbered)
{
Visio::IVShapesPtr shapes = vsoApp->ActivePage->Shapes;
std::map<double, Visio::IVShapePtr> messages;
@@ -189,7 +188,10 @@
{
Visio::IVShapePtr shape = shapes->Item[i];
- if(_tcsicmp(shape->Data1,_T("1")) == 0)
+ if(shape == shapePtr)
+ continue;
+
+ if(_tcsicmp(shape->Data1,_T("1")) == 0 || !onlyNumbered)
{
double tempX = shape->Cells["PinX"]->ResultIU;
double tempY = shape->Cells["PinY"]->ResultIU;
Modified: trunk/src/view/visio/addon/enumerateUtils.h
===================================================================
--- trunk/src/view/visio/addon/enumerateUtils.h 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/enumerateUtils.h 2010-05-13 22:06:53 UTC (rev 776)
@@ -41,10 +41,10 @@
* @return whether first shape is "smaller" then the second one
*/
static bool messageCompare(Visio::IVShapePtr p1, Visio::IVShapePtr p2);
- static bool loadGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int& startIndex, int& numberingType, bool& enumNewMsg, std::wstring& addition);
- static bool saveGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int startIndex, int numberingType, bool enumNewMsg, BSTR addition);
+ static bool loadGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int& startIndex, int& numberingType, std::wstring& addition);
+ static bool saveGroupSettings(Visio::IVApplicationPtr vsoApp, _bstr_t groupID, int startIndex, int numberingType, BSTR addition);
static void selectGroup(Visio::IVApplicationPtr vsoApp, _bstr_t groupID);
- static Visio::IVShapePtr getClosestMessage(Visio::IVApplicationPtr vsoApp, const Visio::IVShapePtr shapePtr);
+ static Visio::IVShapePtr getClosestMessage(Visio::IVApplicationPtr vsoApp, const Visio::IVShapePtr shapePtr, bool onlyNumbered);
static int getGroupCount(Visio::IVApplicationPtr vsoApp);
static void setGroupCount(Visio::IVApplicationPtr vsoApp, int count);
static VAORC disableEnumeration(Visio::IVShapePtr shape);
Modified: trunk/src/view/visio/addon/enumerationDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/enumerationDlg.cpp 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/enumerationDlg.cpp 2010-05-13 22:06:53 UTC (rev 776)
@@ -19,11 +19,10 @@
#include "dllmodule.h"
#include "enumerationDlg.h"
-CEnumerationDlg::CEnumerationDlg(int startIndex, int enumType, bool enumNew, BSTR addition)
+CEnumerationDlg::CEnumerationDlg(int startIndex, int enumType, BSTR addition)
{
this->index = startIndex;
this->numberingType = enumType;
- this->bEnumerateNew = enumNew;
this->addition = addition;
}
@@ -60,7 +59,6 @@
m_numbering.InsertString(3,_T("A, B, C,..."));
m_numbering.SetCurSel(this->numberingType);
- m_enumerateNew.SetCheck((int)this->bEnumerateNew);
m_addition.SetWindowText(addition);
m_addition.SetLimitText(4);
@@ -74,7 +72,6 @@
int CEnumerationDlg::SaveRegistryData()
{
numberingType = m_numbering.GetCurSel();
- bEnumerateNew = (bool)m_enumerateNew.GetCheck();
addition = 0;
m_addition.GetWindowText(addition);
Modified: trunk/src/view/visio/addon/enumerationDlg.h
===================================================================
--- trunk/src/view/visio/addon/enumerationDlg.h 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/enumerationDlg.h 2010-05-13 22:06:53 UTC (rev 776)
@@ -28,7 +28,7 @@
: public ATL::CDialogImpl<CEnumerationDlg>, public CWinDataExchange<CEnumerationDlg>
{
public:
- CEnumerationDlg(int startIndex, int enumType, bool enumNew, BSTR addition);
+ CEnumerationDlg(int startIndex, int enumType, BSTR addition);
enum { IDD = IDD_ENUMERATION_OPTIONS };
enum NumberingType
{
@@ -41,14 +41,12 @@
CComboBox m_numbering;
CEdit m_addition;
CEdit m_index;
- CButton m_enumerateNew;
protected:
BEGIN_DDX_MAP(CEnumerationDlg)
DDX_CONTROL_HANDLE(IDC_COMBO_NUMBERING, m_numbering);
DDX_CONTROL_HANDLE(IDC_ADDITION, m_addition);
DDX_CONTROL_HANDLE(IDC_STARTING_INDEX, m_index);
- DDX_CONTROL_HANDLE(IDC_CHECK_ENUMERATE_NEW, m_enumerateNew);
END_DDX_MAP()
BEGIN_MSG_MAP(CEnumerationDlg)
@@ -67,12 +65,10 @@
int numberingType;
BSTR addition;
- bool bEnumerateNew;
int index;
public:
int getNumberingType() { return numberingType; }
BSTR getAddition() { return addition; }
int getStartingIndex() { return index; }
- bool getEnumerateNew() { return bEnumerateNew; }
};
Modified: trunk/src/view/visio/addon/numberingGlobalDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/numberingGlobalDlg.cpp 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/numberingGlobalDlg.cpp 2010-05-13 22:06:53 UTC (rev 776)
@@ -46,12 +46,49 @@
int CNumberingGlobalDlg::LoadRegistryData()
{
+ if(!m_enumCheck.GetCheck())
+ EnableControls(false);
+
+ m_numberingTypeCombo.InsertString(0,_T("1, 2, 3,..."));
+ m_numberingTypeCombo.InsertString(1,_T("I, II, III,..."));
+ m_numberingTypeCombo.InsertString(2,_T("a, b, c,..."));
+ m_numberingTypeCombo.InsertString(3,_T("A, B, C,..."));
+ m_numberingTypeCombo.SetCurSel(0); //Change to loaded settings
- return 0;
+ m_addition.SetWindowText(_T(". "));
+ m_index.SetWindowText(_T("1"));
+
+ m_nearestMsg.SetCheck(1);
+ m_dontNumber.SetCheck(1);
+
+ return 0;
}
int CNumberingGlobalDlg::SaveRegistryData()
{
+ if(getAutoEnumEnabled() == 1)
+ {
+ SetRegistry<int>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("AutoEnum1"), getAutoEnum1Type());
+ SetRegistry<int>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("AutoEnum2"), getAutoEnum2Type());
+ }
return 0;
}
+
+void CNumberingGlobalDlg::EnableControls(bool bEnable)
+{
+ m_nearestMsg.EnableWindow(bEnable);
+ m_nearestNumberedMsg.EnableWindow(bEnable);
+ m_dontNumber.EnableWindow(bEnable);
+ m_useNumberingStyle.EnableWindow(bEnable);
+ m_numberingTypeCombo.EnableWindow(bEnable);
+ m_addition.EnableWindow(bEnable);
+ m_index.EnableWindow(bEnable);
+}
+
+LRESULT CNumberingGlobalDlg::OnBnClickedEnumCheck(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+ EnableControls(m_enumCheck.GetCheck());
+
+ return 0;
+}
Modified: trunk/src/view/visio/addon/numberingGlobalDlg.h
===================================================================
--- trunk/src/view/visio/addon/numberingGlobalDlg.h 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/numberingGlobalDlg.h 2010-05-13 22:06:53 UTC (rev 776)
@@ -23,26 +23,40 @@
#include <string>
#include <sstream>
#include "data/msc.h"
+#include "enumerateUtils.h"
class CNumberingGlobalDlg
: public ATL::CDialogImpl<CNumberingGlobalDlg>, public CWinDataExchange<CNumberingGlobalDlg>
{
public:
- //CNumberingGlobalDlg(int startIndex, int enumType, bool enumNew, BSTR addition);
enum { IDD = IDD_NUMBERING_GLOBAL };
+ CButton m_enumCheck;
+ CButton m_nearestMsg;
+ CButton m_nearestNumberedMsg;
+ CButton m_dontNumber;
+ CButton m_useNumberingStyle;
+ CComboBox m_numberingTypeCombo;
+ CEdit m_addition;
+ CEdit m_index;
+
protected:
BEGIN_DDX_MAP(CNumberingGlobalDlg)
- //DDX_CONTROL_HANDLE(IDC_COMBO_NUMBERING, m_numbering);
- //DDX_CONTROL_HANDLE(IDC_ADDITION, m_addition);
- //DDX_CONTROL_HANDLE(IDC_STARTING_INDEX, m_index);
- //DDX_CONTROL_HANDLE(IDC_CHECK_ENUMERATE_NEW, m_enumerateNew);
+ DDX_CONTROL_HANDLE(IDC_ENUM_CHECK, m_enumCheck);
+ DDX_CONTROL_HANDLE(IDC_NEAREST_MSG, m_nearestMsg);
+ DDX_CONTROL_HANDLE(IDC_NEAREST_NUMBERED_MSG, m_nearestNumberedMsg);
+ DDX_CONTROL_HANDLE(IDC_DONT_NUMBER, m_dontNumber);
+ DDX_CONTROL_HANDLE(IDC_USE_NUMBERING_STYLE, m_useNumberingStyle);
+ DDX_CONTROL_HANDLE(IDC_COMBO_NUMBERING_GLOBAL, m_numberingTypeCombo);
+ DDX_CONTROL_HANDLE(IDC_ADDITION_GLOBAL, m_addition);
+ DDX_CONTROL_HANDLE(IDC_STARTING_INDEX_GLOBAL, m_index);
END_DDX_MAP()
BEGIN_MSG_MAP(CNumberingGlobalDlg)
MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
COMMAND_ID_HANDLER(IDOK, OnCloseCmd)
COMMAND_ID_HANDLER(IDCANCEL, OnCloseCmd)
+ COMMAND_HANDLER(IDC_ENUM_CHECK, BN_CLICKED, OnBnClickedEnumCheck)
END_MSG_MAP()
// Handler prototypes:
@@ -52,7 +66,15 @@
int LoadRegistryData();
int SaveRegistryData();
+ void EnableControls(bool bEnable = true);
+ const wchar_t* GetRegistryFolder() { return SCSTUDIO_REGISTRY_ROOT _T("\\MessageNumbering"); }
+
public:
+ int getAutoEnumEnabled() { return m_enumCheck.GetCheck(); };
+ int getAutoEnum1Type() { return ((m_nearestMsg.GetCheck() == 0) ? 1 : 0); };
+ int getAutoEnum2Type() { return ((m_dontNumber.GetCheck() == 0) ? 1 : 0); };
+
+ LRESULT OnBnClickedEnumCheck(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
};
Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h 2010-05-13 18:38:46 UTC (rev 775)
+++ trunk/src/view/visio/addon/resource.h 2010-05-13 22:06:53 UTC (rev 776)
@@ -59,6 +59,7 @@
#define IDC_RADIO2 243
#define IDC_SPACING_RDO 243
#define IDC_MS_DIR_RIGHT 243
+#define IDC_DONT_NUMBER 243
#define IDC_IF_TOTAL_WIDTH 244
#define IDC_DEFAULT_BTN 245
#define IDC_MS_DIR_LEFT 251
@@ -83,19 +84,24 @@
#define IDC_MS_COREGION_ERROR 263
#define IDC_MS_COREGION_CONTINUE 264
#define IDC_RADIO1 264
+#define IDC_NEAREST_MSG 264
#define IDC_MS_COREGION_ORDER 265
#define IDC_TAB2 265
#define IDC_TAB_SETTINGS 265
#define IDC_RADIO3 265
+#define IDC_NEAREST_NUMBERED_MSG 265
#define IDC_IF_UNITS2 267
#define IDC_IF_UNITS3 268
#define IDC_MS_CONNECT_WITH_LINE 268
#define IDC_IF_UNITS4 269
#define IDC_MS_CONNECT_WITH_SIDE_SIDE 269
#define IDC_CHECK2 271
+#define IDC_ENUM_CHECK 271
#define IDC_RADIO4 273
+#define IDC_USE_NUMBERING_STYLE 273
#define IDC_COMBO_NUMBERING_GLOBAL 276
#define IDC_ADDITION_GLOBAL 277
+#define IDC_STARTING_INDEX_GLOBAL 278
// Next default values for new objects
//
@@ -103,7 +109,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 226
#define _APS_NEXT_COMMAND_VALUE 32768
-#define _APS_NEXT_CONTROL_VALUE 278
+#define _APS_NEXT_CONTROL_VALUE 279
#define _APS_NEXT_SYMED_VALUE 105
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
