Update layout widgets to GTK4

Author: dar5hak

src/Application.vala

@@ -52,8 +52,8 @@ public class Obliviate.Application : Gtk.Application {
 
         var provider = new Gtk.CssProvider ();
         provider.load_from_resource ("/com/github/elfenware/obliviate/Application.css");
-        Gtk.StyleContext.add_provider_for_screen (
-            Gdk.Screen.get_default (),
+        Gtk.StyleContext.add_provider_for_display (
+            Gdk.Display.get_default (),
             provider,
             Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
         );

src/MainView.vala

@@ -38,7 +38,10 @@ public class Obliviate.MainView : Gtk.Overlay {
         grid = new Gtk.Grid () {
             row_spacing = 4,
             column_spacing = 4,
-            margin = 30,
+            margin_top = 30,
+            margin_bottom = 30,
+            margin_start = 30,
+            margin_end = 30,
             halign = Gtk.Align.CENTER
         };
 
@@ -53,15 +56,13 @@ public class Obliviate.MainView : Gtk.Overlay {
         };
 
         site = new Gtk.Entry () {
-            placeholder_text = _ ("GitHub")
+            placeholder_text = _ ("GitHub"),
+            primary_icon_name = "dialog-information-symbolic",
+            primary_icon_tooltip_text = "Site is not case-sensitive. “GitHub” equals “github”."
         };
 
         site.changed.connect (handle_generate_password);
 
-        var site_info = new Gtk.Image.from_icon_name ("dialog-information-symbolic", Gtk.IconSize.MENU) {
-            tooltip_text = _ ("Site is not case-sensitive. “GitHub” equals “github”.")
-        };
-
         var cipher_key_label = new Gtk.Label (_ ("Cipher key:")) {
             halign = Gtk.Align.END,
             margin_end = 4
@@ -103,8 +104,8 @@ public class Obliviate.MainView : Gtk.Overlay {
         });
 
         var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-        button_box.pack_start (copy_btn);
-        button_box.pack_end (copy_without_symbols_btn);
+        button_box.prepend (copy_btn);
+        button_box.append (copy_without_symbols_btn);
 
         clearing_label = new Gtk.Label (ngettext (
             "Clearing clipboard in %.0f second",
@@ -123,14 +124,13 @@ public class Obliviate.MainView : Gtk.Overlay {
         clearing_progress.add_css_class (Granite.STYLE_CLASS_FLAT);
 
         var plus_label = new Gtk.Label ("+");
-        plus_label.get_style_context ().add_class ("sign");
+        plus_label.add_css_class ("sign");
 
         var equals_label = new Gtk.Label ("=");
-        equals_label.get_style_context ().add_class ("sign");
+        equals_label.add_css_class ("sign");
 
         grid.attach (site_label, 0, 0, 1, 1);
         grid.attach_next_to (site, site_label, Gtk.PositionType.RIGHT);
-        grid.attach_next_to (site_info, site, Gtk.PositionType.RIGHT);
 
         grid.attach_next_to (plus_label, site, Gtk.PositionType.BOTTOM);
 

src/MainWindow.vala

@@ -26,13 +26,13 @@ public class Obliviate.MainWindow : Gtk.Window {
     }
 
     construct {
-        var header = get_header ();
+        var headerbar = get_headerbar ();
 
         var main = new MainView ();
 
         var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        box.add (header);
-        box.add (main);
+        box.append (headerbar);
+        box.append (main);
         set_child (box);
 
         set_size_request (440, 280);
@@ -48,15 +48,15 @@ public class Obliviate.MainWindow : Gtk.Window {
         });
     }
 
-    private Gtk.HeaderBar get_header () {
+    private Gtk.HeaderBar get_headerbar () {
         set_title (_("Obliviate"));
         Gtk.Label title_widget = new Gtk.Label (_("Obliviate"));
         title_widget.add_css_class (Granite.STYLE_CLASS_TITLE_LABEL);
 
-        var header = new Gtk.HeaderBar ();
-        header.set_title_widget (title_widget);
-        header.add_css_class (Granite.STYLE_CLASS_FLAT);
-        set_titlebar (header);
+        var headerbar = new Gtk.HeaderBar ();
+        headerbar.set_title_widget (title_widget);
+        headerbar.add_css_class (Granite.STYLE_CLASS_FLAT);
+        set_titlebar (headerbar);
 
         var help_btn = new Gtk.Button.from_icon_name ("help-contents") {
             tooltip_text = _("Help and FAQ")
@@ -70,9 +70,9 @@ public class Obliviate.MainWindow : Gtk.Window {
             }
         });
 
-        header.pack_end (help_btn);
+        headerbar.pack_end (help_btn);
 
-        return header;
+        return headerbar;
     }
 
     private bool before_destroy () {

src/Service.vala

@@ -70,5 +70,7 @@ public class Obliviate.Service : GLib.Object {
         } catch (Error e) {
             debug ("Error removing symbols.");
         }
+
+        return str;
     }
 }