Merge lp:~teemperor/pantheon-greeter/unittest-branch-truncating into lp:~elementary-pantheon/pantheon-greeter/trunk

[Cody Garver]

[Cody Garver (codygarver)]

Has conflicts

review: Needs Fixing

Unmerged revisions

225. By Raphael Isemann on 2013-10-23

added test-template and fixed some bugs with the truncating

224. By Raphael Isemann on 2013-10-23

first version of name truncating

223. By Raphael Isemann on 2013-10-23

Fixing codestyle

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-08 18:27:22 +0000
+++ CMakeLists.txt	2014-03-31 08:54:15 +0000
@@ -57,6 +57,8 @@
     --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi
 )
 
+add_subdirectory (tests)
+
 add_subdirectory (po)
 
 include (GSettings)

=== modified file 'src/LoginBox.vala'
--- src/LoginBox.vala	2014-03-13 19:52:33 +0000
+++ src/LoginBox.vala	2014-03-31 08:54:15 +0000
@@ -22,6 +22,7 @@
 using Gtk;
 
 public class LoginBox : GtkClutter.Actor {
+<<<<<<< TREE
     public LoginOption user { get; private set; }
     public string current_session {
         get {
@@ -66,9 +67,54 @@
 
     public LoginBox (LoginOption user) {
         this.user = user;
+=======
+    public LightDM.User current_user { get; private set; }
+    public string current_session { get; private set; }
+
+    static int username_maxlength = 16;
+
+    public Gtk.EventBox avatar;
+    public Gtk.Label username;
+    public Gtk.Entry password;
+    public Gtk.Button login;
+    public Gtk.ToggleButton settings;
+    Gtk.Grid grid;
+    Gtk.Spinner spinner;
+    Gdk.Pixbuf image;
+
+    Granite.Drawing.BufferSurface buffer;
+    int shadow_blur = 25;
+    int shadow_x = 0;
+    int shadow_y = 6;
+    double shadow_alpha = 0.6;
+
+    LightDM.Greeter greeter;
+
+    bool _working;
+    public bool working {
+        get {
+            return _working;
+        } set {
+            _working = value;
+            grid.remove ((_working)?avatar as Gtk.Widget:spinner as Gtk.Widget);
+            grid.attach ((_working)?spinner as Gtk.Widget:avatar as Gtk.Widget, 0, 0, 1, 3);
+            grid.show_all ();
+            spinner.start ();
+            if (LightDM.get_sessions ().length () == 1)
+                settings.hide ();
+        }
+    }
+
+    public Gtk.Window draw_ref;
+
+    public LoginBox (LightDM.Greeter greeter) {
+        this.greeter = greeter;
+
+>>>>>>> MERGE-SOURCE
         this.reactive = true;
         this.scale_gravity = Clutter.Gravity.CENTER;
 
+<<<<<<< TREE
 
         if (user.is_guest ()) {
             credentials = new GuestLogin (user);
@@ -105,6 +151,174 @@
         pass_focus ();
         if (user.avatar_ready) {
             update_avatar ();
+=======
+        try {
+            this.image = Gtk.IconTheme.get_default ().load_icon ("avatar-default", 92, 0);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        this.avatar = new Gtk.EventBox ();
+        this.username = new Gtk.Label ("");
+        this.password = new Gtk.Entry ();
+        this.login = new Gtk.Button.with_label (_("Login"));
+        this.settings = new Gtk.ToggleButton ();
+
+        avatar.set_size_request (92, 92);
+        avatar.valign = Gtk.Align.START;
+        avatar.visible_window = false;
+        username.hexpand = true;
+        username.halign  = Gtk.Align.START;
+        username.ellipsize = Pango.EllipsizeMode.END;
+        username.margin_top = 6;
+        username.height_request = 1;
+        login.expand = false;
+        login.height_request = 1;
+        login.width_request = 120;
+        login.margin_top = 26;
+        login.halign = Gtk.Align.END;
+        settings.valign  = Gtk.Align.START;
+        settings.relief  = Gtk.ReliefStyle.NONE;
+        settings.add (new Gtk.Image.from_icon_name ("application-menu-symbolic", Gtk.IconSize.MENU));
+        password.margin_top = 11;
+        password.caps_lock_warning = true;
+        password.set_visibility (false);
+        password.key_release_event.connect ((e) => {
+            if (e.keyval == Gdk.Key.Return || e.keyval == Gdk.Key.KP_Enter) {
+                login.clicked ();
+                return true;
+            } else {
+                return false;
+            }
+        });
+
+        spinner = new Gtk.Spinner ();
+        spinner.valign = Gtk.Align.CENTER;
+        spinner.start ();
+        spinner.set_size_request (92, 24);
+
+        grid = new Gtk.Grid ();
+
+        grid.attach (avatar, 0, 0, 1, 3);
+        grid.attach (settings, 2, 0, 1, 1);
+        grid.attach (username, 1, 0, 1, 1);
+        grid.attach (password, 1, 1, 2, 1);
+        grid.attach (login, 1, 2, 2, 1);
+
+        grid.margin = shadow_blur + 12;
+        grid.margin_top += 5;
+        grid.margin_bottom -= 12;
+        grid.column_spacing = 12;
+
+        avatar.draw.connect ((ctx) => {
+            Granite.Drawing.Utilities.cairo_rounded_rectangle (ctx, 0, 0,
+                                                               avatar.get_allocated_width (), avatar.get_allocated_height (), 3);
+            Gdk.cairo_set_source_pixbuf (ctx, image, 0, 0);
+            ctx.fill_preserve ();
+            ctx.set_line_width (1);
+            ctx.set_source_rgba (0, 0, 0, 0.3);
+            ctx.stroke ();
+            return false;
+        });
+
+        PopOver pop = null;
+        /*session choose popover*/
+        this.settings.toggled.connect (() => {
+            if (!settings.active) {
+                pop.destroy ();
+                return;
+            }
+
+            pop = new PopOver ();
+
+            var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            (pop.get_content_area () as Gtk.Container).add (box);
+
+            var but = new Gtk.RadioButton.with_label (null, LightDM.get_sessions ().nth_data (0).name);
+            box.pack_start (but, false);
+            but.active = LightDM.get_sessions ().nth_data (0).key == current_session;
+
+            but.toggled.connect (() => {
+                if (but.active)
+                    current_session = LightDM.get_sessions ().nth_data (0).key;
+            });
+
+            for (var i = 1;i < LightDM.get_sessions ().length (); i++) {
+                var rad = new Gtk.RadioButton.with_label_from_widget (but, LightDM.get_sessions ().nth_data (i).name);
+                box.pack_start (rad, false);
+                rad.active = LightDM.get_sessions ().nth_data (i).key == current_session;
+                var identifier = LightDM.get_sessions ().nth_data (i).key;
+                rad.toggled.connect ( () => {
+                    if (rad.active)
+                        current_session = identifier;
+                });
+            }
+
+            this.get_stage ().add_child (pop);
+
+            pop.x = this.x + this.width - 265;
+            pop.width = 245;
+            pop.y = this.y + 50;
+            pop.get_widget ().show_all ();
+            pop.destroy.connect (() => {
+                settings.active = false;
+            });
+        });
+
+        /* draw the window stylish! */
+        var css = new Gtk.CssProvider ();
+        try {
+            css.load_from_data (LIGHT_WINDOW_STYLE, -1);
+        } catch (Error e) {
+            warning (e.message);
+        }
+
+        draw_ref = new Gtk.Window ();
+        draw_ref.get_style_context ().add_class ("content-view-window");
+        draw_ref.get_style_context ().add_provider (css, Gtk.STYLE_PROVIDER_PRIORITY_FALLBACK);
+
+        var w = -1; var h = -1;
+        this.get_widget ().size_allocate.connect (() => {
+            if (w == this.get_widget ().get_allocated_width () &&
+                h == this.get_widget ().get_allocated_height ())
+                return;
+
+            w = this.get_widget ().get_allocated_width ();
+            h = this.get_widget ().get_allocated_height ();
+
+            this.buffer = new Granite.Drawing.BufferSurface (w, h);
+
+            this.buffer.context.rectangle (shadow_blur + shadow_x + 3,
+                                           shadow_blur + shadow_y*2, w - shadow_blur*2 + shadow_x - 6, h - shadow_blur*2 - shadow_y);
+            this.buffer.context.set_source_rgba (0, 0, 0, shadow_alpha);
+            this.buffer.context.fill ();
+            this.buffer.exponential_blur (shadow_blur / 2-2);
+
+            draw_ref.get_style_context ().render_activity (this.buffer.context, shadow_blur + shadow_x,
+                                                           shadow_blur + shadow_y -2, w - shadow_blur*2 + shadow_x, h - shadow_blur*2);
+        });
+
+        this.get_widget ().draw.connect ((ctx) => {
+            ctx.rectangle (0, 0, w, h);
+            ctx.set_operator (Cairo.Operator.SOURCE);
+            ctx.set_source_rgba (0, 0, 0, 0);
+            ctx.fill ();
+
+            ctx.set_source_surface (buffer.surface, 0, 0);
+            ctx.paint ();
+
+            return false;
+        });
+
+        ((Gtk.Container) this.get_widget ()).add (grid);
+        this.get_widget ().show_all ();
+        this.get_widget ().get_style_context ().add_class ("content-view");
+    }
+
+    public static string get_user_markup (LightDM.User? user, bool title=false) {
+        if (user.real_name != null && user != null) {
+            return "<span face='Open Sans Light' font='24'>" + shorten_user_name(user.real_name) + "</span>";
+>>>>>>> MERGE-SOURCE
         } else {
             user.avatar_updated.connect (() => {
                 update_avatar ();
@@ -130,6 +344,47 @@
         return credentials.userpassword;
     }
 
+    public static string shorten_user_name (string iname) {
+        string name = iname.strip();
+        if(name.length < username_maxlength) {
+            return name;
+        } else {
+            if(name.contains (" ")) {
+                string[] tokens = name.split(" ");
+                string result = "";
+                int last_shortened = 1;
+                bool unable_to_shorten = false;
+                while(true) {
+                    int length = 0;
+                    for(int i = 0; i < tokens.length; i++) {
+                        length += tokens[i].length;
+                    }
+                    if(length > username_maxlength) {
+                        string token = tokens[last_shortened];
+                        if(token.length > 2)
+                            tokens[last_shortened] =
+                                    token.get_char(0).to_string() + ".";
+                        last_shortened++;
+                        if(last_shortened == tokens.length) {
+                            unable_to_shorten = true;
+                            break;
+                        }
+                    }
+                    else
+                        break;
+                }
+                for(int i = 0; i < tokens.length; i++) {
+                    result += tokens[i] + " ";
+                }
+                if(unable_to_shorten)
+                    return result.substring(0, username_maxlength - 1 ) + "…";
+                else
+                    return result.strip();
+            }
+            return name.substring(0, username_maxlength - 1 ) + "…";
+        }
+    }
+
     public void wrong_pw () {
         credentials.reset_pw ();
         this.animate (Clutter.AnimationMode.EASE_IN_BOUNCE, 150, scale_x: 0.9f, scale_y: 0.9f).

=== added directory 'tests'
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2014-03-31 08:54:15 +0000
@@ -0,0 +1,21 @@
+enable_testing(true)
+include_directories(. ../src)
+
+find_package(PkgConfig)
+pkg_check_modules(GLIB REQUIRED glib-2.0 gee-1.0)
+add_definitions(${GLIB_CFLAGS} ${GLIB_CFLAGS_OTHER})
+link_libraries(${GLIB_LIBRARIES})
+link_directories(${GLIB_LIBRARY_DIRS})
+
+vala_precompile(VALA_C
+  Main.vala
+  TestCase.vala
+  NameTruncateTest.vala
+PACKAGES
+    glib-2.0
+    posix
+)
+
+add_executable(unittests ${VALA_C})
+target_link_libraries(unittests ${LIBS})
+add_test(unittests ${CMAKE_CURRENT_BINARY_DIR}/unittests)
\ No newline at end of file

=== added file 'tests/Main.vala'
--- tests/Main.vala	1970-01-01 00:00:00 +0000
+++ tests/Main.vala	2014-03-31 08:54:15 +0000
@@ -0,0 +1,8 @@
+using GLib;
+
+public static int main(string[] args)
+{
+    Test.init(ref args);
+    TestSuite.get_root().add_suite(new NameTruncateTest().get_suite());
+    return Test.run();
+}

=== added file 'tests/NameTruncateTest.vala'
--- tests/NameTruncateTest.vala	1970-01-01 00:00:00 +0000
+++ tests/NameTruncateTest.vala	2014-03-31 08:54:15 +0000
@@ -0,0 +1,29 @@
+using GLib;
+
+public class NameTruncateTest : Gee.TestCase
+{
+
+  public NameTruncateTest()
+  {
+    // assign a name for this class
+    base("NameTruncateTest");
+    // add test methods
+    add_test("truncate_test", truncate_test);
+  }
+
+  public override void set_up()
+  {
+   // setup your test
+  }
+
+  public void truncate_test()
+  {
+   // add your expressions
+    assert(1 == 1);
+  }
+
+  public override void tear_down()
+  {
+   // tear down your test
+  }
+}
\ No newline at end of file

=== added file 'tests/TestCase.vala'
--- tests/TestCase.vala	1970-01-01 00:00:00 +0000
+++ tests/TestCase.vala	2014-03-31 08:54:15 +0000
@@ -0,0 +1,58 @@
+public abstract class Gee.TestCase : Object {
+
+    private GLib.TestSuite suite;
+    private Adaptor[] adaptors = new Adaptor[0];
+
+    public delegate void TestMethod ();
+
+    public TestCase (string name) {
+        this.suite = new GLib.TestSuite (name);
+    }
+
+    public void add_test (string name, owned TestMethod test) {
+        var adaptor = new Adaptor (name, (owned)test, this);
+        this.adaptors += adaptor;
+
+        this.suite.add (new GLib.TestCase (adaptor.name,
+                                           adaptor.set_up,
+                                           adaptor.run,
+                                           adaptor.tear_down ));
+    }
+
+    public virtual void set_up () {
+    }
+
+    public virtual void tear_down () {
+    }
+
+    public GLib.TestSuite get_suite () {
+        return this.suite;
+    }
+
+    private class Adaptor {
+
+        public string name { get; private set; }
+        private TestMethod test;
+        private TestCase test_case;
+
+        public Adaptor (string name,
+                        owned TestMethod test,
+                        TestCase test_case) {
+            this.name = name;
+            this.test = (owned)test;
+            this.test_case = test_case;
+        }
+
+        public void set_up (void* fixture) {
+            this.test_case.set_up ();
+        }
+
+        public void run (void* fixture) {
+            this.test ();
+        }
+
+        public void tear_down (void* fixture) {
+            this.test_case.tear_down ();
+        }
+    }
+}
\ No newline at end of file