Merge lp:~elementary-pantheon/pantheon-agent-geoclue2/design-tweaks into lp:~elementary-pantheon/pantheon-agent-geoclue2/trunk

[Danielle Foré]

* Use the icon "find-location"
* Change copy
* wrap text at 50 chars
* remove valigns
* double space above checkbox

[Adam Bieńkowski (donadigo)]

Looks good.

review: Approve (code / testing)

=== modified file 'data/org.pantheon.agent-geoclue2.desktop.in.in'
--- data/org.pantheon.agent-geoclue2.desktop.in.in	2017-02-19 11:35:33 +0000
+++ data/org.pantheon.agent-geoclue2.desktop.in.in	2017-02-24 17:39:16 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Location Dialog
 Exec=${LIBDIR}/geoclue2-1-pantheon/pantheon-agent-geoclue2 
-Icon=dialog-password
+Icon=find-location
 Terminal=false
 Type=Application
 StartupNotify=false

=== modified file 'src/Agent.vala'
--- src/Agent.vala	2017-02-23 22:36:13 +0000
+++ src/Agent.vala	2017-02-24 17:39:16 +0000
@@ -117,7 +117,7 @@
 				}
 			}); 
 
-			var dialog = new Widgets.Geoclue2Dialog (accuracy_string, app_info.get_icon ().to_string ());
+			var dialog = new Widgets.Geoclue2Dialog (accuracy_string, app_name, app_info.get_icon ().to_string ());
 			dialog.show_all ();
 
 			var result = dialog.run ();
@@ -157,26 +157,26 @@
 			string message = "";
 			switch (accuracy) {
 				case GeoClue2.AccuracyLevel.COUNTRY:
-					message = _("%s wants to obtain your location to a country level");
+					message = _("the current country");
 					break;
 				case GeoClue2.AccuracyLevel.CITY:
-					message = _("%s wants to obtain your location to a city level");
+					message = _("the nearest city or town");
 					break;
 				case GeoClue2.AccuracyLevel.NEIGHBORHOOD:
-					message = _("%s wants to obtain your location to a neighborhood level");
+					message = _("the nearest neighborhood");
 					break;
 				case GeoClue2.AccuracyLevel.STREET:
-					message = _("%s wants to obtain your location to a street level");
+					message = _("the nearest street");
 					break;
 				case GeoClue2.AccuracyLevel.EXACT:
-					message = _("%s wants to obtain your exact location");
+					message = _("your exact location");
 					break;
 				default:
-					message = _("%s wants to obtain your location");
+					message = _("your location");
 					break;
 			}
 			
-			return message.printf (app_name);
+			return _("%s will be able to detect %s. Permissions can be changed in <a href='settings://security/privacy/location'>Location Settings…</a>").printf (app_name, message);
 		}
 
         private async void register_with_geoclue () {

=== modified file 'src/Geoclue2Dialog.vala'
--- src/Geoclue2Dialog.vala	2017-02-23 23:17:16 +0000
+++ src/Geoclue2Dialog.vala	2017-02-24 17:39:16 +0000
@@ -24,25 +24,27 @@
         public signal void done (bool allow);
         private Gtk.CheckButton remember_checkbox;
 
-        public Geoclue2Dialog (string message, string icon_name) {
+        public Geoclue2Dialog (string message, string app_name, string icon_name) {
             Object (title: _("Location Dialog"), window_position: Gtk.WindowPosition.CENTER, resizable: false, deletable: false, skip_taskbar_hint: true);
 
             set_keep_above (true);
 
-            var heading = new Gtk.Label (_("Location Request"));
+            var heading = new Gtk.Label (_("Allow %s to Access This Device's Location?".printf (app_name)));
             heading.get_style_context ().add_class ("primary");
-            heading.valign = Gtk.Align.END;
+            heading.max_width_chars = 50;
+            heading.wrap = true;
             heading.xalign = 0;
 
             var message_label = new Gtk.Label (message);
-            message_label.max_width_chars = 60;
+            message_label.max_width_chars = 50;
+            message_label.use_markup = true;
             message_label.wrap = true;
-            message_label.valign = Gtk.Align.START;
             message_label.xalign = 0;
 
-            remember_checkbox = new Gtk.CheckButton.with_label (_("Remember this choice"));
+            remember_checkbox = new Gtk.CheckButton.with_label (_("Never ask again"));
+            remember_checkbox.margin_top = 12;
 
-            var image = new Gtk.Image.from_icon_name ("dialog-question", Gtk.IconSize.DIALOG);
+            var image = new Gtk.Image.from_icon_name ("find-location", Gtk.IconSize.DIALOG);
 
             var overlay = new Gtk.Overlay ();
             overlay.valign = Gtk.Align.START;