Merge lp:~elementary-pantheon/pantheon-greeter/file-per-class-loginoptions into lp:~elementary-pantheon/pantheon-greeter/trunk

[Danielle Foré]

* Split PantheonUser.vala into one file per class
* Rename PantheonUser.vala to its class name: LoginOption.vala

Still trying to make this codebase make sense. Moved each of these classes into their own file and then named the original file after its class. Moved them into a folder since these are like items

=== added directory 'src/LoginOptions'
=== added file 'src/LoginOptions/GuestLogin.vala'
--- src/LoginOptions/GuestLogin.vala	1970-01-01 00:00:00 +0000
+++ src/LoginOptions/GuestLogin.vala	2016-09-25 14:28:08 +0000
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2016 elementary LLC. (http://launchpad.net/pantheon-greeter)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
+
+public class GuestLogin : LoginOption {
+
+    public GuestLogin (int index) {
+        base (index);
+    }
+
+    public override bool is_guest {
+        get {
+            return true;
+        }
+    }
+
+    public override string name {
+        get {
+            return "?pantheon greeter guest?";
+        }
+    }
+
+    public override string display_name {
+        get {
+            return _("Guest session");
+        }
+    }
+}

=== renamed file 'src/PantheonUser.vala' => 'src/LoginOptions/LoginOption.vala'
--- src/PantheonUser.vala	2016-04-13 00:49:19 +0000
+++ src/LoginOptions/LoginOption.vala	2016-09-25 14:28:08 +0000
@@ -1,23 +1,22 @@
-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
-/***
-    BEGIN LICENSE
-
-    Copyright (C) 2011-2014 elementary Developers
-
-    This program is free software: you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License version 3, as published
-    by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranties of
-    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-    PURPOSE.  See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program.  If not, see <http://www.gnu.org/licenses/>
-
-    END LICENSE
-***/
+/*
+* Copyright (c) 2011-2016 elementary LLC. (http://launchpad.net/pantheon-greeter)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
 
 public abstract class LoginOption : Object {
 
@@ -131,111 +130,3 @@
         }
     }
 }
-
-public class GuestLogin : LoginOption {
-
-    public GuestLogin (int index) {
-        base (index);
-    }
-
-    public override bool is_guest {
-        get {
-            return true;
-        }
-    }
-
-    public override string name {
-        get {
-            return "?pantheon greeter guest?";
-        }
-    }
-
-    public override string display_name {
-        get {
-            return _("Guest session");
-        }
-    }
-}
-
-public class ManualLogin : LoginOption {
-
-    public ManualLogin (int index) {
-        base (index);
-    }
-
-    public override string name {
-        get {
-            return "?pantheon greeter manual?";
-        }
-    }
-
-    public override string display_name {
-        get {
-            return _("Manual Login");
-        }
-    }
-
-    // We want that the LoginBox makes a Entry for the username.
-    public override bool provides_login_name {
-        get {
-            return false;
-        }
-    }
-}
-
-public class UserLogin : LoginOption {
-
-    public LightDM.User lightdm_user { get; private set; }
-
-    public UserLogin (int index, LightDM.User user) {
-        base (index);
-        this.lightdm_user = user;
-        avatar_ready = false;
-    }
-
-    public override string background {
-        get {
-            return lightdm_user.background;
-        }
-    }
-
-    public override string display_name {
-        get {
-            return lightdm_user.display_name;
-        }
-    }
-
-    public override string name {
-        get {
-            return lightdm_user.name;
-        }
-    }
-
-    public override bool logged_in {
-        get {
-            return lightdm_user.logged_in;
-        }
-    }
-
-    public override string session {
-        get {
-            return lightdm_user.session;
-        }
-    }
-
-    public override async void load_avatar () {
-        try {
-            File file = File.new_for_path (lightdm_user.image);
-            InputStream stream = yield file.read_async (GLib.Priority.DEFAULT);
-            var buf = new Gdk.Pixbuf.from_stream_at_scale (stream, 96, 96, true);
-            avatar = buf;
-        } catch (Error e) {
-            message ("Using default-avatar instead of " + lightdm_user.image);
-        }
-        Idle.add (() => {
-            avatar_ready = true;
-            avatar_updated ();
-            return false;
-        });
-    }
-}

=== added file 'src/LoginOptions/ManualLogin.vala'
--- src/LoginOptions/ManualLogin.vala	1970-01-01 00:00:00 +0000
+++ src/LoginOptions/ManualLogin.vala	2016-09-25 14:28:08 +0000
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) 2016 elementary LLC. (http://launchpad.net/pantheon-greeter)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
+
+public class ManualLogin : LoginOption {
+
+    public ManualLogin (int index) {
+        base (index);
+    }
+
+    public override string name {
+        get {
+            return "?pantheon greeter manual?";
+        }
+    }
+
+    public override string display_name {
+        get {
+            return _("Manual Login");
+        }
+    }
+
+    // We want that the LoginBox makes a Entry for the username.
+    public override bool provides_login_name {
+        get {
+            return false;
+        }
+    }
+}

=== added file 'src/LoginOptions/UserLogin.vala'
--- src/LoginOptions/UserLogin.vala	1970-01-01 00:00:00 +0000
+++ src/LoginOptions/UserLogin.vala	2016-09-25 14:28:08 +0000
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) 2016 elementary LLC. (http://launchpad.net/pantheon-greeter)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*
+*/
+
+public class UserLogin : LoginOption {
+
+    public LightDM.User lightdm_user { get; private set; }
+
+    public UserLogin (int index, LightDM.User user) {
+        base (index);
+        this.lightdm_user = user;
+        avatar_ready = false;
+    }
+
+    public override string background {
+        get {
+            return lightdm_user.background;
+        }
+    }
+
+    public override string display_name {
+        get {
+            return lightdm_user.display_name;
+        }
+    }
+
+    public override string name {
+        get {
+            return lightdm_user.name;
+        }
+    }
+
+    public override bool logged_in {
+        get {
+            return lightdm_user.logged_in;
+        }
+    }
+
+    public override string session {
+        get {
+            return lightdm_user.session;
+        }
+    }
+
+    public override async void load_avatar () {
+        try {
+            File file = File.new_for_path (lightdm_user.image);
+            InputStream stream = yield file.read_async (GLib.Priority.DEFAULT);
+            var buf = new Gdk.Pixbuf.from_stream_at_scale (stream, 96, 96, true);
+            avatar = buf;
+        } catch (Error e) {
+            message ("Using default-avatar instead of " + lightdm_user.image);
+        }
+        Idle.add (() => {
+            avatar_ready = true;
+            avatar_updated ();
+            return false;
+        });
+    }
+}