[gnome-clocks/wip/exalm/libhandy: 4/6] Stop using HdyDialog



commit 2e7abce8e918c03472d2f5823df745c00b840327
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri May 22 22:54:04 2020 +0500

    Stop using HdyDialog
    
    It's removed in libhandy 1.0, so just use GtkDialog for now.

 data/ui/alarmsetupdialog.ui    | 2 +-
 data/ui/worldlocationdialog.ui | 2 +-
 src/alarm.vala                 | 2 +-
 src/timer.vala                 | 4 ++--
 src/world.vala                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/data/ui/alarmsetupdialog.ui b/data/ui/alarmsetupdialog.ui
index be1c779..0e8e4be 100644
--- a/data/ui/alarmsetupdialog.ui
+++ b/data/ui/alarmsetupdialog.ui
@@ -12,7 +12,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <template class="ClocksAlarmSetupDialog" parent="HdyDialog">
+  <template class="ClocksAlarmSetupDialog" parent="GtkDialog">
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
diff --git a/data/ui/worldlocationdialog.ui b/data/ui/worldlocationdialog.ui
index 6422b31..3c69861 100644
--- a/data/ui/worldlocationdialog.ui
+++ b/data/ui/worldlocationdialog.ui
@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires libgweather 3.0 -->
   <!-- interface-requires gtk+ 3.12 -->
-  <template class="ClocksWorldLocationDialog" parent="HdyDialog">
+  <template class="ClocksWorldLocationDialog" parent="GtkDialog">
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
diff --git a/src/alarm.vala b/src/alarm.vala
index da6d082..49c9772 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -528,7 +528,7 @@ public class DayPickerRow : Hdy.ActionRow {
 const int DELETE_ALARM = 2;
 
 [GtkTemplate (ui = "/org/gnome/clocks/ui/alarmsetupdialog.ui")]
-private class SetupDialog : Hdy.Dialog {
+private class SetupDialog : Gtk.Dialog {
     private Utils.WallClock.Format format;
     [GtkChild]
     private Gtk.Grid time_grid;
diff --git a/src/timer.vala b/src/timer.vala
index ba84450..fc18b75 100644
--- a/src/timer.vala
+++ b/src/timer.vala
@@ -138,11 +138,11 @@ public class Item : Object, ContentItem {
     }
 }
 
-public class SetupDialog: Hdy.Dialog {
+public class SetupDialog: Gtk.Dialog {
     public Setup timer_setup;
 
     public SetupDialog (Gtk.Window parent) {
-        Object (transient_for: parent, title: _("New Timer"), use_header_bar: 1);
+        Object (modal: true, transient_for: parent, title: _("New Timer"), use_header_bar: 1);
         this.set_default_size (640, 360);
 
         add_button (_("Cancel"), Gtk.ResponseType.CANCEL);
diff --git a/src/world.vala b/src/world.vala
index e7d3792..d6fc8a6 100644
--- a/src/world.vala
+++ b/src/world.vala
@@ -544,7 +544,7 @@ private class Tile : Gtk.ListBoxRow {
 }
 
 [GtkTemplate (ui = "/org/gnome/clocks/ui/worldlocationdialog.ui")]
-private class LocationDialog : Hdy.Dialog {
+private class LocationDialog : Gtk.Dialog {
     [GtkChild]
     private GWeather.LocationEntry location_entry;
     private Face world;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]