diff --git a/libjexpr/code/JXExprEditor-Function.jxm b/libjexpr/code/JXExprEditor-Function.jxm index 530dad593..e82807218 100644 --- a/libjexpr/code/JXExprEditor-Function.jxm +++ b/libjexpr/code/JXExprEditor-Function.jxm @@ -1,15 +1,15 @@ jx_menu_editor 0 -871 725 +922 725 "JXExprEditor" "Function" ' 40 40 -170 +181 100 43 -176 -199 +197 +211 75 0 diff --git a/libjx/code/JXMacWinPrefsDialog.cpp b/libjx/code/JXMacWinPrefsDialog.cpp index 2786ad5a8..06c484171 100644 --- a/libjx/code/JXMacWinPrefsDialog.cpp +++ b/libjx/code/JXMacWinPrefsDialog.cpp @@ -26,7 +26,6 @@ void JXMacWinPrefsDialog::EditPrefs() { auto* dlog = jnew JXMacWinPrefsDialog; - if (dlog->DoDialog()) { dlog->UpdateSettings(); diff --git a/libjx/code/JXTEBase-CleanWhitespace.jxm b/libjx/code/JXTEBase-CleanWhitespace.jxm index 1c01fea95..fa36b1af1 100644 --- a/libjx/code/JXTEBase-CleanWhitespace.jxm +++ b/libjx/code/JXTEBase-CleanWhitespace.jxm @@ -18,7 +18,7 @@ jx_menu_editor 0 1 "jx_show_whitespace.xpm" "Show whitespace" "" -' +'h "ShowWhitespaceCmd" "__ShowWhitespaceCmd" 0 diff --git a/libjx/strings/JXTEBase-CleanWhitespace b/libjx/strings/JXTEBase-CleanWhitespace index fc89f69cc..795623748 100644 --- a/libjx/strings/JXTEBase-CleanWhitespace +++ b/libjx/strings/JXTEBase-CleanWhitespace @@ -6,7 +6,7 @@ MenuTitle::JXTEBase_CleanWhitespace "CleanWhitespace" -ShowWhitespaceCmd::JXTEBase "Show whitespace" +ShowWhitespaceCmd::JXTEBase "Show whitespace %h h" CleanAllWhitespaceCmd::JXTEBase "Clean all whitespace %h w" CleanWhitespaceSelCmd::JXTEBase "Clean selected ws" CleanAllWSAlignCmd::JXTEBase "Clean all ws & alignment" diff --git a/libjx/testui/code/TestAnyTableDirector-File.jxm b/libjx/testui/code/TestAnyTableDirector-File.jxm index 0f2ab9bce..0ff5d3e07 100644 --- a/libjx/testui/code/TestAnyTableDirector-File.jxm +++ b/libjx/testui/code/TestAnyTableDirector-File.jxm @@ -18,7 +18,7 @@ jx_menu_editor 0 0 "" "Page setup..." "" -' +'g "__PageSetup" "kPageSetupCmd" 0 diff --git a/libjx/testui/code/TestDirector-PrintPostscript.jxm b/libjx/testui/code/TestDirector-PrintPostscript.jxm index 021a1eba2..33bd0a828 100644 --- a/libjx/testui/code/TestDirector-PrintPostscript.jxm +++ b/libjx/testui/code/TestDirector-PrintPostscript.jxm @@ -18,7 +18,7 @@ jx_menu_editor 0 0 "" "Page setup..." "" -' +'g "__PageSetup" "kPSPageSetupCmd" 0 diff --git a/libjx/testui/code/TestDirector-Test.jxm b/libjx/testui/code/TestDirector-Test.jxm index 38fe31484..1091e0ee5 100644 --- a/libjx/testui/code/TestDirector-Test.jxm +++ b/libjx/testui/code/TestDirector-Test.jxm @@ -18,7 +18,7 @@ jx_menu_editor 0 0 "" "New main window" "" -' +'w "__NewMainWindow" "kNewTestDirectorCmd" 1 @@ -58,7 +58,7 @@ jx_menu_editor 0 0 "" "Input fields" "Ctrl-I" -' +'f "__InputFields" "kTestInputCmd" 0 @@ -68,7 +68,7 @@ jx_menu_editor 0 0 "" "Buttons" "Ctrl-B" -' +'b "__Buttons" "kTestButtonsCmd" 0 @@ -78,7 +78,7 @@ jx_menu_editor 0 0 "" "Popup menus" "" -' +'p "__PopupMenus" "kTestPopupChoiceCmd" 0 @@ -88,7 +88,7 @@ jx_menu_editor 0 0 "" "Sliders" "" -' +'s "__Sliders" "kTestSliderCmd" 1 @@ -98,7 +98,7 @@ jx_menu_editor 0 0 "" "Partitions" "" -' +'r "__Partitions" "kTestPartitionsCmd" 0 @@ -108,7 +108,7 @@ jx_menu_editor 0 0 "" "Tab group" "" -' +'t "__TabGroup" "kTestTabGroupCmd" 0 @@ -118,7 +118,7 @@ jx_menu_editor 0 0 "" "String table" "" -' +'i "__StringTable" "kTestStrTableCmd" 0 @@ -128,7 +128,7 @@ jx_menu_editor 0 0 "" "Number table" "" -' +'n "__NumberTable" "kTestNumTableCmd" 0 @@ -138,7 +138,7 @@ jx_menu_editor 0 0 "" "Text editor" "Ctrl-O" -' +'e "__TextEditor" "kTestTextEditorCmd" 0 @@ -148,7 +148,7 @@ jx_menu_editor 0 0 "" "Linked documents" "Super-O" -' +'l "__LinkedDocuments" "kTestLinkedDocCmd" 0 @@ -158,7 +158,7 @@ jx_menu_editor 0 0 "" "Drag-And-Drop (text)" "Hyper-O" -' +'d "__DragAndDropText" "kTestDNDTextCmd" 0 @@ -168,7 +168,7 @@ jx_menu_editor 0 0 "" "Image viewer" "Ctrl-I" -' +'m "__ImageViewer" "kTestImageViewCmd" 0 diff --git a/libjx/testui/code/TestFileListDirector-File.jxm b/libjx/testui/code/TestFileListDirector-File.jxm index 054075041..93930015f 100644 --- a/libjx/testui/code/TestFileListDirector-File.jxm +++ b/libjx/testui/code/TestFileListDirector-File.jxm @@ -28,7 +28,7 @@ jx_menu_editor 0 1 "jx_filter_wildcard.xpm" "Use wildcard filter" "" -' +'w "__UseWildcardFilter" "kUseWildcardCmd" 0 @@ -38,7 +38,7 @@ jx_menu_editor 0 1 "jx_filter_regex.xpm" "Use regex filter" "" -' +'r "__UseRegexFilter" "kUseRegexCmd" 1 diff --git a/libjx/testui/code/TestImageDirector-File.jxm b/libjx/testui/code/TestImageDirector-File.jxm index a6ec6759c..b4d3dcc3f 100644 --- a/libjx/testui/code/TestImageDirector-File.jxm +++ b/libjx/testui/code/TestImageDirector-File.jxm @@ -118,7 +118,7 @@ jx_menu_editor 0 0 "" "Print EPS..." "" -' +'e "__PrintEPS" "kPrintEPSCmd" 1 diff --git a/libjx/testui/code/TestPartitionDirector-Vert.jxm b/libjx/testui/code/TestPartitionDirector-Vert.jxm index 2a0d455eb..c79298f82 100644 --- a/libjx/testui/code/TestPartitionDirector-Vert.jxm +++ b/libjx/testui/code/TestPartitionDirector-Vert.jxm @@ -1,15 +1,15 @@ jx_menu_editor 0 -817 167 +869 166 "TestPartitionDirector" "Vert" 'v 40 40 -154 +163 100 53 -169 -162 +175 +167 75 0 diff --git a/libjx/testui/code/TestTextEditDocument-File.jxm b/libjx/testui/code/TestTextEditDocument-File.jxm index b1e301694..4b3c0a5a3 100644 --- a/libjx/testui/code/TestTextEditDocument-File.jxm +++ b/libjx/testui/code/TestTextEditDocument-File.jxm @@ -1,14 +1,14 @@ jx_menu_editor 0 -705 371 +797 371 "TestTextEditDocument" "File" 'f 40 40 -100 +153 100 50 -138 +158 144 75 @@ -48,7 +48,7 @@ jx_menu_editor 0 0 "" "Save as..." "" -' +'a "__SaveAs" "kSaveFileAsCmd" 0 @@ -58,7 +58,7 @@ jx_menu_editor 0 0 "" "Save a copy as..." "" -' +'y "__SaveACopyAs" "kSaveCopyAsCmd" 0 @@ -68,7 +68,7 @@ jx_menu_editor 0 1 "jx_file_revert_to_saved.xpm" "Revert to saved" "" -' +'r "__RevertToSaved" "kRevertCmd" 1 @@ -98,7 +98,7 @@ jx_menu_editor 0 0 "" "Page setup..." "" -' +'g "__PageSetup" "kPageSetupCmd" 0 diff --git a/libjx/testui/code/TestTextEditor-Edit.jxm b/libjx/testui/code/TestTextEditor-Edit.jxm index 67d553a86..fd1f1874d 100644 --- a/libjx/testui/code/TestTextEditor-Edit.jxm +++ b/libjx/testui/code/TestTextEditor-Edit.jxm @@ -1,15 +1,15 @@ jx_menu_editor 0 -676 258 +707 248 "TestTextEditor" "Edit" ' 40 40 -100 +117 100 48 118 -128 +144 75 0 diff --git a/libjx/testui/code/TestWidget-Actions.jxm b/libjx/testui/code/TestWidget-Actions.jxm index 9eee7e272..4600366fd 100644 --- a/libjx/testui/code/TestWidget-Actions.jxm +++ b/libjx/testui/code/TestWidget-Actions.jxm @@ -1,15 +1,15 @@ jx_menu_editor 0 -839 392 +1031 389 "TestWidget" "Actions" 'a 40 40 -100 +249 100 47 -220 -192 +237 +210 75 0 diff --git a/libjx/testui/code/TestWidget-Points.jxm b/libjx/testui/code/TestWidget-Points.jxm index 86c6d2de6..8c0644f8c 100644 --- a/libjx/testui/code/TestWidget-Points.jxm +++ b/libjx/testui/code/TestWidget-Points.jxm @@ -1,5 +1,5 @@ jx_menu_editor 0 -671 264 +634 264 "TestWidget" "Points" ' @@ -7,7 +7,7 @@ jx_menu_editor 0 40 100 100 -100 +38 100 100 75 diff --git a/libjx/testui/strings/TestAnyTableDirector-File b/libjx/testui/strings/TestAnyTableDirector-File index 9f372377f..6e29ec44b 100644 --- a/libjx/testui/strings/TestAnyTableDirector-File +++ b/libjx/testui/strings/TestAnyTableDirector-File @@ -6,6 +6,6 @@ MenuTitle::TestAnyTableDirector_File "File" -__PageSetup::TestAnyTableDirector "Page setup..." +__PageSetup::TestAnyTableDirector "Page setup... %h g" __Print::TestAnyTableDirector "Print... %h p" __Close::TestAnyTableDirector "Close %h c" diff --git a/libjx/testui/strings/TestDirector-PrintPostscript b/libjx/testui/strings/TestDirector-PrintPostscript index fe368689a..0a711612c 100644 --- a/libjx/testui/strings/TestDirector-PrintPostscript +++ b/libjx/testui/strings/TestDirector-PrintPostscript @@ -6,5 +6,5 @@ MenuTitle::TestDirector_PrintPostscript "PrintPostscript" -__PageSetup::TestDirector "Page setup..." +__PageSetup::TestDirector "Page setup... %h g" __Print::TestDirector "Print... %k Ctrl-P %h p" diff --git a/libjx/testui/strings/TestDirector-Test b/libjx/testui/strings/TestDirector-Test index fbc07e079..75d5a3822 100644 --- a/libjx/testui/strings/TestDirector-Test +++ b/libjx/testui/strings/TestDirector-Test @@ -6,22 +6,22 @@ MenuTitle::TestDirector_Test "Test" -__NewMainWindow::TestDirector "New main window" +__NewMainWindow::TestDirector "New main window %h w" __UserNotification::TestDirector "User notification" __FileChooser::TestDirector "File chooser" __ProgressDisplay::TestDirector "Progress display" -__InputFields::TestDirector "Input fields %k Ctrl-I" -__Buttons::TestDirector "Buttons %k Ctrl-B" -__PopupMenus::TestDirector "Popup menus" -__Sliders::TestDirector "Sliders" -__Partitions::TestDirector "Partitions" -__TabGroup::TestDirector "Tab group" -__StringTable::TestDirector "String table" -__NumberTable::TestDirector "Number table" -__TextEditor::TestDirector "Text editor %k Ctrl-O" -__LinkedDocuments::TestDirector "Linked documents %k Super-O" -__DragAndDropText::TestDirector "Drag-And-Drop (text) %k Hyper-O" -__ImageViewer::TestDirector "Image viewer %k Ctrl-I" +__InputFields::TestDirector "Input fields %k Ctrl-I %h f" +__Buttons::TestDirector "Buttons %k Ctrl-B %h b" +__PopupMenus::TestDirector "Popup menus %h p" +__Sliders::TestDirector "Sliders %h s" +__Partitions::TestDirector "Partitions %h r" +__TabGroup::TestDirector "Tab group %h t" +__StringTable::TestDirector "String table %h i" +__NumberTable::TestDirector "Number table %h n" +__TextEditor::TestDirector "Text editor %k Ctrl-O %h e" +__LinkedDocuments::TestDirector "Linked documents %k Super-O %h l" +__DragAndDropText::TestDirector "Drag-And-Drop (text) %k Hyper-O %h d" +__ImageViewer::TestDirector "Image viewer %k Ctrl-I %h m" __FileList::TestDirector "File List" __SendEmail::TestDirector "Send email" __ShowFileContent::TestDirector "Show file content" diff --git a/libjx/testui/strings/TestFileListDirector-File b/libjx/testui/strings/TestFileListDirector-File index 026cfd8f8..f1b121257 100644 --- a/libjx/testui/strings/TestFileListDirector-File +++ b/libjx/testui/strings/TestFileListDirector-File @@ -7,6 +7,6 @@ MenuTitle::TestFileListDirector_File "File" __ShowSelectedFilesInFileManager::TestFileListDirector "Show selected files in file manager %k Ctrl-Return %h s" -__UseWildcardFilter::TestFileListDirector "Use wildcard filter" -__UseRegexFilter::TestFileListDirector "Use regex filter" +__UseWildcardFilter::TestFileListDirector "Use wildcard filter %h w" +__UseRegexFilter::TestFileListDirector "Use regex filter %h r" __Close::TestFileListDirector "Close %k Ctrl-W %h c" diff --git a/libjx/testui/strings/TestImageDirector-File b/libjx/testui/strings/TestImageDirector-File index 62c49f683..ad821446d 100644 --- a/libjx/testui/strings/TestImageDirector-File +++ b/libjx/testui/strings/TestImageDirector-File @@ -16,5 +16,5 @@ __Copy::TestImageDirector "Copy %k Ctrl-C" __Paste::TestImageDirector "Paste %k Ctrl-V" __PageSetup::TestImageDirector "Page setup..." __PrintPostScript::TestImageDirector "Print PostScript... %k Ctrl-P %h p" -__PrintEPS::TestImageDirector "Print EPS..." +__PrintEPS::TestImageDirector "Print EPS... %h e" __Close::TestImageDirector "Close %k Ctrl-W %h c" diff --git a/libjx/testui/strings/TestTextEditDocument-File b/libjx/testui/strings/TestTextEditDocument-File index d0eb5f0ff..b03befbf9 100644 --- a/libjx/testui/strings/TestTextEditDocument-File +++ b/libjx/testui/strings/TestTextEditDocument-File @@ -9,11 +9,11 @@ MenuTitle::TestTextEditDocument_File "File" __New::TestTextEditDocument "New %k Ctrl-N %h n" __Open::TestTextEditDocument "Open... %k Ctrl-O %h o" __Save::TestTextEditDocument "Save %k Ctrl-S %h s" -__SaveAs::TestTextEditDocument "Save as..." -__SaveACopyAs::TestTextEditDocument "Save a copy as..." -__RevertToSaved::TestTextEditDocument "Revert to saved" +__SaveAs::TestTextEditDocument "Save as... %h a" +__SaveACopyAs::TestTextEditDocument "Save a copy as... %h y" +__RevertToSaved::TestTextEditDocument "Revert to saved %h r" __LoadPrivateFormat::TestTextEditDocument "Load private format... %k Ctrl-Shift-O" __SavePrivateFormat::TestTextEditDocument "Save private format... %k Ctrl-Shift-S" -__PageSetup::TestTextEditDocument "Page setup..." +__PageSetup::TestTextEditDocument "Page setup... %h g" __Print::TestTextEditDocument "Print... %k Ctrl-P %h p" __Close::TestTextEditDocument "Close %k Ctrl-W %h c" diff --git a/todo b/todo index 60ae0b0e6..fdadc0813 100644 --- a/todo +++ b/todo @@ -20,8 +20,6 @@ jcc javascript regex, incl char class - can contain php or jsp glove - convert to jx_menu_editor - undo then redo "transform creates column": puts values back in inverted order remember open documents and restore when start diff --git a/tools/jx_layout_editor/code/App-Help.jxm b/tools/jx_layout_editor/code/App-Help.jxm index 1dd0822c4..bcd0fd7e5 100644 --- a/tools/jx_layout_editor/code/App-Help.jxm +++ b/tools/jx_layout_editor/code/App-Help.jxm @@ -1,15 +1,15 @@ jx_menu_editor 0 -670 269 +744 264 "App" "Help" 'h 40 40 +123 100 100 100 -100 -100 +149 75 0 diff --git a/tools/jx_layout_editor/code/LayoutContainer-Edit.jxm b/tools/jx_layout_editor/code/LayoutContainer-Edit.jxm index dbfabc43a..9c515e0de 100644 --- a/tools/jx_layout_editor/code/LayoutContainer-Edit.jxm +++ b/tools/jx_layout_editor/code/LayoutContainer-Edit.jxm @@ -1,5 +1,5 @@ jx_menu_editor 0 -671 224 +617 220 "LayoutContainer" "Edit" 'e @@ -7,7 +7,7 @@ jx_menu_editor 0 40 100 100 -100 +37 100 100 75 diff --git a/tools/jx_layout_editor/code/LayoutDocument-File.jxm b/tools/jx_layout_editor/code/LayoutDocument-File.jxm index 536678704..4fb687a13 100644 --- a/tools/jx_layout_editor/code/LayoutDocument-File.jxm +++ b/tools/jx_layout_editor/code/LayoutDocument-File.jxm @@ -5,11 +5,11 @@ jx_menu_editor 0 'f 40 40 +144 100 -100 -100 -157 -100 +43 +117 +142 75 0 diff --git a/tools/jx_layout_editor/code/LayoutDocument-Preferences.jxm b/tools/jx_layout_editor/code/LayoutDocument-Preferences.jxm index b7356b368..acdbd44f5 100644 --- a/tools/jx_layout_editor/code/LayoutDocument-Preferences.jxm +++ b/tools/jx_layout_editor/code/LayoutDocument-Preferences.jxm @@ -1,15 +1,15 @@ jx_menu_editor 0 -874 196 +794 198 "LayoutDocument" "Preferences" 'p 40 40 -207 +162 100 -100 -141 -144 +38 +153 +154 75 0 diff --git a/tools/jx_layout_editor/jx_layout_editor.jcc b/tools/jx_layout_editor/jx_layout_editor.jcc index 595ff3c10..0c397cec5 100644 --- a/tools/jx_layout_editor/jx_layout_editor.jcc +++ b/tools/jx_layout_editor/jx_layout_editor.jcc @@ -124,7 +124,7 @@ T "./" "jxlayout --choose --require-obj-names --post-cmd \"jcc --force-reload-op F # build settings 1 -T +F "jx_layout_editor" "${LIB_DEPS}" "make -k all" diff --git a/tools/jx_memory_debugger/code/RecordDirector-File.jxm b/tools/jx_memory_debugger/code/RecordDirector-File.jxm index 6ee1cc79a..b5cc3590e 100644 --- a/tools/jx_memory_debugger/code/RecordDirector-File.jxm +++ b/tools/jx_memory_debugger/code/RecordDirector-File.jxm @@ -18,7 +18,7 @@ jx_menu_editor 0 0 "" "Open selected items" "Return." -' +'o "OpenFiles::MDRecordDirector" "kOpenSelCmd" 1 @@ -28,7 +28,7 @@ jx_menu_editor 0 0 "" "Page setup..." "" -' +'g "__PageSetup" "kPageSetupCmd" 0 @@ -38,7 +38,7 @@ jx_menu_editor 0 1 "jx_file_print.xpm" "Print..." "Ctrl-P" -' +'p "Print::JX" "kPrintCmd" 1 @@ -48,7 +48,7 @@ jx_menu_editor 0 0 "" "Close" "Ctrl-W" -' +'c "CloseWindow::JX" "kCloseCmd" 1 @@ -58,7 +58,7 @@ jx_menu_editor 0 0 "" "Quit" "Ctrl-Q" -' +'q "Quit::JX" "kQuitCmd" 0 diff --git a/tools/jx_memory_debugger/code/StatsDirector-Data.jxm b/tools/jx_memory_debugger/code/StatsDirector-Data.jxm index 7a022f341..da4459339 100644 --- a/tools/jx_memory_debugger/code/StatsDirector-Data.jxm +++ b/tools/jx_memory_debugger/code/StatsDirector-Data.jxm @@ -18,7 +18,7 @@ jx_menu_editor 0 0 "" "Get allocated records" "" -' +'a "GetRecords::MDStatsDirector" "kGetRecordsCmd" 1 @@ -28,7 +28,7 @@ jx_menu_editor 0 0 "" "Take snapshot" "" -' +'s "SaveSnapshot::MDStatsDirector" "kSaveSnapshotCmd" 0 @@ -38,7 +38,7 @@ jx_menu_editor 0 0 "" "Compare with latest snapshot" "" -' +'c "DiffSnapshot::MDStatsDirector" "kDiffSnapshotCmd" 1 diff --git a/tools/jx_memory_debugger/strings/RecordDirector-File b/tools/jx_memory_debugger/strings/RecordDirector-File index be30089ed..e02b9a4bb 100644 --- a/tools/jx_memory_debugger/strings/RecordDirector-File +++ b/tools/jx_memory_debugger/strings/RecordDirector-File @@ -6,8 +6,8 @@ MenuTitle::RecordDirector_File "File" -OpenFiles::MDRecordDirector "Open selected items %k Return." -__PageSetup::RecordDirector "Page setup..." -Print::JX "Print... %k Ctrl-P" -CloseWindow::JX "Close %k Ctrl-W" -Quit::JX "Quit %k Ctrl-Q" +OpenFiles::MDRecordDirector "Open selected items %k Return. %h o" +__PageSetup::RecordDirector "Page setup... %h g" +Print::JX "Print... %k Ctrl-P %h p" +CloseWindow::JX "Close %k Ctrl-W %h c" +Quit::JX "Quit %k Ctrl-Q %h q" diff --git a/tools/jx_memory_debugger/strings/StatsDirector-Data b/tools/jx_memory_debugger/strings/StatsDirector-Data index 485b93cbd..8b21da967 100644 --- a/tools/jx_memory_debugger/strings/StatsDirector-Data +++ b/tools/jx_memory_debugger/strings/StatsDirector-Data @@ -6,9 +6,9 @@ MenuTitle::StatsDirector_Data "Data" -GetRecords::MDStatsDirector "Get allocated records" -SaveSnapshot::MDStatsDirector "Take snapshot" -DiffSnapshot::MDStatsDirector "Compare with latest snapshot" +GetRecords::MDStatsDirector "Get allocated records %h a" +SaveSnapshot::MDStatsDirector "Take snapshot %h s" +DiffSnapshot::MDStatsDirector "Compare with latest snapshot %h c" ShowAppRecordsAction::MDStatsDirector "Show application records" ShowBucket1RecordsAction::MDStatsDirector "Show bucket #1 records" ShowBucket2RecordsAction::MDStatsDirector "Show bucket #2 records"