Skip to content

Commit

Permalink
Install D-Rats in MobaXterm fixes (#283)
Browse files Browse the repository at this point in the history
* Install D-Rats in MobaXterm fixes

Install script needs to build the translation database.

d-rats_in_mobaxterm_install.sh
  Rename to correct name.
  Add packages needed to build the translation database
  and call script to do the build.

d_rats/aprs_icons.py:
  Fix Typographical error.

d_rats/mainwindow.py:
  Fix path for d-rats logo for about dialog

d_rats/version.py:
  Fix git version lookup
  • Loading branch information
wb8tyw authored Nov 24, 2023
1 parent 09626a3 commit 5a5c21a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
11 changes: 7 additions & 4 deletions d-rats_in_mobaxerm_install.sh → d-rats_in_mobaxterm_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion d_rats/aprs_icons.py
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
9 changes: 5 additions & 4 deletions d_rats/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
7 changes: 4 additions & 3 deletions d_rats/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"Marius Petrescu YO2LOJ <[email protected]>\n" \
"John E. Malmberg WB8TYW <[email protected]>"
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" \
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 5a5c21a

Please sign in to comment.