Commit fb2f3a00 authored by Ole Aamot's avatar Ole Aamot

Add Houston marker, center map on Houston and remove the gsettings.

parent fee1f723
......@@ -20,3 +20,4 @@ Gabor Kelemen (Hungarian translation)
Tim Sabsch (German translation)
Justin van Steijn (Dutch translation)
Rafael Fontenelle (Brazilian Portuguese translation)
Rodrigo (Spanish translation)
=============
Version 1.1.1
=============
GUI
* src/gnome-internet-radio-locator-markers.c: Add Houston, Texas
* src/gnome-internet-radio-locator.c: Set default center Houston
Translations
* po/es.po: Updated Spanish translation (Rodrigo)
=============
Version 1.1.0
=============
......
......@@ -25,3 +25,4 @@ Gabor Kelemen (Hungarian translation)
Tim Sabsch (German translation)
Justin van Steijn (Dutch translation)
Rafael Fontenelle (Brazilian Portuguese translation)
Rodrigo (Spanish translation)
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(gnome-internet-radio-locator,1.1.0)
AC_INIT(gnome-internet-radio-locator,1.1.1)
AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
AM_MAINTAINER_MODE
AC_CONFIG_SRCDIR([src/gnome-internet-radio-locator.c])
......@@ -91,7 +91,6 @@ PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR,
glib-2.0 >= 2.38.0 \
gobject-2.0 >= 2.38.0 \
gstreamer-1.0 >= 1.0 \
gsettings-desktop-schemas >= 2.91.92 \
gstreamer-player-1.0 >= 1.0 \
gstreamer-tag-1.0 >= 1.0 \
gstreamer-video-1.0 \
......@@ -133,17 +132,10 @@ AC_SUBST(GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS)
dnl Enable yelp-tools
# YELP_HELP_INIT
# *********
# GSettings
# *********
GLIB_GSETTINGS
AC_OUTPUT([
Makefile
data/Makefile
data/gnome-internet-radio-locator.desktop
data/org.gnome.gnome-internet-radio-locator.gschema.xml
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/22x22/Makefile
......
......@@ -13,12 +13,6 @@ appdatadir = $(datadir)/appdata
appdata_in_files = gnome-internet-radio-locator.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
gsettings_ENUM_NAMESPACE = org.gnome.gnome-internet-radio-locator
gsettings_ENUM_FILES = $(top_srcdir)/src/gnome-internet-radio-locator-gui.h
gsettings_SCHEMAS = org.gnome.gnome-internet-radio-locator.gschema.xml
@GSETTINGS_RULES@
# gsettingsconvertdir = $(datadir)/GConf/gsettings
# gsettingsconvert_DATA = eog.convert
......@@ -33,6 +27,6 @@ EXTRA_DIST = $(DESKTOP_IN_FILES) $(appdata_in_files)
CLEANFILES = $(appdata_DATA)
DISTCLEANFILES = $(DESKTOP_FILES) $(gsettings_SCHEMAS)
DISTCLEANFILES = $(DESKTOP_FILES)
-include $(top_srcdir)/git.mk
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema gettext-domain="gnome-internet-radio-locator" id="org.gnome.gnome-internet-radio-locator" path="/org/gnome/gnome-internet-radio-locator/">
<child name="ui" schema="org.gnome.gnome-internet-radio-locator.ui"/>
</schema>
<schema gettext-domain="gnome-internet-radio-locator" id="org.gnome.gnome-internet-radio-locator.ui" path="/org/gnome/gnome-internet-radio-locator/ui/">
<key name="station" type="s">
<default>'San Francisco, California'</default>
<summary>Default station</summary>
<description>Default Internet Radio station.</description>
</key>
</schema>
</schemalist>
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gnome-internet-radio-locator" path="/org/gnome/gnome-internet-radio-locator/">
<child name="ui" schema="org.gnome.gnome-internet-radio-locator.ui"/>
</schema>
<schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.gnome-internet-radio-locator.ui" path="/org/gnome/gnome-internet-radio-locator/ui/">
<key name="station" type="s">
<default>'San Francisco, California'</default>
<summary>Default station</summary>
<description>Default Internet Radio station.</description>
</key>
</schema>
</schemalist>
......@@ -67,12 +67,13 @@ fi
%{_datadir}/%{name}/
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man1/%{name}.1*
%changelog
* Sun Apr 22 2018 Ole Aamot <ole@gnome.org> - 1.1.1-1
- gnome-internet-radio-locator 1.1.1 build on Fedora Linux 27
* Sat Apr 21 2018 Ole Aamot <ole@gnome.org> - 1.1.0-1
- gnome-internet-radio-locator 1.1.0 build on Fedora Linux 27
......
......@@ -3,7 +3,6 @@
[encoding: UTF-8]
data/gnome-internet-radio-locator.appdata.xml.in
data/gnome-internet-radio-locator.desktop.in.in
[type: gettext/gsettings]data/org.gnome.gnome-internet-radio-locator.gschema.xml.in
src/gnome-internet-radio-locator-gui.c
src/gnome-internet-radio-locator-listener.c
src/gnome-internet-radio-locator-station.c
......
......@@ -175,6 +175,15 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("Houston, Texas\n<span size=\"xx-small\">Coog Radio, University of Houston</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker),29.7589382,-95.3676974);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
/* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
station = g_strdup("London, United Kingdom\n<span size=\"xx-small\">Imperial College Radio</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
......
......@@ -796,7 +796,7 @@ main (int argc,
license_actor = champlain_view_get_license_actor (view);
champlain_license_set_extra_text (license_actor, "Free Internet Radio");
champlain_view_center_on (CHAMPLAIN_VIEW (view), 52.0367323, 1.168934);
champlain_view_center_on (CHAMPLAIN_VIEW (view), 29.7589382, -95.3676974);
layer = create_marker_layer (view, &path);
champlain_view_add_layer (view, CHAMPLAIN_LAYER (path));
champlain_view_add_layer (view, CHAMPLAIN_LAYER (layer));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment