Skip to content

Commit 4a81a50

Browse files
kaiwkaiw
committed
meld/ui/shortcuts.ui: Add file comparison shortcuts
1 parent 014f973 commit 4a81a50

1 file changed

Lines changed: 119 additions & 16 deletions

File tree

‎data/ui/shortcuts.ui‎

Lines changed: 119 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<object class="GtkShortcutsSection">
99
<property name="visible">True</property>
1010
<property name="section-name">main</property>
11-
<property name="max-height">10</property>
1211
<child>
1312
<object class="GtkShortcutsGroup">
1413
<property name="visible">True</property>
@@ -104,20 +103,6 @@
104103
<property name="visible">True</property>
105104
<property name="view">editing</property>
106105
<property name="title" translatable="yes">Editing</property>
107-
<child>
108-
<object class="GtkShortcutsShortcut">
109-
<property name="visible">True</property>
110-
<property name="accelerator">&lt;primary&gt;S</property>
111-
<property name="title" translatable="yes">Save current file</property>
112-
</object>
113-
</child>
114-
<child>
115-
<object class="GtkShortcutsShortcut">
116-
<property name="visible">True</property>
117-
<property name="accelerator">&lt;shift&gt;&lt;primary&gt;S</property>
118-
<property name="title" translatable="yes">Save current file to new path</property>
119-
</object>
120-
</child>
121106
<child>
122107
<object class="GtkShortcutsShortcut">
123108
<property name="visible">True</property>
@@ -132,7 +117,6 @@
132117
<property name="title" translatable="yes">Redo</property>
133118
</object>
134119
</child>
135-
136120
<child>
137121
<object class="GtkShortcutsShortcut">
138122
<property name="visible">True</property>
@@ -184,6 +168,125 @@
184168
</child>
185169
</object>
186170
</child>
171+
<child>
172+
<object class="GtkShortcutsGroup">
173+
<property name="visible">True</property>
174+
<property name="view">file</property>
175+
<property name="title" translatable="yes">File comparison</property>
176+
<child>
177+
<object class="GtkShortcutsShortcut">
178+
<property name="visible">True</property>
179+
<property name="accelerator">&lt;primary&gt;S</property>
180+
<property name="title" translatable="yes">Save current file</property>
181+
</object>
182+
</child>
183+
<child>
184+
<object class="GtkShortcutsShortcut">
185+
<property name="visible">True</property>
186+
<property name="accelerator">&lt;shift&gt;&lt;primary&gt;S</property>
187+
<property name="title" translatable="yes">Save current file to new path</property>
188+
</object>
189+
</child>
190+
<child>
191+
<object class="GtkShortcutsShortcut">
192+
<property name="visible">True</property>
193+
<property name="accelerator">&lt;shift&gt;&lt;primary&gt;L</property>
194+
<property name="title" translatable="yes">Save all files in comparison</property>
195+
</object>
196+
</child>
197+
<child>
198+
<object class="GtkShortcutsShortcut">
199+
<property name="visible">True</property>
200+
<property name="accelerator">&lt;primary&gt;I</property>
201+
<property name="title" translatable="yes">Previous conflict</property>
202+
</object>
203+
</child>
204+
<child>
205+
<object class="GtkShortcutsShortcut">
206+
<property name="visible">True</property>
207+
<property name="accelerator">&lt;primary&gt;K</property>
208+
<property name="title" translatable="yes">Next conflict</property>
209+
</object>
210+
</child>
211+
<child>
212+
<object class="GtkShortcutsShortcut">
213+
<property name="visible">True</property>
214+
<property name="accelerator">&lt;alt&gt;Left</property>
215+
<property name="title" translatable="yes">Push change to left</property>
216+
</object>
217+
</child>
218+
<child>
219+
<object class="GtkShortcutsShortcut">
220+
<property name="visible">True</property>
221+
<property name="accelerator">&lt;alt&gt;Right</property>
222+
<property name="title" translatable="yes">Push change to right</property>
223+
</object>
224+
</child>
225+
<child>
226+
<object class="GtkShortcutsShortcut">
227+
<property name="visible">True</property>
228+
<property name="accelerator">&lt;shift&gt;&lt;alt&gt;Left</property>
229+
<property name="title" translatable="yes">Pull change from left</property>
230+
</object>
231+
</child>
232+
<child>
233+
<object class="GtkShortcutsShortcut">
234+
<property name="visible">True</property>
235+
<property name="accelerator">&lt;shift&gt;&lt;alt&gt;Right</property>
236+
<property name="title" translatable="yes">Pull change from right</property>
237+
</object>
238+
</child>
239+
<child>
240+
<object class="GtkShortcutsShortcut">
241+
<property name="visible">True</property>
242+
<property name="accelerator">&lt;alt&gt;bracketleft</property>
243+
<property name="title" translatable="yes">Copy change above left</property>
244+
</object>
245+
</child>
246+
<child>
247+
<object class="GtkShortcutsShortcut">
248+
<property name="visible">True</property>
249+
<property name="accelerator">&lt;alt&gt;semicolon</property>
250+
<property name="title" translatable="yes">Copy change below left</property>
251+
</object>
252+
</child>
253+
<child>
254+
<object class="GtkShortcutsShortcut">
255+
<property name="visible">True</property>
256+
<property name="accelerator">&lt;alt&gt;bracketright</property>
257+
<property name="title" translatable="yes">Copy change above right</property>
258+
</object>
259+
</child>
260+
<child>
261+
<object class="GtkShortcutsShortcut">
262+
<property name="visible">True</property>
263+
<property name="accelerator">&lt;alt&gt;quoteright</property>
264+
<property name="title" translatable="yes">Copy change below right</property>
265+
</object>
266+
</child>
267+
<child>
268+
<object class="GtkShortcutsShortcut">
269+
<property name="visible">True</property>
270+
<property name="accelerator">&lt;alt&gt;Delete</property>
271+
<property name="title" translatable="yes">Delete change</property>
272+
</object>
273+
</child>
274+
<child>
275+
<object class="GtkShortcutsShortcut">
276+
<property name="visible">True</property>
277+
<property name="accelerator">&lt;alt&gt;Page_Up</property>
278+
<property name="title" translatable="yes">Previous comparison pane</property>
279+
</object>
280+
</child>
281+
<child>
282+
<object class="GtkShortcutsShortcut">
283+
<property name="visible">True</property>
284+
<property name="accelerator">&lt;alt&gt;Page_Down</property>
285+
<property name="title" translatable="yes">Next comparison pane</property>
286+
</object>
287+
</child>
288+
</object>
289+
</child>
187290
</object>
188291
</child>
189292
</object>

0 commit comments

Comments
 (0)