From: Leon W. <moo...@us...> - 2005-11-01 19:42:10
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10402 Modified Files: AnyEdit.rc GeneralPref.cpp GeneralPref.h resource.h Log Message: Add Smart Insert, Tab and Tag settings to the General Preferences Dialog. Index: GeneralPref.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** GeneralPref.h 12 Oct 2005 18:55:57 -0000 1.13 --- GeneralPref.h 1 Nov 2005 19:41:57 -0000 1.14 *************** *** 61,64 **** --- 61,67 ---- BOOL m_bSyncFileTab; BOOL m_bSelectCopy; + BOOL m_bSmartInsert; + BOOL m_bSmartTab; + BOOL m_bSmartTag; //}}AFX_DATA Index: resource.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** resource.h 16 Oct 2005 12:30:05 -0000 1.76 --- resource.h 1 Nov 2005 19:41:58 -0000 1.77 *************** *** 385,388 **** --- 385,391 ---- #define IDC_EDIT_FILENAME 1267 #define IDC_TOUCH 1268 + #define IDC_CHECK_SMARTINSERT 1269 + #define IDC_CHECK_SMARTTAB 1270 + #define IDC_CHECK_SMARTTAG 1271 #define ID_AE_REFRESH_STARTUPPAGE 1340 #define IDD_EDIT_FILE_PROPPAGE1 8410 *************** *** 714,718 **** #define _APS_NEXT_RESOURCE_VALUE 114 #define _APS_NEXT_COMMAND_VALUE 33060 ! #define _APS_NEXT_CONTROL_VALUE 1269 #define _APS_NEXT_SYMED_VALUE 1341 #endif --- 717,721 ---- #define _APS_NEXT_RESOURCE_VALUE 114 #define _APS_NEXT_COMMAND_VALUE 33060 ! #define _APS_NEXT_CONTROL_VALUE 1271 #define _APS_NEXT_SYMED_VALUE 1341 #endif Index: GeneralPref.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/GeneralPref.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GeneralPref.cpp 3 Dec 2004 06:46:12 -0000 1.14 --- GeneralPref.cpp 1 Nov 2005 19:41:57 -0000 1.15 *************** *** 58,61 **** --- 58,64 ---- m_bSyncFileTab = FALSE; m_bSelectCopy = FALSE; + m_bSmartInsert = FALSE; + m_bSmartTab = FALSE; + m_bSmartTag = FALSE; //}}AFX_DATA_INIT *************** *** 80,83 **** --- 83,89 ---- DDX_Check(pDX, IDC_CHECK_SYNCFILETAB, m_bSyncFileTab); DDX_Check(pDX, IDC_CHECK_SELCOPY, m_bSelectCopy); + DDX_Check(pDX, IDC_CHECK_SMARTINSERT, m_bSmartInsert); + DDX_Check(pDX, IDC_CHECK_SMARTTAB, m_bSmartTab); + DDX_Check(pDX, IDC_CHECK_SMARTTAG, m_bSmartTag); //}}AFX_DATA_MAP } *************** *** 101,104 **** --- 107,113 ---- ON_BN_CLICKED(IDC_CHECK_SYNCFILETAB, OnControlChanged) ON_BN_CLICKED(IDC_CHECK_SELCOPY, OnControlChanged) + ON_BN_CLICKED(IDC_CHECK_SMARTINSERT, OnControlChanged) + ON_BN_CLICKED(IDC_CHECK_SMARTTAB, OnControlChanged) + ON_BN_CLICKED(IDC_CHECK_SMARTTAG, OnControlChanged) //}}AFX_MSG_MAP END_MESSAGE_MAP() *************** *** 129,132 **** --- 138,144 ---- m_iTabbedDocSelector = pConfigFile->GetTabbedDocumentSelector(); m_bSyncFileTab = pConfigFile->GetSynchronizedFileTab(); + m_bSmartInsert = pConfigFile->GetSmartInsert(); + m_bSmartTab = pConfigFile->GetSmartTab(); + m_bSmartTag = pConfigFile->GetSmartTag(); // Update the dialog *************** *** 213,216 **** --- 225,243 ---- } + if( m_bSmartInsert != ( pConfigFile->GetSmartInsert() ? TRUE : FALSE ) ) + { + pConfigFile->SetSmartInsert( m_bSmartInsert ? true : false ); + } + + if( m_bSmartTab != ( pConfigFile->GetSmartTab() ? TRUE : FALSE ) ) + { + pConfigFile->SetSmartTab( m_bSmartTab ? true : false ); + } + + if( m_bSmartTag != ( pConfigFile->GetSmartTag() ? TRUE : FALSE ) ) + { + pConfigFile->SetSmartTag( m_bSmartTag ? true : false ); + } + return TRUE; } Index: AnyEdit.rc =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** AnyEdit.rc 16 Oct 2005 12:30:05 -0000 1.121 --- AnyEdit.rc 1 Nov 2005 19:41:57 -0000 1.122 *************** *** 14,18 **** ///////////////////////////////////////////////////////////////////////////// ! // Englisch (USA) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) --- 14,18 ---- ///////////////////////////////////////////////////////////////////////////// ! // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) *************** *** 1507,1511 **** CONTROL "Allow Multiple Instances",IDC_CHECK_MULTIPLEINSTANCES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,16,91,10 ! GROUPBOX "Tabbed Document Selector",IDC_STATIC,162,73,117,46 CONTROL "Open Last Workspace",IDC_CHECK_OPENLASTWS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,12,71,87,10 --- 1507,1511 ---- CONTROL "Allow Multiple Instances",IDC_CHECK_MULTIPLEINSTANCES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,16,91,10 ! GROUPBOX "Tabbed Document Selector",IDC_STATIC,7,123,146,46 CONTROL "Open Last Workspace",IDC_CHECK_OPENLASTWS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,12,71,87,10 *************** *** 1519,1527 **** BS_AUTOCHECKBOX | WS_TABSTOP,12,16,62,10 CONTROL "None",IDC_RADIO_DOCTABNONE,"Button",BS_AUTORADIOBUTTON | ! WS_GROUP,168,104,33,10 CONTROL "Bottom",IDC_RADIO_DOCTAB_BOTTOM,"Button", ! BS_AUTORADIOBUTTON,168,94,38,10 CONTROL "Top",IDC_RADIO_DOCTAB_TOP,"Button",BS_AUTORADIOBUTTON, ! 168,84,29,10 CONTROL "Maximize Documents",IDC_CHECK_MAXIMIZEDOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,12,38,83,10 --- 1519,1527 ---- BS_AUTOCHECKBOX | WS_TABSTOP,12,16,62,10 CONTROL "None",IDC_RADIO_DOCTABNONE,"Button",BS_AUTORADIOBUTTON | ! WS_GROUP,13,154,33,10 CONTROL "Bottom",IDC_RADIO_DOCTAB_BOTTOM,"Button", ! BS_AUTORADIOBUTTON,13,144,38,10 CONTROL "Top",IDC_RADIO_DOCTAB_TOP,"Button",BS_AUTORADIOBUTTON, ! 13,134,29,10 CONTROL "Maximize Documents",IDC_CHECK_MAXIMIZEDOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,12,38,83,10 *************** *** 1529,1537 **** GROUPBOX "On Exit",IDC_STATIC,7,89,146,28 GROUPBOX "Editor",IDC_STATIC,162,6,117,52 ! GROUPBOX "Workspace Bar",IDC_STATIC,162,124,117,27 CONTROL "Synchronized File Tab",IDC_CHECK_SYNCFILETAB,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,167,135,86,10 CONTROL "Copy On Mouse Selection",IDC_CHECK_SELCOPY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,167,46,106,10 END --- 1529,1544 ---- GROUPBOX "On Exit",IDC_STATIC,7,89,146,28 GROUPBOX "Editor",IDC_STATIC,162,6,117,52 ! GROUPBOX "Workspace Bar",IDC_STATIC,162,65,117,27 CONTROL "Synchronized File Tab",IDC_CHECK_SYNCFILETAB,"Button", ! BS_AUTOCHECKBOX | WS_TABSTOP,167,76,86,10 CONTROL "Copy On Mouse Selection",IDC_CHECK_SELCOPY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,167,46,106,10 + GROUPBOX "Smart Editing",IDC_STATIC,162,98,117,45 + CONTROL "Smart Insert",IDC_CHECK_SMARTINSERT,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,167,108,53,10 + CONTROL "Smart Tab",IDC_CHECK_SMARTTAB,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,167,119,49,10 + CONTROL "Smart Tag",IDC_CHECK_SMARTTAG,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,167,129,49,10 END *************** *** 3318,3322 **** END ! #endif // Englisch (USA) resources ///////////////////////////////////////////////////////////////////////////// --- 3325,3329 ---- END ! #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// |