[evolution] I#973 - Increase size of calendar copy/move dialog
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] I#973 - Increase size of calendar copy/move dialog
- Date: Fri, 3 Jul 2020 07:09:48 +0000 (UTC)
commit 3f3bebb829d4048955c71f731a86f945c6e2d3a5
Author: Bryan Dunsmore <bryan dunsmore outlook com>
Date: Fri Jul 3 09:08:44 2020 +0200
I#973 - Increase size of calendar copy/move dialog
Make calendar copy/move dialog more similar to mail's folder selector dialog.
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/973
Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/59
src/e-util/e-source-selector-dialog.c | 65 ++++++-----------------------------
1 file changed, 10 insertions(+), 55 deletions(-)
---
diff --git a/src/e-util/e-source-selector-dialog.c b/src/e-util/e-source-selector-dialog.c
index 6b6b6f9e04..e91dbdb812 100644
--- a/src/e-util/e-source-selector-dialog.c
+++ b/src/e-util/e-source-selector-dialog.c
@@ -21,6 +21,8 @@
#include "evolution-config.h"
#include <glib/gi18n-lib.h>
+
+#include "e-tree-view-frame.h"
#include "e-source-selector.h"
#include "e-source-selector-dialog.h"
@@ -207,10 +209,8 @@ source_selector_dialog_constructed (GObject *object)
{
ESourceSelectorDialog *dialog;
ESource *primary_selection;
- GtkWidget *label, *hgrid;
GtkWidget *container;
GtkWidget *widget;
- gchar *label_text;
/* Chain up to parent's method. */
G_OBJECT_CLASS (e_source_selector_dialog_parent_class)->constructed (object);
@@ -219,64 +219,21 @@ source_selector_dialog_constructed (GObject *object)
container = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
- widget = g_object_new (
- GTK_TYPE_GRID,
- "orientation", GTK_ORIENTATION_VERTICAL,
- "column-homogeneous", FALSE,
- "row-spacing", 12,
- NULL);
- gtk_container_set_border_width (GTK_CONTAINER (widget), 12);
+ widget = e_tree_view_frame_new ();
+ e_tree_view_frame_set_toolbar_visible (E_TREE_VIEW_FRAME (widget), FALSE);
gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
gtk_widget_show (widget);
container = widget;
- label_text = g_strdup_printf ("<b>%s</b>", _("_Destination"));
- label = gtk_label_new_with_mnemonic (label_text);
- gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_container_add (GTK_CONTAINER (container), label);
- gtk_widget_show (label);
- g_free (label_text);
-
- hgrid = g_object_new (
- GTK_TYPE_GRID,
- "orientation", GTK_ORIENTATION_HORIZONTAL,
- "row-homogeneous", FALSE,
- "column-spacing", 12,
- "vexpand", TRUE,
- "valign", GTK_ALIGN_FILL,
- NULL);
- gtk_container_add (GTK_CONTAINER (container), hgrid);
- gtk_widget_show (hgrid);
-
- widget = gtk_label_new ("");
- gtk_container_add (GTK_CONTAINER (hgrid), widget);
- gtk_widget_show (widget);
-
- widget = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (
- GTK_SCROLLED_WINDOW (widget),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (
- GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
- gtk_widget_set_hexpand (widget, TRUE);
- gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
- gtk_widget_set_vexpand (widget, TRUE);
- gtk_widget_set_valign (widget, GTK_ALIGN_FILL);
- gtk_container_add (GTK_CONTAINER (hgrid), widget);
- gtk_widget_show (widget);
-
- container = widget;
-
widget = e_source_selector_new (
dialog->priv->registry,
dialog->priv->extension_name);
e_source_selector_set_show_toggles (E_SOURCE_SELECTOR (widget), FALSE);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget);
- gtk_container_add (GTK_CONTAINER (container), widget);
+ e_tree_view_frame_set_tree_view (
+ E_TREE_VIEW_FRAME (container),
+ GTK_TREE_VIEW (widget));
dialog->priv->selector = widget;
- gtk_widget_show (widget);
g_signal_connect (
widget, "row_activated",
@@ -352,18 +309,16 @@ static void
e_source_selector_dialog_init (ESourceSelectorDialog *dialog)
{
GtkWidget *action_area;
- GtkWidget *content_area;
dialog->priv = E_SOURCE_SELECTOR_DIALOG_GET_PRIVATE (dialog);
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
- content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_window_set_title (GTK_WINDOW (dialog), _("Select destination"));
- gtk_window_set_default_size (GTK_WINDOW (dialog), 320, 240);
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 500);
- gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
- gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
+ gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
+ gtk_widget_set_margin_top (action_area, 5);
gtk_dialog_add_buttons (
GTK_DIALOG (dialog),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]