[gnome-games/wip/exalm/buildable: 2/6] preferences-page: Turn into a class
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/buildable: 2/6] preferences-page: Turn into a class
- Date: Wed, 17 Oct 2018 19:50:17 +0000 (UTC)
commit ab802f17f6e4213483694a404fbdae5462a288b5
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Sun Oct 14 16:40:06 2018 +0500
preferences-page: Turn into a class
Make PreferencesPage a class rather than an interface.
data/ui/preferences-page-controllers.ui | 2 +-
data/ui/preferences-page-plugins.ui | 2 +-
data/ui/preferences-page-video.ui | 2 +-
src/ui/preferences-page-controllers.vala | 4 +---
src/ui/preferences-page-plugins.vala | 4 +---
src/ui/preferences-page-video.vala | 4 +---
src/ui/preferences-page.vala | 4 ++--
7 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/data/ui/preferences-page-controllers.ui b/data/ui/preferences-page-controllers.ui
index a0d8c3ec..256b76e5 100644
--- a/data/ui/preferences-page-controllers.ui
+++ b/data/ui/preferences-page-controllers.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="GamesPreferencesPageControllers" parent="GtkBin">
+ <template class="GamesPreferencesPageControllers" parent="GamesPreferencesPage">
<property name="visible">True</property>
<child>
<object class="GtkScrolledWindow">
diff --git a/data/ui/preferences-page-plugins.ui b/data/ui/preferences-page-plugins.ui
index f3c1ea5e..d768da1c 100644
--- a/data/ui/preferences-page-plugins.ui
+++ b/data/ui/preferences-page-plugins.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.16 -->
- <template class="GamesPreferencesPagePlugins" parent="GtkBin">
+ <template class="GamesPreferencesPagePlugins" parent="GamesPreferencesPage">
<property name="visible">True</property>
<child>
<object class="GtkScrolledWindow" id="plugins">
diff --git a/data/ui/preferences-page-video.ui b/data/ui/preferences-page-video.ui
index be65929d..ccd9b01a 100644
--- a/data/ui/preferences-page-video.ui
+++ b/data/ui/preferences-page-video.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <template class="GamesPreferencesPageVideo" parent="GtkBin">
+ <template class="GamesPreferencesPageVideo" parent="GamesPreferencesPage">
<property name="visible">True</property>
<child>
<object class="GtkScrolledWindow">
diff --git a/src/ui/preferences-page-controllers.vala b/src/ui/preferences-page-controllers.vala
index 902d1420..b955259a 100644
--- a/src/ui/preferences-page-controllers.vala
+++ b/src/ui/preferences-page-controllers.vala
@@ -1,9 +1,7 @@
// This file is part of GNOME Games. License: GPL-3.0+.
[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-controllers.ui")]
-private class Games.PreferencesPageControllers: Gtk.Bin, PreferencesPage {
- public PreferencesSubpage subpage { get; protected set; }
-
+private class Games.PreferencesPageControllers: PreferencesPage {
[GtkChild]
private Gtk.Label gamepads_label;
[GtkChild]
diff --git a/src/ui/preferences-page-plugins.vala b/src/ui/preferences-page-plugins.vala
index 091b4021..4df31040 100644
--- a/src/ui/preferences-page-plugins.vala
+++ b/src/ui/preferences-page-plugins.vala
@@ -1,9 +1,7 @@
// This file is part of GNOME Games. License: GPL-3.0+.
[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-plugins.ui")]
-private class Games.PreferencesPagePlugins: Gtk.Bin, PreferencesPage {
- public PreferencesSubpage subpage { get; protected set; }
-
+private class Games.PreferencesPagePlugins: PreferencesPage {
[GtkChild]
private Gtk.ListBox list_box;
diff --git a/src/ui/preferences-page-video.vala b/src/ui/preferences-page-video.vala
index 0077428b..ebb249ce 100644
--- a/src/ui/preferences-page-video.vala
+++ b/src/ui/preferences-page-video.vala
@@ -1,9 +1,7 @@
// This file is part of GNOME Games. License: GPL-3.0+.
[GtkTemplate (ui = "/org/gnome/Games/ui/preferences-page-video.ui")]
-private class Games.PreferencesPageVideo: Gtk.Bin, PreferencesPage {
- public PreferencesSubpage subpage { get; protected set; }
-
+private class Games.PreferencesPageVideo: PreferencesPage {
private string _filter_active;
public string filter_active {
set {
diff --git a/src/ui/preferences-page.vala b/src/ui/preferences-page.vala
index de44674e..c92b77d8 100644
--- a/src/ui/preferences-page.vala
+++ b/src/ui/preferences-page.vala
@@ -1,5 +1,5 @@
// This file is part of GNOME Games. License: GPL-3.0+.
-private interface Games.PreferencesPage: Gtk.Widget {
- public abstract PreferencesSubpage subpage { get; protected set; }
+private class Games.PreferencesPage: Gtk.Bin {
+ public PreferencesSubpage subpage { get; protected set; }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]