14 files changed, 273 insertions, 56 deletions

diff --git a/src/application.c b/src/application.c
index 74e8bd4..f8a1274 100644
--- a/src/application.c
+++ b/src/application.c
@@ -99,8 +99,6 @@ application_init(MESSENGER_Application *app,
 
   pthread_mutex_init(&(app->chat.mutex), NULL);
 
-  app->ui.mobile = FALSE;
-
   app->ui.bindings = g_hash_table_new(g_direct_hash, g_direct_equal);
 
   g_application_add_main_option(
@@ -155,7 +153,7 @@ _application_chat_thread(void *args)
           'm',
           "mobile",
           "Optimize UI spacing for mobile devices",
-          &(app->ui.mobile)
+          &(app->settings.mobile_design)
       ),
       GNUNET_GETOPT_option_string (
           'e',
diff --git a/src/application.h b/src/application.h
index d7be05a..8e3e51a 100644
--- a/src/application.h
+++ b/src/application.h
@@ -32,6 +32,7 @@
 
 #include "ui/accounts.h"
 #include "ui/contacts.h"
+#include "ui/delete_messages.h"
 #include "ui/invite_contact.h"
 #include "ui/messenger.h"
 #include "ui/new_account.h"
@@ -71,7 +72,6 @@ typedef struct MESSENGER_Application
 
   struct {
     int status;
-    gboolean mobile;
 
     GHashTable *bindings;
 
@@ -79,6 +79,7 @@ typedef struct MESSENGER_Application
 
     UI_INVITE_CONTACT_Handle invite_contact;
     UI_SEND_FILE_Handle send_file;
+    UI_DELETE_MESSAGES_Handle delete_messages;
 
     UI_NEW_CONTACT_Handle new_contact;
     UI_NEW_GROUP_Handle new_group;
@@ -89,6 +90,14 @@ typedef struct MESSENGER_Application
     UI_CONTACTS_Handle contacts;
     UI_SETTINGS_Handle settings;
   } ui;
+
+  struct {
+    gboolean mobile_design;
+    gboolean hide_delete_dialog;
+    gboolean disable_notifications;
+    gboolean accept_all_files;
+    gboolean accept_all_invites;
+  } settings;
 } MESSENGER_Application;
 
 void
diff --git a/src/ui/accounts.c b/src/ui/accounts.c
index f89244f..1817180 100644
--- a/src/ui/accounts.c
+++ b/src/ui/accounts.c
@@ -148,11 +148,6 @@ ui_accounts_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "accounts_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("Accounts")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)
diff --git a/src/ui/chat.c b/src/ui/chat.c
index 72d75b0..4fe4735 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -33,6 +33,7 @@
 #include "../application.h"
 #include "../contact.h"
 #include "account_entry.h"
+#include "delete_messages.h"
 
 static gboolean
 _flap_reveal_switch(gpointer user_data)
@@ -214,13 +215,11 @@ handle_chat_selection_close_button_click(UNUSED GtkButton *button,
   gtk_list_box_unselect_all(listbox);
 }
 
-static void
-handle_chat_selection_delete_button_click(UNUSED GtkButton *button,
-                                          gpointer user_data)
+void
+_delete_messages_callback(GHashTable *bindings,
+                          GList *selected,
+                          gulong delay)
 {
-  UI_CHAT_Handle *handle = (UI_CHAT_Handle*) user_data;
-
-  GList *selected = gtk_list_box_get_selected_rows(handle->messages_listbox);
   UI_MESSAGE_Handle *message;
 
   while (selected)
@@ -230,14 +229,17 @@ handle_chat_selection_delete_button_click(UNUSED GtkButton *button,
     if (!row)
       goto skip_row;
 
-    message = g_hash_table_lookup(handle->bindings, row);
+    message = g_hash_table_lookup(bindings, row);
 
     if ((!message) || (!(message->msg)))
       goto skip_row;
 
     GNUNET_CHAT_message_delete(
-        message->msg,
-        GNUNET_TIME_relative_get_zero_()
+        message->msg,
+        GNUNET_TIME_relative_multiply(
+            GNUNET_TIME_relative_get_second_(),
+            delay
+        )
     );
 
   skip_row:
@@ -246,6 +248,32 @@ handle_chat_selection_delete_button_click(UNUSED GtkButton *button,
 }
 
 static void
+handle_chat_selection_delete_button_click(UNUSED GtkButton *button,
+                                          gpointer user_data)
+{
+  UI_CHAT_Handle *handle = (UI_CHAT_Handle*) user_data;
+
+  MESSENGER_Application *app = handle->app;
+
+  GList *selected = gtk_list_box_get_selected_rows(handle->messages_listbox);
+
+  if (app->settings.hide_delete_dialog)
+    _delete_messages_callback(app->ui.bindings, selected, 0);
+  else
+  {
+    ui_delete_messages_dialog_init(app, &(app->ui.delete_messages));
+
+    ui_delete_messages_dialog_link(
+        &(app->ui.delete_messages),
+        _delete_messages_callback,
+        selected
+    );
+
+    gtk_widget_show(GTK_WIDGET(app->ui.delete_messages.dialog));
+  }
+}
+
+static void
 handle_attach_file_button_click(GtkButton *button,
                                 gpointer user_data)
 {
@@ -366,7 +394,7 @@ handle_send_text_key_press (GtkWidget *widget,
 {
   MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
-  if ((app->ui.mobile) ||
+  if ((app->settings.mobile_design) ||
       (event->state & GDK_SHIFT_MASK) ||
       ((event->keyval != GDK_KEY_Return) &&
        (event->keyval != GDK_KEY_KP_Enter)))
@@ -393,7 +421,7 @@ ui_chat_new(MESSENGER_Application *app)
   UI_CHAT_Handle *handle = g_malloc(sizeof(UI_CHAT_Handle));
   UI_MESSENGER_Handle *messenger = &(app->ui.messenger);
 
-  handle->bindings = app->ui.bindings;
+  handle->app = app;
 
   handle->messages = NULL;
   handle->edge_value = 0;
diff --git a/src/ui/chat.h b/src/ui/chat.h
index b27f829..2c33789 100644
--- a/src/ui/chat.h
+++ b/src/ui/chat.h
@@ -38,7 +38,7 @@ typedef struct UI_FILE_LOAD_ENTRY_Handle UI_FILE_LOAD_ENTRY_Handle;
 
 typedef struct UI_CHAT_Handle
 {
-  GHashTable *bindings;
+  MESSENGER_Application *app;
 
   GList *messages;
   gdouble edge_value;
diff --git a/src/ui/contacts.c b/src/ui/contacts.c
index ad46773..2e3b0ec 100644
--- a/src/ui/contacts.c
+++ b/src/ui/contacts.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
+   Copyright (C) 2021--2022 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -188,11 +188,6 @@ ui_contacts_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "contacts_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("Contacts")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)
diff --git a/src/ui/delete_messages.c b/src/ui/delete_messages.c
new file mode 100644
index 0000000..df75484
--- /dev/null
+++ b/src/ui/delete_messages.c
@@ -0,0 +1,152 @@
+/*
+   This file is part of GNUnet.
+   Copyright (C) 2022 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   SPDX-License-Identifier: AGPL3.0-or-later
+ */
+/*
+ * @author Tobias Frisch
+ * @file ui/delete_messages.c
+ */
+
+#include "delete_messages.h"
+
+#include "../application.h"
+
+static void
+handle_cancel_button_click(UNUSED GtkButton *button,
+                           gpointer user_data)
+{
+  GtkDialog *dialog = GTK_DIALOG(user_data);
+  gtk_window_close(GTK_WINDOW(dialog));
+}
+
+static void
+handle_confirm_button_click(UNUSED GtkButton *button,
+                            gpointer user_data)
+{
+  MESSENGER_Application *app = (MESSENGER_Application*) user_data;
+
+  app->settings.hide_delete_dialog = gtk_toggle_button_get_active(
+      GTK_TOGGLE_BUTTON(app->ui.delete_messages.hide_checkbox)
+  );
+
+  GtkTreeModel *model = gtk_combo_box_get_model(
+      app->ui.delete_messages.delay_combobox
+  );
+
+  gulong delay = 0;
+
+  GtkTreeIter iter;
+  if (gtk_combo_box_get_active_iter(app->ui.delete_messages.delay_combobox,
+                                    &iter))
+    gtk_tree_model_get(model, &iter, 1, &delay, -1);
+
+  if (app->ui.delete_messages.callback)
+    app->ui.delete_messages.callback(
+        app->ui.bindings,
+        app->ui.delete_messages.selected,
+        delay
+    );
+
+  gtk_window_close(GTK_WINDOW(app->ui.delete_messages.dialog));
+}
+
+static void
+handle_dialog_destroy(UNUSED GtkWidget *window,
+                      gpointer user_data)
+{
+  MESSENGER_Application *app = (MESSENGER_Application*) user_data;
+
+  ui_delete_messages_dialog_cleanup(&(app->ui.delete_messages));
+}
+
+void
+ui_delete_messages_dialog_init(MESSENGER_Application *app,
+                               UI_DELETE_MESSAGES_Handle *handle)
+{
+  handle->selected = NULL;
+  handle->callback = NULL;
+
+  handle->builder = gtk_builder_new_from_resource(
+      application_get_resource_path(app, "ui/delete_messages.ui")
+  );
+
+  handle->dialog = GTK_DIALOG(
+      gtk_builder_get_object(handle->builder, "delete_messages_dialog")
+  );
+
+  gtk_window_set_transient_for(
+      GTK_WINDOW(handle->dialog),
+      GTK_WINDOW(app->ui.messenger.main_window)
+  );
+
+  handle->delay_store = GTK_LIST_STORE(
+      gtk_builder_get_object(handle->builder, "delay_store")
+  );
+
+  handle->delay_combobox = GTK_COMBO_BOX(
+      gtk_builder_get_object(handle->builder, "delay_combobox")
+  );
+
+  handle->hide_checkbox = GTK_CHECK_BUTTON(
+      gtk_builder_get_object(handle->builder, "hide_checkbox")
+  );
+
+  handle->cancel_button = GTK_BUTTON(
+      gtk_builder_get_object(handle->builder, "cancel_button")
+  );
+
+  g_signal_connect(
+      handle->cancel_button,
+      "clicked",
+      G_CALLBACK(handle_cancel_button_click),
+      handle->dialog
+  );
+
+  handle->confirm_button = GTK_BUTTON(
+      gtk_builder_get_object(handle->builder, "confirm_button")
+  );
+
+  g_signal_connect(
+      handle->confirm_button,
+      "clicked",
+      G_CALLBACK(handle_confirm_button_click),
+      app
+  );
+
+  g_signal_connect(
+      handle->dialog,
+      "destroy",
+      G_CALLBACK(handle_dialog_destroy),
+      app
+  );
+}
+
+void
+ui_delete_messages_dialog_link(UI_DELETE_MESSAGES_Handle *handle,
+                               UI_DELETE_MESSAGES_Callback callback,
+                               GList *selected)
+{
+  handle->selected = selected;
+  handle->callback = callback;
+}
+
+void
+ui_delete_messages_dialog_cleanup(UI_DELETE_MESSAGES_Handle *handle)
+{
+  g_object_unref(handle->builder);
+}
diff --git a/src/ui/delete_messages.h b/src/ui/delete_messages.h
new file mode 100644
index 0000000..9cf9949
--- /dev/null
+++ b/src/ui/delete_messages.h
@@ -0,0 +1,65 @@
+/*
+   This file is part of GNUnet.
+   Copyright (C) 2022 GNUnet e.V.
+
+   GNUnet is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Affero General Public License as published
+   by the Free Software Foundation, either version 3 of the License,
+   or (at your option) any later version.
+
+   GNUnet is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+   SPDX-License-Identifier: AGPL3.0-or-later
+ */
+/*
+ * @author Tobias Frisch
+ * @file ui/delete_messages.h
+ */
+
+#ifndef UI_DELETE_MESSAGES_H_
+#define UI_DELETE_MESSAGES_H_
+
+#include "messenger.h"
+
+typedef void
+(*UI_DELETE_MESSAGES_Callback) (GHashTable *bindings,
+                                GList *selected,
+                                gulong delay);
+
+typedef struct UI_DELETE_MESSAGES_Handle
+{
+  GList *selected;
+
+  UI_DELETE_MESSAGES_Callback callback;
+
+  GtkBuilder *builder;
+  GtkDialog *dialog;
+
+  GtkListStore *delay_store;
+
+  GtkComboBox *delay_combobox;
+  GtkCheckButton *hide_checkbox;
+
+  GtkButton *cancel_button;
+  GtkButton *confirm_button;
+} UI_DELETE_MESSAGES_Handle;
+
+void
+ui_delete_messages_dialog_init(MESSENGER_Application *app,
+                               UI_DELETE_MESSAGES_Handle *handle);
+
+void
+ui_delete_messages_dialog_link(UI_DELETE_MESSAGES_Handle *handle,
+                               UI_DELETE_MESSAGES_Callback callback,
+                               GList *selected);
+
+void
+ui_delete_messages_dialog_cleanup(UI_DELETE_MESSAGES_Handle *handle);
+
+#endif /* UI_DELETE_MESSAGES_H_ */
diff --git a/src/ui/invite_contact.c b/src/ui/invite_contact.c
index 8e18860..3afeee0 100644
--- a/src/ui/invite_contact.c
+++ b/src/ui/invite_contact.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
+   Copyright (C) 2021--2022 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -180,11 +180,6 @@ ui_invite_contact_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "invite_contact_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("Invite Contact")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 058fcbf..c031b1b 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -308,7 +308,7 @@ ui_messenger_init(MESSENGER_Application *app,
       G_BINDING_INVERT_BOOLEAN
   );
 
-  if (app->ui.mobile)
+  if (app->settings.mobile_design)
     g_object_bind_property(
       handle->leaflet_chat,
       "folded",
diff --git a/src/ui/new_account.c b/src/ui/new_account.c
index fdc53ff..6642261 100644
--- a/src/ui/new_account.c
+++ b/src/ui/new_account.c
@@ -123,11 +123,6 @@ ui_new_account_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "new_account_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("New Account")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)
diff --git a/src/ui/new_contact.c b/src/ui/new_contact.c
index 0713aa9..8188740 100644
--- a/src/ui/new_contact.c
+++ b/src/ui/new_contact.c
@@ -295,11 +295,6 @@ ui_new_contact_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "new_contact_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("New Contact")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)
diff --git a/src/ui/new_group.c b/src/ui/new_group.c
index dbad66b..59199dc 100644
--- a/src/ui/new_group.c
+++ b/src/ui/new_group.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
+   Copyright (C) 2021--2022 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -206,11 +206,6 @@ ui_new_group_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "new_group_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("New Group")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)
diff --git a/src/ui/new_platform.c b/src/ui/new_platform.c
index 544b7c7..8611432 100644
--- a/src/ui/new_platform.c
+++ b/src/ui/new_platform.c
@@ -1,6 +1,6 @@
 /*
    This file is part of GNUnet.
-   Copyright (C) 2021 GNUnet e.V.
+   Copyright (C) 2021--2022 GNUnet e.V.
 
    GNUnet is free software: you can redistribute it and/or modify it
    under the terms of the GNU Affero General Public License as published
@@ -108,11 +108,6 @@ ui_new_platform_dialog_init(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "new_platform_dialog")
   );
 
-  gtk_window_set_title(
-      GTK_WINDOW(handle->dialog),
-      _("New Platform")
-  );
-
   gtk_window_set_transient_for(
       GTK_WINDOW(handle->dialog),
       GTK_WINDOW(app->ui.messenger.main_window)