[gnome-boxes] Revert "Remove a few redundant usages of namespaces"
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] Revert "Remove a few redundant usages of namespaces"
- Date: Tue, 25 Oct 2011 00:20:46 +0000 (UTC)
commit 7aed0fafaed29a4a920ebdb88cf709f2786286b6
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date: Tue Oct 25 02:19:33 2011 +0200
Revert "Remove a few redundant usages of namespaces"
This reverts commit 1c2e8bf4aacc7df97365efbde64e78847be2ff82.
We really need to make it clear what kind of UI elements we are
talking about: gtk, clutter, clutter-gtk, or boxes.
src/app.vala | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/app.vala b/src/app.vala
index 4b66750..59430e6 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -13,12 +13,12 @@ private enum Boxes.AppPage {
}
private class Boxes.App: Boxes.UI {
- public override Actor actor { get { return stage; } }
+ public override Clutter.Actor actor { get { return stage; } }
public Gtk.Window window;
- public Notebook notebook;
+ public Gtk.Notebook notebook;
public GtkClutter.Embed embed;
- public Stage stage;
- public State state;
+ public Clutter.Stage stage;
+ public Clutter.State state;
public Clutter.Box box; // the whole app box
public CollectionItem current_item; // current object/vm manipulated
public Topbar topbar;
@@ -28,7 +28,7 @@ private class Boxes.App: Boxes.UI {
public Wizard wizard;
public DisplayPage display_page;
- private TableLayout box_table;
+ private Clutter.TableLayout box_table;
private Collection collection;
private CollectionView view;
@@ -115,7 +115,7 @@ private class Boxes.App: Boxes.UI {
private void setup_ui () {
window = new Gtk.Window ();
window.set_default_size (640, 480);
- notebook = new Notebook ();
+ notebook = new Gtk.Notebook ();
notebook.show_border = false;
notebook.show_tabs = false;
window.add (notebook);
@@ -125,18 +125,18 @@ private class Boxes.App: Boxes.UI {
display_page = new DisplayPage (this);
notebook.append_page (display_page.widget, null);
- stage = embed.get_stage () as Stage;
+ stage = embed.get_stage () as Clutter.Stage;
stage.set_color (gdk_rgba_to_clutter_color (get_boxes_bg_color ()));
- state = new State ();
+ state = new Clutter.State ();
state.set_duration (null, null, duration);
window.destroy.connect (quit);
window.key_press_event.connect (on_key_pressed);
- box_table = new TableLayout ();
+ box_table = new Clutter.TableLayout ();
box = new Clutter.Box (box_table);
- box.add_constraint (new BindConstraint (stage, BindCoordinate.SIZE, 0));
+ box.add_constraint (new Clutter.BindConstraint (stage, BindCoordinate.SIZE, 0));
stage.add_actor (box);
topbar = new Topbar (this);
@@ -156,7 +156,7 @@ private class Boxes.App: Boxes.UI {
switch (ui_state) {
case UIState.DISPLAY:
- box.set_layout_manager (new FixedLayout ());
+ box.set_layout_manager (new Clutter.FixedLayout ());
state.set_state ("display");
break;
case UIState.CREDS:
@@ -189,7 +189,7 @@ private class Boxes.App: Boxes.UI {
Gtk.main_quit ();
}
- private bool on_key_pressed (Widget widget, EventKey event) {
+ private bool on_key_pressed (Widget widget, Gdk.EventKey event) {
if (event.keyval == F11_KEY) {
if (WindowState.FULLSCREEN in window.get_window ().get_state ())
window.unfullscreen ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]