Skip to content

Commit 5f84284

Browse files
kaiwkaiw
committed
Merge branch 'master' into Gio
2 parents 3a8dae9 + 5f2e3f4 commit 5f84284

43 files changed

Lines changed: 5417 additions & 4585 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NEWS‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,69 @@
11

2+
2015-10-05 meld 3.15.0
3+
======================
4+
5+
Features:
6+
7+
* New API for version control plugins with more consistent interfaces and
8+
data structures across different plugins, enabling many minor
9+
improvements (Kai Willadsen)
10+
* Support the conflict resolution prompt in file comparisons for all VCs
11+
* Improve caching behaviour for some version control plugins
12+
* Better sensitivity handling for version control actions
13+
* Cache and show more metadata (e.g., file renames)
14+
* Several version control plugins have not been ported to the new API; the
15+
current list of support plugins is: Git, Mercurial, Subversion 1.7+,
16+
Bazaar
17+
* Faster rendering in file comparison view, enabled by new GtkTextView API
18+
(Kai Willadsen)
19+
* Move to using GtkSourceView style schemes with Meld-specific colour tags
20+
for highlight colours; this lets themes include colours that match the
21+
sourceview theme (Kai Willadsen)
22+
* Offer to open binary files externally (Pratik Dayama)
23+
* Show the common ancestor in conflicting regions (and the merged file
24+
everywhere else) when viewing conflicts through Meld's version control
25+
view; currently this is only supported under Git (Kai Willadsen)
26+
* Support showing staged/partially staged status of files under Git (Kai
27+
Willadsen)
28+
* Update preferences dialog to new style with headerbar (Kai Willadsen)
29+
30+
31+
Fixes:
32+
33+
* Documentation updates (Andrew Beyer)
34+
* Fix crash with some GTK+ versions when using --output (Kai Willadsen)
35+
* Fix merge-all action not working at all (Kai Willadsen)
36+
* Fix creating patches with unicode path names (Kai Willadsen)
37+
* Fix copy-to-clipboard option in patch dialog (Kai Willadsen)
38+
* Fix diffmap alignment for new GTK+ allocation behaviour (Kai Willadsen)
39+
* Improve float accuracy in folder comparison timestamp resolution (Kai
40+
Willadsen)
41+
* Fix default SVN keyword filter to escape $ characters (Kai Willadsen)
42+
* Fix display of unicode --help from command line (Kai Willadsen)
43+
* Fix keyboard shortcut docs (Kai Willadsen)
44+
* Don't incorrectly show identical notification for changed folder
45+
comparisons (Kai Willadsen)
46+
47+
48+
Internal changes:
49+
50+
* Requirements are now GTK+ 3.14, GtkSourceView 3.14 and GLib 2.36
51+
* Rewritten version control plugin API
52+
* Unified colour handling between linkmap, diffmap and file comparison
53+
* Move all textview drawing to a new GtkSourceView subclass, using the new
54+
GTK+ draw-layer API
55+
56+
57+
Translations:
58+
59+
* Daniel Mustieles (es)
60+
* Gábor Kelemen (hu)
61+
* Jiri Grönroos (fi)
62+
* Josef Andersson (sv)
63+
* Marek Černocký (cs)
64+
* Piotr Drąg (pl)
65+
66+
267
2015-07-23 meld 3.14.0
368
======================
469

‎bin/meld‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ def check_requirements():
158158
try:
159159
# FIXME: Extra clause for gi
160160
import gi
161-
from gi.repository import Gtk
162161
gi.require_version("Gtk", "3.0")
162+
from gi.repository import Gtk
163163
version = (Gtk.get_major_version(), Gtk.get_minor_version())
164164
assert version >= gtk_requirement
165165
except (ImportError, AssertionError) as e:
@@ -172,6 +172,7 @@ def check_requirements():
172172
missing_reqs("GLib", glib_requirement, e)
173173

174174
try:
175+
gi.require_version('GtkSource', '3.0')
175176
from gi.repository import GtkSource
176177
# TODO: There is no way to get at GtkSourceView's actual version
177178
assert hasattr(GtkSource, 'SearchSettings')

‎data/styles/meld-base.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
<style name="meld:unknown-text" foreground="#888888"/>
1414
<style name="meld:syncpoint-outline" foreground="#555555"/>
1515
<style name="meld:current-chunk-highlight" background="rgba(255, 255, 255, 0.5)"/>
16+
<style name="meld:dimmed" foreground="#999999"/>
1617
</style-scheme>

