Code cleanups

Author: Philip-Scott

src/Services/SlideManager.vala

@@ -47,7 +47,7 @@ public class Spice.SlideManager : Object {
     }
 
     public Slide? preview_slide_ = null;
-    public Slide preview_slide {
+    public Slide? preview_slide {
         get {
             if (preview_slide_ == null || preview_slide_.visible == false) {
                 return null;

src/Widgets/SlideList.vala

@@ -20,12 +20,12 @@
 */
 
 public class Spice.SlideList : Gtk.Grid {
-    private Gtk.Grid slides_grid;
+    public static int WIDTH = 200;
+    public static int HEIGHT = 150;
+
     private Gtk.ListBox slides_list;
     private unowned SlideManager manager;
 
-    private Gtk.Button new_slide_button;
-
     public SlideList (SlideManager manager) {
         orientation = Gtk.Orientation.VERTICAL;
         get_style_context ().add_class ("slide-list");
@@ -87,28 +87,7 @@ public class Spice.SlideList : Gtk.Grid {
         });
 
         add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-        add (slides_toolbar ());
-
-        foreach (var slide in manager.slides) {
-            add_slide (slide);
-        }
-    }
-
-    private SlideListRow add_slide (Slide slide) {
-        var slide_row = new SlideListRow (slide, manager);
-
-        slide_row.get_style_context ().add_class ("slide");
-
-        slides_list.add (slide_row);
-        slides_list.show_all ();
-
-        return slide_row;
-    }
 
-    public static int WIDTH = 200;
-    public static int HEIGHT = 150;
-
-    public Gtk.Button slides_toolbar () {
         var plus_icon = new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
         plus_icon.margin = 3;
 
@@ -125,7 +104,23 @@ public class Spice.SlideList : Gtk.Grid {
             Utils.new_slide (manager);
         });
 
-        return new_slide_button;
+
+        add (new_slide_button);
+
+        foreach (var slide in manager.slides) {
+            add_slide (slide);
+        }
+    }
+
+    private SlideListRow add_slide (Slide slide) {
+        var slide_row = new SlideListRow (slide, manager);
+
+        slide_row.get_style_context ().add_class ("slide");
+
+        slides_list.add (slide_row);
+        slides_list.show_all ();
+
+        return slide_row;
     }
 
     private class SlideListRow : Gtk.ListBoxRow {
@@ -141,7 +136,7 @@ public class Spice.SlideList : Gtk.Grid {
             slide_widget = new SlideWidget.from_slide (slide);
 
             slide_widget.settings_requested.connect (() => {
-                popup_menu ();
+                show_rightclick_menu ();
             });
 
             add (slide_widget);
@@ -168,9 +163,7 @@ public class Spice.SlideList : Gtk.Grid {
             }
         """;
 
-        private Gtk.Menu? menu = null;
-
-        public void popup_menu () {
+        public void show_rightclick_menu () {
             var menu = new Gtk.Menu ();
 
             var cut = new Gtk.MenuItem.with_label (_("Cut"));
@@ -236,7 +229,7 @@ public class Spice.SlideList : Gtk.Grid {
             activate ();
 
             if (event.button == 3) {
-                popup_menu ();
+                show_rightclick_menu ();
             }
 
             return false;