From e16aafe86c57600620078a2ef371c7a0c601304a Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Fri, 7 Jul 2017 11:53:28 +0200 Subject: [PATCH] data: move default SVGs under `default/` subdirectory.. .. and install them in the appropriate directory after #209 --- data/README.md | 17 ++++------------ data/default/README.md | 15 ++++++++++++++ data/{ => default}/etekcity.svg | 0 data/{ => default}/logitech-g300.svg | 0 data/{ => default}/logitech-g303.svg | 0 data/{ => default}/logitech-g500s.svg | 0 data/{ => default}/logitech-g502.svg | 0 data/{ => default}/logitech-g700.svg | 0 data/{ => default}/logitech-g9.svg | 0 data/{ => default}/logitech-g900.svg | 0 data/{ => default}/logitech-mx_master.svg | 0 data/{ => default}/roccat-kone-xtd.svg | 0 meson.build | 24 +++++++++++------------ 13 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 data/default/README.md rename data/{ => default}/etekcity.svg (100%) rename data/{ => default}/logitech-g300.svg (100%) rename data/{ => default}/logitech-g303.svg (100%) rename data/{ => default}/logitech-g500s.svg (100%) rename data/{ => default}/logitech-g502.svg (100%) rename data/{ => default}/logitech-g700.svg (100%) rename data/{ => default}/logitech-g9.svg (100%) rename data/{ => default}/logitech-g900.svg (100%) rename data/{ => default}/logitech-mx_master.svg (100%) rename data/{ => default}/roccat-kone-xtd.svg (100%) diff --git a/data/README.md b/data/README.md index c0abfd95..a8ddfde9 100644 --- a/data/README.md +++ b/data/README.md @@ -1,20 +1,11 @@ libratbag data files ==================== -These SVG files should approximate the device to make it immediately -recognizable. Detail work not required, the graphic is an illustration only. +This directory contains the SVG files for each theme. In general, device SVGs +should approximate the device to make it immediately recognizable. Detail work +not required, the graphic is an illustration only. -Requirements ------------- - -- Canvas size: 750x750 pixels -- Two layers in the final SVG: a lower layer named "Device" with the device - itself, "Leaders" with the buttons and leader-lines -- The device should be approximately centered on the canvas and occupy a - meaningful portion of the canvas without making it look cramped -- Button labels must be in 12pt Sans, starting with Button0 -- Wheel buttons may be labeled separately if required (look at the Etekcity - for an example) +For theme-specific requirements, consult the README in the subdirectories. Technique --------- diff --git a/data/default/README.md b/data/default/README.md new file mode 100644 index 00000000..a271e328 --- /dev/null +++ b/data/default/README.md @@ -0,0 +1,15 @@ +libratbag default theme +==================== + +Requirements +------------ + +- Canvas size: 750x750 pixels +- Two layers in the final SVG: a lower layer named "Device" with the device + itself, "Leaders" with the buttons and leader-lines +- The device should be approximately centered on the canvas and occupy a + meaningful portion of the canvas without making it look cramped +- Button labels must be in 12pt Sans, starting with Button0 +- Wheel buttons may be labeled separately if required (look at the Etekcity + for an example) + diff --git a/data/etekcity.svg b/data/default/etekcity.svg similarity index 100% rename from data/etekcity.svg rename to data/default/etekcity.svg diff --git a/data/logitech-g300.svg b/data/default/logitech-g300.svg similarity index 100% rename from data/logitech-g300.svg rename to data/default/logitech-g300.svg diff --git a/data/logitech-g303.svg b/data/default/logitech-g303.svg similarity index 100% rename from data/logitech-g303.svg rename to data/default/logitech-g303.svg diff --git a/data/logitech-g500s.svg b/data/default/logitech-g500s.svg similarity index 100% rename from data/logitech-g500s.svg rename to data/default/logitech-g500s.svg diff --git a/data/logitech-g502.svg b/data/default/logitech-g502.svg similarity index 100% rename from data/logitech-g502.svg rename to data/default/logitech-g502.svg diff --git a/data/logitech-g700.svg b/data/default/logitech-g700.svg similarity index 100% rename from data/logitech-g700.svg rename to data/default/logitech-g700.svg diff --git a/data/logitech-g9.svg b/data/default/logitech-g9.svg similarity index 100% rename from data/logitech-g9.svg rename to data/default/logitech-g9.svg diff --git a/data/logitech-g900.svg b/data/default/logitech-g900.svg similarity index 100% rename from data/logitech-g900.svg rename to data/default/logitech-g900.svg diff --git a/data/logitech-mx_master.svg b/data/default/logitech-mx_master.svg similarity index 100% rename from data/logitech-mx_master.svg rename to data/default/logitech-mx_master.svg diff --git a/data/roccat-kone-xtd.svg b/data/default/roccat-kone-xtd.svg similarity index 100% rename from data/roccat-kone-xtd.svg rename to data/default/roccat-kone-xtd.svg diff --git a/meson.build b/meson.build index a3a676f5..f5f61cc1 100644 --- a/meson.build +++ b/meson.build @@ -285,19 +285,19 @@ install_data('hwdb/70-libratbag-mouse.hwdb', install_dir : udev_hwdb_dir) #### svg files #### -svg_files = [ - 'data/etekcity.svg', - 'data/logitech-g300.svg', - 'data/logitech-g303.svg', - 'data/logitech-g500s.svg', - 'data/logitech-g502.svg', - 'data/logitech-g700.svg', - 'data/logitech-g900.svg', - 'data/logitech-mx_master.svg', - 'data/roccat-kone-xtd.svg' +default_svg_files = [ + 'data/default/etekcity.svg', + 'data/default/logitech-g300.svg', + 'data/default/logitech-g303.svg', + 'data/default/logitech-g500s.svg', + 'data/default/logitech-g502.svg', + 'data/default/logitech-g700.svg', + 'data/default/logitech-g900.svg', + 'data/default/logitech-mx_master.svg', + 'data/default/roccat-kone-xtd.svg' ] -install_data(svg_files, - install_dir : '@0@/libratbag'.format(get_option('datadir'))) +install_data(default_svg_files, + install_dir : join_paths(get_option('datadir'), 'libratbag', 'default')) #### tests #### enable_tests = get_option('enable-tests')