[gnome-boxes/wip/exalm/remove-switcher: 1/2] Drop the filter switcher
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/wip/exalm/remove-switcher: 1/2] Drop the filter switcher
- Date: Tue, 26 May 2020 17:00:34 +0000 (UTC)
commit 53d9e0609494875d05c32c8cafa6dc3510bdd0fd
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Tue May 26 21:56:57 2020 +0500
Drop the filter switcher
See https://gitlab.gnome.org/GNOME/gnome-boxes/-/merge_requests/317#note_820522
data/gnome-boxes.gresource.xml | 1 -
data/ui/collection-filter-switcher.ui | 54 ------------------------
data/ui/collection-toolbar.ui | 6 ---
src/collection-filter-switcher.vala | 78 -----------------------------------
src/collection-toolbar.vala | 6 ---
src/meson.build | 1 -
6 files changed, 146 deletions(-)
---
diff --git a/data/gnome-boxes.gresource.xml b/data/gnome-boxes.gresource.xml
index 09d478be..3fe6f967 100644
--- a/data/gnome-boxes.gresource.xml
+++ b/data/gnome-boxes.gresource.xml
@@ -11,7 +11,6 @@
<file>icons/eye-open-negative-filled-symbolic.svg</file>
<file preprocess="xml-stripblanks">ui/app-window.ui</file>
<file preprocess="xml-stripblanks">ui/auth-notification.ui</file>
- <file preprocess="xml-stripblanks">ui/collection-filter-switcher.ui</file>
<file preprocess="xml-stripblanks">ui/collection-toolbar.ui</file>
<file preprocess="xml-stripblanks">ui/display-page.ui</file>
<file preprocess="xml-stripblanks">ui/display-toolbar.ui</file>
diff --git a/data/ui/collection-toolbar.ui b/data/ui/collection-toolbar.ui
index e9e641fd..7536412e 100644
--- a/data/ui/collection-toolbar.ui
+++ b/data/ui/collection-toolbar.ui
@@ -8,12 +8,6 @@
<class name="titlebar"/>
</style>
- <child type="title">
- <object class="BoxesCollectionFilterSwitcher" id="filter_switcher">
- <property name="visible">True</property>
- </object>
- </child>
-
<child>
<object class="GtkMenuButton" id="new_btn">
<property name="visible">True</property>
diff --git a/src/collection-toolbar.vala b/src/collection-toolbar.vala
index c62d12aa..822d1196 100644
--- a/src/collection-toolbar.vala
+++ b/src/collection-toolbar.vala
@@ -19,8 +19,6 @@
private MenuButton downloads_hub_btn;
[GtkChild]
public MenuButton hamburger_btn;
- [GtkChild]
- private CollectionFilterSwitcher filter_switcher;
private AppWindow window;
@@ -43,8 +41,6 @@ public void setup_ui (AppWindow window) {
window.notify["ui-state"].connect (ui_state_changed);
App.app.notify["main-window"].connect (ui_state_changed);
- filter_switcher.setup_ui (window);
-
var builder = new Builder.from_resource ("/org/gnome/Boxes/ui/menus.ui");
MenuModel menu = (MenuModel) builder.get_object ("app-menu");
hamburger_btn.popover = new Popover.from_model (hamburger_btn, menu);
@@ -114,7 +110,6 @@ private void ui_state_changed () {
new_btn.show ();
grid_btn.visible = window.view_type != AppWindow.ViewType.ICON;
list_btn.visible = window.view_type != AppWindow.ViewType.LIST;
- custom_title = filter_switcher;
break;
case UIState.CREDS:
@@ -124,7 +119,6 @@ private void ui_state_changed () {
search_btn.hide ();
grid_btn.hide ();
list_btn.hide ();
- custom_title = null;
break;
default:
diff --git a/src/meson.build b/src/meson.build
index eeb05310..b4591cb8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -50,7 +50,6 @@ vala_sources = [
'archive-writer.vala',
'auth-notification.vala',
'collection.vala',
- 'collection-filter-switcher.vala',
'collection-toolbar.vala',
'display-page.vala',
'display-toolbar.vala',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]