commit 2becb58d21d908430a4a72abe7c31f81bb91dc3e
parent fb62a40c0b413f663136a1293f5851c06f0f11b0
Author: wwp <subscript@free.fr>
Date: Sun, 13 Apr 2025 18:46:22 +0200
Add a bit of space to the quicksearch combo.
Use HSPACING_NARROW(_2).
Coding style (indent).
Diffstat:
3 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/src/common/defs.h b/src/common/defs.h
@@ -146,6 +146,7 @@
#define SESSION_TIMEOUT_INTERVAL 60 /* sec */
#define MAX_HISTORY_SIZE 32
#define HSPACING_NARROW 4
+#define HSPACING_NARROW_2 2
#define VSPACING 10
#define VSPACING_NARROW 4
#define VSPACING_NARROW_2 2
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2024 the Claws Mail team and Colin Leroy
+ * Copyright (C) 1999-2025 the Claws Mail team and Colin Leroy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
#include "claws-features.h"
#endif
+#include <defs.h>
+
#include <glib.h>
#include <glib/gi18n.h>
#include <ctype.h>
@@ -820,31 +822,31 @@ QuickSearch *quicksearch_new()
/* quick search */
hbox_search = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- menu = gtk_list_store_new(4,
- G_TYPE_STRING,
- G_TYPE_BOOLEAN,
- G_TYPE_BOOLEAN,
- G_TYPE_INT);
+ menu = gtk_list_store_new(4,
+ G_TYPE_STRING,
+ G_TYPE_BOOLEAN,
+ G_TYPE_BOOLEAN,
+ G_TYPE_INT);
- search_type_combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(menu));
+ search_type_combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(menu));
gtk_widget_set_focus_on_click(GTK_WIDGET(search_type_combo), FALSE);
gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(search_type_combo),
(GtkTreeViewRowSeparatorFunc)search_type_combo_separator_func,
NULL, NULL);
- renderer = gtk_cell_renderer_toggle_new();
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(search_type_combo), renderer, TRUE);
+ renderer = gtk_cell_renderer_toggle_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(search_type_combo), renderer, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(search_type_combo),
renderer,
"visible", SEARCH_TYPE_COL_CHECKBOX,
"active", SEARCH_TYPE_COL_CHECKBOX_ACTIVE,
NULL);
- renderer = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(search_type_combo), renderer, TRUE);
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(search_type_combo), renderer, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(search_type_combo),
renderer, "text", SEARCH_TYPE_COL_TEXT, NULL);
- gtk_box_pack_start(GTK_BOX(hbox_search), search_type_combo, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_type_combo, FALSE, FALSE, HSPACING_NARROW_2);
gtk_list_store_append(menu, &iter);
gtk_list_store_set(menu, &iter,
@@ -923,12 +925,12 @@ QuickSearch *quicksearch_new()
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), search_string_entry, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox_search), vbox, TRUE, TRUE, 4);
+ gtk_box_pack_start(GTK_BOX(hbox_search), vbox, TRUE, TRUE, HSPACING_NARROW);
gtk_widget_show(vbox);
gtk_widget_show(search_string_entry);
- search_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
+ search_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, HSPACING_NARROW+1);
clear_search = gtkut_stock_button("edit-clear", _("C_lear"));
gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
FALSE, FALSE, 0);
@@ -957,7 +959,7 @@ QuickSearch *quicksearch_new()
_("Information about extended symbols"));
gtk_widget_show(search_description);
- gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, HSPACING_NARROW_2);
gtk_widget_show(search_hbox);
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((search_string_entry)))),
@@ -1210,4 +1212,3 @@ void quicksearch_set_search_strings(QuickSearch *quicksearch)
quicksearch_set_popdown_strings(quicksearch);
}
-
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -595,7 +595,7 @@ SummaryView *summary_create(MainWindow *mainwin)
CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar"));
- gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, HSPACING_NARROW_2);
gtk_box_pack_start(GTK_BOX(hbox), stat_vbox, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(stat_vbox), stat_box, TRUE, TRUE, 0);
@@ -607,7 +607,7 @@ SummaryView *summary_create(MainWindow *mainwin)
statlabel_folder = gtk_label_new("");
gtk_widget_show(statlabel_folder);
- gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, HSPACING_NARROW_2);
statlabel_select = gtk_label_new("");
gtk_widget_show(statlabel_select);
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
@@ -616,7 +616,7 @@ SummaryView *summary_create(MainWindow *mainwin)
toggle_eventbox = gtk_event_box_new();
gtk_widget_show(toggle_eventbox);
- gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
+ gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, HSPACING_NARROW);
toggle_arrow = gtk_image_new_from_icon_name("pan-down-symbolic", GTK_ICON_SIZE_MENU);
gtk_widget_show(toggle_arrow);
@@ -628,7 +628,7 @@ SummaryView *summary_create(MainWindow *mainwin)
#ifdef GENERIC_UMPC
multiple_sel_togbtn = gtk_toggle_button_new();
gtk_widget_show(multiple_sel_togbtn);
- gtk_box_pack_end(GTK_BOX(hbox), multiple_sel_togbtn, FALSE, FALSE, 4);
+ gtk_box_pack_end(GTK_BOX(hbox), multiple_sel_togbtn, FALSE, FALSE, HSPACING_NARROW);
CLAWS_SET_TIP(multiple_sel_togbtn,
_("Toggle multiple selection"));
g_signal_connect(G_OBJECT(multiple_sel_togbtn), "toggled",
@@ -638,7 +638,7 @@ SummaryView *summary_create(MainWindow *mainwin)
statlabel_msgs = gtk_label_new("");
gtk_widget_show(statlabel_msgs);
- gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, 4);
+ gtk_box_pack_end(GTK_BOX(stat_box), statlabel_msgs, FALSE, FALSE, HSPACING_NARROW);
hbox_spc = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(hbox_spc);
@@ -875,8 +875,10 @@ void summary_relayout(SummaryView *summaryview)
case NORMAL_LAYOUT:
case WIDE_LAYOUT:
case WIDE_MSGLIST_LAYOUT:
- gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
- gtk_box_pack_end(GTK_BOX(summaryview->stat_box), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box),
+ summaryview->hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(summaryview->stat_box),
+ summaryview->statlabel_msgs, FALSE, FALSE, HSPACING_NARROW);
gtk_widget_show_all(summaryview->stat_box);
gtk_widget_show_all(summaryview->stat_box2);
if (prefs_common.layout_mode == WIDE_MSGLIST_LAYOUT ||
@@ -887,8 +889,10 @@ void summary_relayout(SummaryView *summaryview)
break;
case VERTICAL_LAYOUT:
case SMALL_LAYOUT:
- gtk_box_pack_start(GTK_BOX(summaryview->stat_box), summaryview->hbox_l, TRUE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(summaryview->stat_box2), summaryview->statlabel_msgs, FALSE, FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box),
+ summaryview->hbox_l, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(summaryview->stat_box2),
+ summaryview->statlabel_msgs, FALSE, FALSE, HSPACING_NARROW);
gtk_widget_show_all(summaryview->stat_box);
gtk_widget_show_all(summaryview->stat_box2);
if (prefs_common.layout_mode == SMALL_LAYOUT) {
