[gnome-clocks] Port stack widget from libgd to gtk+
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks] Port stack widget from libgd to gtk+
- Date: Sun, 9 Jun 2013 20:04:42 +0000 (UTC)
commit de4d63c5b8a9511f47e1c24c12cb544c3399ff5e
Author: Evgeny Bobkin <evgen ibqn gmail com>
Date: Sun Jun 9 09:10:47 2013 +0200
Port stack widget from libgd to gtk+
https://bugzilla.gnome.org/show_bug.cgi?id=701889
configure.ac | 1 -
data/ui/window.ui | 2 +-
src/alarm.vala | 2 +-
src/timer.vala | 4 ++--
src/widgets.vala | 10 +++++-----
src/window.vala | 2 +-
src/world.vala | 4 ++--
7 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 12ce9f0..550b063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,6 @@ PKG_CHECK_MODULES(CLOCKS, [
LIBGD_INIT([
static
header-bar
- stack
vapi
])
diff --git a/data/ui/window.ui b/data/ui/window.ui
index 3a29d49..3febaa5 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -22,7 +22,7 @@
<class name="content-view"/>
</style>
<child>
- <object class="GdStack" id="stack">
+ <object class="GtkStack" id="stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
diff --git a/src/alarm.vala b/src/alarm.vala
index ed61e69..832427f 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -462,7 +462,7 @@ private class RingingPanel : Gtk.EventBox {
}
}
-public class MainPanel : Gd.Stack, Clocks.Clock {
+public class MainPanel : Gtk.Stack, Clocks.Clock {
public string label { get; construct set; }
public HeaderBar header_bar { get; construct set; }
public PanelId panel_id { get; construct set; }
diff --git a/src/timer.vala b/src/timer.vala
index fb467db..0b1b36e 100644
--- a/src/timer.vala
+++ b/src/timer.vala
@@ -19,7 +19,7 @@
namespace Clocks {
namespace Timer {
-public class MainPanel : Gd.Stack, Clocks.Clock {
+public class MainPanel : Gtk.Stack, Clocks.Clock {
enum State {
STOPPED,
RUNNING,
@@ -47,7 +47,7 @@ public class MainPanel : Gd.Stack, Clocks.Clock {
private GLib.Timer timer;
public MainPanel (HeaderBar header_bar) {
- Object (label: _("Timer"), header_bar: header_bar, transition_type:
Gd.StackTransitionType.CROSSFADE, panel_id: PanelId.TIMER);
+ Object (label: _("Timer"), header_bar: header_bar, transition_type:
Gtk.StackTransitionType.CROSSFADE, panel_id: PanelId.TIMER);
settings = new GLib.Settings ("org.gnome.clocks");
diff --git a/src/widgets.vala b/src/widgets.vala
index 009a978..bc13b00 100644
--- a/src/widgets.vala
+++ b/src/widgets.vala
@@ -25,7 +25,7 @@ public class HeaderBar : Gd.HeaderBar {
STANDALONE
}
- private Gd.StackSwitcher stack_switcher;
+ private Gtk.StackSwitcher stack_switcher;
[CCode (notify = false)]
public Mode mode {
@@ -53,13 +53,13 @@ public class HeaderBar : Gd.HeaderBar {
private Mode _mode;
construct {
- stack_switcher = new Gd.StackSwitcher ();
+ stack_switcher = new Gtk.StackSwitcher ();
realize.connect (() => {
custom_title = stack_switcher;
});
}
- public void set_stack (Gd.Stack stack) {
+ public void set_stack (Gtk.Stack stack) {
stack_switcher.set_stack (stack);
}
@@ -589,12 +589,12 @@ public class AmPmToggleButton : Gtk.Button {
}
private AmPm _choice;
- private Gd.Stack stack;
+ private Gtk.Stack stack;
private Gtk.Label am_label;
private Gtk.Label pm_label;
public AmPmToggleButton () {
- stack = new Gd.Stack ();
+ stack = new Gtk.Stack ();
get_style_context ().add_class ("clocks-ampm-toggle-button");
diff --git a/src/window.vala b/src/window.vala
index 109c49a..717ab7b 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -33,7 +33,7 @@ public class Window : Gtk.ApplicationWindow {
[GtkChild]
private HeaderBar header_bar;
[GtkChild]
- private Gd.Stack stack;
+ private Gtk.Stack stack;
private GLib.Settings settings;
private Gtk.Widget[] panels;
private Gtk.Separator separator;
diff --git a/src/world.vala b/src/world.vala
index 3249e41..b1a844a 100644
--- a/src/world.vala
+++ b/src/world.vala
@@ -249,7 +249,7 @@ private class StandalonePanel : Gtk.EventBox {
}
}
-public class MainPanel : Gd.Stack, Clocks.Clock {
+public class MainPanel : Gtk.Stack, Clocks.Clock {
public string label { get; construct set; }
public HeaderBar header_bar { get; construct set; }
public PanelId panel_id { get; construct set; }
@@ -264,7 +264,7 @@ public class MainPanel : Gd.Stack, Clocks.Clock {
private StandalonePanel standalone;
public MainPanel (HeaderBar header_bar) {
- Object (label: _("World"), header_bar: header_bar, transition_type:
Gd.StackTransitionType.CROSSFADE, panel_id: PanelId.WORLD);
+ Object (label: _("World"), header_bar: header_bar, transition_type:
Gtk.StackTransitionType.CROSSFADE, panel_id: PanelId.WORLD);
locations = new List<Item> ();
settings = new GLib.Settings ("org.gnome.clocks");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]