* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "layout-config.h"
+#include <cstring>
+
+#include <glib-object.h>
+
+#include <config.h>
+
+#include "compat.h"
+#include "intl.h"
#include "ui-misc.h"
+namespace
+{
enum {
COLUMN_TEXT = 0,
COLUMN_KEY
};
-
-typedef struct _LayoutStyle LayoutStyle;
-struct _LayoutStyle
+struct LayoutStyle
{
LayoutLocation a, b, c;
};
-typedef struct _LayoutConfig LayoutConfig;
-struct _LayoutConfig
+struct LayoutConfig
{
GtkWidget *box;
gint a, b, c;
};
+constexpr gint LAYOUT_STYLE_SIZE = 48;
-static LayoutStyle layout_config_styles[] = {
+// @todo Use std::array
+constexpr LayoutStyle layout_config_styles[] = {
/* 1, 2, 3 */
{ static_cast<LayoutLocation>(LAYOUT_LEFT | LAYOUT_TOP), static_cast<LayoutLocation>(LAYOUT_LEFT | LAYOUT_BOTTOM), LAYOUT_RIGHT },
{ static_cast<LayoutLocation>(LAYOUT_LEFT | LAYOUT_TOP), static_cast<LayoutLocation>(LAYOUT_RIGHT | LAYOUT_TOP), LAYOUT_BOTTOM },
{ LAYOUT_TOP, static_cast<LayoutLocation>(LAYOUT_LEFT | LAYOUT_BOTTOM), static_cast<LayoutLocation>(LAYOUT_RIGHT | LAYOUT_BOTTOM) }
};
-static gint layout_config_style_count = sizeof(layout_config_styles) / sizeof(LayoutStyle);
+constexpr gint layout_config_style_count = sizeof(layout_config_styles) / sizeof(LayoutStyle);
-static const gchar *layout_titles[] = { N_("Tools"), N_("Files"), N_("Image") };
+const gchar *layout_titles[] = { N_("Tools"), N_("Files"), N_("Image") };
-static void layout_config_destroy(GtkWidget *UNUSED(widget), gpointer data)
+void layout_config_destroy(GtkWidget *, gpointer data)
{
- auto lc = static_cast<LayoutConfig *>(data);
+ auto lc = static_cast<LayoutConfig *>(data);
g_list_free(lc->style_widgets);
g_free(lc);
}
-static void layout_config_set_order(LayoutLocation l, gint n,
+void layout_config_set_order(LayoutLocation l, gint n,
LayoutLocation *a, LayoutLocation *b, LayoutLocation *c)
{
switch (n)
}
}
-static void layout_config_from_data(gint style, gint oa, gint ob, gint oc,
+void layout_config_from_data(gint style, gint oa, gint ob, gint oc,
LayoutLocation *la, LayoutLocation *lb, LayoutLocation *lc)
{
LayoutStyle ls;
layout_config_set_order(ls.c, oc, la, lb, lc);
}
-void layout_config_parse(gint style, const gchar *order,
- LayoutLocation *a, LayoutLocation *b, LayoutLocation *c)
-{
- gint na, nb, nc;
-
- layout_config_order_from_text(order, &na, &nb, &nc);
- layout_config_from_data(style, na, nb, nc, a, b, c);
-}
-
-static void layout_config_list_order_set(LayoutConfig *lc, gint src, gint dest)
+void layout_config_list_order_set(LayoutConfig *lc, gint src, gint dest)
{
GtkListStore *store;
GtkTreeIter iter;
}
}
-static gint layout_config_list_order_get(LayoutConfig *lc, gint n)
+gint layout_config_list_order_get(LayoutConfig *lc, gint n)
{
GtkTreeModel *store;
GtkTreeIter iter;
return 0;
}
-void layout_config_set(GtkWidget *widget, gint style, const gchar *order)
-{
- LayoutConfig *lc;
- GtkWidget *button;
- gint a, b, c;
-
- lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
-
- if (!lc) return;
-
- style = CLAMP(style, 0, layout_config_style_count);
- button = static_cast<GtkWidget *>(g_list_nth_data(lc->style_widgets, style));
- if (!button) return;
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
-
- layout_config_order_from_text(order, &a, &b, &c);
-
- layout_config_list_order_set(lc, a, 0);
- layout_config_list_order_set(lc, b, 1);
- layout_config_list_order_set(lc, c, 2);
-}
-
-gchar *layout_config_get(GtkWidget *widget, gint *style)
-{
- LayoutConfig *lc;
-
- lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
-
- /* this should not happen */
- if (!lc) return nullptr;
-
- *style = lc->style;
-
- lc->a = layout_config_list_order_get(lc, 0);
- lc->b = layout_config_list_order_get(lc, 1);
- lc->c = layout_config_list_order_get(lc, 2);
-
- return layout_config_order_to_text(lc->a, lc->b, lc->c);
-}
-
-static void layout_config_widget_click_cb(GtkWidget *widget, gpointer data)
+void layout_config_widget_click_cb(GtkWidget *widget, gpointer data)
{
LayoutConfig *lc;
if (lc) lc->style = GPOINTER_TO_INT(data);
}
-static void layout_config_table_button(GtkWidget *table, LayoutLocation l, const gchar *text)
+void layout_config_table_button(GtkWidget *table, LayoutLocation l, const gchar *text)
{
GtkWidget *button;
- gint x1, y1;
- gint x2, y2;
+ gint x1;
+ gint y1;
+ gint x2;
+ gint y2;
x1 = 0;
y1 = 0;
button = gtk_button_new_with_label(text);
gtk_widget_set_sensitive(button, FALSE);
gtk_widget_set_can_focus(button, FALSE);
- gtk_table_attach_defaults(GTK_TABLE(table), button, x1, x2, y1, y2);
+ gtk_grid_attach(GTK_GRID(table), button, x1, y1, x2 - x1, y2 - y1);
gtk_widget_show(button);
}
-#define LAYOUT_STYLE_SIZE 48
-
-static GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint style, LayoutConfig *lc)
+GtkWidget *layout_config_widget(GtkWidget *group, GtkWidget *box, gint style, LayoutConfig *lc)
{
GtkWidget *table;
LayoutStyle ls;
if (group)
{
+#if HAVE_GTK4
+ group = gtk_toggle_button_new();
+ gtk_toggle_button_set_group(button, group);
+#else
group = gtk_radio_button_new(gtk_radio_button_get_group(GTK_RADIO_BUTTON(group)));
+#endif
}
else
{
+#if HAVE_GTK4
+ group = gtk_toggle_button_new();
+#else
group = gtk_radio_button_new(nullptr);
+#endif
}
g_object_set_data(G_OBJECT(group), "layout_config", lc);
g_signal_connect(G_OBJECT(group), "clicked",
- G_CALLBACK(layout_config_widget_click_cb), GINT_TO_POINTER(style));
- gtk_box_pack_start(GTK_BOX(box), group, FALSE, FALSE, 0);
+ G_CALLBACK(layout_config_widget_click_cb), GINT_TO_POINTER(style));
+ gq_gtk_box_pack_start(GTK_BOX(box), group, FALSE, FALSE, 0);
- table = gtk_table_new(2, 2, TRUE);
+ table = gtk_grid_new();
layout_config_table_button(table, ls.a, "1");
layout_config_table_button(table, ls.b, "2");
layout_config_table_button(table, ls.c, "3");
gtk_widget_set_size_request(table, LAYOUT_STYLE_SIZE, LAYOUT_STYLE_SIZE);
- gtk_container_add(GTK_CONTAINER(group), table);
+ gq_gtk_container_add(GTK_WIDGET(group), table);
gtk_widget_show(table);
gtk_widget_show(group);
return group;
}
-static void layout_config_number_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
- GtkTreeModel *store, GtkTreeIter *iter, gpointer UNUSED(data))
+void layout_config_number_cb(GtkTreeViewColumn *, GtkCellRenderer *cell,
+ GtkTreeModel *store, GtkTreeIter *iter, gpointer)
{
GtkTreePath *tpath;
gint *indices;
g_free(buf);
}
-GtkWidget *layout_config_new(void)
+gchar num_to_text_char(gint n)
+{
+ switch (n)
+ {
+ case 1:
+ return '2';
+ break;
+ case 2:
+ return '3';
+ break;
+ }
+ return '1';
+}
+
+gchar *layout_config_order_to_text(gint a, gint b, gint c)
+{
+ gchar *text;
+
+ text = g_strdup(" ");
+
+ text[0] = num_to_text_char(a);
+ text[1] = num_to_text_char(b);
+ text[2] = num_to_text_char(c);
+
+ return text;
+}
+
+gint text_char_to_num(const gchar *text, gint n)
+{
+ if (text[n] == '3') return 2;
+ if (text[n] == '2') return 1;
+ return 0;
+}
+
+void layout_config_order_from_text(const gchar *text, gint *a, gint *b, gint *c)
+{
+ if (!text || strlen(text) < 3)
+ {
+ *a = 0;
+ *b = 1;
+ *c = 2;
+ }
+ else
+ {
+ *a = text_char_to_num(text, 0);
+ *b = text_char_to_num(text, 1);
+ *c = text_char_to_num(text, 2);
+ }
+}
+
+} // namespace
+
+void layout_config_parse(gint style, const gchar *order,
+ LayoutLocation *a, LayoutLocation *b, LayoutLocation *c)
+{
+ gint na;
+ gint nb;
+ gint nc;
+
+ layout_config_order_from_text(order, &na, &nb, &nc);
+ layout_config_from_data(style, na, nb, nc, a, b, c);
+}
+
+void layout_config_set(GtkWidget *widget, gint style, const gchar *order)
+{
+ LayoutConfig *lc;
+ GtkWidget *button;
+ gint a;
+ gint b;
+ gint c;
+
+ lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
+
+ if (!lc) return;
+
+ style = CLAMP(style, 0, layout_config_style_count);
+ button = static_cast<GtkWidget *>(g_list_nth_data(lc->style_widgets, style));
+ if (!button) return;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
+
+ layout_config_order_from_text(order, &a, &b, &c);
+
+ layout_config_list_order_set(lc, a, 0);
+ layout_config_list_order_set(lc, b, 1);
+ layout_config_list_order_set(lc, c, 2);
+}
+
+gchar *layout_config_get(GtkWidget *widget, gint *style)
+{
+ LayoutConfig *lc;
+
+ lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
+
+ /* this should not happen */
+ if (!lc) return nullptr;
+
+ *style = lc->style;
+
+ lc->a = layout_config_list_order_get(lc, 0);
+ lc->b = layout_config_list_order_get(lc, 1);
+ lc->c = layout_config_list_order_get(lc, 2);
+
+ return layout_config_order_to_text(lc->a, lc->b, lc->c);
+}
+
+GtkWidget *layout_config_new()
{
LayoutConfig *lc;
GtkWidget *hbox;
G_CALLBACK(layout_config_destroy), lc);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- gtk_box_pack_start(GTK_BOX(lc->box), hbox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lc->box), hbox, FALSE, FALSE, 0);
for (i = 0; i < layout_config_style_count; i++)
{
group = layout_config_widget(group, hbox, i, lc);
}
gtk_widget_show(hbox);
- scrolled = gtk_scrolled_window_new(nullptr, nullptr);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+ scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+ gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_NEVER, GTK_POLICY_NEVER);
- gtk_box_pack_start(GTK_BOX(lc->box), scrolled, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(lc->box), scrolled, FALSE, FALSE, 0);
gtk_widget_show(scrolled);
store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
gtk_list_store_set(store, &iter, COLUMN_TEXT, _(layout_titles[i]), COLUMN_KEY, i, -1);
}
- gtk_container_add(GTK_CONTAINER(scrolled), lc->listview);
+ gq_gtk_container_add(GTK_WIDGET(scrolled), lc->listview);
gtk_widget_show(lc->listview);
pref_label_new(lc->box, _("(drag to change order)"));
return lc->box;
}
-
-static gchar num_to_text_char(gint n)
-{
- switch (n)
- {
- case 1:
- return '2';
- break;
- case 2:
- return '3';
- break;
- }
- return '1';
-}
-
-gchar *layout_config_order_to_text(gint a, gint b, gint c)
-{
- gchar *text;
-
- text = g_strdup(" ");
-
- text[0] = num_to_text_char(a);
- text[1] = num_to_text_char(b);
- text[2] = num_to_text_char(c);
-
- return text;
-}
-
-static gint text_char_to_num(const gchar *text, gint n)
-{
- if (text[n] == '3') return 2;
- if (text[n] == '2') return 1;
- return 0;
-}
-
-void layout_config_order_from_text(const gchar *text, gint *a, gint *b, gint *c)
-{
- if (!text || strlen(text) < 3)
- {
- *a = 0;
- *b = 1;
- *c = 2;
- }
- else
- {
- *a = text_char_to_num(text, 0);
- *b = text_char_to_num(text, 1);
- *c = text_char_to_num(text, 2);
- }
-}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff