#include "ui_utildlg.h"
#include "filedata.h"
+#include "rcfile.h"
#include "ui_fileops.h"
#include "ui_misc.h"
#include "ui_pathsel.h"
*-----------------------------------------------------------------------------
*/
+typedef struct _DialogWindow DialogWindow;
+struct _DialogWindow
+{
+ gint x;
+ gint y;
+ gint w;
+ gint h;
+ gchar *title;
+ gchar *role;
+};
+
+static GList *dialog_windows = NULL;
+
+static void generic_dialog_save_window(const gchar *title, const gchar *role, gint x, gint y, gint h, gint w)
+{
+ GList *work;
+
+ work = g_list_first(dialog_windows);
+ while (work)
+ {
+ DialogWindow *dw = work->data;
+ if (g_strcmp0(dw->title ,title) == 0 && g_strcmp0(dw->role, role) == 0)
+ {
+ dw->x = x;
+ dw->y = y;
+ dw->w = w;
+ dw->h = h;
+ return;
+ }
+ work = work->next;
+ }
+
+ DialogWindow *dw = g_new0(DialogWindow, 1);
+ dw->title = g_strdup(title);
+ dw->role = g_strdup(role);
+ dw->x = x;
+ dw->y = y;
+ dw->w = w;
+ dw->h = h;
+
+ dialog_windows = g_list_append(dialog_windows, dw);
+}
+
+static gboolean generic_dialog_find_window(const gchar *title, const gchar *role, gint *x, gint *y, gint *h, gint *w)
+{
+ GList *work;
+
+ work = g_list_first(dialog_windows);
+ while (work)
+ {
+ DialogWindow *dw = work->data;
+
+ if (g_strcmp0(dw->title,title) == 0 && g_strcmp0(dw->role, role) == 0)
+ {
+ *x = dw->x;
+ *y = dw->y;
+ *w = dw->w;
+ *h = dw->h;
+ return TRUE;
+ }
+ work = work->next;
+ }
+ return FALSE;
+}
+
void generic_dialog_close(GenericDialog *gd)
{
+ gchar *ident_string;
+ gchar *full_title;
+ gchar *actual_title;
+ gint x, y, h, w;
+
+ gdk_window_get_root_origin(gtk_widget_get_window (gd->dialog), &x, &y);
+ w = gdk_window_get_width(gtk_widget_get_window (gd->dialog));
+ h = gdk_window_get_height(gtk_widget_get_window (gd->dialog));
+
+ /* The window title is modified in window.c: window_new()
+ * by appending the string " - Geeqie"
+ */
+ ident_string = g_strconcat(" - ", GQ_APPNAME, NULL);
+ full_title = g_strdup(gtk_window_get_title(GTK_WINDOW(gd->dialog)));
+ actual_title = strndup(full_title, g_strrstr(full_title, ident_string) - full_title);
+
+ generic_dialog_save_window(actual_title, gtk_window_get_role(GTK_WINDOW(gd->dialog)), x, y, w, h);
+
gtk_widget_destroy(gd->dialog);
g_free(gd);
+ g_free(ident_string);
+ g_free(full_title);
+ g_free(actual_title);
}
static void generic_dialog_click_cb(GtkWidget *widget, gpointer data)
if (event->keyval == GDK_KEY_Escape)
{
- if (gd->cancel_cb) gd->cancel_cb(gd, gd->data);
- else if (auto_close) generic_dialog_click_cb(widget, data);
+ if (gd->cancel_cb)
+ {
+ gd->cancel_cb(gd, gd->data);
+ if (auto_close) generic_dialog_close(gd);
+ }
+ else
+ {
+ if (auto_close) generic_dialog_click_cb(widget, data);
+ }
return TRUE;
}
return FALSE;
GtkWidget *image;
image = gtk_image_new_from_stock(icon_stock_id, GTK_ICON_SIZE_DIALOG);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_widget_set_halign(GTK_WIDGET(image), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign(GTK_WIDGET(image), GTK_ALIGN_START);
+#else
gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0);
+#endif
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
gtk_widget_show(image);
}
{
label = pref_label_new(vbox, heading);
pref_label_bold(label, TRUE, TRUE);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+#endif
}
if (text)
{
label = pref_label_new(vbox, text);
+#if GTK_CHECK_VERSION(3,16,0)
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(label), 0.5);
+#else
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+#endif
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
}
return vbox;
}
+void generic_dialog_windows_load_config(const gchar **attribute_names, const gchar **attribute_values)
+{
+ DialogWindow *dw = g_new0(DialogWindow, 1);
+ gchar *title = NULL;
+ gchar *role = NULL;
+ gint x = 0;
+ gint y = 0;
+ gint w = 0;
+ gint h = 0;
+
+ while (*attribute_names)
+ {
+ const gchar *option = *attribute_names++;
+ const gchar *value = *attribute_values++;
+ if (READ_CHAR_FULL("title", title)) continue;
+ if (READ_CHAR_FULL("role", role)) continue;
+ if (READ_INT_FULL("x", x)) continue;
+ if (READ_INT_FULL("y", y)) continue;
+ if (READ_INT_FULL("w", w)) continue;
+ if (READ_INT_FULL("h", h)) continue;
+
+ log_printf("unknown attribute %s = %s\n", option, value);
+ }
+
+ if (title && title[0] != 0)
+ {
+ dw->title = g_strdup(title);
+ dw->role = g_strdup(role);
+ dw->x = x;
+ dw->y = y;
+ dw->w = w;
+ dw->h = h;
+
+ dialog_windows = g_list_append(dialog_windows, dw);
+ }
+}
+
+void generic_dialog_windows_write_config(GString *outstr, gint indent)
+{
+ GList *work;
+
+ if (options->save_dialog_window_positions && dialog_windows)
+ {
+ WRITE_NL(); WRITE_STRING("<%s>", "dialogs");
+ indent++;
+
+ work = g_list_first(dialog_windows);
+ while (work)
+ {
+ DialogWindow *dw = work->data;
+ WRITE_NL(); WRITE_STRING("<window ");
+ write_char_option(outstr, indent + 1, "title", dw->title);
+ write_char_option(outstr, indent + 1, "role", dw->role);
+ WRITE_INT(*dw, x);
+ WRITE_INT(*dw, y);
+ WRITE_INT(*dw, w);
+ WRITE_INT(*dw, h);
+ WRITE_STRING("/>");
+ work = work->next;
+ }
+ indent--;
+ WRITE_NL(); WRITE_STRING("</%s>", "dialogs");
+
+ dialog_windows = NULL;
+ }
+}
+
static void generic_dialog_setup(GenericDialog *gd,
const gchar *title,
const gchar *role,
void (*cancel_cb)(GenericDialog *, gpointer), gpointer data)
{
GtkWidget *vbox;
+ gint x, y, w, h;
+ GtkWidget *scrolled;
gd->auto_close = auto_close;
gd->data = data;
gd->cancel_cb = cancel_cb;
gd->dialog = window_new(GTK_WINDOW_TOPLEVEL, role, NULL, NULL, title);
+ DEBUG_NAME(gd->dialog);
gtk_window_set_type_hint(GTK_WINDOW(gd->dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
+ if (options->save_dialog_window_positions)
+ {
+ if (generic_dialog_find_window(title, role, &x, &y, &w, &h))
+ {
+ gtk_window_set_default_size(GTK_WINDOW(gd->dialog), w, h);
+ gtk_window_move(GTK_WINDOW(gd->dialog), x, y);
+ }
+ }
+
if (parent)
{
GtkWindow *window = NULL;
gtk_window_set_resizable(GTK_WINDOW(gd->dialog), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(gd->dialog), PREF_PAD_BORDER);
+ scrolled = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_propagate_natural_height(GTK_SCROLLED_WINDOW(scrolled), TRUE);
+ gtk_scrolled_window_set_propagate_natural_width(GTK_SCROLLED_WINDOW(scrolled), TRUE);
vbox = gtk_vbox_new(FALSE, PREF_PAD_BUTTON_SPACE);
- gtk_container_add(GTK_CONTAINER(gd->dialog), vbox);
+ gtk_container_add(GTK_CONTAINER(scrolled), vbox);
+ gtk_container_add(GTK_CONTAINER(gd->dialog), scrolled);
+ gtk_widget_show(scrolled);
gtk_widget_show(vbox);
gd->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
projects / geeqie.git / blobdiff