[gnome-internet-radio-locator] Create popup markers on click-to-play map locations
- From: ole <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-internet-radio-locator] Create popup markers on click-to-play map locations
- Date: Sat, 16 Sep 2017 14:30:55 +0000 (UTC)
commit 4eaa45ffe225ecbe6eb3c243fa126a410a073bab
Author: Ole Aamot <oka oka no>
Date: Sat Sep 16 16:30:39 2017 +0200
Create popup markers on click-to-play map locations
src/gnome-internet-radio-locator-markers.c | 2 +-
src/gnome-internet-radio-locator.c | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 1b0d36e..896c7c4 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -29,6 +29,7 @@ extern GtkEntryCompletion *completion;
extern GNOMEInternetRadioLocatorStationInfo *stationinfo, *localstation;
extern gchar *world_station_xml_filename;
extern GstPlayer *player;
+extern ChamplainMarkerLayer *layer;
typedef struct
{
@@ -74,7 +75,6 @@ ChamplainMarkerLayer *
create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **path)
{
ClutterActor *marker;
- ChamplainMarkerLayer *layer;
ClutterActor *layer_actor;
ClutterColor orange = { 0xf3, 0x94, 0x07, 0xbb };
LocationCallbackData callback_data;
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index 65283ea..52f4bfa 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -70,6 +70,8 @@ gchar *list_item_data_key ="list_item_data";
GtkWidget *gnome_internet_radio_locator_app;
GstPlayer *player;
+ChamplainMarkerLayer *layer;
+ClutterActor *marker;
gchar *world_station_xml_filename, *local_station_xml_file;
@@ -113,7 +115,6 @@ mouse_click_cb (ClutterActor *actor, ClutterButtonEvent *event, ChamplainView *v
{
GError **error;
gdouble lat, lon;
- ChamplainMarker *marker;
GeocodePlace *place;
GeocodeLocation *location;
GeocodeReverse *reverse;
@@ -127,8 +128,11 @@ mouse_click_cb (ClutterActor *actor, ClutterButtonEvent *event, ChamplainView *v
reverse = geocode_reverse_new_for_location (location);
place = geocode_reverse_resolve (reverse, error);
name = geocode_place_get_town (place);
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
champlain_label_set_text (CHAMPLAIN_LABEL (marker), (gchar *)name);
- // gtk_entry_set_text(GTK_ENTRY(input),(gchar *)name);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), lat, lon);
+ champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+ gtk_entry_set_text(GTK_ENTRY(input),(gchar *)name);
g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), NULL);
GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("Mouse click at: %f %f (%s)\n", lat, lon, name);
return TRUE;
@@ -671,7 +675,6 @@ main (int argc,
GtkWidget *window;
GtkWidget *widget, *vbox, *bbox, *button, *viewport, *image;
ChamplainView *view;
- ChamplainMarkerLayer *layer;
ClutterActor *scale;
ChamplainLicense *license_actor;
GtkListStore *model;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]