diff --git a/linux/keyman-config/get_kmp b/linux/keyman-config/get_kmp index 3b159520b4..55b9d15555 100755 --- a/linux/keyman-config/get_kmp +++ b/linux/keyman-config/get_kmp @@ -1,7 +1,7 @@ #!/usr/bin/python3 import sys -from keymanconfig.get_kmp import get_kmp +from keyman_config.get_kmp import get_kmp def main(argv): if len(sys.argv) != 2: diff --git a/linux/keyman-config/install_kmp b/linux/keyman-config/install_kmp index 4d1d933d2a..1c4c9c6018 100755 --- a/linux/keyman-config/install_kmp +++ b/linux/keyman-config/install_kmp @@ -2,9 +2,9 @@ import argparse import sys -from keymanconfig.install_kmp import install_kmp -from keymanconfig.list_installed_kmp import get_kmp_version -from keymanconfig.get_kmp import get_keyboard_data, get_kmp +from keyman_config.install_kmp import install_kmp +from keyman_config.list_installed_kmp import get_kmp_version +from keyman_config.get_kmp import get_keyboard_data, get_kmp def main(): parser = argparse.ArgumentParser(description='Install a Keyman keyboard, either a local .kmp file or specify a keyboard id to download and install') diff --git a/linux/keyman-config/keyman-config b/linux/keyman-config/keyman-config index 0cfdc6b6a8..6afcac9cd3 100755 --- a/linux/keyman-config/keyman-config +++ b/linux/keyman-config/keyman-config @@ -3,7 +3,7 @@ import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk -from keymanconfig.view_installed import ViewInstalledWindow +from keyman_config.view_installed import ViewInstalledWindow if __name__ == '__main__': w = ViewInstalledWindow() diff --git a/linux/keyman-config/keymanconfig/__init__.py b/linux/keyman-config/keyman_config/__init__.py similarity index 100% rename from linux/keyman-config/keymanconfig/__init__.py rename to linux/keyman-config/keyman_config/__init__.py diff --git a/linux/keyman-config/keymanconfig/accelerators.py b/linux/keyman-config/keyman_config/accelerators.py similarity index 100% rename from linux/keyman-config/keymanconfig/accelerators.py rename to linux/keyman-config/keyman_config/accelerators.py diff --git a/linux/keyman-config/keymanconfig/check_mime_type.py b/linux/keyman-config/keyman_config/check_mime_type.py similarity index 100% rename from linux/keyman-config/keymanconfig/check_mime_type.py rename to linux/keyman-config/keyman_config/check_mime_type.py diff --git a/linux/keyman-config/keymanconfig/convertico.py b/linux/keyman-config/keyman_config/convertico.py similarity index 100% rename from linux/keyman-config/keymanconfig/convertico.py rename to linux/keyman-config/keyman_config/convertico.py diff --git a/linux/keyman-config/keymanconfig/downloadkeyboard.py b/linux/keyman-config/keyman_config/downloadkeyboard.py similarity index 93% rename from linux/keyman-config/keymanconfig/downloadkeyboard.py rename to linux/keyman-config/keyman_config/downloadkeyboard.py index 2343ef1486..20d2fb580c 100755 --- a/linux/keyman-config/keymanconfig/downloadkeyboard.py +++ b/linux/keyman-config/keyman_config/downloadkeyboard.py @@ -9,10 +9,10 @@ import gi gi.require_version('Gtk', '3.0') gi.require_version('WebKit', '3.0') from gi.repository import Gtk, WebKit -from keymanconfig.get_kmp import get_download_folder, download_kmp_file -from keymanconfig.install_window import InstallKmpWindow -from keymanconfig.check_mime_type import check_mime_type -from keymanconfig.accelerators import bind_accelerator, init_accel +from keyman_config.get_kmp import get_download_folder, download_kmp_file +from keyman_config.install_window import InstallKmpWindow +from keyman_config.check_mime_type import check_mime_type +from keyman_config.accelerators import bind_accelerator, init_accel class DownloadKmpWindow(Gtk.Window): diff --git a/linux/keyman-config/keymanconfig/get_kmp.py b/linux/keyman-config/keyman_config/get_kmp.py similarity index 100% rename from linux/keyman-config/keymanconfig/get_kmp.py rename to linux/keyman-config/keyman_config/get_kmp.py diff --git a/linux/keyman-config/keymanconfig/icons/cross20.png b/linux/keyman-config/keyman_config/icons/cross20.png similarity index 100% rename from linux/keyman-config/keymanconfig/icons/cross20.png rename to linux/keyman-config/keyman_config/icons/cross20.png diff --git a/linux/keyman-config/keymanconfig/icons/defaultpackage.gif b/linux/keyman-config/keyman_config/icons/defaultpackage.gif similarity index 100% rename from linux/keyman-config/keymanconfig/icons/defaultpackage.gif rename to linux/keyman-config/keyman_config/icons/defaultpackage.gif diff --git a/linux/keyman-config/keymanconfig/icons/expand20.png b/linux/keyman-config/keyman_config/icons/expand20.png similarity index 100% rename from linux/keyman-config/keymanconfig/icons/expand20.png rename to linux/keyman-config/keyman_config/icons/expand20.png diff --git a/linux/keyman-config/keymanconfig/icons/help20.png b/linux/keyman-config/keyman_config/icons/help20.png similarity index 100% rename from linux/keyman-config/keymanconfig/icons/help20.png rename to linux/keyman-config/keyman_config/icons/help20.png diff --git a/linux/keyman-config/keymanconfig/icons/icon_kmp.png b/linux/keyman-config/keyman_config/icons/icon_kmp.png similarity index 100% rename from linux/keyman-config/keymanconfig/icons/icon_kmp.png rename to linux/keyman-config/keyman_config/icons/icon_kmp.png diff --git a/linux/keyman-config/keymanconfig/install_kmp.py b/linux/keyman-config/keyman_config/install_kmp.py similarity index 96% rename from linux/keyman-config/keymanconfig/install_kmp.py rename to linux/keyman-config/keyman_config/install_kmp.py index c3a742159a..756e3f4960 100755 --- a/linux/keyman-config/keymanconfig/install_kmp.py +++ b/linux/keyman-config/keyman_config/install_kmp.py @@ -13,11 +13,11 @@ from ast import literal_eval import requests -from keymanconfig.get_kmp import get_keyboard_data, get_kmp -from keymanconfig.kmpmetadata import determine_filetype, parseinfdata, parsemetadata -from keymanconfig.uninstall_kmp import uninstall_kmp -from keymanconfig.convertico import checkandsaveico -from keymanconfig.kvk2ldml import convert_kvk_to_ldml, output_ldml +from keyman_config.get_kmp import get_keyboard_data, get_kmp +from keyman_config.kmpmetadata import determine_filetype, parseinfdata, parsemetadata +from keyman_config.uninstall_kmp import uninstall_kmp +from keyman_config.convertico import checkandsaveico +from keyman_config.kvk2ldml import convert_kvk_to_ldml, output_ldml def list_files(directory, extension): return (f for f in listdir(directory) if f.endswith('.' + extension)) diff --git a/linux/keyman-config/keymanconfig/install_window.py b/linux/keyman-config/keyman_config/install_window.py similarity index 96% rename from linux/keyman-config/keymanconfig/install_window.py rename to linux/keyman-config/keyman_config/install_window.py index 2ac99ebfbe..ebadeb7f91 100755 --- a/linux/keyman-config/keymanconfig/install_window.py +++ b/linux/keyman-config/keyman_config/install_window.py @@ -13,14 +13,14 @@ gi.require_version('Gtk', '3.0') gi.require_version('WebKit', '3.0') from gi.repository import Gtk, WebKit from distutils.version import StrictVersion -from keymanconfig.install_kmp import install_kmp, extract_kmp, get_metadata -from keymanconfig.list_installed_kmp import get_kmp_version -from keymanconfig.kmpmetadata import get_fonts -from keymanconfig.welcome import WelcomeView -from keymanconfig.uninstall_kmp import uninstall_kmp -from keymanconfig.get_kmp import get_download_folder -from keymanconfig.check_mime_type import check_mime_type -from keymanconfig.accelerators import bind_accelerator, init_accel +from keyman_config.install_kmp import install_kmp, extract_kmp, get_metadata +from keyman_config.list_installed_kmp import get_kmp_version +from keyman_config.kmpmetadata import get_fonts +from keyman_config.welcome import WelcomeView +from keyman_config.uninstall_kmp import uninstall_kmp +from keyman_config.get_kmp import get_download_folder +from keyman_config.check_mime_type import check_mime_type +from keyman_config.accelerators import bind_accelerator, init_accel class InstallKmpWindow(Gtk.Window): diff --git a/linux/keyman-config/keymanconfig/keyboard_details.py b/linux/keyman-config/keyman_config/keyboard_details.py similarity index 100% rename from linux/keyman-config/keymanconfig/keyboard_details.py rename to linux/keyman-config/keyman_config/keyboard_details.py diff --git a/linux/keyman-config/keymanconfig/kmpmetadata.py b/linux/keyman-config/keyman_config/kmpmetadata.py similarity index 100% rename from linux/keyman-config/keymanconfig/kmpmetadata.py rename to linux/keyman-config/keyman_config/kmpmetadata.py diff --git a/linux/keyman-config/keymanconfig/kvk2ldml.py b/linux/keyman-config/keyman_config/kvk2ldml.py similarity index 100% rename from linux/keyman-config/keymanconfig/kvk2ldml.py rename to linux/keyman-config/keyman_config/kvk2ldml.py diff --git a/linux/keyman-config/keymanconfig/list_installed_kmp.py b/linux/keyman-config/keyman_config/list_installed_kmp.py similarity index 96% rename from linux/keyman-config/keymanconfig/list_installed_kmp.py rename to linux/keyman-config/keyman_config/list_installed_kmp.py index d74a686ee5..9cd0b5037c 100755 --- a/linux/keyman-config/keymanconfig/list_installed_kmp.py +++ b/linux/keyman-config/keyman_config/list_installed_kmp.py @@ -3,8 +3,8 @@ import argparse import os import json -from keymanconfig.kmpmetadata import parsemetadata, parseinfdata -from keymanconfig.get_kmp import get_keyboard_data +from keyman_config.kmpmetadata import parsemetadata, parseinfdata +from keyman_config.get_kmp import get_keyboard_data def get_installed_kmp(): """ diff --git a/linux/keyman-config/keymanconfig/uninstall_kmp.py b/linux/keyman-config/keyman_config/uninstall_kmp.py similarity index 100% rename from linux/keyman-config/keymanconfig/uninstall_kmp.py rename to linux/keyman-config/keyman_config/uninstall_kmp.py diff --git a/linux/keyman-config/keymanconfig/view_installed.py b/linux/keyman-config/keyman_config/view_installed.py similarity index 95% rename from linux/keyman-config/keymanconfig/view_installed.py rename to linux/keyman-config/keyman_config/view_installed.py index cd585ad475..e961f41999 100755 --- a/linux/keyman-config/keymanconfig/view_installed.py +++ b/linux/keyman-config/keyman_config/view_installed.py @@ -6,13 +6,13 @@ import gi gi.require_version('Gtk', '3.0') gi.require_version('Gdk', '3.0') from gi.repository import Gtk, Gdk -from keymanconfig.list_installed_kmp import get_installed_kmp -from keymanconfig.welcome import WelcomeView -from keymanconfig.keyboard_details import KeyboardDetailsView -from keymanconfig.downloadkeyboard import DownloadKmpWindow -from keymanconfig.install_window import InstallKmpWindow -from keymanconfig.uninstall_kmp import uninstall_kmp -from keymanconfig.accelerators import bind_accelerator, init_accel +from keyman_config.list_installed_kmp import get_installed_kmp +from keyman_config.welcome import WelcomeView +from keyman_config.keyboard_details import KeyboardDetailsView +from keyman_config.downloadkeyboard import DownloadKmpWindow +from keyman_config.install_window import InstallKmpWindow +from keyman_config.uninstall_kmp import uninstall_kmp +from keyman_config.accelerators import bind_accelerator, init_accel class KeyboardBox(Gtk.Box): def __init__(self, kmp, window): diff --git a/linux/keyman-config/keymanconfig/welcome.py b/linux/keyman-config/keyman_config/welcome.py similarity index 95% rename from linux/keyman-config/keymanconfig/welcome.py rename to linux/keyman-config/keyman_config/welcome.py index 58b6ea4795..647a9edd31 100644 --- a/linux/keyman-config/keymanconfig/welcome.py +++ b/linux/keyman-config/keyman_config/welcome.py @@ -9,8 +9,8 @@ import webbrowser gi.require_version('Gtk', '3.0') gi.require_version('WebKit', '3.0') from gi.repository import Gtk, WebKit -from keymanconfig.check_mime_type import check_mime_type -from keymanconfig.accelerators import bind_accelerator, init_accel +from keyman_config.check_mime_type import check_mime_type +from keyman_config.accelerators import bind_accelerator, init_accel class WelcomeView(Gtk.Window): diff --git a/linux/keyman-config/kmpmetadata b/linux/keyman-config/kmpmetadata index a01068e11a..43c6a4903b 100755 --- a/linux/keyman-config/kmpmetadata +++ b/linux/keyman-config/kmpmetadata @@ -2,7 +2,7 @@ import sys import os.path -from keymanconfig.kmpmetadata import parseinfdata, parsemetadata +from keyman_config.kmpmetadata import parseinfdata, parsemetadata def main(argv): if len(sys.argv) != 2: diff --git a/linux/keyman-config/kvk2ldml b/linux/keyman-config/kvk2ldml index 7dc0fec26f..bc64c9775d 100755 --- a/linux/keyman-config/kvk2ldml +++ b/linux/keyman-config/kvk2ldml @@ -3,7 +3,7 @@ import argparse import os.path import sys -from keymanconfig.kvk2ldml import parse_kvk_file, print_kvk, convert_ldml, output_ldml +from keyman_config.kvk2ldml import parse_kvk_file, print_kvk, convert_ldml, output_ldml # import struct diff --git a/linux/keyman-config/list_installed_kmp b/linux/keyman-config/list_installed_kmp index 8c9b619876..8e2947513c 100755 --- a/linux/keyman-config/list_installed_kmp +++ b/linux/keyman-config/list_installed_kmp @@ -2,7 +2,7 @@ import argparse import os -from keymanconfig.list_installed_kmp import get_installed_kmp +from keyman_config.list_installed_kmp import get_installed_kmp def main(): parser = argparse.ArgumentParser(description='Show installed keyman keyboards.') diff --git a/linux/keyman-config/uninstall_kmp b/linux/keyman-config/uninstall_kmp index 348914c89b..8424a74d12 100755 --- a/linux/keyman-config/uninstall_kmp +++ b/linux/keyman-config/uninstall_kmp @@ -1,7 +1,7 @@ #!/usr/bin/python3 import sys -from keymanconfig.uninstall_kmp import uninstall_kmp +from keyman_config.uninstall_kmp import uninstall_kmp def main(argv): if len(sys.argv) != 2: