Merge lp:~haggai-eran/unity-greeter/rtl into lp:~robert-ancell/unity-greeter/trunk

[Haggai Eran]

Hi,

I've tried making unity-greeter translatable, and mirror the interface for right-to-left locales. I'm a bit new to vala, so I hope this is right.
I had to change the code that renders text to use Pango, as otherwise Hebrew characters wouldn't render. It seems to have changed how things look a little bit also for the English version.
I don't know if this can be avoided though.

I'll be glad if someone would have a look at this.

Regards,
Haggai

[Robert Ancell (robert-ancell)]

Hi,

Sorry for the delay in getting back to you. I've just merged another branch that does the translations:
https://code.launchpad.net/~kelemeng/unity-greeter/bug831026/+merge/72457

But the RTL stuff sounds good too. Could you update this branch to have just the RTL changes? I've also asked the design team if they have an opinion on RTL behaviour.

Also, to contribute patches to Unity greeter you need to have signed the contributor agreement [1], can you please look over that?

[1] http://www.canonical.com/contributors

Thanks,
--Robert

[Haggai Eran (haggai-eran)]

Sure, I'll update my branch. About the contributor agreement, It will probably take me another two weeks to get my employer's approval, since everybody is on vacation right now. I'll tell you when I've signed it.

[Robert Ancell (robert-ancell)]

See Bug #834386 which I've opened so this issue can be better discussed.

[lp:~haggai-eran/unity-greeter/rtl]

80. By Haggai Eran on 2011-08-25

Merged trunk changes.

Use pango font descriptor instead of ft2 font face.

81. By Haggai Eran on 2011-08-26

Fix username position with pango, and use absolute font size.

82. By Haggai Eran on 2011-09-16

Merged latest version. Use the new pango code.

83. By Haggai Eran on 2011-09-16

Handle entry ellipsizing according to the directionality.

[Robert Ancell (robert-ancell)]

Hi Haggai,

I just had a play with this, thanks for keeping it up to date!

The main issues seem to be:
- The settings menu (cog) is on the right - it should be moved to the left to match Mika's sketch
- If you have mixed LTR and RTL entries the layout looks confused (I recommend picking one, i.e. if there is any RTL names then flip them all, or perhaps pick the majority).
- The login indicators (arrows beside the name) are still on the left

I'd also recommend replacing some explicit variable types (bool, double) with 'var' as this makes it easier to read.

review: Needs Fixing

[lp:~haggai-eran/unity-greeter/rtl]

84. By Haggai Eran on 2011-09-23

Merge trunk.

85. By Haggai Eran on 2011-09-23

Remove some variables types, and unneeded attr_size_new_absolute decleration.

[Haggai Eran (haggai-eran)]

Hi,

Perhaps we are not testing the greeter the same way, but for me the cog is on the left , and the login indicators are on the right. I've uploaded a screenshot to the bug here: https://bugs.launchpad.net/unity-greeter/+bug/834386/+attachment/2447007/+files/greeter-rtl.png

Are you testing the greeter with an RTL locale?

[lp:~haggai-eran/unity-greeter/rtl]

86. By Haggai Eran on 2011-10-01

Merge trunk.

87. By Haggai Eran on 2011-10-01

Align entries according to the global direction, and not based on their individual directions.

Unmerged revisions

87. By Haggai Eran on 2011-10-01

Align entries according to the global direction, and not based on their individual directions.

86. By Haggai Eran on 2011-10-01

Merge trunk.

85. By Haggai Eran on 2011-09-23

Remove some variables types, and unneeded attr_size_new_absolute decleration.

84. By Haggai Eran on 2011-09-23

Merge trunk.

83. By Haggai Eran on 2011-09-16

Handle entry ellipsizing according to the directionality.

82. By Haggai Eran on 2011-09-16

Merged latest version. Use the new pango code.

81. By Haggai Eran on 2011-08-26

Fix username position with pango, and use absolute font size.

80. By Haggai Eran on 2011-08-25

Merged trunk changes.

Use pango font descriptor instead of ft2 font face.

79. By Haggai Eran on 2011-08-16

Move indicator menu to the left on right-to-left locales.

78. By Haggai Eran on 2011-08-16

Correct the alignment for right-to-left languages.

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2011-09-28 05:33:51 +0000
+++ src/user-list.vala	2011-10-01 07:03:23 +0000
@@ -786,6 +786,14 @@
         }
         e.layout = create_pango_layout (label);
         e.layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 16"));
+        e.layout.set_width ((box_width - 2) * grid_size * Pango.SCALE);
+        e.layout.set_ellipsize (Pango.EllipsizeMode.END);
+        e.layout.set_height (-1);
+        // Using the text detected direction to determine alignment. Combined with the fact
+        // that auto_dir is enabled, this should cause the alignment to only depend on the
+        // global setting, and not on the text.
+        var rtl_text = e.layout.get_line_readonly (0).resolved_dir == Pango.Direction.RTL;
+        e.layout.set_alignment (!rtl_text ? Pango.Alignment.LEFT : Pango.Alignment.RIGHT);
         e.background = background;
         e.is_active = is_active;
 
@@ -998,6 +1006,8 @@
     private void get_selected_location (out int x, out int y)
     {
         x = get_grid_offset (get_allocated_width ()) + grid_size;
+        if (get_direction() == Gtk.TextDirection.RTL)
+            x = get_allocated_width () - x - box_width * grid_size;
         var row = (int) (get_allocated_height () / grid_size - box_height) / 2;
         y = get_grid_offset (get_allocated_height ()) + row * grid_size;
     }
@@ -1075,6 +1085,8 @@
         if (resized)
             debug ("Resized to %dx%d", get_allocated_width (), get_allocated_height ());
 
+        var rtl = get_direction() == Gtk.TextDirection.RTL;
+
         Gtk.Requisition natural_size;
         menubar.get_preferred_size (null, out natural_size);
         var child_allocation = Gtk.Allocation ();
@@ -1096,7 +1108,10 @@
         prompt_entry.size_allocate (child_allocation);
         login_button.size_allocate (child_allocation);
 
-        child_allocation.x = base_x + box_width * grid_size - grid_size - grid_size / 4;
+        if (!rtl)
+            child_allocation.x = base_x + box_width * grid_size - grid_size - grid_size / 4;
+        else
+            child_allocation.x = base_x + grid_size / 4;
         child_allocation.y = base_y + grid_size / 4;
         child_allocation.width = grid_size;
         child_allocation.height = grid_size;
@@ -1114,6 +1129,8 @@
 
     private void draw_entry (Cairo.Context c, UserEntry entry, double alpha = 0.5)
     {
+        var rtl = get_direction() == Gtk.TextDirection.RTL;
+
         c.save ();
         
         if (high_contrast_item.active)
@@ -1121,15 +1138,28 @@
 
         if (entry.is_active)
         {
-            c.move_to (8, grid_size / 2 + 0.5 - 4);
-            c.rel_line_to (5, 4);
-            c.rel_line_to (-5, 4);
+            if (!rtl)
+            {
+                c.move_to (8, grid_size / 2 + 0.5 - 4);
+                c.rel_line_to (5, 4);
+                c.rel_line_to (-5, 4);
+            }
+            else
+            {
+                c.move_to (box_width * grid_size - 8, grid_size / 2 + 0.5 - 4);
+                c.rel_line_to (-5, 4);
+                c.rel_line_to (5, 4);
+            }
             c.close_path ();
             c.set_source_rgba (1.0, 1.0, 1.0, alpha);
             c.fill ();
         }
 
-        var mask = new Cairo.Pattern.linear (0, 0, grid_size * box_width, 0);
+        Cairo.Pattern mask;
+        if (!rtl)
+            mask = new Cairo.Pattern.linear (0, 0, grid_size * box_width, 0);
+        else
+            mask = new Cairo.Pattern.linear (grid_size * box_width, 0, 0, 0);
         var left = 1.0 - 2.0 / 7;
         mask.add_color_stop_rgba (left, 1.0, 1.0, 1.0, alpha);
         mask.add_color_stop_rgba (left + 64.0 / (grid_size * box_width), 1.0, 1.0, 1.0, 0.0);
@@ -1137,7 +1167,9 @@
 
         int w, h;
         entry.layout.get_pixel_size (out w, out h);
-        c.translate (grid_size / 2, grid_size - (grid_size - (h)) / 2 - h);
+        var x = grid_size / 2;
+        if (rtl) x += grid_size;
+        c.translate (x, grid_size - (grid_size - (h)) / 2 - h);
         c.move_to (0, 0);
         Pango.cairo_show_layout (c, entry.layout);
 
@@ -1226,6 +1258,8 @@
 
         draw_background (c);
 
+        var rtl = get_direction() == Gtk.TextDirection.RTL;
+
         c.save ();
 
         int base_x, base_y;
@@ -1288,16 +1322,31 @@
 
             if (selected_entry.is_active)
             {
-                c.move_to (8, text_y + h / 2 + 0.5 - 4);
-                c.rel_line_to (5, 4);
-                c.rel_line_to (-5, 4);
+                if (!rtl)
+                {
+                    c.move_to (8, text_y + h / 2 + 0.5 - 4);
+                    c.rel_line_to (5, 4);
+                    c.rel_line_to (-5, 4);
+                }
+                else
+                {
+                    c.move_to (box_width * grid_size - 8, text_y + h / 2 + 0.5 - 4);
+                    c.rel_line_to (-5, 4);
+                    c.rel_line_to (5, 4);
+                }
                 c.close_path ();
                 c.set_source_rgb (1.0, 1.0, 1.0);
                 c.fill ();
             }
 
-            c.move_to (grid_size / 2, text_y);
-            var mask = new Cairo.Pattern.linear (0, 0, grid_size * box_width, 0);
+            var x = grid_size / 2;
+            if (rtl) x += grid_size;
+            c.move_to (x, text_y);
+            Cairo.Pattern mask;
+            if (!rtl)
+                mask = new Cairo.Pattern.linear (0, 0, grid_size * box_width, 0);
+            else
+                mask = new Cairo.Pattern.linear (grid_size * box_width, 0, 0, 0);
             var left = 1.0 - 2.0 / 7;
             mask.add_color_stop_rgba (left, 1.0, 1.0, 1.0, 1.0);
             mask.add_color_stop_rgba (left + 5.4 / (grid_size * box_width), 1.0, 1.0, 1.0, 0.5);
@@ -1315,7 +1364,11 @@
                 text = error;
 
             var layout = create_pango_layout (text);
+            layout.set_width ((grid_size * (box_width - 1)) * Pango.SCALE);
+            layout.set_ellipsize (Pango.EllipsizeMode.END);
+            layout.set_height (-1);
             layout.set_font_description (Pango.FontDescription.from_string ("Ubuntu 10"));
+            layout.set_alignment (!rtl ? Pango.Alignment.LEFT : Pango.Alignment.RIGHT);
             int w, h;
             layout.get_pixel_size (out w, out h);
             c.move_to (grid_size / 2, grid_size * 1.25 - h);