# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com # Fake Node ID fc20099e8e0e33321f119e4ab3d327ea62681ffd
Move chirpui/ to chirp/ui/ (#2351)
diff --git a/build/make_source_release.sh b/build/make_source_release.sh index 6cbc116..2a5af86 100755 --- a/build/make_source_release.sh +++ b/build/make_source_release.sh @@ -13,7 +13,7 @@ DST="${TMP}/${RELDIR}"
mkdir -p $DST
-cp -rav --parents chirp/*.py chirp/drivers/*.py csvdump/*.py chirpui/* $DST +cp -rav --parents chirp/*.py chirp/drivers/*.py csvdump/*.py chirp/ui/* $DST cp -av *.py ${DST}
cp -rav $INCLUDE ${DST} diff --git a/chirpui/__init__.py b/chirp/ui/__init__.py similarity index 100% rename from chirpui/__init__.py rename to chirp/ui/__init__.py diff --git a/chirpui/bandplans.py b/chirp/ui/bandplans.py similarity index 99% rename from chirpui/bandplans.py rename to chirp/ui/bandplans.py index 4096d78..483261c 100644 --- a/chirpui/bandplans.py +++ b/chirp/ui/bandplans.py @@ -17,7 +17,7 @@ import gtk import logging from chirp import bandplan, bandplan_na, bandplan_au from chirp import bandplan_iaru_r1, bandplan_iaru_r2, bandplan_iaru_r3 -from chirpui import inputdialog +from chirp.ui import inputdialog
LOG = logging.getLogger(__name__)
diff --git a/chirpui/bankedit.py b/chirp/ui/bankedit.py similarity index 99% rename from chirpui/bankedit.py rename to chirp/ui/bankedit.py index 82f6b30..48d4b4f 100644 --- a/chirpui/bankedit.py +++ b/chirp/ui/bankedit.py @@ -21,7 +21,7 @@ import logging from gobject import TYPE_INT, TYPE_STRING, TYPE_BOOLEAN
from chirp import chirp_common -from chirpui import common, miscwidgets +from chirp.ui import common, miscwidgets
LOG = logging.getLogger(__name__)
diff --git a/chirpui/clone.py b/chirp/ui/clone.py similarity index 99% rename from chirpui/clone.py rename to chirp/ui/clone.py index 5050b0d..f20c1d2 100644 --- a/chirpui/clone.py +++ b/chirp/ui/clone.py @@ -21,7 +21,7 @@ import gtk import gobject
from chirp import platform, directory, detect, chirp_common -from chirpui import miscwidgets, cloneprog, inputdialog, common, config +from chirp.ui import miscwidgets, cloneprog, inputdialog, common, config
LOG = logging.getLogger(__name__)
diff --git a/chirpui/cloneprog.py b/chirp/ui/cloneprog.py similarity index 100% rename from chirpui/cloneprog.py rename to chirp/ui/cloneprog.py diff --git a/chirpui/common.py b/chirp/ui/common.py similarity index 99% rename from chirpui/common.py rename to chirp/ui/common.py index 83a1a19..dc611b3 100644 --- a/chirpui/common.py +++ b/chirp/ui/common.py @@ -24,7 +24,7 @@ import traceback import logging
from chirp import errors -from chirpui import reporting, config +from chirp.ui import reporting, config
LOG = logging.getLogger(__name__)
diff --git a/chirpui/config.py b/chirp/ui/config.py similarity index 100% rename from chirpui/config.py rename to chirp/ui/config.py diff --git a/chirpui/dstaredit.py b/chirp/ui/dstaredit.py similarity index 99% rename from chirpui/dstaredit.py rename to chirp/ui/dstaredit.py index d58f74b..3409ef4 100644 --- a/chirpui/dstaredit.py +++ b/chirp/ui/dstaredit.py @@ -17,7 +17,7 @@ import gtk import gobject import logging
-from chirpui import common, miscwidgets +from chirp.ui import common, miscwidgets
LOG = logging.getLogger(__name__)
diff --git a/chirpui/editorset.py b/chirp/ui/editorset.py similarity index 99% rename from chirpui/editorset.py rename to chirp/ui/editorset.py index f13da34..5c5d62e 100644 --- a/chirpui/editorset.py +++ b/chirp/ui/editorset.py @@ -20,8 +20,8 @@ import logging
from chirp import chirp_common, directory from chirp.drivers import generic_csv, generic_xml -from chirpui import memedit, dstaredit, bankedit, common, importdialog -from chirpui import inputdialog, reporting, settingsedit, radiobrowser, config +from chirp.ui import memedit, dstaredit, bankedit, common, importdialog +from chirp.ui import inputdialog, reporting, settingsedit, radiobrowser, config
LOG = logging.getLogger(__name__)
diff --git a/chirpui/fips.py b/chirp/ui/fips.py similarity index 100% rename from chirpui/fips.py rename to chirp/ui/fips.py diff --git a/chirpui/importdialog.py b/chirp/ui/importdialog.py similarity index 99% rename from chirpui/importdialog.py rename to chirp/ui/importdialog.py index 5e4305f..2bc9899 100644 --- a/chirpui/importdialog.py +++ b/chirp/ui/importdialog.py @@ -20,7 +20,7 @@ import logging
from chirp import errors, chirp_common, import_logic from chirp.drivers import generic_xml -from chirpui import common +from chirp.ui import common
LOG = logging.getLogger(__name__)
@@ -641,7 +641,7 @@ class ExportDialog(ImportDialog): ACTION = _("Export")
if __name__ == "__main__": - from chirpui import editorset + from chirp.ui import editorset import sys
f = sys.argv[1] diff --git a/chirpui/inputdialog.py b/chirp/ui/inputdialog.py similarity index 99% rename from chirpui/inputdialog.py rename to chirp/ui/inputdialog.py index d3f2828..96531d0 100644 --- a/chirpui/inputdialog.py +++ b/chirp/ui/inputdialog.py @@ -17,7 +17,7 @@ import gtk import logging
from miscwidgets import make_choice -from chirpui import reporting +from chirp.ui import reporting
LOG = logging.getLogger(__name__)
diff --git a/chirpui/mainapp.py b/chirp/ui/mainapp.py similarity index 99% rename from chirpui/mainapp.py rename to chirp/ui/mainapp.py index bf3236c..872270b 100644 --- a/chirpui/mainapp.py +++ b/chirp/ui/mainapp.py @@ -25,14 +25,14 @@ import logging import gtk import gobject
-from chirpui import inputdialog, common +from chirp.ui import inputdialog, common from chirp import platform, directory, util from chirp.drivers import generic_xml, generic_csv from chirp.drivers import ic9x, kenwood_live, idrp, vx7, vx5, vx6 from chirp.drivers import icf, ic9x_icf from chirp import CHIRP_VERSION, chirp_common, detect, errors -from chirpui import editorset, clone, miscwidgets, config, reporting, fips -from chirpui import bandplans +from chirp.ui import editorset, clone, miscwidgets, config, reporting, fips +from chirp.ui import bandplans
gobject.threads_init()
diff --git a/chirpui/memdetail.py b/chirp/ui/memdetail.py similarity index 99% rename from chirpui/memdetail.py rename to chirp/ui/memdetail.py index 0766230..d58ecde 100644 --- a/chirpui/memdetail.py +++ b/chirp/ui/memdetail.py @@ -18,7 +18,7 @@ import os import logging
from chirp import chirp_common, settings -from chirpui import miscwidgets, common +from chirp.ui import miscwidgets, common
LOG = logging.getLogger(__name__)
diff --git a/chirpui/memedit.py b/chirp/ui/memedit.py similarity index 99% rename from chirpui/memedit.py rename to chirp/ui/memedit.py index 7da07a2..4834cce 100644 --- a/chirpui/memedit.py +++ b/chirp/ui/memedit.py @@ -29,8 +29,8 @@ import pickle import os import logging
-from chirpui import common, shiftdialog, miscwidgets, config, memdetail -from chirpui import bandplans +from chirp.ui import common, shiftdialog, miscwidgets, config, memdetail +from chirp.ui import bandplans from chirp import chirp_common, errors, directory, import_logic
LOG = logging.getLogger(__name__) diff --git a/chirpui/miscwidgets.py b/chirp/ui/miscwidgets.py similarity index 100% rename from chirpui/miscwidgets.py rename to chirp/ui/miscwidgets.py diff --git a/chirpui/radiobrowser.py b/chirp/ui/radiobrowser.py similarity index 99% rename from chirpui/radiobrowser.py rename to chirp/ui/radiobrowser.py index d5781a3..971a4d6 100644 --- a/chirpui/radiobrowser.py +++ b/chirp/ui/radiobrowser.py @@ -6,7 +6,7 @@ import os import logging
from chirp import bitwise -from chirpui import common, config +from chirp.ui import common, config
LOG = logging.getLogger(__name__)
diff --git a/chirpui/reporting.py b/chirp/ui/reporting.py similarity index 99% rename from chirpui/reporting.py rename to chirp/ui/reporting.py index ad3c22a..6908e10 100644 --- a/chirpui/reporting.py +++ b/chirp/ui/reporting.py @@ -42,7 +42,7 @@ LOG = logging.getLogger(__name__)
try: # Don't let failure to import any of these modules cause trouble - from chirpui import config + from chirp.ui import config import xmlrpclib except: ENABLED = False diff --git a/chirpui/settingsedit.py b/chirp/ui/settingsedit.py similarity index 99% rename from chirpui/settingsedit.py rename to chirp/ui/settingsedit.py index e25727e..4d50048 100644 --- a/chirpui/settingsedit.py +++ b/chirp/ui/settingsedit.py @@ -19,7 +19,7 @@ import logging
from chirp import chirp_common from chirp import settings -from chirpui import common, miscwidgets +from chirp.ui import common, miscwidgets
LOG = logging.getLogger(__name__)
diff --git a/chirpui/shiftdialog.py b/chirp/ui/shiftdialog.py similarity index 100% rename from chirpui/shiftdialog.py rename to chirp/ui/shiftdialog.py diff --git a/chirpw b/chirpw index 0c81da8..cb67047 100755 --- a/chirpw +++ b/chirpw @@ -21,7 +21,7 @@ from chirp import logger from chirp import elib_intl from chirp import platform from chirp.drivers import * -from chirpui import config +from chirp.ui import config
import sys @@ -124,7 +124,7 @@ logger.handle_options(args)
a = None if True: - from chirpui import mainapp + from chirp.ui import mainapp a = mainapp.ChirpMain()
for i in args.files: diff --git a/csvdump/csvapp.py b/csvdump/csvapp.py index aaae614..e07a213 100644 --- a/csvdump/csvapp.py +++ b/csvdump/csvapp.py @@ -22,7 +22,7 @@ import serial import os
import csvdump -from chirpui import inputdialog, cloneprog +from chirp.ui import inputdialog, cloneprog
import chirp from chirp import ic9x, id800, ic2820, ic2200, errors diff --git a/locale/Makefile b/locale/Makefile index efa465d..1bcfa21 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -13,7 +13,7 @@ clean: find * -depth -type d -exec rmdir "{}" ;
chirpui.pot: - /usr/bin/find ../chirpui -name '*.py' > .files + /usr/bin/find ../chirp/ui -name '*.py' > .files xgettext -L Python -k_ -o chirpui.pot -f .files $(XGT_OPTS)
%.po: chirpui.pot diff --git a/setup.py b/setup.py index 1f5a506..88451b3 100644 --- a/setup.py +++ b/setup.py @@ -119,7 +119,7 @@ def default_build():
setup( name="chirp", - packages=["chirp", "chirp.drivers", "chirpui"], + packages=["chirp", "chirp.drivers", "chirp.ui"], version=CHIRP_VERSION, scripts=["chirpw"], data_files=[('share/applications', desktop_files), @@ -166,7 +166,7 @@ else: if os.path.exists("rpttool"): nuke_manifest("include tools/icomsio.sh", "include README.rpttool") rpttool_build() - if os.path.exists("chirpui"): + if os.path.exists("chirp/ui"): nuke_manifest("include *.xsd", "include share/*.desktop", "include share/chirp.png", diff --git a/tests/unit/test_memedit_edits.py b/tests/unit/test_memedit_edits.py index decd667..3870a56 100644 --- a/tests/unit/test_memedit_edits.py +++ b/tests/unit/test_memedit_edits.py @@ -3,7 +3,7 @@ from tests.unit import base
__builtins__["_"] = lambda s: s
-from chirpui import memedit +from chirp.ui import memedit
class TestEdits(base.BaseTest): diff --git a/tests/unit/test_shiftdialog.py b/tests/unit/test_shiftdialog.py index 46f83ce..e4d63a6 100644 --- a/tests/unit/test_shiftdialog.py +++ b/tests/unit/test_shiftdialog.py @@ -2,7 +2,7 @@ import unittest import mox
from tests.unit import base -from chirpui import shiftdialog +from chirp.ui import shiftdialog from chirp import chirp_common from chirp import errors
diff --git a/tools/cpep8.manifest b/tools/cpep8.manifest index 92e8d4f..afeef1d 100644 --- a/tools/cpep8.manifest +++ b/tools/cpep8.manifest @@ -96,29 +96,29 @@ ./chirp/pyPEG.py ./chirp/radioreference.py ./chirp/settings.py +./chirp/ui/__init__.py +./chirp/ui/bandplans.py +./chirp/ui/bankedit.py +./chirp/ui/clone.py +./chirp/ui/cloneprog.py +./chirp/ui/common.py +./chirp/ui/config.py +./chirp/ui/dstaredit.py +./chirp/ui/editorset.py +./chirp/ui/fips.py +./chirp/ui/importdialog.py +./chirp/ui/inputdialog.py +./chirp/ui/mainapp.py +./chirp/ui/memdetail.py +./chirp/ui/memedit.py +./chirp/ui/miscwidgets.py +./chirp/ui/radiobrowser.py +./chirp/ui/reporting.py +./chirp/ui/settingsedit.py +./chirp/ui/shiftdialog.py ./chirp/util.py ./chirp/xml_ll.py ./chirpc -./chirpui/__init__.py -./chirpui/bandplans.py -./chirpui/bankedit.py -./chirpui/clone.py -./chirpui/cloneprog.py -./chirpui/common.py -./chirpui/config.py -./chirpui/dstaredit.py -./chirpui/editorset.py -./chirpui/fips.py -./chirpui/importdialog.py -./chirpui/inputdialog.py -./chirpui/mainapp.py -./chirpui/memdetail.py -./chirpui/memedit.py -./chirpui/miscwidgets.py -./chirpui/radiobrowser.py -./chirpui/reporting.py -./chirpui/settingsedit.py -./chirpui/shiftdialog.py ./chirpw ./csvdump.py ./csvdump/__init__.py