Skip to content

Commit f5ddbf2

Browse files
adaptitbruceadaptitbruce
committed
Made a wxDesigner change to last dialog in dialogs list - to help with kbserver issues, made a change to ParseWord() in doc.cpp to fix and error where m_key was getting parentheses doubled, e.g. ((1:1-13)) instead of correct value 1:1-13
1 parent 5a72e9e commit f5ddbf2

8 files changed

+914
-179
lines changed

‎source/Adapt_It.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32087,7 +32087,7 @@ wxString CAdapt_ItApp::GetDistFolder()
3208732087
//#endif
3208832088

3208932089
// BEW added 22Jan24
32090-
bool CAdapt_ItApp::GrantPermissionsFile_Create(wxString& newUser, wxString& newFullname, wxString& newPwd)
32090+
bool CAdapt_ItApp::CreatNewUserGrantPermissionsAndFlush(wxString& newUser, wxString& newFullname, wxString& newPwd)
3209132091
{
3209232092
// sanity checks go here, which include (a) a kbserver is running, (b) it's host is known (need ipAddr),
3209332093
// (c) newUser, newFullname and newPwd strings are all nonempty in the caller

‎source/Adapt_It.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3140,7 +3140,7 @@ class CAdapt_ItApp : public wxApp
31403140
wxString m_rootPassword_Archived;
31413141
// BEW 22Jan24 added strings for granting permissions in context of kbserver for a foreign new user
31423142
wxString m_foreignUserPermissionsFilename; // set it to _T("PermissionsUserFullnamePwd") at end of OnInit()
3143-
bool GrantPermissionsFile_Create(wxString& newUser, wxString& newFullname, wxString& newPwd); // BEW added 22Jan24
3143+
bool CreatNewUserGrantPermissionsAndFlush(wxString& newUser, wxString& newFullname, wxString& newPwd); // BEW added 22Jan24
31443144

31453145

31463146
// When a new user is added to the user table, successfully, make the new username, fullname, password

‎source/Adapt_It.wdr

2.03 KB
Binary file not shown.

‎source/Adapt_ItDoc.cpp

+726-20
Large diffs are not rendered by default.

‎source/Adapt_ItView.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -16699,9 +16699,10 @@ void CAdapt_ItView::MakeTargetStringIncludingPunctuation(CSourcePhrase *pSrcPhra
1669916699
{
1670016700
wxLogDebug(_T("MakeTgtStrIncPunc() line %d: sn= %d, str= [%s], pSrcPhrase->m_key = [%s] , , pSrcPhrase->m_targetStr = [%s] , input targetStr= %s"),
1670116701
__LINE__, pSrcPhrase->m_nSequNumber, str.c_str(), pSrcPhrase->m_key.c_str(), pSrcPhrase->m_targetStr.c_str(), targetStr.c_str());
16702-
if (pSrcPhrase->m_nSequNumber >= 1)
16702+
if (pSrcPhrase->m_nSequNumber >= 17)
1670316703
{
1670416704

16705+
1670516706
int halt_here = 1; wxUnusedVar(halt_here);
1670616707
}
1670716708
}

‎source/Adapt_It_wdr.cpp

+30-10
Original file line numberDiff line numberDiff line change
@@ -9838,7 +9838,7 @@ wxSizer *NewUserCredentialsFunc( wxWindow *parent, bool call_fit, bool set_sizer
98389838

98399839
wxBoxSizer *item1 = new wxBoxSizer( wxVERTICAL );
98409840

9841-
wxTextCtrl *item2 = new wxTextCtrl( parent, ID_TEXTCTRL_USER_INFO, _("You are adding a new user to the KBserver database. Here you need to type in the following information: 1. username 2. fullname 3. username's password. You also need to tick the checkbox if the new user is permitted to add more users. If permission is not granted, the new user can use the KBserver, but not add more users. "), wxDefaultPosition, wxSize(480,80), wxTE_MULTILINE|wxTE_READONLY );
9841+
wxTextCtrl *item2 = new wxTextCtrl( parent, ID_TEXTCTRL_USER_INFO, _("Adding a new user to the KBserver database. Type in the following: 1. a username 2. a fullname 3. a password. If the new user is permitted to add more users, click the checkbox Permit Adding More Users. If you want the new user to have the authority to control all KBserver actions, click the checkbox Create User With All Permissions. You can tick both checkboxes, or one, or none. "), wxDefaultPosition, wxSize(480,80), wxTE_MULTILINE|wxTE_READONLY );
98429842
item1->Add( item2, 0, wxGROW|wxALL, 5 );
98439843

98449844
item1->Add( 20, 10, 0, wxALIGN_CENTER, 5 );
@@ -9877,18 +9877,38 @@ wxSizer *NewUserCredentialsFunc( wxWindow *parent, bool call_fit, bool set_sizer
98779877
wxTextCtrl *item11 = new wxTextCtrl( parent, ID_TEXTCTRL_NEW_USERS_PWD, wxT(""), wxDefaultPosition, wxSize(250,-1), 0 );
98789878
item9->Add( item11, 0, wxALIGN_CENTER|wxALL, 5 );
98799879

9880+
wxBoxSizer *item12 = new wxBoxSizer( wxHORIZONTAL );
9881+
9882+
item9->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
9883+
98809884
item1->Add( item9, 0, wxRIGHT|wxTOP|wxBOTTOM, 5 );
98819885

9882-
wxCheckBox *item12 = new wxCheckBox( parent, ID_CHECKBOX_GRANT_PERMISSION, _("Grant Permission"), wxDefaultPosition, wxDefaultSize, 0 );
9883-
item1->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
9886+
wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
9887+
9888+
item13->Add( 8, 20, 0, wxALIGN_CENTER|wxALL, 5 );
98849889

9885-
wxStdDialogButtonSizer *item13 = new wxStdDialogButtonSizer;
9886-
{ wxButton *button = new wxButton( parent, wxID_OK );
9887-
button->SetDefault();
9888-
item13->AddButton( button ); }
9889-
item13->AddButton( new wxButton( parent, wxID_CANCEL ) );
9890-
item13->Realize();
9891-
item1->Add( item13, 0, wxGROW|wxALL, 5 );
9890+
wxCheckBox *item14 = new wxCheckBox( parent, ID_CHECKBOX_ALL_PERMISSIONS, _("Create User With All Permissions"), wxDefaultPosition, wxDefaultSize, 0 );
9891+
item14->SetToolTip( _("Create new use, grant all permissions, lodge in Manager's user list") );
9892+
item13->Add( item14, 0, wxALIGN_CENTER|wxALL, 5 );
9893+
9894+
item13->Add( 22, 20, 0, wxALIGN_CENTER|wxALL, 5 );
9895+
9896+
wxCheckBox *item15 = new wxCheckBox( parent, ID_CHECKBOX_GRANT_PERMISSION, _("Permit Adding More Users"), wxDefaultPosition, wxDefaultSize, 0 );
9897+
item13->Add( item15, 0, wxALIGN_CENTER|wxALL, 5 );
9898+
9899+
item13->Add( 18, 20, 0, wxALIGN_CENTER|wxALL, 5 );
9900+
9901+
wxButton *item16 = new wxButton( parent, wxID_OK, _("OK"), wxDefaultPosition, wxSize(60,-1), 0 );
9902+
item16->SetDefault();
9903+
item13->Add( item16, 0, wxALIGN_CENTER|wxALL, 5 );
9904+
9905+
item13->Add( 8, 20, 0, wxALIGN_CENTER|wxALL, 5 );
9906+
9907+
wxButton *item17 = new wxButton( parent, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(60,-1), 0 );
9908+
item17->SetToolTip( _("Do not create a new user with all permissions") );
9909+
item13->Add( item17, 0, wxALIGN_CENTER|wxALL, 5 );
9910+
9911+
item1->Add( item13, 0, wxALIGN_CENTER|wxALL, 5 );
98929912

98939913
item0->Add( item1, 0, wxALL, 5 );
98949914

‎source/Adapt_It_wdr.h

+140-139
Original file line numberDiff line numberDiff line change
@@ -1197,144 +1197,145 @@ const int ID_TEXT_NEW_FULLNAME = 10912;
11971197
const int ID_TEXTCTRL_NEW_FULLNAME = 10913;
11981198
const int ID_TEXT_USERS_PASSWORD = 10914;
11991199
const int ID_TEXTCTRL_NEW_USERS_PWD = 10915;
1200-
const int ID_CHECKBOX_GRANT_PERMISSION = 10916;
1200+
const int ID_CHECKBOX_ALL_PERMISSIONS = 10916;
1201+
const int ID_CHECKBOX_GRANT_PERMISSION = 10917;
12011202
wxSizer *NewUserCredentialsFunc( wxWindow *parent, bool call_fit = true, bool set_sizer = true );
12021203

12031204
// Declare menubar functions
12041205

1205-
const int ID_FILE_MENU = 10917;
1206-
const int ID_SAVE_AS = 10918;
1207-
const int ID_FILE_SAVE_COMMIT = 10919;
1208-
const int ID_FILE_PACK_DOC = 10920;
1209-
const int ID_FILE_UNPACK_DOC = 10921;
1210-
const int ID_MENU = 10922;
1211-
const int ID_FILE_STARTUP_WIZARD = 10923;
1212-
const int ID_FILE_CLOSEKB = 10924;
1213-
const int ID_FILE_CHANGEFOLDER = 10925;
1214-
const int ID_FILE_SAVEKB = 10926;
1215-
const int ID_FILE_BACKUP_KB = 10927;
1216-
const int ID_FILE_RESTORE_KB = 10928;
1217-
const int ID_FILE_REVERT_FILE = 10929;
1218-
const int ID_FILE_LIST_VERSIONS = 10930;
1219-
const int ID_FILE_TAKE_OWNERSHIP = 10931;
1220-
const int ID_EDIT_MENU = 10932;
1221-
const int ID_EDIT_CUT = 10933;
1222-
const int ID_EDIT_COPY = 10934;
1223-
const int ID_EDIT_PASTE = 10935;
1224-
const int ID_GO_TO = 10936;
1225-
const int ID_EDIT_SOURCE_TEXT = 10937;
1226-
const int ID_EDIT_CONSISTENCY_CHECK = 10938;
1227-
const int ID_MENU_CHANGE_USERNAME = 10939;
1228-
const int ID_EDITMENU_CHANGE_PUNCTS_MKRS_PLACE = 10940;
1229-
const int ID_EDIT_MOVE_NOTE_FORWARD = 10941;
1230-
const int ID_EDIT_MOVE_NOTE_BACKWARD = 10942;
1231-
const int ID_VIEW_MENU = 10943;
1232-
const int ID_VIEW_TOOLBAR = 10944;
1233-
const int ID_VIEW_STATUS_BAR = 10945;
1234-
const int ID_VIEW_COMPOSE_BAR = 10946;
1235-
const int ID_VIEW_MODE_BAR = 10947;
1236-
const int ID_COPY_SOURCE = 10948;
1237-
const int ID_SELECT_COPIED_SOURCE = 10949;
1238-
const int ID_MARKER_WRAPS_STRIP = 10950;
1239-
const int ID_UNITS = 10951;
1240-
const int ID_CHANGE_INTERFACE_LANGUAGE = 10952;
1241-
const int ID_VIEW_SHOW_ADMIN_MENU = 10953;
1242-
const int ID_TOOLS_MENU = 10954;
1243-
const int ID_TOOLS_CLIPBOARD_ADAPT = 10955;
1244-
const int ID_TOOLS_DEFINE_CC = 10956;
1245-
const int ID_UNLOAD_CC_TABLES = 10957;
1246-
const int ID_USE_CC = 10958;
1247-
const int ID_ACCEPT_CHANGES = 10959;
1248-
const int ID_TOOLS_DEFINE_SILCONVERTER = 10960;
1249-
const int ID_USE_SILCONVERTER = 10961;
1250-
const int ID_TOOLS_KB_EDITOR = 10962;
1251-
const int ID_TOOLS_AUTO_CAPITALIZATION = 10963;
1252-
const int ID_MENU_UPPER_AVAIL = 10964;
1253-
const int ID_RETRANS_REPORT = 10965;
1254-
const int ID_TOOLS_SPLIT_DOC = 10966;
1255-
const int ID_TOOLS_JOIN_DOCS = 10967;
1256-
const int ID_TOOLS_MOVE_DOC = 10968;
1257-
const int ID_TOOLS_INSTALL_GIT = 10969;
1258-
const int ID_EXPORT_IMPORT_MENU = 10970;
1259-
const int ID_FILE_EXPORT_SOURCE = 10971;
1260-
const int ID_FILE_EXPORT = 10972;
1261-
const int ID_FILE_EXPORT_TO_RTF = 10973;
1262-
const int ID_EXPORT_GLOSSES = 10974;
1263-
const int ID_EXPORT_FREE_TRANS = 10975;
1264-
const int ID_FILE_EXPORT_KB = 10976;
1265-
const int ID_IMPORT_TO_KB = 10977;
1266-
const int ID_MENU_IMPORT_EDITED_SOURCE_TEXT = 10978;
1267-
const int ID_ADVANCED_MENU = 10979;
1268-
const int ID_ADVANCED_SEE_GLOSSES = 10980;
1269-
const int ID_ADVANCED_GLOSSING_USES_NAV_FONT = 10981;
1270-
const int ID_ADVANCED_TRANSFORM_ADAPTATIONS_INTO_GLOSSES = 10982;
1271-
const int ID_ADVANCED_DELAY = 10983;
1272-
const int ID_ADVANCED_BOOKMODE = 10984;
1273-
const int ID_ADVANCED_FREE_TRANSLATION_MODE = 10985;
1274-
const int ID_ADVANCED_TARGET_TEXT_IS_DEFAULT = 10986;
1275-
const int ID_ADVANCED_GLOSS_TEXT_IS_DEFAULT = 10987;
1276-
const int ID_ADVANCED_REMOVE_FILTERED_FREE_TRANSLATIONS = 10988;
1277-
const int ID_ADVANCED_COLLECT_BACKTRANSLATIONS = 10989;
1278-
const int ID_ADVANCED_REMOVE_FILTERED_BACKTRANSLATIONS = 10990;
1279-
const int ID_ADVANCED_USETRANSLITERATIONMODE = 10991;
1280-
const int ID_ADVANCED_SENDSYNCHRONIZEDSCROLLINGMESSAGES = 10992;
1281-
const int ID_ADVANCED_RECEIVESYNCHRONIZEDSCROLLINGMESSAGES = 10993;
1282-
const int ID_ADVANCED_PROTECT_EDITOR_FM__GETTING_CHANGES_FOR_THIS_DOC = 10994;
1283-
const int ID_ADVANCED_ALLOW_EDITOR_TO_GET_CHANGES_FOR_THIS_DOC = 10995;
1284-
const int ID_MENU_SHOW_KBSERVER_SETUP_DLG = 10996;
1285-
const int ID_MENU_SHOW_KBSERVER_DLG = 10997;
1286-
const int ID_MENU_DISCOVER_KBSERVERS = 10998;
1287-
const int ID_LAYOUT_MENU = 10999;
1288-
const int ID_ALIGNMENT = 11000;
1289-
const int ID_HELP_MENU = 11001;
1290-
const int ID_MENU_AI_QUICK_START = 11002;
1291-
const int ID_REPORT_A_PROBLEM = 11003;
1292-
const int ID_GIVE_FEEDBACK = 11004;
1293-
const int ID_HELP_USE_TOOLTIPS = 11005;
1294-
const int ID_ADMINISTRATOR_MENU = 11006;
1295-
const int ID_MENU_HELP_FOR_ADMINISTRATORS = 11007;
1296-
const int ID_SETUP_EDITOR_COLLABORATION = 11008;
1297-
const int ID_MENU_MANAGE_DATA_TRANSFER_PROTECTIONS_TO_EDITOR = 11009;
1298-
const int ID_FORCE_VERSE_SECTIONING = 11010;
1299-
const int ID_EDIT_USER_MENU_SETTINGS_PROFILE = 11011;
1300-
const int ID_MENU_TEMP_TURN_OFF_CURRENT_PROFILE = 11012;
1301-
const int ID_ASSIGN_LOCATIONS_FOR_INPUTS_OUTPUTS = 11013;
1302-
const int ID_MOVE_OR_COPY_FOLDERS_OR_FILES = 11014;
1303-
const int ID_SET_PASSWORD_MENU = 11015;
1304-
const int ID_CUSTOM_WORK_FOLDER_LOCATION = 11016;
1305-
const int ID_LOCK_CUSTOM_LOCATION = 11017;
1306-
const int ID_UNLOCK_CUSTOM_LOCATION = 11018;
1307-
const int ID_LOCAL_WORK_FOLDER_MENU = 11019;
1308-
const int ID_DVCS_VERSION = 11020;
1309-
const int ID_MENU_ADMIN_ADD_USERS = 11021;
1310-
const int ID_MENU_KBSHARINGMGR = 11022;
1206+
const int ID_FILE_MENU = 10918;
1207+
const int ID_SAVE_AS = 10919;
1208+
const int ID_FILE_SAVE_COMMIT = 10920;
1209+
const int ID_FILE_PACK_DOC = 10921;
1210+
const int ID_FILE_UNPACK_DOC = 10922;
1211+
const int ID_MENU = 10923;
1212+
const int ID_FILE_STARTUP_WIZARD = 10924;
1213+
const int ID_FILE_CLOSEKB = 10925;
1214+
const int ID_FILE_CHANGEFOLDER = 10926;
1215+
const int ID_FILE_SAVEKB = 10927;
1216+
const int ID_FILE_BACKUP_KB = 10928;
1217+
const int ID_FILE_RESTORE_KB = 10929;
1218+
const int ID_FILE_REVERT_FILE = 10930;
1219+
const int ID_FILE_LIST_VERSIONS = 10931;
1220+
const int ID_FILE_TAKE_OWNERSHIP = 10932;
1221+
const int ID_EDIT_MENU = 10933;
1222+
const int ID_EDIT_CUT = 10934;
1223+
const int ID_EDIT_COPY = 10935;
1224+
const int ID_EDIT_PASTE = 10936;
1225+
const int ID_GO_TO = 10937;
1226+
const int ID_EDIT_SOURCE_TEXT = 10938;
1227+
const int ID_EDIT_CONSISTENCY_CHECK = 10939;
1228+
const int ID_MENU_CHANGE_USERNAME = 10940;
1229+
const int ID_EDITMENU_CHANGE_PUNCTS_MKRS_PLACE = 10941;
1230+
const int ID_EDIT_MOVE_NOTE_FORWARD = 10942;
1231+
const int ID_EDIT_MOVE_NOTE_BACKWARD = 10943;
1232+
const int ID_VIEW_MENU = 10944;
1233+
const int ID_VIEW_TOOLBAR = 10945;
1234+
const int ID_VIEW_STATUS_BAR = 10946;
1235+
const int ID_VIEW_COMPOSE_BAR = 10947;
1236+
const int ID_VIEW_MODE_BAR = 10948;
1237+
const int ID_COPY_SOURCE = 10949;
1238+
const int ID_SELECT_COPIED_SOURCE = 10950;
1239+
const int ID_MARKER_WRAPS_STRIP = 10951;
1240+
const int ID_UNITS = 10952;
1241+
const int ID_CHANGE_INTERFACE_LANGUAGE = 10953;
1242+
const int ID_VIEW_SHOW_ADMIN_MENU = 10954;
1243+
const int ID_TOOLS_MENU = 10955;
1244+
const int ID_TOOLS_CLIPBOARD_ADAPT = 10956;
1245+
const int ID_TOOLS_DEFINE_CC = 10957;
1246+
const int ID_UNLOAD_CC_TABLES = 10958;
1247+
const int ID_USE_CC = 10959;
1248+
const int ID_ACCEPT_CHANGES = 10960;
1249+
const int ID_TOOLS_DEFINE_SILCONVERTER = 10961;
1250+
const int ID_USE_SILCONVERTER = 10962;
1251+
const int ID_TOOLS_KB_EDITOR = 10963;
1252+
const int ID_TOOLS_AUTO_CAPITALIZATION = 10964;
1253+
const int ID_MENU_UPPER_AVAIL = 10965;
1254+
const int ID_RETRANS_REPORT = 10966;
1255+
const int ID_TOOLS_SPLIT_DOC = 10967;
1256+
const int ID_TOOLS_JOIN_DOCS = 10968;
1257+
const int ID_TOOLS_MOVE_DOC = 10969;
1258+
const int ID_TOOLS_INSTALL_GIT = 10970;
1259+
const int ID_EXPORT_IMPORT_MENU = 10971;
1260+
const int ID_FILE_EXPORT_SOURCE = 10972;
1261+
const int ID_FILE_EXPORT = 10973;
1262+
const int ID_FILE_EXPORT_TO_RTF = 10974;
1263+
const int ID_EXPORT_GLOSSES = 10975;
1264+
const int ID_EXPORT_FREE_TRANS = 10976;
1265+
const int ID_FILE_EXPORT_KB = 10977;
1266+
const int ID_IMPORT_TO_KB = 10978;
1267+
const int ID_MENU_IMPORT_EDITED_SOURCE_TEXT = 10979;
1268+
const int ID_ADVANCED_MENU = 10980;
1269+
const int ID_ADVANCED_SEE_GLOSSES = 10981;
1270+
const int ID_ADVANCED_GLOSSING_USES_NAV_FONT = 10982;
1271+
const int ID_ADVANCED_TRANSFORM_ADAPTATIONS_INTO_GLOSSES = 10983;
1272+
const int ID_ADVANCED_DELAY = 10984;
1273+
const int ID_ADVANCED_BOOKMODE = 10985;
1274+
const int ID_ADVANCED_FREE_TRANSLATION_MODE = 10986;
1275+
const int ID_ADVANCED_TARGET_TEXT_IS_DEFAULT = 10987;
1276+
const int ID_ADVANCED_GLOSS_TEXT_IS_DEFAULT = 10988;
1277+
const int ID_ADVANCED_REMOVE_FILTERED_FREE_TRANSLATIONS = 10989;
1278+
const int ID_ADVANCED_COLLECT_BACKTRANSLATIONS = 10990;
1279+
const int ID_ADVANCED_REMOVE_FILTERED_BACKTRANSLATIONS = 10991;
1280+
const int ID_ADVANCED_USETRANSLITERATIONMODE = 10992;
1281+
const int ID_ADVANCED_SENDSYNCHRONIZEDSCROLLINGMESSAGES = 10993;
1282+
const int ID_ADVANCED_RECEIVESYNCHRONIZEDSCROLLINGMESSAGES = 10994;
1283+
const int ID_ADVANCED_PROTECT_EDITOR_FM__GETTING_CHANGES_FOR_THIS_DOC = 10995;
1284+
const int ID_ADVANCED_ALLOW_EDITOR_TO_GET_CHANGES_FOR_THIS_DOC = 10996;
1285+
const int ID_MENU_SHOW_KBSERVER_SETUP_DLG = 10997;
1286+
const int ID_MENU_SHOW_KBSERVER_DLG = 10998;
1287+
const int ID_MENU_DISCOVER_KBSERVERS = 10999;
1288+
const int ID_LAYOUT_MENU = 11000;
1289+
const int ID_ALIGNMENT = 11001;
1290+
const int ID_HELP_MENU = 11002;
1291+
const int ID_MENU_AI_QUICK_START = 11003;
1292+
const int ID_REPORT_A_PROBLEM = 11004;
1293+
const int ID_GIVE_FEEDBACK = 11005;
1294+
const int ID_HELP_USE_TOOLTIPS = 11006;
1295+
const int ID_ADMINISTRATOR_MENU = 11007;
1296+
const int ID_MENU_HELP_FOR_ADMINISTRATORS = 11008;
1297+
const int ID_SETUP_EDITOR_COLLABORATION = 11009;
1298+
const int ID_MENU_MANAGE_DATA_TRANSFER_PROTECTIONS_TO_EDITOR = 11010;
1299+
const int ID_FORCE_VERSE_SECTIONING = 11011;
1300+
const int ID_EDIT_USER_MENU_SETTINGS_PROFILE = 11012;
1301+
const int ID_MENU_TEMP_TURN_OFF_CURRENT_PROFILE = 11013;
1302+
const int ID_ASSIGN_LOCATIONS_FOR_INPUTS_OUTPUTS = 11014;
1303+
const int ID_MOVE_OR_COPY_FOLDERS_OR_FILES = 11015;
1304+
const int ID_SET_PASSWORD_MENU = 11016;
1305+
const int ID_CUSTOM_WORK_FOLDER_LOCATION = 11017;
1306+
const int ID_LOCK_CUSTOM_LOCATION = 11018;
1307+
const int ID_UNLOCK_CUSTOM_LOCATION = 11019;
1308+
const int ID_LOCAL_WORK_FOLDER_MENU = 11020;
1309+
const int ID_DVCS_VERSION = 11021;
1310+
const int ID_MENU_ADMIN_ADD_USERS = 11022;
1311+
const int ID_MENU_KBSHARINGMGR = 11023;
13111312
wxMenuBar *AIMenuBarFunc();
13121313

13131314
// Declare toolbar functions
13141315

1315-
const int ID_BUTTON_GUESSER = 11023;
1316-
const int ID_BUTTON_CREATE_NOTE = 11024;
1317-
const int ID_BUTTON_PREV_NOTE = 11025;
1318-
const int ID_BUTTON_NEXT_NOTE = 11026;
1319-
const int ID_BUTTON_DELETE_ALL_NOTES = 11027;
1320-
const int ID_BUTTON_RESPECTING_BDRY = 11028;
1321-
const int ID_BUTTON_SHOWING_PUNCT = 11029;
1322-
const int ID_BUTTON_TO_END = 11030;
1323-
const int ID_BUTTON_TO_START = 11031;
1324-
const int ID_BUTTON_STEP_DOWN = 11032;
1325-
const int ID_BUTTON_STEP_UP = 11033;
1326-
const int ID_BUTTON_GO_TO = 11034;
1327-
const int ID_BUTTON_MERGE = 11035;
1328-
const int ID_BUTTON_RETRANSLATION = 11036;
1329-
const int ID_BUTTON_EDIT_RETRANSLATION = 11037;
1330-
const int ID_REMOVE_RETRANSLATION = 11038;
1331-
const int ID_BUTTON_NULL_SRC_LEFT = 11039;
1332-
const int ID_BUTTON_NULL_SRC_RIGHT = 11040;
1333-
const int ID_BUTTON_REMOVE_NULL_SRCPHRASE = 11041;
1334-
const int ID_BUTTON_CHOOSE_TRANSLATION = 11042;
1335-
const int ID_SHOWING_ALL = 11043;
1336-
const int ID_BUTTON_EARLIER_TRANSLATION = 11044;
1337-
const int ID_BUTTON_NO_PUNCT_COPY = 11045;
1316+
const int ID_BUTTON_GUESSER = 11024;
1317+
const int ID_BUTTON_CREATE_NOTE = 11025;
1318+
const int ID_BUTTON_PREV_NOTE = 11026;
1319+
const int ID_BUTTON_NEXT_NOTE = 11027;
1320+
const int ID_BUTTON_DELETE_ALL_NOTES = 11028;
1321+
const int ID_BUTTON_RESPECTING_BDRY = 11029;
1322+
const int ID_BUTTON_SHOWING_PUNCT = 11030;
1323+
const int ID_BUTTON_TO_END = 11031;
1324+
const int ID_BUTTON_TO_START = 11032;
1325+
const int ID_BUTTON_STEP_DOWN = 11033;
1326+
const int ID_BUTTON_STEP_UP = 11034;
1327+
const int ID_BUTTON_GO_TO = 11035;
1328+
const int ID_BUTTON_MERGE = 11036;
1329+
const int ID_BUTTON_RETRANSLATION = 11037;
1330+
const int ID_BUTTON_EDIT_RETRANSLATION = 11038;
1331+
const int ID_REMOVE_RETRANSLATION = 11039;
1332+
const int ID_BUTTON_NULL_SRC_LEFT = 11040;
1333+
const int ID_BUTTON_NULL_SRC_RIGHT = 11041;
1334+
const int ID_BUTTON_REMOVE_NULL_SRCPHRASE = 11042;
1335+
const int ID_BUTTON_CHOOSE_TRANSLATION = 11043;
1336+
const int ID_SHOWING_ALL = 11044;
1337+
const int ID_BUTTON_EARLIER_TRANSLATION = 11045;
1338+
const int ID_BUTTON_NO_PUNCT_COPY = 11046;
13381339
void AIToolBarFunc( wxToolBar *parent );
13391340

13401341
void AIToolBar32x30Func( wxToolBar *parent );
@@ -1343,15 +1344,15 @@ void AIToolBar32x30Func( wxToolBar *parent );
13431344

13441345
wxBitmap AIToolBarBitmapsUnToggledFunc( size_t index );
13451346

1346-
const int ID_BITMAP_FOLDERAI = 11046;
1347-
const int ID_BITMAP_FILEAI = 11047;
1348-
const int ID_BITMAP_EMPTY_FOLDER = 11048;
1347+
const int ID_BITMAP_FOLDERAI = 11047;
1348+
const int ID_BITMAP_FILEAI = 11048;
1349+
const int ID_BITMAP_EMPTY_FOLDER = 11049;
13491350
wxBitmap AIMainFrameIcons( size_t index );
13501351

1351-
const int ID_BUTTON_IGNORING_BDRY = 11049;
1352-
const int ID_BUTTON_HIDING_PUNCT = 11050;
1353-
const int ID_SHOWING_TGT = 11051;
1354-
const int ID_BUTTON_ENABLE_PUNCT_COPY = 11052;
1352+
const int ID_BUTTON_IGNORING_BDRY = 11050;
1353+
const int ID_BUTTON_HIDING_PUNCT = 11051;
1354+
const int ID_SHOWING_TGT = 11052;
1355+
const int ID_BUTTON_ENABLE_PUNCT_COPY = 11053;
13551356
wxBitmap AIToolBarBitmapsToggledFunc( size_t index );
13561357

13571358
wxBitmap WhichFilesBitmapsFunc( size_t index );
@@ -1362,8 +1363,8 @@ wxBitmap AIToolBarBitmapsUnToggled32x30Func( size_t index );
13621363

13631364
wxBitmap HtmlWindowBitmapsFunc( size_t index );
13641365

1365-
const int ID_BITMAP_CHBOX_OFF = 11053;
1366-
const int ID_BITMAP_CHBOX_ON = 11054;
1366+
const int ID_BITMAP_CHBOX_OFF = 11054;
1367+
const int ID_BITMAP_CHBOX_ON = 11055;
13671368
wxBitmap BulkKbDeleteFunc( size_t index );
13681369

13691370
#endif

0 commit comments

Comments
 (0)