[gnome-boxes] CollectionView -> IconView
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] CollectionView -> IconView
- Date: Wed, 2 Sep 2015 18:28:17 +0000 (UTC)
commit 53270a26e71dcdc24b87de27c28a6f0a967e1879
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Wed Sep 2 18:51:18 2015 +0100
CollectionView -> IconView
Now that we have two collection views, let's rename the original one to
IconView. We don't want to show too much favouritism, do we? :)
data/ui/app-window.ui | 4 ++--
src/Makefile.am | 2 +-
src/app-window.vala | 10 +++++-----
src/{collection-view.vala => icon-view.vala} | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/ui/app-window.ui b/data/ui/app-window.ui
index a6a7fcc..e074f62 100644
--- a/data/ui/app-window.ui
+++ b/data/ui/app-window.ui
@@ -84,11 +84,11 @@
</child>
<child>
- <object class="BoxesCollectionView" id="collection_view">
+ <object class="BoxesIconView" id="icon_view">
<property name="visible">True</property>
</object>
<packing>
- <property name="name">collection-view</property>
+ <property name="name">icon-view</property>
</packing>
</child>
diff --git a/src/Makefile.am b/src/Makefile.am
index 00a6286..8b9d211 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,7 +101,6 @@ gnome_boxes_SOURCES = \
archive-reader.vala \
archive-writer.vala \
auth-notification.vala \
- collection-view.vala \
collection.vala \
collection-filter-switcher.vala \
collection-toolbar.vala \
@@ -111,6 +110,7 @@ gnome_boxes_SOURCES = \
editable-entry.vala \
i-properties-provider.vala \
i-collection-view.vala \
+ icon-view.vala \
installer-media.vala \
installed-media.vala \
keys-input-popover.vala \
diff --git a/src/app-window.vala b/src/app-window.vala
index 13a5a1f..740708b 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -94,7 +94,7 @@ private class Boxes.AppWindow: Gtk.ApplicationWindow, Boxes.UI {
[GtkChild]
public Gtk.Stack below_bin;
[GtkChild]
- private CollectionView collection_view;
+ private IconView icon_view;
[GtkChild]
private ListView list_view;
@@ -105,7 +105,7 @@ private class Boxes.AppWindow: Gtk.ApplicationWindow, Boxes.UI {
switch (view_type) {
default:
case ViewType.ICON:
- return collection_view;
+ return icon_view;
case ViewType.LIST:
return list_view;
}
@@ -157,13 +157,13 @@ private class Boxes.AppWindow: Gtk.ApplicationWindow, Boxes.UI {
move (x, y);
}
- views = { collection_view, list_view };
+ views = { icon_view, list_view };
}
public void setup_ui () {
topbar.setup_ui (this);
display_page.setup_ui (this);
- collection_view.setup_ui (this);
+ icon_view.setup_ui (this);
list_view.setup_ui (this);
selectionbar.setup_ui (this);
searchbar.setup_ui (this);
@@ -193,7 +193,7 @@ private class Boxes.AppWindow: Gtk.ApplicationWindow, Boxes.UI {
// The order is important for some widgets here (e.g properties must change its state before wizard
so it can
// flush any deferred changes for wizard to pick-up when going back from properties to wizard
(review).
foreach (var ui in new Boxes.UI[] { topbar,
- collection_view,
+ icon_view,
list_view,
props_window,
wizard_window,
diff --git a/src/collection-view.vala b/src/icon-view.vala
similarity index 99%
rename from src/collection-view.vala
rename to src/icon-view.vala
index 5c7d7b7..74e88d6 100644
--- a/src/collection-view.vala
+++ b/src/icon-view.vala
@@ -6,7 +6,7 @@ public enum Boxes.SelectionCriteria {
RUNNING
}
-private class Boxes.CollectionView: Gd.MainView, Boxes.ICollectionView, Boxes.UI {
+private class Boxes.IconView: Gd.MainView, Boxes.ICollectionView, Boxes.UI {
public UIState previous_ui_state { get; protected set; }
public UIState ui_state { get; protected set; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]