[gnome-boxes/wip/less-dialogs2: 2/14] topbar: Remove props_toolbar property
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/wip/less-dialogs2: 2/14] topbar: Remove props_toolbar property
- Date: Thu, 4 Dec 2014 23:26:24 +0000 (UTC)
commit 1656ddf299b72bcc3be64593c6ee4a0eed1fa8b8
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Mon Nov 24 14:43:58 2014 +0000
topbar: Remove props_toolbar property
Properties is now in its own window where it has a dedicated topbar of
its own so PropertiesToolbar is not needed in main window's topbar
anymore.
data/ui/topbar.ui | 12 ------------
src/topbar.vala | 10 +---------
2 files changed, 1 insertions(+), 21 deletions(-)
---
diff --git a/data/ui/topbar.ui b/data/ui/topbar.ui
index cb8f57b..058d809 100644
--- a/data/ui/topbar.ui
+++ b/data/ui/topbar.ui
@@ -28,18 +28,6 @@
</packing>
</child>
- <!-- Properties -->
- <child>
- <object class="BoxesPropertiesToolbar" id="props_toolbar">
- <property name="visible">True</property>
- <property name="show-close-button">True</property>
- </object>
-
- <packing>
- <property name="name">properties</property>
- </packing>
- </child>
-
<!-- Display -->
<child>
<object class="BoxesDisplayToolbar" id="display_toolbar">
diff --git a/src/topbar.vala b/src/topbar.vala
index bd66130..2a617d1 100644
--- a/src/topbar.vala
+++ b/src/topbar.vala
@@ -4,18 +4,15 @@ using Gtk;
public enum Boxes.TopbarPage {
COLLECTION,
SELECTION,
- PROPERTIES,
DISPLAY
}
[GtkTemplate (ui = "/org/gnome/Boxes/ui/topbar.ui")]
private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
- private const string[] page_names = { "collection", "selection", "properties", "display" };
+ private const string[] page_names = { "collection", "selection", "display" };
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
- [GtkChild]
- public PropertiesToolbar props_toolbar;
[GtkChild]
private CollectionToolbar collection_toolbar;
@@ -94,7 +91,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
collection_toolbar.setup_ui (window);
selection_toolbar.setup_ui (window);
display_toolbar.setup_ui (window);
- props_toolbar.setup_ui (window);
}
private void ui_state_changed () {
@@ -111,10 +107,6 @@ private class Boxes.Topbar: Gtk.Stack, Boxes.UI {
page = TopbarPage.DISPLAY;
break;
- case UIState.PROPERTIES:
- page = TopbarPage.PROPERTIES;
- break;
-
default:
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]