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 0000000..90a98c1 Binary files /dev/null and b/data/img/marker-icon.png differ 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