[dia: 14/14] Merge branch 'zbrown/gresource-icons' into 'master'
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia: 14/14] Merge branch 'zbrown/gresource-icons' into 'master'
- Date: Wed, 8 May 2019 22:43:53 +0000 (UTC)
commit 4ede4a82866ed4745d87bfadc99669b3b14e4f1d
Merge: 2c96a940 69c0d45c
Author: Zander <ajhb2001 outlook com>
Date: Wed May 8 22:43:34 2019 +0000
Merge branch 'zbrown/gresource-icons' into 'master'
GResource Icons
Stop using inline pixbufs and instead use gresource
As Gtk doesn't have native support for GResource in Gtk2 some utilities are needed
Also simplifies object icon loading as there is now a single way to get a types icon
(`dia_object_type_get_icon`) rather than multiple similar-but-not-idential implementations
I intend to further simplify icon handling in Dia 2 but for now backwards compatability with inline icons
is mantained to avoid breaking existing 3rd party objects
Unfortunately there is quite a bit of noise as vscode tries to normalise whitespace according to editor
config
I'll leave this open a few days for comments
See merge request GNOME/dia!30
app/app_procs.c | 91 +++--
app/create_object.c | 62 +--
app/cursor.c | 101 +----
app/cursor.h | 12 +-
app/dia.gresource.xml | 27 ++
app/diagram_tree_view.c | 45 +--
app/display.c | 170 ++++----
app/display.h | 3 +-
.../dia-connectable-empty.png} | Bin
.../connectable.png => icons/dia-connectable.png} | Bin
.../dia-cursor-create.png} | Bin
app/icons/dia-diagram.png | Bin 0 -> 2215 bytes
.../off-grid.png => icons/dia-grid-off.png} | Bin
app/{pixmaps/on-grid.png => icons/dia-grid-on.png} | Bin
app/{pixmaps/group.png => icons/dia-group.png} | Bin
.../layer-add.png => icons/dia-layer-add.png} | Bin
.../dia-layer-move-above.png} | Bin
.../dia-layer-move-below.png} | Bin
.../dia-layer-rename.png} | Bin
app/{pixmaps/layers.png => icons/dia-layers.png} | Bin
.../dia-mainpoints-off.png} | Bin
.../dia-mainpoints-on.png} | Bin
.../arrow-22.png => icons/dia-tool-modify.png} | Bin
.../scroll-22.png => icons/dia-tool-scroll.png} | Bin
.../textedit-22.png => icons/dia-tool-text.png} | Bin
.../zoom-22.png => icons/dia-tool-zoom.png} | Bin
app/{pixmaps/ungroup.png => icons/dia-ungroup.png} | Bin
.../dia-visible-empty.png} | Bin
app/{pixmaps/visible.png => icons/dia-visible.png} | Bin
app/icons/org.gnome.Dia.png | Bin 0 -> 3344 bytes
app/interface.c | 133 +++---
app/layer_dialog.c | 164 ++++----
app/magnify.c | 12 +-
app/menus.c | 187 +++++----
app/meson.build | 8 +-
app/modify_tool.c | 118 +++---
app/pixmaps/arrow.xpm | 27 --
app/pixmaps/cursor-create-data.png | Bin 196 -> 0 bytes
app/pixmaps/cursor-hand-closed.png | Bin 205 -> 0 bytes
app/pixmaps/cursor-hand-open.png | Bin 223 -> 0 bytes
app/pixmaps/cursor-magnify-minus.png | Bin 250 -> 0 bytes
app/pixmaps/cursor-magnify-plus.png | Bin 268 -> 0 bytes
app/pixmaps/dia-app.png | Bin 2565 -> 0 bytes
app/pixmaps/dia-diagram.png | Bin 1992 -> 0 bytes
app/pixmaps/eye.xbm | 9 -
app/pixmaps/meson.build | 52 ---
app/pixmaps/modify-24x24.png | Bin 251 -> 0 bytes
app/pixmaps/n_a.xpm | 26 --
app/pixmaps/scroll-24x24.png | Bin 555 -> 0 bytes
app/pixmaps/selectable-empty.png | Bin 156 -> 0 bytes
app/pixmaps/selectable.png | Bin 188 -> 0 bytes
app/pixmaps/snap-to-grid-mask.xpm | 26 --
app/pixmaps/snap-to-grid.xpm | 19 -
app/pixmaps/zoom-24x24.png | Bin 997 -> 0 bytes
app/scroll_tool.c | 21 +-
app/splash.c | 11 +-
app/textedit_tool.c | 14 +-
app/toolbox.c | 110 ++---
app/toolbox.h | 2 +-
data/diagram.svg | 450 +++++++++++++++++++++
lib/dia_dirs.c | 18 +-
lib/dia_image.c | 34 +-
.../dia-chain-broken.png} | Bin
.../dia-chain-unbroken.png} | Bin
lib/{pixmaps => icons}/standard-path.png | Bin
lib/libdia.def | 2 +-
lib/libdia.gresource.xml | 8 +
lib/meson.build | 8 +-
lib/object.c | 147 ++++---
lib/object.h | 2 +
lib/pixmaps/broken.png | Bin 4239 -> 0 bytes
lib/pixmaps/broken.xpm | 88 ----
lib/pixmaps/meson.build | 17 -
lib/standard-path.c | 45 +--
lib/widgets.c | 141 ++++---
lib/widgets.h | 11 +-
meson.build | 3 -
objects/standard/arc.c | 91 ++---
objects/standard/bezier.c | 91 ++---
objects/standard/beziergon.c | 39 +-
objects/standard/box.c | 59 ++-
objects/standard/ellipse.c | 55 ++-
objects/standard/image.c | 51 ++-
objects/standard/line.c | 50 ++-
objects/standard/meson.build | 2 +-
objects/standard/outline.c | 49 ++-
objects/standard/pixmaps/arc-24x24.png | Bin 382 -> 0 bytes
objects/standard/pixmaps/arc.xpm | 29 --
objects/standard/pixmaps/bezier.xpm | 29 --
objects/standard/pixmaps/beziergon-24x24.png | Bin 1072 -> 0 bytes
objects/standard/pixmaps/beziergon.xpm | 31 --
objects/standard/pixmaps/bezierline-24x24.png | Bin 378 -> 0 bytes
objects/standard/pixmaps/box-24x24.png | Bin 394 -> 0 bytes
objects/standard/pixmaps/box.xpm | 29 --
objects/standard/pixmaps/ellipse-24x24.png | Bin 959 -> 0 bytes
objects/standard/pixmaps/ellipse.xpm | 29 --
objects/standard/pixmaps/image-24x24.png | Bin 657 -> 0 bytes
objects/standard/pixmaps/image.xpm | 31 --
objects/standard/pixmaps/line-24x24.png | Bin 298 -> 0 bytes
objects/standard/pixmaps/line.xpm | 28 --
objects/standard/pixmaps/meson.build | 34 +-
objects/standard/pixmaps/polygon-24x24.png | Bin 602 -> 0 bytes
objects/standard/pixmaps/polygon.xpm | 29 --
objects/standard/pixmaps/polyline-24x24.png | Bin 394 -> 0 bytes
objects/standard/pixmaps/polyline.xpm | 29 --
objects/standard/pixmaps/standard.gresource.xml | 17 +
objects/standard/pixmaps/text.xpm | 27 --
objects/standard/pixmaps/zigzag.xpm | 29 --
objects/standard/pixmaps/zigzagline-24x24.png | Bin 341 -> 0 bytes
objects/standard/polygon.c | 23 +-
objects/standard/polyline.c | 27 +-
objects/standard/textobj.c | 30 +-
objects/standard/zigzagline.c | 30 +-
113 files changed, 1600 insertions(+), 1792 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
