[gnome-boxes/wip/less-actors2] ui: Don't require actor property
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/wip/less-actors2] ui: Don't require actor property
- Date: Thu, 20 Feb 2014 14:01:03 +0000 (UTC)
commit f2f7316a417a25d1f73de43e7b2060ee6eb8bbf5
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Thu Feb 20 13:52:28 2014 +0000
ui: Don't require actor property
This property is no longer used anywhere so lets remove this redundant
requirement now and remove the dummy implementation from implemeter
classes.
src/app.vala | 3 ---
src/collection-view.vala | 12 ------------
src/collection.vala | 2 --
src/empty-boxes.vala | 10 ----------
src/machine.vala | 11 -----------
src/properties.vala | 12 ------------
src/sidebar.vala | 11 -----------
src/topbar.vala | 13 -------------
src/ui.vala | 2 --
src/wizard.vala | 12 ------------
10 files changed, 0 insertions(+), 88 deletions(-)
---
diff --git a/src/app.vala b/src/app.vala
index 4cb5f24..1c222a1 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -48,7 +48,6 @@ private class Boxes.Application: Gtk.Application {
private class Boxes.App: GLib.Object, Boxes.UI {
public static App app;
- public Clutter.Actor actor { get { return null; } }
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
public Gtk.ApplicationWindow window;
@@ -601,8 +600,6 @@ private class Boxes.App: GLib.Object, Boxes.UI {
below_bin.show_all ();
- properties.actor.hide ();
-
main_vbox.show_all ();
set_state (UIState.COLLECTION);
diff --git a/src/collection-view.vala b/src/collection-view.vala
index afde1be..3725a2d 100644
--- a/src/collection-view.vala
+++ b/src/collection-view.vala
@@ -1,5 +1,4 @@
// This file is part of GNOME Boxes. License: LGPLv2+
-using Clutter;
public enum Boxes.SelectionCriteria {
ALL,
@@ -8,19 +7,9 @@ public enum Boxes.SelectionCriteria {
}
private class Boxes.CollectionView: Gd.MainView, Boxes.UI {
- // See FIXME on Topbar class
- public Clutter.Actor actor {
- get {
- if (gtkactor == null)
- gtkactor = new Clutter.Actor ();
- return gtkactor;
- }
- }
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
- private Clutter.Actor gtkactor;
-
private Category _category;
public Category category {
get { return _category; }
@@ -58,7 +47,6 @@ private class Boxes.CollectionView: Gd.MainView, Boxes.UI {
private void ui_state_changed () {
if (ui_state == UIState.COLLECTION)
unselect_all ();
- fade_actor (actor, ui_state == UIState.COLLECTION ? 255 : 0);
}
private void update_screenshot (Gtk.TreeIter iter) {
diff --git a/src/collection.vala b/src/collection.vala
index 5c8dc86..8cd089a 100644
--- a/src/collection.vala
+++ b/src/collection.vala
@@ -3,8 +3,6 @@
private abstract class Boxes.CollectionItem: GLib.Object, Boxes.UI {
public string name { set; get; }
- public Clutter.Actor actor { get { return item_actor; } }
- public abstract Clutter.Actor item_actor { get; }
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
diff --git a/src/empty-boxes.vala b/src/empty-boxes.vala
index 0344e4c..a811caf 100644
--- a/src/empty-boxes.vala
+++ b/src/empty-boxes.vala
@@ -2,19 +2,9 @@
[GtkTemplate (ui = "/org/gnome/Boxes/ui/empty-boxes.ui")]
private class Boxes.EmptyBoxes : Gtk.Stack, Boxes.UI {
- // See FIXME on Topbar class
- public Clutter.Actor actor {
- get {
- if (gtk_actor == null)
- gtk_actor = new Clutter.Actor ();
- return gtk_actor;
- }
- }
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
- private Clutter.Actor gtk_actor;
-
[GtkChild]
private Gtk.Box grid_box;
diff --git a/src/machine.vala b/src/machine.vala
index e9f8da9..a41b04e 100644
--- a/src/machine.vala
+++ b/src/machine.vala
@@ -1,19 +1,8 @@
// This file is part of GNOME Boxes. License: LGPLv2+
-using Clutter;
using Gdk;
using Gtk;
private abstract class Boxes.Machine: Boxes.CollectionItem, Boxes.IPropertiesProvider {
- // Check FIXME on Topbar.actor
- public override Clutter.Actor item_actor {
- get {
- if (machine_actor == null)
- machine_actor = new Clutter.Actor ();
- return machine_actor;
- }
- }
- private Clutter.Actor machine_actor;
-
public Boxes.CollectionSource source;
public Boxes.BoxConfig config;
public Gdk.Pixbuf? pixbuf { get; set; }
diff --git a/src/properties.vala b/src/properties.vala
index 7cc39c3..fa0889b 100644
--- a/src/properties.vala
+++ b/src/properties.vala
@@ -11,19 +11,9 @@ private enum Boxes.PropertiesPage {
}
private class Boxes.Properties: Gtk.Notebook, Boxes.UI {
- // See FIXME on Topbar class
- public Clutter.Actor actor {
- get {
- if (gtk_actor == null)
- gtk_actor = new Clutter.Actor ();
- return gtk_actor;
- }
- }
-
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
- private Clutter.Actor gtk_actor;
private ulong stats_id;
private bool restore_fullscreen;
@@ -214,7 +204,5 @@ private class Boxes.Properties: Gtk.Notebook, Boxes.UI {
restore_fullscreen = false;
}
}
-
- fade_actor (actor, ui_state == UIState.PROPERTIES ? 255 : 0);
}
}
diff --git a/src/sidebar.vala b/src/sidebar.vala
index 2701ed6..e463a08 100644
--- a/src/sidebar.vala
+++ b/src/sidebar.vala
@@ -1,7 +1,6 @@
// This file is part of GNOME Boxes. License: LGPLv2+
using Gtk;
using Gdk;
-using Clutter;
private enum Boxes.SidebarPage {
COLLECTION,
@@ -11,19 +10,9 @@ private enum Boxes.SidebarPage {
[GtkTemplate (ui = "/org/gnome/Boxes/ui/sidebar.ui")]
private class Boxes.Sidebar: Gtk.Revealer, Boxes.UI {
- // See FIXME on Topbar class
- public Clutter.Actor actor {
- get {
- if (gtk_actor == null)
- gtk_actor = new Clutter.Actor ();
- return gtk_actor;
- }
- }
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
- private Clutter.Actor gtk_actor; // the sidebar box
-
[GtkChild]
private Gtk.Notebook notebook;
[GtkChild]
diff --git a/src/topbar.vala b/src/topbar.vala
index d397a86..2bb2ae7 100644
--- a/src/topbar.vala
+++ b/src/topbar.vala
@@ -1,5 +1,4 @@
// This file is part of GNOME Boxes. License: LGPLv2+
-using Clutter;
using Gtk;
public enum Boxes.TopbarPage {
@@ -12,18 +11,6 @@ public enum Boxes.TopbarPage {
[GtkTemplate (ui = "/org/gnome/Boxes/ui/topbar.ui")]
private class Boxes.Topbar: Gtk.Notebook, Boxes.UI {
- // FIXME: This is really redundant now that App is using widget property
- // instead but parent Boxes.UI currently requires an actor. Hopefully
- // soon we can move more towards new Gtk classes and Boxes.UI requires
- // a widget property instead.
- public Clutter.Actor actor {
- get {
- if (gtk_actor == null)
- gtk_actor = new Clutter.Actor ();
- return gtk_actor;
- }
- }
- private Clutter.Actor gtk_actor;
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
diff --git a/src/ui.vala b/src/ui.vala
index 0fd119a..f54e439 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -11,8 +11,6 @@ private enum Boxes.UIState {
}
private interface Boxes.UI: GLib.Object {
- public abstract Clutter.Actor actor { get; }
-
public abstract UIState previous_ui_state { get; protected set; }
public abstract UIState ui_state { get; protected set; }
diff --git a/src/wizard.vala b/src/wizard.vala
index 2696b75..29c8ec3 100644
--- a/src/wizard.vala
+++ b/src/wizard.vala
@@ -12,16 +12,6 @@ private enum Boxes.WizardPage {
[GtkTemplate (ui = "/org/gnome/Boxes/ui/wizard.ui")]
private class Boxes.Wizard: Gtk.Notebook, Boxes.UI {
- // See FIXME on Topbar class
- public Clutter.Actor actor {
- get {
- if (gtk_actor == null)
- gtk_actor = new Clutter.Actor ();
- return gtk_actor;
- }
- }
-
- private Clutter.Actor gtk_actor;
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
@@ -577,8 +567,6 @@ private class Boxes.Wizard: Gtk.Notebook, Boxes.UI {
page = WizardPage.INTRODUCTION;
}
}
-
- fade_actor (actor, ui_state == UIState.WIZARD ? 255 : 0);
}
private void destroy_machine () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]