‎data/styles/meld-dark.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
<style name="meld:unknown-text" background="#aaaaaa"/>
1515
<style name="meld:syncpoint-outline" foreground="#bbbbbb"/>
1616
<style name="meld:current-chunk-highlight" background="rgba(255, 255, 255, 0.1)"/>
17+
<style name="meld:dimmed" foreground="#999999"/>
1718
</style-scheme>

‎data/ui/filediff.ui‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
</object>
182182
<object class="GtkMessageDialog" id="check_save_dialog">
183183
<property name="can_focus">False</property>
184-
<property name="border_width">5</property>
185184
<property name="type_hint">dialog</property>
186185
<property name="skip_taskbar_hint">True</property>
187186
<property name="message_type">warning</property>
@@ -197,7 +196,7 @@
197196
<object class="GtkButtonBox" id="dialog-action_area1">
198197
<property name="visible">True</property>
199198
<property name="can_focus">False</property>
200-
<property name="layout_style">end</property>
199+
<property name="layout_style">expand</property>
201200
<child>
202201
<object class="GtkButton" id="close_button">
203202
<property name="label" translatable="yes">Close _without Saving</property>
@@ -208,7 +207,7 @@
208207
</object>
209208
<packing>
210209
<property name="expand">False</property>
211-
<property name="fill">False</property>
210+
<property name="fill">True</property>
212211
<property name="position">0</property>
213212
</packing>
214213
</child>
@@ -222,7 +221,7 @@
222221
</object>
223222
<packing>
224223
<property name="expand">False</property>
225-
<property name="fill">False</property>
224+
<property name="fill">True</property>
226225
<property name="position">1</property>
227226
</packing>
228227
</child>
@@ -236,7 +235,7 @@
236235
</object>
237236
<packing>
238237
<property name="expand">False</property>
239-
<property name="fill">False</property>
238+
<property name="fill">True</property>
240239
<property name="position">2</property>
241240
</packing>
242241
</child>
@@ -804,7 +803,6 @@
804803
</object>
805804
<object class="GtkMessageDialog" id="revert_dialog">
806805
<property name="can_focus">False</property>
807-
<property name="border_width">5</property>
808806
<property name="type_hint">dialog</property>
809807
<property name="skip_taskbar_hint">True</property>
810808
<property name="message_type">question</property>
@@ -821,7 +819,7 @@
821819
<object class="GtkButtonBox" id="dialog-action_area2">
822820
<property name="visible">True</property>
823821
<property name="can_focus">False</property>
824-
<property name="layout_style">end</property>
822+
<property name="layout_style">expand</property>
825823
<child>
826824
<object class="GtkButton" id="cancel_button1">
827825
<property name="label">gtk-cancel</property>
@@ -833,7 +831,7 @@
833831
</object>
834832
<packing>
835833
<property name="expand">False</property>
836-
<property name="fill">False</property>
834+
<property name="fill">True</property>
837835
<property name="position">0</property>
838836
</packing>
839837
</child>
@@ -848,7 +846,7 @@
848846
</object>
849847
<packing>
850848
<property name="expand">False</property>
851-
<property name="fill">False</property>
849+
<property name="fill">True</property>
852850
<property name="position">1</property>
853851
</packing>
854852
</child>

