annotate kdiff3/src-QT4/kdiff3_shell.rc @ 113:7bca1f1340f6 tip

Build fixes for Xcode 10 / Qt 5.12
author Chris Cannam
date Mon, 17 Dec 2018 11:13:01 +0000
parents fcd146072e0c
children
rev   line source
joachim99@8 1 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
joachim99@51 2 <kpartgui name="kdiff3_shell" version="9">
joachim99@8 3 <MenuBar>
joachim99@8 4 <Menu name="file"><text>&amp;File</text>
joachim99@8 5 <Action name="file_reload"/>
joachim99@8 6 </Menu>
joachim99@8 7 <Menu name="directory"><text>&amp;Directory</text>
joachim99@8 8 <Action name="dir_start_operation"/>
joachim99@51 9 <Action name="dir_run_operation_for_current_item"/>
joachim99@8 10 <Action name="dir_compare_current"/>
joachim99@8 11 <Action name="dir_rescan"/>
joachim99@69 12 <!-- <Action name="dir_save_merge_state"/>
joachim99@69 13 <Action name="dir_load_merge_state"/> -->
joachim99@8 14 <Action name="dir_fold_all"/>
joachim99@8 15 <Action name="dir_unfold_all"/>
joachim99@69 16 <Action name="dir_show_identical_files"/>
joachim99@69 17 <Action name="dir_show_different_files"/>
joachim99@69 18 <Action name="dir_show_files_only_in_a"/>
joachim99@69 19 <Action name="dir_show_files_only_in_b"/>
joachim99@69 20 <Action name="dir_show_files_only_in_c"/>
joachim99@8 21 <Action name="dir_choose_a_everywhere"/>
joachim99@8 22 <Action name="dir_choose_b_everywhere"/>
joachim99@8 23 <Action name="dir_choose_c_everywhere"/>
joachim99@8 24 <Action name="dir_autochoose_everywhere"/>
joachim99@8 25 <Action name="dir_nothing_everywhere"/>
joachim99@69 26 <Action name="dir_synchronize_directories"/>
joachim99@69 27 <Action name="dir_choose_newer_files"/>
joachim99@69 28 <Action name="dir_compare_explicitly_selected_files"/>
joachim99@69 29 <Action name="dir_merge_explicitly_selected_files"/>
joachim99@51 30 <Menu name="dir_current_merge_menu"><text>Current Item Merge Operation</text>
joachim99@51 31 <Action name="dir_current_do_nothing"/>
joachim99@51 32 <Action name="dir_current_choose_a"/>
joachim99@51 33 <Action name="dir_current_choose_b"/>
joachim99@51 34 <Action name="dir_current_choose_c"/>
joachim99@51 35 <Action name="dir_current_merge"/>
joachim99@51 36 <Action name="dir_current_delete"/>
joachim99@51 37 </Menu>
joachim99@51 38 <Menu name="dir_current_sync_menu"><text>Current Item Sync Operation</text>
joachim99@51 39 <Action name="dir_current_sync_do_nothing"/>
joachim99@51 40 <Action name="dir_current_sync_copy_a_to_b"/>
joachim99@51 41 <Action name="dir_current_sync_copy_b_to_a"/>
joachim99@51 42 <Action name="dir_current_sync_delete_a"/>
joachim99@51 43 <Action name="dir_current_sync_delete_b"/>
joachim99@51 44 <Action name="dir_current_sync_delete_a_and_b"/>
joachim99@51 45 <Action name="dir_current_sync_merge_to_a"/>
joachim99@51 46 <Action name="dir_current_sync_merge_to_b"/>
joachim99@51 47 <Action name="dir_current_sync_merge_to_a_and_b"/>
joachim99@51 48 </Menu>
joachim99@8 49 </Menu>
joachim99@8 50 <Menu name="movement"><text>&amp;Movement</text>
joachim99@8 51 <Action name="go_current"/>
joachim99@8 52 <Action name="go_top"/>
joachim99@8 53 <Action name="go_bottom"/>
joachim99@8 54 <Action name="go_prev_delta"/>
joachim99@8 55 <Action name="go_next_delta"/>
joachim99@8 56 <Action name="go_prev_conflict"/>
joachim99@8 57 <Action name="go_next_conflict"/>
joachim99@8 58 <Action name="go_prev_unsolved_conflict"/>
joachim99@8 59 <Action name="go_next_unsolved_conflict"/>
joachim99@8 60 </Menu>
joachim99@66 61 <Menu name="diff"><text>D&amp;iffview</text>
joachim99@66 62 <Action name="diff_showlinenumbers"/>
joachim99@66 63 <Action name="diff_show_whitespace_characters"/>
joachim99@66 64 <Action name="diff_show_whitespace"/>
joachim99@66 65 <Action name="diff_overview_normal"/>
joachim99@66 66 <Action name="diff_overview_ab"/>
joachim99@66 67 <Action name="diff_overview_ac"/>
joachim99@66 68 <Action name="diff_overview_bc"/>
joachim99@66 69 <Action name="diff_wordwrap"/>
joachim99@69 70 <Action name="diff_add_manual_diff_help"/>
joachim99@69 71 <Action name="diff_clear_manual_diff_help_list"/>
joachim99@66 72 </Menu>
joachim99@8 73 <Menu name="merge"><text>&amp;Merge</text>
joachim99@8 74 <Action name="merge_current"/>
joachim99@8 75 <Action name="merge_choose_a"/>
joachim99@8 76 <Action name="merge_choose_b"/>
joachim99@8 77 <Action name="merge_choose_c"/>
joachim99@8 78 <Action name="merge_autoadvance"/>
joachim99@8 79 <Action name="merge_choose_a_everywhere"/>
joachim99@8 80 <Action name="merge_choose_b_everywhere"/>
joachim99@8 81 <Action name="merge_choose_c_everywhere"/>
joachim99@51 82 <Action name="merge_choose_a_for_unsolved_conflicts"/>
joachim99@51 83 <Action name="merge_choose_b_for_unsolved_conflicts"/>
joachim99@51 84 <Action name="merge_choose_c_for_unsolved_conflicts"/>
joachim99@51 85 <Action name="merge_choose_a_for_unsolved_whitespace_conflicts"/>
joachim99@51 86 <Action name="merge_choose_b_for_unsolved_whitespace_conflicts"/>
joachim99@51 87 <Action name="merge_choose_c_for_unsolved_whitespace_conflicts"/>
joachim99@8 88 <Action name="merge_autosolve"/>
joachim99@8 89 <Action name="merge_autounsolve"/>
joachim99@69 90 <Action name="merge_splitdiff"/>
joachim99@69 91 <Action name="merge_joindiffs"/>
joachim99@69 92 <Action name="merge_regexp_automerge"/>
joachim99@69 93 <Action name="merge_versioncontrol_history"/>
joachim99@8 94 </Menu>
joachim99@8 95 <Menu name="window"><text>&amp;Window</text>
joachim99@8 96 <Action name="win_focus_prev"/>
joachim99@8 97 <Action name="win_focus_next"/>
joachim99@8 98 <Action name="win_show_a"/>
joachim99@8 99 <Action name="win_show_b"/>
joachim99@8 100 <Action name="win_show_c"/>
joachim99@8 101 <Action name="win_dir_show_both"/>
joachim99@8 102 <Action name="win_dir_view_toggle"/>
joachim99@8 103 <Action name="win_toggle_split_orientation"/>
joachim99@8 104 </Menu>
joachim99@8 105 </MenuBar>
joachim99@80 106 <ToolBar name="mainToolBar" iconText="icononly" fullWidth="true"><text>Main Toolbar</text>
joachim99@8 107 <Action name="merge_current"/>
joachim99@8 108 <Action name="go_current"/>
joachim99@8 109 <Action name="go_top"/>
joachim99@8 110 <Action name="go_bottom"/>
joachim99@8 111 <Action name="go_prev_delta"/>
joachim99@8 112 <Action name="go_next_delta"/>
joachim99@8 113 <Action name="go_prev_conflict"/>
joachim99@8 114 <Action name="go_next_conflict"/>
joachim99@8 115 <Action name="go_prev_unsolved_conflict"/>
joachim99@8 116 <Action name="go_next_unsolved_conflict"/>
joachim99@8 117 <Action name="merge_choose_a"/>
joachim99@8 118 <Action name="merge_choose_b"/>
joachim99@8 119 <Action name="merge_choose_c"/>
joachim99@8 120 <Action name="merge_autoadvance"/>
joachim99@66 121 <Action name="diff_show_whitespace"/>
joachim99@66 122 <Action name="diff_show_whitespace_characters"/>
joachim99@66 123 <Action name="diff_showlinenumbers"/>
joachim99@69 124 <Action name="dir_show_identical_files"/>
joachim99@69 125 <Action name="dir_show_files_only_in_a"/>
joachim99@69 126 <Action name="dir_show_files_only_in_b"/>
joachim99@8 127 </ToolBar>
joachim99@8 128 </kpartgui>