From 7833d6fa576e3b72bbb31463381cfc10673a928e Mon Sep 17 00:00:00 2001 From: Zoe Moore Date: Sat, 24 Dec 2022 20:49:10 -0800 Subject: [PATCH] Added marker icon to map --- README.md | 4 ++++ data/img/marker-icon.png | Bin 0 -> 9248 bytes data/ui/main.blp | 1 + data/wince.gresource.xml | 1 + src/modules/views/main.cr | 7 +++++-- src/wince.cr | 2 +- 6 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 data/img/marker-icon.png diff --git a/README.md b/README.md index 52c66bd..0ea9b35 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,7 @@ crystal run src/gtktest.cr ``` You can build for production with `make` and install with `make install` + +## Credits + +Marker icon from [Paomedia on iconfinder](https://www.iconfinder.com/icons/299087/marker_map_icon) \ No newline at end of file diff --git a/data/img/marker-icon.png b/data/img/marker-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..90a98c1221d53158995a2325561ea4a332d893d2 GIT binary patch literal 9248 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 NQ(aH3OvUEb{{UFlus#3) literal 0 HcmV?d00001 diff --git a/data/ui/main.blp b/data/ui/main.blp index baf208b..e1d73ee 100644 --- a/data/ui/main.blp +++ b/data/ui/main.blp @@ -78,6 +78,7 @@ Adw.ApplicationWindow mainWindow { Gtk.Label detailsTitle { halign: start; + wrap: true; styles ["title-1"] } diff --git a/data/wince.gresource.xml b/data/wince.gresource.xml index 7a0cec0..c63e192 100644 --- a/data/wince.gresource.xml +++ b/data/wince.gresource.xml @@ -4,5 +4,6 @@ ui/compiled/main.ui ui/compiled/templates/businessrow.ui ui/compiled/templates/hourrow.ui + img/marker-icon.png diff --git a/src/modules/views/main.cr b/src/modules/views/main.cr index 33e9af2..15ab635 100644 --- a/src/modules/views/main.cr +++ b/src/modules/views/main.cr @@ -49,10 +49,13 @@ module Wince DETAILS_MAP.map_source = Shumate::MapSourceRegistry .new_with_defaults().by_id(Shumate::MAP_SOURCE_OSM_MAPNIK) - icon = Gtk::Image.new_from_icon_name("view-pin-symbolic") + pixbuf = GdkPixbuf::Pixbuf.new_from_resource("/wince/img/marker-icon.png") + icon = Gtk::Image.new_from_pixbuf(pixbuf) @@marker = Shumate::Marker.new @@marker.try do|m| + m.height_request = 64 + m.width_request = 64 m.child = icon marker_layer = Shumate::MarkerLayer.new(DETAILS_MAP.viewport) marker_layer.add_marker(m) @@ -174,7 +177,7 @@ module Wince viewport = DETAILS_MAP.viewport viewport.set_location(latitude, longitude) - viewport.zoom_level = 14 + viewport.zoom_level = 16 @@marker.try {|m| m.set_location(latitude, longitude) } end diff --git a/src/wince.cr b/src/wince.cr index 0abd5f4..7e59eb7 100644 --- a/src/wince.cr +++ b/src/wince.cr @@ -29,5 +29,5 @@ module Wince DETAILS_HOURS_BOX = Gtk::ListBox.cast(B_UI["detailsHoursBox"]) DETAILS_MAP = Shumate::SimpleMap.cast(B_UI["detailsMap"]) - APP = Adw::Application.new("dev.wince", Gio::ApplicationFlags::None) + APP = Adw::Application.new("space.quietfeathers.wince", Gio::ApplicationFlags::None) end