← Back to team overview

elementaryart team mailing list archive

[Merge] lp:~voldyman/granite/fixed-934803 into lp:granite

 

Akshay Shekher has proposed merging lp:~voldyman/granite/fixed-934803 into lp:granite.

Requested reviews:
  elementary Pantheon team (elementary-pantheon)
Related bugs:
  Bug #934803 in Granite: "About widget email links should have tooltips"
  https://bugs.launchpad.net/granite/+bug/934803

For more details, see:
https://code.launchpad.net/~voldyman/granite/fixed-934803/+merge/117200

Hovering over a persons name shows their email in a tooltip
-- 
https://code.launchpad.net/~voldyman/granite/fixed-934803/+merge/117200
Your team elementaryart (old) is subscribed to branch lp:granite.
=== modified file 'lib/GtkPatch/AboutDialog.vala'
--- lib/GtkPatch/AboutDialog.vala	2012-07-13 09:04:27 +0000
+++ lib/GtkPatch/AboutDialog.vala	2012-07-29 21:14:19 +0000
@@ -239,7 +239,7 @@
     private const string BIG_TEXT_CSS = """
     .h2 { font: open sans light 18; }
     """;
-    
+
     private const string STYLESHEET = """
         * {
             -GtkDialog-action-area-border: 12px;
@@ -354,7 +354,7 @@
         content_scrolled.add_with_viewport(content_scrolled_vbox);
 
         title_vbox.pack_start(name_label, false, false, 12); //FIXME
-        
+
         content_right_box.pack_start(title_vbox, false, false, 0);
         content_right_box.pack_start(content_scrolled, true, true, 0);
         // Extra padding between the scrolled window and the action area
@@ -378,14 +378,16 @@
         close_button.grab_focus();
     }
 
-    private string set_string_from_string_array(string title, string[] peoples)
+    private string set_string_from_string_array(string title, string[] peoples,bool tooltip=false)
     {
+        if (tooltip)
+            return string.joinv ("\n",peoples);
+
         string text  = "";
         string name  = "";
         string email = "" ;
         string _person_data;
-        bool email_started= false;        
-        //text += add_credits_section (title, peoples);
+        bool email_started= false;
         text += title + "<span size=\"small\">";
         for (int i= 0;i<peoples.length;i++){
             if (peoples[i] == null)
@@ -400,19 +402,18 @@
                 if (!email_started)
                     name += _person_data[j].to_string ();
 
-                else 
-                    if ( _person_data[j] != '<' && _person_data[j] != '>')
+                else
+                    if (_person_data.get (j) != '>' && _person_data.get (j) != '<')
                         email +=_person_data[j].to_string ();
 
-            }            
+            }
             if (email == "")
                 text += "<u>%s</u>\n".printf (name);
             else
-                text += "<a href=\"%s\">%s</a>\n".printf (email,name);
+                text += "<a href=\"%s\" title=\"%s\">%s</a>\n".printf (email,email,name);
             email = ""; name =""; email_started=false;
         }
         text += "</span>";
-
         return text;
     }
 


Follow ups