‎data/ui/preferences.ui‎

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -86,64 +86,23 @@
8686
</data>
8787
</object>
8888
<object class="GtkDialog" id="preferencesdialog">
89-
<property name="can_focus">False</property>
90-
<property name="border_width">5</property>
89+
<property name="border_width">0</property>
90+
<property name="modal">True</property>
91+
<property name="resizable">False</property>
9192
<property name="title" translatable="yes">Meld Preferences</property>
9293
<property name="type_hint">dialog</property>
94+
<property name="use-header-bar">1</property>
9395
<signal name="response" handler="on_response" swapped="no"/>
9496
<child internal-child="vbox">
9597
<object class="GtkBox" id="dialog-vbox4">
9698
<property name="visible">True</property>
9799
<property name="can_focus">False</property>
98100
<property name="orientation">vertical</property>
99-
<child internal-child="action_area">
100-
<object class="GtkButtonBox" id="dialog-action_area4">
101-
<property name="visible">True</property>
102-
<property name="can_focus">False</property>
103-
<property name="layout_style">end</property>
104-
<child>
105-
<object class="GtkButton" id="helpbutton1">
106-
<property name="label">gtk-help</property>
107-
<property name="can_focus">True</property>
108-
<property name="can_default">True</property>
109-
<property name="receives_default">False</property>
110-
<property name="use_stock">True</property>
111-
</object>
112-
<packing>
113-
<property name="expand">False</property>
114-
<property name="fill">False</property>
115-
<property name="position">0</property>
116-
</packing>
117-
</child>
118-
<child>
119-
<object class="GtkButton" id="closebutton1">
120-
<property name="label">gtk-close</property>
121-
<property name="visible">True</property>
122-
<property name="can_focus">True</property>
123-
<property name="can_default">True</property>
124-
<property name="receives_default">False</property>
125-
<property name="use_stock">True</property>
126-
<accelerator key="Escape" signal="clicked"/>
127-
</object>
128-
<packing>
129-
<property name="expand">False</property>
130-
<property name="fill">False</property>
131-
<property name="position">1</property>
132-
</packing>
133-
</child>
134-
</object>
135-
<packing>
136-
<property name="expand">False</property>
137-
<property name="fill">True</property>
138-
<property name="pack_type">end</property>
139-
<property name="position">0</property>
140-
</packing>
141-
</child>
101+
<property name="border-width">0</property>
142102
<child>
143103
<object class="GtkNotebook" id="notebook">
144104
<property name="visible">True</property>
145105
<property name="can_focus">False</property>
146-
<property name="border_width">5</property>
147106
<property name="show_border">False</property>
148107
<child>
149108
<object class="GtkVBox" id="editor_tab">
@@ -1586,10 +1545,6 @@
15861545
</child>
15871546
</object>
15881547
</child>
1589-
<action-widgets>
1590-
<action-widget response="-11">helpbutton1</action-widget>
1591-
<action-widget response="-7">closebutton1</action-widget>
1592-
</action-widgets>
15931548
</object>
15941549
<object class="GtkSizeGroup" id="sizegroup_editor">
15951550
<widgets>

‎data/ui/vcview.ui‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,6 @@
633633
</object>
634634
<object class="GtkMessageDialog" id="pushdialog">
635635
<property name="can_focus">False</property>
636-
<property name="border_width">5</property>
637636
<property name="type_hint">dialog</property>
638637
<property name="skip_taskbar_hint">True</property>
639638
<property name="message_type">question</property>
@@ -649,7 +648,7 @@
649648
<object class="GtkButtonBox" id="dialog-action_area2">
650649
<property name="visible">True</property>
651650
<property name="can_focus">False</property>
652-
<property name="layout_style">end</property>
651+
<property name="layout_style">expand</property>
653652
<child>
654653
<object class="GtkButton" id="cancelbutton">
655654
<property name="label">gtk-cancel</property>
@@ -660,7 +659,7 @@
660659
</object>
661660
<packing>
662661
<property name="expand">False</property>
663-
<property name="fill">False</property>
662+
<property name="fill">True</property>
664663
<property name="position">0</property>
665664
</packing>
666665
</child>
@@ -674,7 +673,7 @@
674673
</object>
675674
<packing>
676675
<property name="expand">False</property>
677-
<property name="fill">False</property>
676+
<property name="fill">True</property>
678677
<property name="position">1</property>
679678
</packing>
680679
</child>

‎help/cs/cs.po‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
msgid ""
77
msgstr ""
88
"Project-Id-Version: meld master\n"
9-
"POT-Creation-Date: 2015-07-20 19:42+0000\n"
10-
"PO-Revision-Date: 2015-07-21 11:57+0200\n"
9+
"POT-Creation-Date: 2015-10-11 11:40+0000\n"
10+
"PO-Revision-Date: 2015-10-11 18:42+0200\n"
1111
"Last-Translator: Marek Černocký <marek@manet.cz>\n"
1212
"Language-Team: Czech <gnome-cs-list@gnome.org>\n"
1313
"Language: cs\n"
@@ -33,8 +33,7 @@ msgstr "3"
3333
#: C/resolving-conflicts.page:10 C/preferences.page:10 C/file-changes.page:10
3434
#: C/file-mode.page:11 C/flattened-view.page:10 C/index.page:8
3535
#: C/vc-mode.page:10 C/keyboard-shortcuts.page:10 C/introduction.page:10
36-
#: C/folder-mode.page:10 C/missing-functionality.page:10
37-
#: C/command-line.page:10
36+
#: C/folder-mode.page:10 C/missing-functionality.page:10 C/command-line.page:10
3837
msgid "Kai Willadsen"
3938
msgstr "Kai Willadsen"
4039

