icon-themes/colibre/vcl/res/autoscroll_e.png |binary icon-themes/colibre/vcl/res/autoscroll_n.png |binary icon-themes/colibre/vcl/res/autoscroll_ne.png |binary icon-themes/colibre/vcl/res/autoscroll_ns.png |binary icon-themes/colibre/vcl/res/autoscroll_nswe.png |binary icon-themes/colibre/vcl/res/autoscroll_nw.png |binary icon-themes/colibre/vcl/res/autoscroll_s.png |binary icon-themes/colibre/vcl/res/autoscroll_se.png |binary icon-themes/colibre/vcl/res/autoscroll_sw.png |binary icon-themes/colibre/vcl/res/autoscroll_w.png |binary icon-themes/colibre/vcl/res/autoscroll_we.png |binary icon-themes/colibre/vcl/res/chain.png |binary icon-themes/colibre/vcl/res/chain_not_allowed.png |binary icon-themes/colibre/vcl/res/chart.png |binary icon-themes/colibre/vcl/res/copy_data.png |binary icon-themes/colibre/vcl/res/copy_data_link.png |binary icon-themes/colibre/vcl/res/copy_file.png |binary icon-themes/colibre/vcl/res/copy_file_link.png |binary icon-themes/colibre/vcl/res/copy_files.png |binary icon-themes/colibre/vcl/res/crook.png |binary icon-themes/colibre/vcl/res/crop.png |binary icon-themes/colibre/vcl/res/detective.png |binary icon-themes/colibre/vcl/res/draw_arc.png |binary icon-themes/colibre/vcl/res/draw_bezier.png |binary icon-themes/colibre/vcl/res/draw_caption.png |binary icon-themes/colibre/vcl/res/draw_circle_cut.png |binary icon-themes/colibre/vcl/res/draw_connect.png |binary icon-themes/colibre/vcl/res/draw_ellipse.png |binary icon-themes/colibre/vcl/res/draw_freehand.png |binary icon-themes/colibre/vcl/res/draw_line.png |binary icon-themes/colibre/vcl/res/draw_pie.png |binary icon-themes/colibre/vcl/res/draw_polygon.png |binary icon-themes/colibre/vcl/res/draw_rect.png |binary icon-themes/colibre/vcl/res/draw_text.png |binary icon-themes/colibre/vcl/res/fill.png |binary icon-themes/colibre/vcl/res/h_shear.png |binary icon-themes/colibre/vcl/res/help.png |binary icon-themes/colibre/vcl/res/hide_whitespace.png |binary icon-themes/colibre/vcl/res/hourglass.png |binary icon-themes/colibre/vcl/res/link_data.png |binary icon-themes/colibre/vcl/res/link_file.png |binary icon-themes/colibre/vcl/res/magnify.png |binary icon-themes/colibre/vcl/res/mirror.png |binary icon-themes/colibre/vcl/res/move_bezier_weight.png |binary icon-themes/colibre/vcl/res/move_data.png |binary icon-themes/colibre/vcl/res/move_data_link.png |binary icon-themes/colibre/vcl/res/move_file.png |binary icon-themes/colibre/vcl/res/move_file_link.png |binary icon-themes/colibre/vcl/res/move_files.png |binary icon-themes/colibre/vcl/res/move_point.png |binary icon-themes/colibre/vcl/res/neswsize.png |binary icon-themes/colibre/vcl/res/not_allowed.png |binary icon-themes/colibre/vcl/res/null.png |binary icon-themes/colibre/vcl/res/nwsesize.png |binary icon-themes/colibre/vcl/res/pen.png |binary icon-themes/colibre/vcl/res/pivot_column.png |binary icon-themes/colibre/vcl/res/pivot_delete.png |binary icon-themes/colibre/vcl/res/pivot_field.png |binary icon-themes/colibre/vcl/res/pivot_row.png |binary icon-themes/colibre/vcl/res/rotate.png |binary icon-themes/colibre/vcl/res/show_whitespace.png |binary icon-themes/colibre/vcl/res/tab_select_e.png |binary icon-themes/colibre/vcl/res/tab_select_s.png |binary icon-themes/colibre/vcl/res/tab_select_se.png |binary icon-themes/colibre/vcl/res/tab_select_sw.png |binary icon-themes/colibre/vcl/res/tab_select_w.png |binary icon-themes/colibre/vcl/res/text_vertical.png |binary icon-themes/colibre/vcl/res/v_shear.png |binary vcl/inc/bitmaps.hlst | 136 ++++++++++----------- vcl/unx/gtk3/gtk3gtkdata.cxx | 4 70 files changed, 70 insertions(+), 70 deletions(-)
New commits: commit 25d176ada67ada550bd4d0d08177c232cf7eeb37 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Mar 4 15:58:18 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Mar 5 08:17:32 2019 +0100 tdf#123796 Wrong cursor when inserting shape regression from commit c5ac80d90ebcc1c3fad18ece8784ac2b36f52045 make cursor images part of the theme Turns out that I can't put SVG files into a normal theme, only colibre_svg is allowed to contain SVG files, so my idea of having only one set of files is not going to fly. So make a copy of the PNG files into the colibre theme, which is what everything currently falls back to. Change-Id: I5f04226da5c8b3d5db7e9807e845112b76b72f22 Reviewed-on: https://gerrit.libreoffice.org/68695 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/icon-themes/colibre/vcl/res/autoscroll_e.png b/icon-themes/colibre/vcl/res/autoscroll_e.png new file mode 100644 index 000000000000..a3a30e0bcdce Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_e.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_n.png b/icon-themes/colibre/vcl/res/autoscroll_n.png new file mode 100644 index 000000000000..7a140b1ec926 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_n.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_ne.png b/icon-themes/colibre/vcl/res/autoscroll_ne.png new file mode 100644 index 000000000000..311506aeb349 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_ne.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_ns.png b/icon-themes/colibre/vcl/res/autoscroll_ns.png new file mode 100644 index 000000000000..1c8950eb28bc Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_ns.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_nswe.png b/icon-themes/colibre/vcl/res/autoscroll_nswe.png new file mode 100644 index 000000000000..aae5246fbbc0 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_nswe.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_nw.png b/icon-themes/colibre/vcl/res/autoscroll_nw.png new file mode 100644 index 000000000000..9fd0036df077 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_nw.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_s.png b/icon-themes/colibre/vcl/res/autoscroll_s.png new file mode 100644 index 000000000000..bee09e736ad1 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_s.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_se.png b/icon-themes/colibre/vcl/res/autoscroll_se.png new file mode 100644 index 000000000000..d7883211d44f Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_se.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_sw.png b/icon-themes/colibre/vcl/res/autoscroll_sw.png new file mode 100644 index 000000000000..0b0a496a52ec Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_sw.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_w.png b/icon-themes/colibre/vcl/res/autoscroll_w.png new file mode 100644 index 000000000000..5a4b9519e075 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_w.png differ diff --git a/icon-themes/colibre/vcl/res/autoscroll_we.png b/icon-themes/colibre/vcl/res/autoscroll_we.png new file mode 100644 index 000000000000..b9c5afaac043 Binary files /dev/null and b/icon-themes/colibre/vcl/res/autoscroll_we.png differ diff --git a/icon-themes/colibre/vcl/res/chain.png b/icon-themes/colibre/vcl/res/chain.png new file mode 100644 index 000000000000..dbf069924d73 Binary files /dev/null and b/icon-themes/colibre/vcl/res/chain.png differ diff --git a/icon-themes/colibre/vcl/res/chain_not_allowed.png b/icon-themes/colibre/vcl/res/chain_not_allowed.png new file mode 100644 index 000000000000..547703edf12c Binary files /dev/null and b/icon-themes/colibre/vcl/res/chain_not_allowed.png differ diff --git a/icon-themes/colibre/vcl/res/chart.png b/icon-themes/colibre/vcl/res/chart.png new file mode 100644 index 000000000000..de5514006e1f Binary files /dev/null and b/icon-themes/colibre/vcl/res/chart.png differ diff --git a/icon-themes/colibre/vcl/res/copy_data.png b/icon-themes/colibre/vcl/res/copy_data.png new file mode 100644 index 000000000000..b6202fd9144f Binary files /dev/null and b/icon-themes/colibre/vcl/res/copy_data.png differ diff --git a/icon-themes/colibre/vcl/res/copy_data_link.png b/icon-themes/colibre/vcl/res/copy_data_link.png new file mode 100644 index 000000000000..fab24c9f8f7c Binary files /dev/null and b/icon-themes/colibre/vcl/res/copy_data_link.png differ diff --git a/icon-themes/colibre/vcl/res/copy_file.png b/icon-themes/colibre/vcl/res/copy_file.png new file mode 100644 index 000000000000..70546d0c0c22 Binary files /dev/null and b/icon-themes/colibre/vcl/res/copy_file.png differ diff --git a/icon-themes/colibre/vcl/res/copy_file_link.png b/icon-themes/colibre/vcl/res/copy_file_link.png new file mode 100644 index 000000000000..23561e484e36 Binary files /dev/null and b/icon-themes/colibre/vcl/res/copy_file_link.png differ diff --git a/icon-themes/colibre/vcl/res/copy_files.png b/icon-themes/colibre/vcl/res/copy_files.png new file mode 100644 index 000000000000..b6f76051f10f Binary files /dev/null and b/icon-themes/colibre/vcl/res/copy_files.png differ diff --git a/icon-themes/colibre/vcl/res/crook.png b/icon-themes/colibre/vcl/res/crook.png new file mode 100644 index 000000000000..4378f8df8351 Binary files /dev/null and b/icon-themes/colibre/vcl/res/crook.png differ diff --git a/icon-themes/colibre/vcl/res/crop.png b/icon-themes/colibre/vcl/res/crop.png new file mode 100644 index 000000000000..92a778ada31a Binary files /dev/null and b/icon-themes/colibre/vcl/res/crop.png differ diff --git a/icon-themes/colibre/vcl/res/detective.png b/icon-themes/colibre/vcl/res/detective.png new file mode 100644 index 000000000000..abe93f263d4d Binary files /dev/null and b/icon-themes/colibre/vcl/res/detective.png differ diff --git a/icon-themes/colibre/vcl/res/draw_arc.png b/icon-themes/colibre/vcl/res/draw_arc.png new file mode 100644 index 000000000000..9772a1c6b85a Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_arc.png differ diff --git a/icon-themes/colibre/vcl/res/draw_bezier.png b/icon-themes/colibre/vcl/res/draw_bezier.png new file mode 100644 index 000000000000..988498137e9a Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_bezier.png differ diff --git a/icon-themes/colibre/vcl/res/draw_caption.png b/icon-themes/colibre/vcl/res/draw_caption.png new file mode 100644 index 000000000000..d1ef82818735 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_caption.png differ diff --git a/icon-themes/colibre/vcl/res/draw_circle_cut.png b/icon-themes/colibre/vcl/res/draw_circle_cut.png new file mode 100644 index 000000000000..cb4ed0e85ecd Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_circle_cut.png differ diff --git a/icon-themes/colibre/vcl/res/draw_connect.png b/icon-themes/colibre/vcl/res/draw_connect.png new file mode 100644 index 000000000000..e4a43bdbe021 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_connect.png differ diff --git a/icon-themes/colibre/vcl/res/draw_ellipse.png b/icon-themes/colibre/vcl/res/draw_ellipse.png new file mode 100644 index 000000000000..319c4574c7c1 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_ellipse.png differ diff --git a/icon-themes/colibre/vcl/res/draw_freehand.png b/icon-themes/colibre/vcl/res/draw_freehand.png new file mode 100644 index 000000000000..2de92942adde Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_freehand.png differ diff --git a/icon-themes/colibre/vcl/res/draw_line.png b/icon-themes/colibre/vcl/res/draw_line.png new file mode 100644 index 000000000000..6afb670ef8a8 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_line.png differ diff --git a/icon-themes/colibre/vcl/res/draw_pie.png b/icon-themes/colibre/vcl/res/draw_pie.png new file mode 100644 index 000000000000..44a9474846b9 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_pie.png differ diff --git a/icon-themes/colibre/vcl/res/draw_polygon.png b/icon-themes/colibre/vcl/res/draw_polygon.png new file mode 100644 index 000000000000..847e6ad9bea5 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_polygon.png differ diff --git a/icon-themes/colibre/vcl/res/draw_rect.png b/icon-themes/colibre/vcl/res/draw_rect.png new file mode 100644 index 000000000000..ff3dcbba07b4 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_rect.png differ diff --git a/icon-themes/colibre/vcl/res/draw_text.png b/icon-themes/colibre/vcl/res/draw_text.png new file mode 100644 index 000000000000..ee375f0e47a0 Binary files /dev/null and b/icon-themes/colibre/vcl/res/draw_text.png differ diff --git a/icon-themes/colibre/vcl/res/fill.png b/icon-themes/colibre/vcl/res/fill.png new file mode 100644 index 000000000000..220641b9beb4 Binary files /dev/null and b/icon-themes/colibre/vcl/res/fill.png differ diff --git a/icon-themes/colibre/vcl/res/h_shear.png b/icon-themes/colibre/vcl/res/h_shear.png new file mode 100644 index 000000000000..b45beded2d93 Binary files /dev/null and b/icon-themes/colibre/vcl/res/h_shear.png differ diff --git a/icon-themes/colibre/vcl/res/help.png b/icon-themes/colibre/vcl/res/help.png new file mode 100644 index 000000000000..e29c19eccd22 Binary files /dev/null and b/icon-themes/colibre/vcl/res/help.png differ diff --git a/icon-themes/colibre/vcl/res/hide_whitespace.png b/icon-themes/colibre/vcl/res/hide_whitespace.png new file mode 100644 index 000000000000..0195b91cdb39 Binary files /dev/null and b/icon-themes/colibre/vcl/res/hide_whitespace.png differ diff --git a/icon-themes/colibre/vcl/res/hourglass.png b/icon-themes/colibre/vcl/res/hourglass.png new file mode 100644 index 000000000000..822368d7c950 Binary files /dev/null and b/icon-themes/colibre/vcl/res/hourglass.png differ diff --git a/icon-themes/colibre/vcl/res/link_data.png b/icon-themes/colibre/vcl/res/link_data.png new file mode 100644 index 000000000000..6432db0155b6 Binary files /dev/null and b/icon-themes/colibre/vcl/res/link_data.png differ diff --git a/icon-themes/colibre/vcl/res/link_file.png b/icon-themes/colibre/vcl/res/link_file.png new file mode 100644 index 000000000000..e17107fec9ff Binary files /dev/null and b/icon-themes/colibre/vcl/res/link_file.png differ diff --git a/icon-themes/colibre/vcl/res/magnify.png b/icon-themes/colibre/vcl/res/magnify.png new file mode 100644 index 000000000000..4e73146b91e4 Binary files /dev/null and b/icon-themes/colibre/vcl/res/magnify.png differ diff --git a/icon-themes/colibre/vcl/res/mirror.png b/icon-themes/colibre/vcl/res/mirror.png new file mode 100644 index 000000000000..8fac93f0b6df Binary files /dev/null and b/icon-themes/colibre/vcl/res/mirror.png differ diff --git a/icon-themes/colibre/vcl/res/move_bezier_weight.png b/icon-themes/colibre/vcl/res/move_bezier_weight.png new file mode 100644 index 000000000000..63bf76ad3942 Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_bezier_weight.png differ diff --git a/icon-themes/colibre/vcl/res/move_data.png b/icon-themes/colibre/vcl/res/move_data.png new file mode 100644 index 000000000000..60ece8a53e59 Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_data.png differ diff --git a/icon-themes/colibre/vcl/res/move_data_link.png b/icon-themes/colibre/vcl/res/move_data_link.png new file mode 100644 index 000000000000..6951cd718d97 Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_data_link.png differ diff --git a/icon-themes/colibre/vcl/res/move_file.png b/icon-themes/colibre/vcl/res/move_file.png new file mode 100644 index 000000000000..97a01c88fa4d Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_file.png differ diff --git a/icon-themes/colibre/vcl/res/move_file_link.png b/icon-themes/colibre/vcl/res/move_file_link.png new file mode 100644 index 000000000000..53301ba58c50 Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_file_link.png differ diff --git a/icon-themes/colibre/vcl/res/move_files.png b/icon-themes/colibre/vcl/res/move_files.png new file mode 100644 index 000000000000..2cdddb410aae Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_files.png differ diff --git a/icon-themes/colibre/vcl/res/move_point.png b/icon-themes/colibre/vcl/res/move_point.png new file mode 100644 index 000000000000..41945deb1916 Binary files /dev/null and b/icon-themes/colibre/vcl/res/move_point.png differ diff --git a/icon-themes/colibre/vcl/res/neswsize.png b/icon-themes/colibre/vcl/res/neswsize.png new file mode 100644 index 000000000000..91b89b5803ec Binary files /dev/null and b/icon-themes/colibre/vcl/res/neswsize.png differ diff --git a/icon-themes/colibre/vcl/res/not_allowed.png b/icon-themes/colibre/vcl/res/not_allowed.png new file mode 100644 index 000000000000..df770a495194 Binary files /dev/null and b/icon-themes/colibre/vcl/res/not_allowed.png differ diff --git a/icon-themes/colibre/vcl/res/null.png b/icon-themes/colibre/vcl/res/null.png new file mode 100644 index 000000000000..489636595bec Binary files /dev/null and b/icon-themes/colibre/vcl/res/null.png differ diff --git a/icon-themes/colibre/vcl/res/nwsesize.png b/icon-themes/colibre/vcl/res/nwsesize.png new file mode 100644 index 000000000000..fc6a33288ef2 Binary files /dev/null and b/icon-themes/colibre/vcl/res/nwsesize.png differ diff --git a/icon-themes/colibre/vcl/res/pen.png b/icon-themes/colibre/vcl/res/pen.png new file mode 100644 index 000000000000..81b583086778 Binary files /dev/null and b/icon-themes/colibre/vcl/res/pen.png differ diff --git a/icon-themes/colibre/vcl/res/pivot_column.png b/icon-themes/colibre/vcl/res/pivot_column.png new file mode 100644 index 000000000000..1c38b915b886 Binary files /dev/null and b/icon-themes/colibre/vcl/res/pivot_column.png differ diff --git a/icon-themes/colibre/vcl/res/pivot_delete.png b/icon-themes/colibre/vcl/res/pivot_delete.png new file mode 100644 index 000000000000..fbd663ee36c1 Binary files /dev/null and b/icon-themes/colibre/vcl/res/pivot_delete.png differ diff --git a/icon-themes/colibre/vcl/res/pivot_field.png b/icon-themes/colibre/vcl/res/pivot_field.png new file mode 100644 index 000000000000..04375de1efe6 Binary files /dev/null and b/icon-themes/colibre/vcl/res/pivot_field.png differ diff --git a/icon-themes/colibre/vcl/res/pivot_row.png b/icon-themes/colibre/vcl/res/pivot_row.png new file mode 100644 index 000000000000..18ef0e8e59ba Binary files /dev/null and b/icon-themes/colibre/vcl/res/pivot_row.png differ diff --git a/icon-themes/colibre/vcl/res/rotate.png b/icon-themes/colibre/vcl/res/rotate.png new file mode 100644 index 000000000000..a8137e077e56 Binary files /dev/null and b/icon-themes/colibre/vcl/res/rotate.png differ diff --git a/icon-themes/colibre/vcl/res/show_whitespace.png b/icon-themes/colibre/vcl/res/show_whitespace.png new file mode 100644 index 000000000000..fe374643eb20 Binary files /dev/null and b/icon-themes/colibre/vcl/res/show_whitespace.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_e.png b/icon-themes/colibre/vcl/res/tab_select_e.png new file mode 100644 index 000000000000..a2da05e009d1 Binary files /dev/null and b/icon-themes/colibre/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_s.png b/icon-themes/colibre/vcl/res/tab_select_s.png new file mode 100644 index 000000000000..ba20589c794f Binary files /dev/null and b/icon-themes/colibre/vcl/res/tab_select_s.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_se.png b/icon-themes/colibre/vcl/res/tab_select_se.png new file mode 100644 index 000000000000..4ee7f62b304b Binary files /dev/null and b/icon-themes/colibre/vcl/res/tab_select_se.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_sw.png b/icon-themes/colibre/vcl/res/tab_select_sw.png new file mode 100644 index 000000000000..11d7cb34d64d Binary files /dev/null and b/icon-themes/colibre/vcl/res/tab_select_sw.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_w.png b/icon-themes/colibre/vcl/res/tab_select_w.png new file mode 100644 index 000000000000..62813a975855 Binary files /dev/null and b/icon-themes/colibre/vcl/res/tab_select_w.png differ diff --git a/icon-themes/colibre/vcl/res/text_vertical.png b/icon-themes/colibre/vcl/res/text_vertical.png new file mode 100644 index 000000000000..dcc1080e5fcf Binary files /dev/null and b/icon-themes/colibre/vcl/res/text_vertical.png differ diff --git a/icon-themes/colibre/vcl/res/v_shear.png b/icon-themes/colibre/vcl/res/v_shear.png new file mode 100644 index 000000000000..b01cb6c935e1 Binary files /dev/null and b/icon-themes/colibre/vcl/res/v_shear.png differ diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_e.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_e.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_e.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_e.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_n.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_n.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_n.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_n.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_ne.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_ne.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_ne.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_ne.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_ns.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_ns.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_ns.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_ns.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_nswe.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_nswe.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_nswe.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_nswe.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_nw.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_nw.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_nw.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_nw.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_s.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_s.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_s.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_s.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_se.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_se.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_se.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_se.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_sw.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_sw.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_sw.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_sw.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_w.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_w.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_w.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_w.svg diff --git a/icon-themes/colibre/vcl/cursors/autoscroll_we.svg b/icon-themes/colibre_svg/vcl/res/autoscroll_we.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/autoscroll_we.svg rename to icon-themes/colibre_svg/vcl/res/autoscroll_we.svg diff --git a/icon-themes/colibre/vcl/cursors/chain.svg b/icon-themes/colibre_svg/vcl/res/chain.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/chain.svg rename to icon-themes/colibre_svg/vcl/res/chain.svg diff --git a/icon-themes/colibre/vcl/cursors/chain_not_allowed.svg b/icon-themes/colibre_svg/vcl/res/chain_not_allowed.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/chain_not_allowed.svg rename to icon-themes/colibre_svg/vcl/res/chain_not_allowed.svg diff --git a/icon-themes/colibre/vcl/cursors/chart.svg b/icon-themes/colibre_svg/vcl/res/chart.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/chart.svg rename to icon-themes/colibre_svg/vcl/res/chart.svg diff --git a/icon-themes/colibre/vcl/cursors/copy_data.svg b/icon-themes/colibre_svg/vcl/res/copy_data.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/copy_data.svg rename to icon-themes/colibre_svg/vcl/res/copy_data.svg diff --git a/icon-themes/colibre/vcl/cursors/copy_data_link.svg b/icon-themes/colibre_svg/vcl/res/copy_data_link.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/copy_data_link.svg rename to icon-themes/colibre_svg/vcl/res/copy_data_link.svg diff --git a/icon-themes/colibre/vcl/cursors/copy_file.svg b/icon-themes/colibre_svg/vcl/res/copy_file.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/copy_file.svg rename to icon-themes/colibre_svg/vcl/res/copy_file.svg diff --git a/icon-themes/colibre/vcl/cursors/copy_file_link.svg b/icon-themes/colibre_svg/vcl/res/copy_file_link.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/copy_file_link.svg rename to icon-themes/colibre_svg/vcl/res/copy_file_link.svg diff --git a/icon-themes/colibre/vcl/cursors/copy_files.svg b/icon-themes/colibre_svg/vcl/res/copy_files.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/copy_files.svg rename to icon-themes/colibre_svg/vcl/res/copy_files.svg diff --git a/icon-themes/colibre/vcl/cursors/crook.svg b/icon-themes/colibre_svg/vcl/res/crook.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/crook.svg rename to icon-themes/colibre_svg/vcl/res/crook.svg diff --git a/icon-themes/colibre/vcl/cursors/crop.svg b/icon-themes/colibre_svg/vcl/res/crop.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/crop.svg rename to icon-themes/colibre_svg/vcl/res/crop.svg diff --git a/icon-themes/colibre/vcl/cursors/detective.svg b/icon-themes/colibre_svg/vcl/res/detective.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/detective.svg rename to icon-themes/colibre_svg/vcl/res/detective.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_arc.svg b/icon-themes/colibre_svg/vcl/res/draw_arc.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_arc.svg rename to icon-themes/colibre_svg/vcl/res/draw_arc.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_bezier.svg b/icon-themes/colibre_svg/vcl/res/draw_bezier.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_bezier.svg rename to icon-themes/colibre_svg/vcl/res/draw_bezier.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_caption.svg b/icon-themes/colibre_svg/vcl/res/draw_caption.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_caption.svg rename to icon-themes/colibre_svg/vcl/res/draw_caption.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_circle_cut.svg b/icon-themes/colibre_svg/vcl/res/draw_circle_cut.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_circle_cut.svg rename to icon-themes/colibre_svg/vcl/res/draw_circle_cut.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_connect.svg b/icon-themes/colibre_svg/vcl/res/draw_connect.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_connect.svg rename to icon-themes/colibre_svg/vcl/res/draw_connect.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_ellipse.svg b/icon-themes/colibre_svg/vcl/res/draw_ellipse.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_ellipse.svg rename to icon-themes/colibre_svg/vcl/res/draw_ellipse.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_freehand.svg b/icon-themes/colibre_svg/vcl/res/draw_freehand.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_freehand.svg rename to icon-themes/colibre_svg/vcl/res/draw_freehand.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_line.svg b/icon-themes/colibre_svg/vcl/res/draw_line.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_line.svg rename to icon-themes/colibre_svg/vcl/res/draw_line.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_pie.svg b/icon-themes/colibre_svg/vcl/res/draw_pie.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_pie.svg rename to icon-themes/colibre_svg/vcl/res/draw_pie.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_polygon.svg b/icon-themes/colibre_svg/vcl/res/draw_polygon.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_polygon.svg rename to icon-themes/colibre_svg/vcl/res/draw_polygon.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_rect.svg b/icon-themes/colibre_svg/vcl/res/draw_rect.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_rect.svg rename to icon-themes/colibre_svg/vcl/res/draw_rect.svg diff --git a/icon-themes/colibre/vcl/cursors/draw_text.svg b/icon-themes/colibre_svg/vcl/res/draw_text.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/draw_text.svg rename to icon-themes/colibre_svg/vcl/res/draw_text.svg diff --git a/icon-themes/colibre/vcl/cursors/fill.svg b/icon-themes/colibre_svg/vcl/res/fill.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/fill.svg rename to icon-themes/colibre_svg/vcl/res/fill.svg diff --git a/icon-themes/colibre/vcl/cursors/h_shear.svg b/icon-themes/colibre_svg/vcl/res/h_shear.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/h_shear.svg rename to icon-themes/colibre_svg/vcl/res/h_shear.svg diff --git a/icon-themes/colibre/vcl/cursors/help.svg b/icon-themes/colibre_svg/vcl/res/help.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/help.svg rename to icon-themes/colibre_svg/vcl/res/help.svg diff --git a/icon-themes/colibre/vcl/cursors/hide_whitespace.svg b/icon-themes/colibre_svg/vcl/res/hide_whitespace.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/hide_whitespace.svg rename to icon-themes/colibre_svg/vcl/res/hide_whitespace.svg diff --git a/icon-themes/colibre/vcl/cursors/hourglass.svg b/icon-themes/colibre_svg/vcl/res/hourglass.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/hourglass.svg rename to icon-themes/colibre_svg/vcl/res/hourglass.svg diff --git a/icon-themes/colibre/vcl/cursors/link_data.svg b/icon-themes/colibre_svg/vcl/res/link_data.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/link_data.svg rename to icon-themes/colibre_svg/vcl/res/link_data.svg diff --git a/icon-themes/colibre/vcl/cursors/link_file.svg b/icon-themes/colibre_svg/vcl/res/link_file.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/link_file.svg rename to icon-themes/colibre_svg/vcl/res/link_file.svg diff --git a/icon-themes/colibre/vcl/cursors/magnify.svg b/icon-themes/colibre_svg/vcl/res/magnify.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/magnify.svg rename to icon-themes/colibre_svg/vcl/res/magnify.svg diff --git a/icon-themes/colibre/vcl/cursors/mirror.svg b/icon-themes/colibre_svg/vcl/res/mirror.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/mirror.svg rename to icon-themes/colibre_svg/vcl/res/mirror.svg diff --git a/icon-themes/colibre/vcl/cursors/move_bezier_weight.svg b/icon-themes/colibre_svg/vcl/res/move_bezier_weight.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_bezier_weight.svg rename to icon-themes/colibre_svg/vcl/res/move_bezier_weight.svg diff --git a/icon-themes/colibre/vcl/cursors/move_data.svg b/icon-themes/colibre_svg/vcl/res/move_data.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_data.svg rename to icon-themes/colibre_svg/vcl/res/move_data.svg diff --git a/icon-themes/colibre/vcl/cursors/move_data_link.svg b/icon-themes/colibre_svg/vcl/res/move_data_link.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_data_link.svg rename to icon-themes/colibre_svg/vcl/res/move_data_link.svg diff --git a/icon-themes/colibre/vcl/cursors/move_file.svg b/icon-themes/colibre_svg/vcl/res/move_file.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_file.svg rename to icon-themes/colibre_svg/vcl/res/move_file.svg diff --git a/icon-themes/colibre/vcl/cursors/move_file_link.svg b/icon-themes/colibre_svg/vcl/res/move_file_link.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_file_link.svg rename to icon-themes/colibre_svg/vcl/res/move_file_link.svg diff --git a/icon-themes/colibre/vcl/cursors/move_files.svg b/icon-themes/colibre_svg/vcl/res/move_files.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_files.svg rename to icon-themes/colibre_svg/vcl/res/move_files.svg diff --git a/icon-themes/colibre/vcl/cursors/move_point.svg b/icon-themes/colibre_svg/vcl/res/move_point.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/move_point.svg rename to icon-themes/colibre_svg/vcl/res/move_point.svg diff --git a/icon-themes/colibre/vcl/cursors/neswsize.svg b/icon-themes/colibre_svg/vcl/res/neswsize.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/neswsize.svg rename to icon-themes/colibre_svg/vcl/res/neswsize.svg diff --git a/icon-themes/colibre/vcl/cursors/not_allowed.svg b/icon-themes/colibre_svg/vcl/res/not_allowed.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/not_allowed.svg rename to icon-themes/colibre_svg/vcl/res/not_allowed.svg diff --git a/icon-themes/colibre/vcl/cursors/null.svg b/icon-themes/colibre_svg/vcl/res/null.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/null.svg rename to icon-themes/colibre_svg/vcl/res/null.svg diff --git a/icon-themes/colibre/vcl/cursors/nwsesize.svg b/icon-themes/colibre_svg/vcl/res/nwsesize.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/nwsesize.svg rename to icon-themes/colibre_svg/vcl/res/nwsesize.svg diff --git a/icon-themes/colibre/vcl/cursors/pen.svg b/icon-themes/colibre_svg/vcl/res/pen.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/pen.svg rename to icon-themes/colibre_svg/vcl/res/pen.svg diff --git a/icon-themes/colibre/vcl/cursors/pivot_column.svg b/icon-themes/colibre_svg/vcl/res/pivot_column.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/pivot_column.svg rename to icon-themes/colibre_svg/vcl/res/pivot_column.svg diff --git a/icon-themes/colibre/vcl/cursors/pivot_delete.svg b/icon-themes/colibre_svg/vcl/res/pivot_delete.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/pivot_delete.svg rename to icon-themes/colibre_svg/vcl/res/pivot_delete.svg diff --git a/icon-themes/colibre/vcl/cursors/pivot_field.svg b/icon-themes/colibre_svg/vcl/res/pivot_field.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/pivot_field.svg rename to icon-themes/colibre_svg/vcl/res/pivot_field.svg diff --git a/icon-themes/colibre/vcl/cursors/pivot_row.svg b/icon-themes/colibre_svg/vcl/res/pivot_row.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/pivot_row.svg rename to icon-themes/colibre_svg/vcl/res/pivot_row.svg diff --git a/icon-themes/colibre/vcl/cursors/rotate.svg b/icon-themes/colibre_svg/vcl/res/rotate.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/rotate.svg rename to icon-themes/colibre_svg/vcl/res/rotate.svg diff --git a/icon-themes/colibre/vcl/cursors/show_whitespace.svg b/icon-themes/colibre_svg/vcl/res/show_whitespace.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/show_whitespace.svg rename to icon-themes/colibre_svg/vcl/res/show_whitespace.svg diff --git a/icon-themes/colibre/vcl/cursors/tab_select_e.svg b/icon-themes/colibre_svg/vcl/res/tab_select_e.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/tab_select_e.svg rename to icon-themes/colibre_svg/vcl/res/tab_select_e.svg diff --git a/icon-themes/colibre/vcl/cursors/tab_select_s.svg b/icon-themes/colibre_svg/vcl/res/tab_select_s.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/tab_select_s.svg rename to icon-themes/colibre_svg/vcl/res/tab_select_s.svg diff --git a/icon-themes/colibre/vcl/cursors/tab_select_se.svg b/icon-themes/colibre_svg/vcl/res/tab_select_se.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/tab_select_se.svg rename to icon-themes/colibre_svg/vcl/res/tab_select_se.svg diff --git a/icon-themes/colibre/vcl/cursors/tab_select_sw.svg b/icon-themes/colibre_svg/vcl/res/tab_select_sw.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/tab_select_sw.svg rename to icon-themes/colibre_svg/vcl/res/tab_select_sw.svg diff --git a/icon-themes/colibre/vcl/cursors/tab_select_w.svg b/icon-themes/colibre_svg/vcl/res/tab_select_w.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/tab_select_w.svg rename to icon-themes/colibre_svg/vcl/res/tab_select_w.svg diff --git a/icon-themes/colibre/vcl/cursors/text_vertical.svg b/icon-themes/colibre_svg/vcl/res/text_vertical.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/text_vertical.svg rename to icon-themes/colibre_svg/vcl/res/text_vertical.svg diff --git a/icon-themes/colibre/vcl/cursors/v_shear.svg b/icon-themes/colibre_svg/vcl/res/v_shear.svg similarity index 100% rename from icon-themes/colibre/vcl/cursors/v_shear.svg rename to icon-themes/colibre_svg/vcl/res/v_shear.svg diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst index eea1ea30786e..1aa8d16a28cb 100644 --- a/vcl/inc/bitmaps.hlst +++ b/vcl/inc/bitmaps.hlst @@ -147,74 +147,74 @@ #define RID_BMP_TREENODE_EXPANDED "res/minus.png" -#define RID_CURSOR_AUTOSCROLL_E "vcl/cursors/autoscroll_e.png" -#define RID_CURSOR_AUTOSCROLL_N "vcl/cursors/autoscroll_n.png" -#define RID_CURSOR_AUTOSCROLL_NE "vcl/cursors/autoscroll_ne.png" -#define RID_CURSOR_AUTOSCROLL_NS "vcl/cursors/autoscroll_ns.png" -#define RID_CURSOR_AUTOSCROLL_NSWE "vcl/cursors/autoscroll_nswe.png" -#define RID_CURSOR_AUTOSCROLL_NW "vcl/cursors/autoscroll_nw.png" -#define RID_CURSOR_AUTOSCROLL_S "vcl/cursors/autoscroll_s.png" -#define RID_CURSOR_AUTOSCROLL_SE "vcl/cursors/autoscroll_se.png" -#define RID_CURSOR_AUTOSCROLL_SW "vcl/cursors/autoscroll_sw.png" -#define RID_CURSOR_AUTOSCROLL_W "vcl/cursors/autoscroll_w.png" -#define RID_CURSOR_AUTOSCROLL_WE "vcl/cursors/autoscroll_we.png" -#define RID_CURSOR_CHAIN "vcl/cursors/chain.png" -#define RID_CURSOR_CHAIN_NOT_ALLOWED "vcl/cursors/chain_not_allowed.png" -#define RID_CURSOR_CHART "vcl/cursors/chart.png" -#define RID_CURSOR_COPY_DATA "vcl/cursors/copy_data.png" -#define RID_CURSOR_COPY_DATA_LINK "vcl/cursors/copy_data_link.png" -#define RID_CURSOR_COPY_FILE "vcl/cursors/copy_file.png" -#define RID_CURSOR_COPY_FILES "vcl/cursors/copy_files.png" -#define RID_CURSOR_COPY_FILE_LINK "vcl/cursors/copy_file_link.png" -#define RID_CURSOR_CROOK "vcl/cursors/crook.png" -#define RID_CURSOR_CROP "vcl/cursors/crop.png" -#define RID_CURSOR_DRAW_ARC "vcl/cursors/draw_arc.png" -#define RID_CURSOR_DRAW_BEZIER "vcl/cursors/draw_bezier.png" -#define RID_CURSOR_DRAW_CAPTION "vcl/cursors/draw_caption.png" -#define RID_CURSOR_DRAW_CIRCLE_CUT "vcl/cursors/draw_circle_cut.png" -#define RID_CURSOR_DRAW_CONNECT "vcl/cursors/draw_connect.png" -#define RID_CURSOR_DRAW_ELLIPSE "vcl/cursors/draw_ellipse.png" -#define RID_CURSOR_DETECTIVE "vcl/cursors/detective.png" -#define RID_CURSOR_DRAW_FREEHAND "vcl/cursors/draw_freehand.png" -#define RID_CURSOR_DRAW_LINE "vcl/cursors/draw_line.png" -#define RID_CURSOR_DRAW_PIE "vcl/cursors/draw_pie.png" -#define RID_CURSOR_DRAW_POLYGON "vcl/cursors/draw_polygon.png" -#define RID_CURSOR_DRAW_RECT "vcl/cursors/draw_rect.png" -#define RID_CURSOR_DRAW_TEXT "vcl/cursors/draw_text.png" -#define RID_CURSOR_FILL "vcl/cursors/fill.png" -#define RID_CURSOR_HELP "vcl/cursors/help.png" -#define RID_CURSOR_HOURGLASS "vcl/cursors/hourglass.png" -#define RID_CURSOR_H_SHEAR "vcl/cursors/h_shear.png" -#define RID_CURSOR_LINK_DATA "vcl/cursors/link_data.png" -#define RID_CURSOR_LINK_FILE "vcl/cursors/link_file.png" -#define RID_CURSOR_MAGNIFY "vcl/cursors/magnify.png" -#define RID_CURSOR_MIRROR "vcl/cursors/mirror.png" -#define RID_CURSOR_MOVE_BEZIER_WEIGHT "vcl/cursors/move_bezier_weight.png" -#define RID_CURSOR_MOVE_DATA "vcl/cursors/move_data.png" -#define RID_CURSOR_MOVE_DATA_LINK "vcl/cursors/move_data_link.png" -#define RID_CURSOR_MOVE_FILE "vcl/cursors/move_file.png" -#define RID_CURSOR_MOVE_FILES "vcl/cursors/move_files.png" -#define RID_CURSOR_MOVE_FILE_LINK "vcl/cursors/move_file_link.png" -#define RID_CURSOR_MOVE_POINT "vcl/cursors/move_point.png" -#define RID_CURSOR_NESWSIZE "vcl/cursors/neswsize.png" -#define RID_CURSOR_NOT_ALLOWED "vcl/cursors/not_allowed.png" -#define RID_CURSOR_NULL "vcl/cursors/null.png" -#define RID_CURSOR_NWSESIZE "vcl/cursors/nwsesize.png" -#define RID_CURSOR_PEN "vcl/cursors/pen.png" -#define RID_CURSOR_PIVOT_COLUMN "vcl/cursors/pivot_column.png" -#define RID_CURSOR_PIVOT_DELETE "vcl/cursors/pivot_delete.png" -#define RID_CURSOR_PIVOT_FIELD "vcl/cursors/pivot_field.png" -#define RID_CURSOR_PIVOT_ROW "vcl/cursors/pivot_row.png" -#define RID_CURSOR_ROTATE "vcl/cursors/rotate.png" -#define RID_CURSOR_TAB_SELECT_E "vcl/cursors/tab_select_e.png" -#define RID_CURSOR_TAB_SELECT_S "vcl/cursors/tab_select_s.png" -#define RID_CURSOR_TAB_SELECT_SE "vcl/cursors/tab_select_se.png" -#define RID_CURSOR_TAB_SELECT_SW "vcl/cursors/tab_select_sw.png" -#define RID_CURSOR_TAB_SELECT_W "vcl/cursors/tab_select_w.png" -#define RID_CURSOR_V_SHEAR "vcl/cursors/v_shear.png" -#define RID_CURSOR_TEXT_VERTICAL "vcl/cursors/text_vertical.png" -#define RID_CURSOR_HIDE_WHITESPACE "vcl/cursors/hide_whitespace.png" -#define RID_CURSOR_SHOW_WHITESPACE "vcl/cursors/show_whitespace.png" +#define RID_CURSOR_AUTOSCROLL_E "vcl/res/autoscroll_e.png" +#define RID_CURSOR_AUTOSCROLL_N "vcl/res/autoscroll_n.png" +#define RID_CURSOR_AUTOSCROLL_NE "vcl/res/autoscroll_ne.png" +#define RID_CURSOR_AUTOSCROLL_NS "vcl/res/autoscroll_ns.png" +#define RID_CURSOR_AUTOSCROLL_NSWE "vcl/res/autoscroll_nswe.png" +#define RID_CURSOR_AUTOSCROLL_NW "vcl/res/autoscroll_nw.png" +#define RID_CURSOR_AUTOSCROLL_S "vcl/res/autoscroll_s.png" +#define RID_CURSOR_AUTOSCROLL_SE "vcl/res/autoscroll_se.png" +#define RID_CURSOR_AUTOSCROLL_SW "vcl/res/autoscroll_sw.png" +#define RID_CURSOR_AUTOSCROLL_W "vcl/res/autoscroll_w.png" +#define RID_CURSOR_AUTOSCROLL_WE "vcl/res/autoscroll_we.png" +#define RID_CURSOR_CHAIN "vcl/res/chain.png" +#define RID_CURSOR_CHAIN_NOT_ALLOWED "vcl/res/chain_not_allowed.png" +#define RID_CURSOR_CHART "vcl/res/chart.png" +#define RID_CURSOR_COPY_DATA "vcl/res/copy_data.png" +#define RID_CURSOR_COPY_DATA_LINK "vcl/res/copy_data_link.png" +#define RID_CURSOR_COPY_FILE "vcl/res/copy_file.png" +#define RID_CURSOR_COPY_FILES "vcl/res/copy_files.png" +#define RID_CURSOR_COPY_FILE_LINK "vcl/res/copy_file_link.png" +#define RID_CURSOR_CROOK "vcl/res/crook.png" +#define RID_CURSOR_CROP "vcl/res/crop.png" +#define RID_CURSOR_DRAW_ARC "vcl/res/draw_arc.png" +#define RID_CURSOR_DRAW_BEZIER "vcl/res/draw_bezier.png" +#define RID_CURSOR_DRAW_CAPTION "vcl/res/draw_caption.png" +#define RID_CURSOR_DRAW_CIRCLE_CUT "vcl/res/draw_circle_cut.png" +#define RID_CURSOR_DRAW_CONNECT "vcl/res/draw_connect.png" +#define RID_CURSOR_DRAW_ELLIPSE "vcl/res/draw_ellipse.png" +#define RID_CURSOR_DETECTIVE "vcl/res/detective.png" +#define RID_CURSOR_DRAW_FREEHAND "vcl/res/draw_freehand.png" +#define RID_CURSOR_DRAW_LINE "vcl/res/draw_line.png" +#define RID_CURSOR_DRAW_PIE "vcl/res/draw_pie.png" +#define RID_CURSOR_DRAW_POLYGON "vcl/res/draw_polygon.png" +#define RID_CURSOR_DRAW_RECT "vcl/res/draw_rect.png" +#define RID_CURSOR_DRAW_TEXT "vcl/res/draw_text.png" +#define RID_CURSOR_FILL "vcl/res/fill.png" +#define RID_CURSOR_HELP "vcl/res/help.png" +#define RID_CURSOR_HOURGLASS "vcl/res/hourglass.png" +#define RID_CURSOR_H_SHEAR "vcl/res/h_shear.png" +#define RID_CURSOR_LINK_DATA "vcl/res/link_data.png" +#define RID_CURSOR_LINK_FILE "vcl/res/link_file.png" +#define RID_CURSOR_MAGNIFY "vcl/res/magnify.png" +#define RID_CURSOR_MIRROR "vcl/res/mirror.png" +#define RID_CURSOR_MOVE_BEZIER_WEIGHT "vcl/res/move_bezier_weight.png" +#define RID_CURSOR_MOVE_DATA "vcl/res/move_data.png" +#define RID_CURSOR_MOVE_DATA_LINK "vcl/res/move_data_link.png" +#define RID_CURSOR_MOVE_FILE "vcl/res/move_file.png" +#define RID_CURSOR_MOVE_FILES "vcl/res/move_files.png" +#define RID_CURSOR_MOVE_FILE_LINK "vcl/res/move_file_link.png" +#define RID_CURSOR_MOVE_POINT "vcl/res/move_point.png" +#define RID_CURSOR_NESWSIZE "vcl/res/neswsize.png" +#define RID_CURSOR_NOT_ALLOWED "vcl/res/not_allowed.png" +#define RID_CURSOR_NULL "vcl/res/null.png" +#define RID_CURSOR_NWSESIZE "vcl/res/nwsesize.png" +#define RID_CURSOR_PEN "vcl/res/pen.png" +#define RID_CURSOR_PIVOT_COLUMN "vcl/res/pivot_column.png" +#define RID_CURSOR_PIVOT_DELETE "vcl/res/pivot_delete.png" +#define RID_CURSOR_PIVOT_FIELD "vcl/res/pivot_field.png" +#define RID_CURSOR_PIVOT_ROW "vcl/res/pivot_row.png" +#define RID_CURSOR_ROTATE "vcl/res/rotate.png" +#define RID_CURSOR_TAB_SELECT_E "vcl/res/tab_select_e.png" +#define RID_CURSOR_TAB_SELECT_S "vcl/res/tab_select_s.png" +#define RID_CURSOR_TAB_SELECT_SE "vcl/res/tab_select_se.png" +#define RID_CURSOR_TAB_SELECT_SW "vcl/res/tab_select_sw.png" +#define RID_CURSOR_TAB_SELECT_W "vcl/res/tab_select_w.png" +#define RID_CURSOR_V_SHEAR "vcl/res/v_shear.png" +#define RID_CURSOR_TEXT_VERTICAL "vcl/res/text_vertical.png" +#define RID_CURSOR_HIDE_WHITESPACE "vcl/res/hide_whitespace.png" +#define RID_CURSOR_SHOW_WHITESPACE "vcl/res/show_whitespace.png" #endif diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 3b7d662e9990..c1f54738a97e 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -273,11 +273,11 @@ void GtkSalDisplay::monitorsChanged( GdkScreen const * pScreen ) GdkCursor* GtkSalDisplay::getFromSvg(OUString const & name, int nXHot, int nYHot) { - guint nDefaultCursorSize = gdk_display_get_default_cursor_size( m_pGdkDisplay ); - //BitmapEx aBitmapEx = vcl::bitmap::loadFromName(name, ImageLoadFlags::IgnoreScalingFactor); GdkPixbuf* pPixBuf = load_icon_by_name(name); + assert(pPixBuf && "missing image?"); if (!pPixBuf) return nullptr; + guint nDefaultCursorSize = gdk_display_get_default_cursor_size( m_pGdkDisplay ); GdkPixbuf* pScaledPixBuf = gdk_pixbuf_scale_simple(pPixBuf, nDefaultCursorSize, nDefaultCursorSize, GDK_INTERP_HYPER); g_object_unref(pPixBuf); GdkCursor* pCursor = gdk_cursor_new_from_pixbuf( m_pGdkDisplay, pScaledPixBuf, nXHot, nYHot); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits