diff --git a/d-rats_in_mobaxerm_install.sh b/d-rats_in_mobaxterm_install.sh similarity index 91% rename from d-rats_in_mobaxerm_install.sh rename to d-rats_in_mobaxterm_install.sh index 57cad83..18d8127 100755 --- a/d-rats_in_mobaxerm_install.sh +++ b/d-rats_in_mobaxterm_install.sh @@ -17,7 +17,7 @@ $apt_get -y upgrade $apt_get -y install \ aspell aspell-de aspell-en aspell-es aspell-it \ ffmpeg \ - gedit gettext git gcc-core \ + gedit gettext gettext-devel git gcc-core \ libgtk3_0 libjpeg-devel libportaudio-devel \ python39 python39-devel python39-gi python39-lxml \ python3-pip python39-sphinx \ @@ -56,11 +56,14 @@ if [ ! -e "$HOME/d-rats-git" ]; then git clone https://github.com/ham-radio-software/D-Rats.git \ "$HOME/d-rats-git" else - pushd "$HOME/d-rats-git" - git pull - popd + git -C d-rats-git pull || echo "unable to pull updates for PRs here" fi +# Update the locale database +pushd "$HOME/d-rats-git" + ./build_pot.sh +popd + # Handle lzhuf if [ ! -e /usr/bin/lzhuf ]; then lzexe="/drives/c/Program Files/lzhuf/lzhuf.exe" diff --git a/d_rats/aprs_icons.py b/d_rats/aprs_icons.py index f504926..65d8898 100755 --- a/d_rats/aprs_icons.py +++ b/d_rats/aprs_icons.py @@ -140,7 +140,7 @@ def get_icon_from_map(cls, iconmap, symbol): @classmethod def add_aprs_overlay(cls, pixbuf, code): ''' - Add Overlay to APRS pixuf + Add Overlay to APRS pixbuf :param pixbuf: Original Pixbuf of APRS icon :type pixbuf: :class:`GdkPixbuf.Pixbuf` diff --git a/d_rats/mainwindow.py b/d_rats/mainwindow.py index 1de948a..7f83bb6 100755 --- a/d_rats/mainwindow.py +++ b/d_rats/mainwindow.py @@ -68,6 +68,7 @@ from d_rats.ui.main_common import prompt_for_station from d_rats.ui.main_common import ask_for_confirmation +from d_rats.dplatform import Platform from d_rats.menu_helpers import add_menu_theme_image from d_rats.menu_helpers import add_menu_accel_file_image from d_rats.menu_helpers import add_menu_accel_theme_image @@ -254,10 +255,10 @@ def _activate_about(self, _button): dialog.set_comments(verinfo) #dialog.set_license(LICENSE) dialog.set_license_type(Gtk.License.GPL_3_0) - - logo = GdkPixbuf.Pixbuf.new_from_file_at_size("images/d-rats2.png", 64, 64) - #dialog.set_logo_icon_name(None) - dialog.set_logo(logo) + sys_data = Platform.get_platform().sys_data() + image = os.path.join(sys_data, "images", "d-rats2.png") + d_rats_pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(image, 64, 64) + dialog.set_logo(d_rats_pixbuf) dialog.run() dialog.destroy() diff --git a/d_rats/version.py b/d_rats/version.py index 0966a8d..178d09d 100644 --- a/d_rats/version.py +++ b/d_rats/version.py @@ -63,9 +63,9 @@ "Marius Petrescu YO2LOJ \n" \ "John E. Malmberg WB8TYW " AUTHOR_COPYRIGHT = "2008-2010 Dan Smith (KK7DS)\n" \ - "2014-2022 Maurizio Andreotti (IZ2LXI) &\n" \ + "2014-2023 Maurizio Andreotti (IZ2LXI) &\n" \ "Marius Petrescu (YO2LOJ)\n" \ - "2021-2022 John E. Malmberg (WB8TYW)." + "2021-2023 John E. Malmberg (WB8TYW)." DATA_COPYRIGHT = "Location and Map data Copyright www.thunderforest.com and\n" \ "copyright OpenStreetMap Contributors, www.osm.org/copyright.\n" \ "Some Map Data courtesy of the U.S. Geological Survey.\n" \ @@ -361,7 +361,8 @@ def _get_version(cls): if isdir(join(module_dir, '.git')): # Get the version using "git describe". - cmd = 'git describe --tags --dirty'.split() + cmd = 'git -C %s describe --tags --dirty' % module_dir + cmd = cmd.split() try: raw_version = subprocess.check_output(cmd).decode().strip() cls._parse_version(raw_version)