@@ -709,10 +708,10 @@ msgid ""
709708
msgstr ""
710709
"Název příkazu, který provede otevření textových souborů v externím editoru. "
711710
"Stačí samotný příkaz (např. <cmd>gedit</cmd>), a otevíraný soubor je pak "
712-
"předán jako poslední argument. Nebo případně můžete do příkazu přidat <code>"
713-
"{file}</code> a <code>{line}</code>, které pak <app>Meld</app> nahradí "
714-
"názvem souboru včetně cesty, respektive číslem aktuálního řádku. (např. "
715-
"<cmd>gedit {file}:{line}</cmd>)."
711+
"předán jako poslední argument. Nebo případně můžete do příkazu přidat "
712+
"<code>{file}</code> a <code>{line}</code>, které pak <app>Meld</app> "
713+
"nahradí názvem souboru včetně cesty, respektive číslem aktuálního řádku. "
714+
"(např. <cmd>gedit {file}:{line}</cmd>)."
716715

717716
#. (itstool) path: terms/title
718717
#: C/preferences.page:31
@@ -1441,9 +1440,9 @@ msgid "Find the next instance of the string."
14411440
msgstr "Najít následující výskyt řetězce"
14421441

14431442
#. (itstool) path: td/p
1444-
#: C/keyboard-shortcuts.page:90 C/keyboard-shortcuts.page:96
1445-
msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
1446-
msgstr "<keyseq><key>Alt</key><key>Up</key></keyseq>"
1443+
#: C/keyboard-shortcuts.page:90
1444+
msgid "<keyseq><key>Alt</key><key>Down</key></keyseq>"
1445+
msgstr "<keyseq><key>Alt</key><key>↓</key></keyseq>"
14471446

14481447
#. (itstool) path: td/p
14491448
#: C/keyboard-shortcuts.page:91
@@ -1454,6 +1453,11 @@ msgstr ""
14541453
"Přejít na následující rozdíl (také <keyseq><key>Ctrl</key><key>D</key></"
14551454
"keyseq>)"
14561455

1456+
#. (itstool) path: td/p
1457+
#: C/keyboard-shortcuts.page:96
1458+
msgid "<keyseq><key>Alt</key><key>Up</key></keyseq>"
1459+
msgstr "<keyseq><key>Alt</key><key>↑</key></keyseq>"
1460+
14571461
#. (itstool) path: td/p
14581462
#: C/keyboard-shortcuts.page:97
14591463
msgid ""

‎meld/build_helpers.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,12 @@ def get_data_files(self):
139139
msgfmt = ['msgfmt', po_file, '-o', mo_file]
140140
self.spawn(msgfmt)
141141
for page in self.C_PAGES:
142-
itstool = ['itstool', '-m', mo_file, '-o', build_path, page]
142+
itstool = [
143+
'itstool', '-m', mo_file, '-o', build_path, page]
143144
self.spawn(itstool)
144145
for extra in self.C_EXTRA:
145-
extra_path = os.path.join(build_path, os.path.basename(extra))
146+
extra_path = os.path.join(
147+
build_path, os.path.basename(extra))
146148
if os.path.exists(extra_path):
147149
os.unlink(extra_path)
148150
os.symlink(os.path.relpath(extra, source_path), extra_path)
@@ -154,7 +156,8 @@ def get_data_files(self):
154156
path_help = os.path.join('share', 'help', lang, name)
155157
path_figures = os.path.join(path_help, 'figures')
156158
data_files.append((path_help, xml_files + mallard_files))
157-
data_files.append((path_figures, glob.glob('%s/figures/*.png' % build_path)))
159+
data_files.append(
160+
(path_figures, glob.glob('%s/figures/*.png' % build_path)))
158161

159162
return data_files
160163

@@ -201,7 +204,8 @@ def run(self):
201204
for category in glob.glob(os.path.join(size, "*")):
202205
icons = (glob.glob(os.path.join(category, "*.png")) +
203206
glob.glob(os.path.join(category, "*.svg")))
204-
icons = [icon for icon in icons if not os.path.islink(icon)]
207+
icons = [
208+
icon for icon in icons if not os.path.islink(icon)]
205209
if not icons:
206210
continue
207211
data_files.append(("%s/%s/%s/%s" %
@@ -262,7 +266,7 @@ def _rebuild_po(self):
262266
max_po_mtime = 0
263267
for po_file in glob.glob("%s/*.po" % self.po_dir):
264268
lang = os.path.basename(po_file[:-3])
265-
if selected_languages and not lang in selected_languages:
269+
if selected_languages and lang not in selected_languages:
266270
continue
267271
mo_dir = os.path.join("build", "mo", lang, "LC_MESSAGES")
268272
mo_file = os.path.join(mo_dir, "%s.mo" % self.domain)

0 commit comments

Comments
 (0)