From a87a297be33ec4469a284717924281a56a47215c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 13 Aug 2019 11:08:44 +1000 Subject: [PATCH] Merge tuhigui/data to just data/ Step one in making the tuihgui a submodule of tuhi Signed-off-by: Peter Hutterer --- .../data => data}/input-tablet-missing-symbolic.svg | 0 {tuhigui/data => data}/meson.build | 0 .../org.freedesktop.Tuhi.appdata.xml.in.in | 0 .../data => data}/org.freedesktop.Tuhi.desktop.in | 0 {tuhigui/data => data}/org.freedesktop.Tuhi.svg | 0 {tuhigui/data => data}/tuhi.gresource.xml | 0 {tuhigui/data => data}/ui/AboutDialog.ui.in | 0 {tuhigui/data => data}/ui/Drawing.ui | 0 {tuhigui/data => data}/ui/DrawingPerspective.ui | 0 {tuhigui/data => data}/ui/ErrorPerspective.ui | 2 +- {tuhigui/data => data}/ui/Flowbox.ui | 0 {tuhigui/data => data}/ui/MainWindow.ui | 0 {tuhigui/data => data}/ui/SetupPerspective.ui | 0 meson.build | 12 ++++++------ 14 files changed, 7 insertions(+), 7 deletions(-) rename {tuhigui/data => data}/input-tablet-missing-symbolic.svg (100%) rename {tuhigui/data => data}/meson.build (100%) rename {tuhigui/data => data}/org.freedesktop.Tuhi.appdata.xml.in.in (100%) rename {tuhigui/data => data}/org.freedesktop.Tuhi.desktop.in (100%) rename {tuhigui/data => data}/org.freedesktop.Tuhi.svg (100%) rename {tuhigui/data => data}/tuhi.gresource.xml (100%) rename {tuhigui/data => data}/ui/AboutDialog.ui.in (100%) rename {tuhigui/data => data}/ui/Drawing.ui (100%) rename {tuhigui/data => data}/ui/DrawingPerspective.ui (100%) rename {tuhigui/data => data}/ui/ErrorPerspective.ui (98%) rename {tuhigui/data => data}/ui/Flowbox.ui (100%) rename {tuhigui/data => data}/ui/MainWindow.ui (100%) rename {tuhigui/data => data}/ui/SetupPerspective.ui (100%) diff --git a/tuhigui/data/input-tablet-missing-symbolic.svg b/data/input-tablet-missing-symbolic.svg similarity index 100% rename from tuhigui/data/input-tablet-missing-symbolic.svg rename to data/input-tablet-missing-symbolic.svg diff --git a/tuhigui/data/meson.build b/data/meson.build similarity index 100% rename from tuhigui/data/meson.build rename to data/meson.build diff --git a/tuhigui/data/org.freedesktop.Tuhi.appdata.xml.in.in b/data/org.freedesktop.Tuhi.appdata.xml.in.in similarity index 100% rename from tuhigui/data/org.freedesktop.Tuhi.appdata.xml.in.in rename to data/org.freedesktop.Tuhi.appdata.xml.in.in diff --git a/tuhigui/data/org.freedesktop.Tuhi.desktop.in b/data/org.freedesktop.Tuhi.desktop.in similarity index 100% rename from tuhigui/data/org.freedesktop.Tuhi.desktop.in rename to data/org.freedesktop.Tuhi.desktop.in diff --git a/tuhigui/data/org.freedesktop.Tuhi.svg b/data/org.freedesktop.Tuhi.svg similarity index 100% rename from tuhigui/data/org.freedesktop.Tuhi.svg rename to data/org.freedesktop.Tuhi.svg diff --git a/tuhigui/data/tuhi.gresource.xml b/data/tuhi.gresource.xml similarity index 100% rename from tuhigui/data/tuhi.gresource.xml rename to data/tuhi.gresource.xml diff --git a/tuhigui/data/ui/AboutDialog.ui.in b/data/ui/AboutDialog.ui.in similarity index 100% rename from tuhigui/data/ui/AboutDialog.ui.in rename to data/ui/AboutDialog.ui.in diff --git a/tuhigui/data/ui/Drawing.ui b/data/ui/Drawing.ui similarity index 100% rename from tuhigui/data/ui/Drawing.ui rename to data/ui/Drawing.ui diff --git a/tuhigui/data/ui/DrawingPerspective.ui b/data/ui/DrawingPerspective.ui similarity index 100% rename from tuhigui/data/ui/DrawingPerspective.ui rename to data/ui/DrawingPerspective.ui diff --git a/tuhigui/data/ui/ErrorPerspective.ui b/data/ui/ErrorPerspective.ui similarity index 98% rename from tuhigui/data/ui/ErrorPerspective.ui rename to data/ui/ErrorPerspective.ui index b41965d..f02aed5 100644 --- a/tuhigui/data/ui/ErrorPerspective.ui +++ b/data/ui/ErrorPerspective.ui @@ -18,7 +18,7 @@ True False - TuhiGUI is an interactive GUI to download data from Tuhi. + TuhiGUI is an interactive GUI to download data from Tuhi. Tuhi connects to tablets of the Wacom Ink range. It allows you to download the drawings stored on those devices as SVGs for processing later. diff --git a/tuhigui/data/ui/Flowbox.ui b/data/ui/Flowbox.ui similarity index 100% rename from tuhigui/data/ui/Flowbox.ui rename to data/ui/Flowbox.ui diff --git a/tuhigui/data/ui/MainWindow.ui b/data/ui/MainWindow.ui similarity index 100% rename from tuhigui/data/ui/MainWindow.ui rename to data/ui/MainWindow.ui diff --git a/tuhigui/data/ui/SetupPerspective.ui b/data/ui/SetupPerspective.ui similarity index 100% rename from tuhigui/data/ui/SetupPerspective.ui rename to data/ui/SetupPerspective.ui diff --git a/meson.build b/meson.build index 7dee5a6..0b2c278 100644 --- a/meson.build +++ b/meson.build @@ -24,7 +24,7 @@ libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), 'tuhi') i18n = import('i18n') subdir('po') -subdir('tuhigui/data') +subdir('data') # Find the directory to install our Python code pymod = import('python') @@ -32,7 +32,7 @@ py3 = pymod.find_installation() python_dir = py3.get_install_dir() install_subdir('tuhigui', install_dir: python_dir, - exclude_directories: ['__pycache__', 'data']) + exclude_directories: ['__pycache__']) install_subdir('tuhi', install_dir: python_dir, exclude_directories: '__pycache__') @@ -65,7 +65,7 @@ config_tuhigui.set('localedir', localedir) config_tuhigui.set('devel', '') config_tuhigui_devel = config_tuhigui -config_tuhigui_devel.set('pkgdatadir', join_paths(meson.build_root(), 'tuhigui', 'data')) +config_tuhigui_devel.set('pkgdatadir', join_paths(meson.build_root(), 'data')) config_tuhigui_devel.set('localedir', join_paths(meson.build_root(), 'po')) config_tuhigui_devel.set('devel', ''' sys.path.insert(1, '@0@') @@ -97,7 +97,7 @@ configure_file(input: 'tuhi-server.py', meson.add_install_script('meson_install.sh') -desktop_file = i18n.merge_file(input: 'tuhigui/data/org.freedesktop.Tuhi.desktop.in', +desktop_file = i18n.merge_file(input: 'data/org.freedesktop.Tuhi.desktop.in', output: 'org.freedesktop.Tuhi.desktop', type: 'desktop', po_dir: podir, @@ -109,7 +109,7 @@ conf.set('version', meson.project_version()) conf.set('url', 'https://github.com/tuhiproject/tuhi') conf.set('version_date', version_date) -appdata_intl = configure_file(input: 'tuhigui/data/org.freedesktop.Tuhi.appdata.xml.in.in', +appdata_intl = configure_file(input: 'data/org.freedesktop.Tuhi.appdata.xml.in.in', output: 'org.freedesktop.Tuhi.appdata.xml.in', configuration: conf) @@ -120,7 +120,7 @@ appdata = i18n.merge_file(input: appdata_intl, install: true, install_dir: metainfodir) -install_data('tuhigui/data/org.freedesktop.Tuhi.svg', install_dir: icondir) +install_data('data/org.freedesktop.Tuhi.svg', install_dir: icondir) flake8 = find_program('flake8-3', required: false) if flake8.found()