[meld: 175/175] Merge branch 'ui-next' into 'master'
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 175/175] Merge branch 'ui-next' into 'master'
- Date: Sat, 13 Apr 2019 02:20:41 +0000 (UTC)
commit b86ae9cf0f01a41419fa0d5e9de7af0895a1c084
Merge: ebd02a95 9847097a
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Apr 13 02:20:26 2019 +0000
Merge branch 'ui-next' into 'master'
UI refresh
See merge request GNOME/meld!30
data/icons/filter-ignored-24.png | Bin 749 -> 0 bytes
data/icons/filter-modified-24.png | Bin 952 -> 0 bytes
data/icons/filter-nonvc-24.png | Bin 1048 -> 0 bytes
data/icons/filter-normal-24.png | Bin 1059 -> 0 bytes
.../hicolor/16x16/apps/meld-version-control.png | Bin 876 -> 0 bytes
.../hicolor/48x48/apps/meld-version-control.png | Bin 2521 -> 0 bytes
data/icons/vc-add-24.png | Bin 755 -> 0 bytes
data/icons/vc-checkout-24.png | Bin 749 -> 0 bytes
data/icons/vc-commit-24.png | Bin 792 -> 0 bytes
data/icons/vc-push-24.png | Bin 891 -> 0 bytes
data/icons/vc-remove-24.png | Bin 644 -> 0 bytes
data/icons/vc-resolve-24.png | Bin 736 -> 0 bytes
data/icons/vc-update-24.png | Bin 797 -> 0 bytes
data/meld.css | 52 +-
data/org.gnome.meld.gschema.xml | 18 +
data/styles/meld-base.xml | 3 +-
data/styles/meld-dark.xml | 3 +-
data/ui/dirdiff-ui.xml | 61 --
data/ui/filediff-ui.xml | 77 --
data/ui/meldapp-ui.xml | 72 --
data/ui/vcview-ui.xml | 78 --
dev-requirements.txt | 6 +-
meld/accelerators.py | 50 ++
meld/actiongutter.py | 401 ++++++++++
meld/chunkmap.py | 431 +++++++++++
meld/conf.py | 4 -
meld/const.py | 24 +-
meld/diffgrid.py | 94 ++-
meld/diffmap.py | 182 -----
meld/dirdiff.py | 413 +++++------
meld/filediff.py | 634 ++++++++++------
meld/gutterrendererchunk.py | 221 ------
meld/linkmap.py | 3 +-
meld/matchers/diffutil.py | 13 +
meld/meldapp.py | 2 +
meld/meldbuffer.py | 2 +-
meld/melddoc.py | 76 +-
meld/meldwindow.py | 403 +++-------
meld/menuhelpers.py | 23 +
meld/preferences.py | 58 +-
meld/recent.py | 2 +-
meld/resources/gtk/help-overlay.ui | 77 +-
meld/resources/gtk/menus.ui | 177 ++++-
meld/resources/meld.gresource.xml | 4 +
meld/resources/ui/appwindow.ui | 224 +++++-
meld/resources/ui/column-list.ui | 4 +-
meld/resources/ui/dirdiff-actions.ui | 84 +++
meld/resources/ui/dirdiff-menus.ui | 34 +
meld/resources/ui/dirdiff.ui | 342 +++------
meld/resources/ui/filediff-actions.ui | 105 +++
meld/resources/ui/filediff-menus.ui | 63 ++
meld/resources/ui/filediff.ui | 579 ++++++++-------
meld/resources/ui/filter-list.ui | 8 +-
meld/resources/ui/findbar.ui | 212 +++---
meld/resources/ui/new-diff-tab.ui | 821 ++++++++++-----------
meld/resources/ui/preferences.ui | 183 ++++-
meld/resources/ui/recent-selector.ui | 56 ++
meld/resources/ui/vcview-menus.ui | 46 ++
meld/resources/ui/vcview.ui | 242 +++---
meld/sourceview.py | 90 ++-
meld/tree.py | 2 +-
meld/ui/catalog.xml | 4 +-
meld/ui/filechooser.py | 1 +
meld/ui/findbar.py | 73 +-
meld/ui/gladesupport.py | 4 +-
meld/ui/notebook.py | 2 +-
meld/ui/recentselector.py | 95 +++
meld/ui/statusbar.py | 20 +-
meld/ui/util.py | 20 -
meld/ui/vcdialogs.py | 1 +
meld/vc/__init__.py | 20 +-
meld/vcview.py | 232 +++---
test/test_gutterrendererchunk.py | 83 ++-
73 files changed, 4268 insertions(+), 3046 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]