1 files changed, 15 insertions, 0 deletions
diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala
index 59edef2c..fc1eb678 100644
--- a/main/src/ui/settings_dialog.vala
+++ b/main/src/ui/settings_dialog.vala
@@ -14,6 +14,8 @@ class SettingsDialog : Dialog {
     [GtkChild] private unowned RadioButton encryption_radio_undecided;
     [GtkChild] private unowned RadioButton encryption_radio_omemo;
     [GtkChild] private unowned RadioButton encryption_radio_openpgp;
+    [GtkChild] private unowned CheckButton send_button_checkbutton;
+    [GtkChild] private unowned CheckButton enter_newline_checkbutton;
 
     Dino.Entities.Settings settings = Dino.Application.get_default().settings;
 
@@ -28,6 +30,9 @@ class SettingsDialog : Dialog {
         encryption_radio_undecided.active = settings.default_encryption == Encryption.UNKNOWN;
         encryption_radio_omemo.active = settings.default_encryption == Encryption.OMEMO;
         encryption_radio_openpgp.active = settings.default_encryption == Encryption.PGP;
+        send_button_checkbutton.active = settings.send_button;
+        enter_newline_checkbutton.active = settings.enter_newline;
+        enter_newline_checkbutton.sensitive = settings.send_button;
 
         typing_checkbutton.toggled.connect(() => { settings.send_typing = typing_checkbutton.active; } );
         marker_checkbutton.toggled.connect(() => { settings.send_marker = marker_checkbutton.active; } );
@@ -52,6 +57,16 @@ class SettingsDialog : Dialog {
                 settings.default_encryption = Encryption.PGP;
             }
         });
+
+        send_button_checkbutton.toggled.connect(() => { settings.send_button = send_button_checkbutton.active; });
+        enter_newline_checkbutton.toggled.connect(() => { settings.enter_newline = enter_newline_checkbutton.active; });
+        settings.send_button_update.connect((visible) => {
+            enter_newline_checkbutton.sensitive = visible;
+
+            if (visible == false) {
+                enter_newline_checkbutton.active = visible;
+            }
+        });
     }
 }