Simplify and unify gtk_window creation with the help of

the new window_new() function, that wraps gtk_window_new()
call.
Subclass, title and icon are set in the same call.

diff --git a/src/collect.c b/src/collect.c
index 9f9c0bf..d259df6 100644 (file)
--- a/src/collect.c
+++ b/src/collect.c
@@ -1162,8 +1162,7 @@ CollectWindow *collection_window_new(const gchar *path)
 
        cw->cd = collection_new(path);
 
-       cw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       window_set_icon(cw->window, PIXBUF_INLINE_ICON_BOOK, NULL);
+       cw->window = window_new(GTK_WINDOW_TOPLEVEL, "collection", PIXBUF_INLINE_ICON_BOOK, NULL, NULL);
 
        geometry.min_width = 32;
        geometry.min_height = 32;
@@ -1185,7 +1184,6 @@ CollectWindow *collection_window_new(const gchar *path)
 
        gtk_window_set_resizable(GTK_WINDOW(cw->window), TRUE);
        collection_window_update_title(cw);
-       gtk_window_set_wmclass(GTK_WINDOW(cw->window), "collection", GQ_WMCLASS);
        gtk_container_set_border_width (GTK_CONTAINER (cw->window), 0);
 
        g_signal_connect(G_OBJECT(cw->window), "delete_event",

diff --git a/src/dupe.c b/src/dupe.c
index 3a6aad8..f3bd9dc 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -3103,9 +3103,8 @@ DupeWindow *dupe_window_new(DupeMatchType match_mask)
 
        dw->second_set = FALSE;
 
-       dw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-        window_set_icon(dw->window, NULL, NULL);
-
+       dw->window = window_new(GTK_WINDOW_TOPLEVEL, "dupe", NULL, NULL, _("Find duplicates"));
+      
        geometry.min_width = 32;
        geometry.min_height = 32;
        geometry.base_width = DUPE_DEF_WIDTH;
@@ -3116,12 +3115,6 @@ DupeWindow *dupe_window_new(DupeMatchType match_mask)
        gtk_window_set_default_size(GTK_WINDOW(dw->window), DUPE_DEF_WIDTH, DUPE_DEF_HEIGHT);
 
        gtk_window_set_resizable(GTK_WINDOW(dw->window), TRUE);
-       {
-       gchar *title = g_strdup_printf("%s - %s", _("Find duplicates"), GQ_APPNAME);
-       gtk_window_set_title(GTK_WINDOW(dw->window), title);
-       g_free(title);
-       }
-        gtk_window_set_wmclass(GTK_WINDOW(dw->window), "dupe", GQ_WMCLASS);
         gtk_container_set_border_width (GTK_CONTAINER (dw->window), 0);
 
         g_signal_connect(G_OBJECT(dw->window), "delete_event",

diff --git a/src/fullscreen.c b/src/fullscreen.c
index 53c1c71..65387ed 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -238,8 +238,7 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
        fullscreen_prefs_get_geometry(fullscreen_screen, window, &x, &y, &w, &h,
                                      &screen, &same);
 
-       fs->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_wmclass(GTK_WINDOW(fs->window), "fullscreen", GQ_WMCLASS);
+       fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen"));
 
        /* this requests no decorations, if you still have them complain to the window manager author(s) */
        gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
@@ -264,12 +263,6 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
        g_signal_connect(G_OBJECT(fs->window), "delete_event",
                         G_CALLBACK(fullscreen_delete_cb), fs);
 
-       {
-       gchar *title = g_strdup_printf("%s - %s", _("Full screen"), GQ_APPNAME);
-       gtk_window_set_title(GTK_WINDOW(fs->window), title);
-       g_free(title);
-       }
-
        geometry.min_width = w;
        geometry.min_height = h;
        geometry.max_width = w;

diff --git a/src/img-view.c b/src/img-view.c
index 69c8660..32dbd79 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -844,19 +844,15 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
        vw->list = NULL;
        vw->list_pointer = NULL;
 
-       vw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL);
 
        geometry.min_width = 8;
        geometry.min_height = 8;
        gtk_window_set_geometry_hints(GTK_WINDOW(vw->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
 
        gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE);
-       gtk_window_set_title (GTK_WINDOW(vw->window), GQ_APPNAME);
-        gtk_window_set_wmclass(GTK_WINDOW(vw->window), "view", GQ_WMCLASS);
         gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0);
 
-       window_set_icon(vw->window, PIXBUF_INLINE_ICON_VIEW, NULL);
-
        vw->imd = image_new(FALSE);
 
        image_background_set_color(vw->imd, user_specified_window_background ? &window_background_color : NULL);

diff --git a/src/info.c b/src/info.c
index dfb61c6..3594a4a 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -775,17 +775,10 @@ void info_window_new(FileData *fd, GList *list)
        id->fd = (FileData *)id->list->data;
        id->updated = FALSE;
 
-       id->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       id->window = window_new(GTK_WINDOW_TOPLEVEL, "properties", NULL, NULL, _("Image properties"));
        gtk_window_set_type_hint(GTK_WINDOW(id->window), GDK_WINDOW_TYPE_HINT_DIALOG);
-       window_set_icon(id->window, NULL, NULL);
 
        gtk_window_set_resizable(GTK_WINDOW(id->window), TRUE);
-       {
-       gchar *title = g_strdup_printf("%s - %s", _("Image properties"), GQ_APPNAME); 
-       gtk_window_set_title(GTK_WINDOW(id->window), title);
-       g_free(title);
-       }
-       gtk_window_set_wmclass(GTK_WINDOW(id->window), "properties", GQ_WMCLASS);
 
        geometry.min_width = 32;
        geometry.min_height = 32;

diff --git a/src/layout.c b/src/layout.c
index 3a519f8..b294c24 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1317,7 +1317,7 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
                GdkGeometry geometry;
                GdkWindowHints hints;
 
-               lw->tools = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+               lw->tools = window_new(GTK_WINDOW_TOPLEVEL, "tools", PIXBUF_INLINE_ICON_TOOLS, NULL, _("Tools"));
                g_signal_connect(G_OBJECT(lw->tools), "delete_event",
                                 G_CALLBACK(layout_tools_delete_cb), lw);
                layout_keyboard_init(lw, lw->tools);
@@ -1340,16 +1340,8 @@ static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *fi
 
 
                gtk_window_set_resizable(GTK_WINDOW(lw->tools), TRUE);
-               {
-               gchar *title = g_strdup_printf("%s - %s", _("Tools"), GQ_APPNAME);
-               gtk_window_set_title(GTK_WINDOW(lw->tools), title);
-               g_free(title);
-               }
-               gtk_window_set_wmclass(GTK_WINDOW(lw->tools), "tools", GQ_WMCLASS);
                gtk_container_set_border_width(GTK_CONTAINER(lw->tools), 0);
-
-               window_set_icon(lw->tools, PIXBUF_INLINE_ICON_TOOLS, NULL);
-
+       
                new_window = TRUE;
                }
        else
@@ -1930,15 +1922,10 @@ LayoutWindow *layout_new_with_geometry(const gchar *path, gint popped, gint hidd
 
        /* window */
 
-       lw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       lw->window = window_new(GTK_WINDOW_TOPLEVEL, GQ_WMCLASS, NULL, NULL, NULL);
        gtk_window_set_resizable(GTK_WINDOW(lw->window), TRUE);
-
-       gtk_window_set_title(GTK_WINDOW(lw->window), GQ_APPNAME);
-       gtk_window_set_wmclass(GTK_WINDOW(lw->window), GQ_WMCLASS, GQ_WMCLASS);
        gtk_container_set_border_width(GTK_CONTAINER(lw->window), 0);
 
-       window_set_icon(lw->window, NULL, NULL);
-
        if (save_window_positions)
                {
                hint_mask = GDK_HINT_USER_POS;

diff --git a/src/main.c b/src/main.c
index c4f5b80..b2fe233 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -52,6 +52,34 @@ static CollectionData *command_collection = NULL;
  *-----------------------------------------------------------------------------
  */ 
 
+GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+                     const gchar *icon_file, const gchar *subtitle)
+{
+       gchar *title;
+       GtkWidget *window;
+
+       window = gtk_window_new(type);
+       if (!window) return NULL;
+       
+       if (subtitle)
+               {
+               title = g_strdup_printf("%s - %s", subtitle, GQ_APPNAME);
+               }
+       else
+               {
+               title = g_strdup_printf("%s", GQ_APPNAME);
+               }
+       
+       gtk_window_set_title(GTK_WINDOW(window), title);
+       g_free(title);
+
+       window_set_icon(window, icon, icon_file);
+       gtk_window_set_role(GTK_WINDOW(window), name);
+       gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS);
+
+       return window;
+}
+
 void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file)
 {
        if (!icon && !file) icon = PIXBUF_INLINE_ICON;

diff --git a/src/main.h b/src/main.h
index 1511822..8a5608c 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -243,6 +243,8 @@ extern gint color_profile_use_image;
  * This also doubles as the main.c header.
  */
 
+GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+                     const gchar *icon_file, const gchar *subtitle);
 void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file);
 gint window_maximized(GtkWidget *window);
 

diff --git a/src/pan-view.c b/src/pan-view.c
index be1f3a6..ef4b464 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -2354,24 +2354,15 @@ static void pan_window_new_real(const gchar *path)
        pw->overlay_id = -1;
        pw->idle_id = -1;
 
-       pw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       pw->window = window_new(GTK_WINDOW_TOPLEVEL, "panview", NULL, NULL, _("Pan View"));
 
        geometry.min_width = 8;
        geometry.min_height = 8;
        gtk_window_set_geometry_hints(GTK_WINDOW(pw->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
 
        gtk_window_set_resizable(GTK_WINDOW(pw->window), TRUE);
-
-       {
-       gchar *title = g_strdup_printf("%s - %s",  _("Pan View"), GQ_APPNAME);
-       gtk_window_set_title(GTK_WINDOW(pw->window), title);
-       g_free(title);
-       }
-        gtk_window_set_wmclass(GTK_WINDOW(pw->window), "view", GQ_WMCLASS);
         gtk_container_set_border_width(GTK_CONTAINER(pw->window), 0);
 
-       window_set_icon(pw->window, NULL, NULL);
-
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(pw->window), vbox);
        gtk_widget_show(vbox);

diff --git a/src/preferences.c b/src/preferences.c
index 95e1004..309efb6 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -1508,22 +1508,14 @@ static void config_window_create(void)
        GtkWidget *button;
        GtkWidget *ct_button;
 
-       configwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       configwindow = window_new(GTK_WINDOW_TOPLEVEL, "preferences", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Preferences"));
        gtk_window_set_type_hint(GTK_WINDOW(configwindow), GDK_WINDOW_TYPE_HINT_DIALOG);
        g_signal_connect(G_OBJECT (configwindow), "delete_event",
                         G_CALLBACK(config_window_delete), NULL);
        gtk_window_set_default_size(GTK_WINDOW(configwindow), CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT);                
        gtk_window_set_resizable(GTK_WINDOW(configwindow), TRUE);
-       {
-       gchar *title = g_strdup_printf("%s - %s", _("Preferences"), GQ_APPNAME);
-       gtk_window_set_title(GTK_WINDOW(configwindow), title);
-       g_free(title);
-       }
-       gtk_window_set_wmclass(GTK_WINDOW(configwindow), "config", GQ_WMCLASS);
        gtk_container_set_border_width(GTK_CONTAINER(configwindow), PREF_PAD_BORDER);
 
-       window_set_icon(configwindow, PIXBUF_INLINE_ICON_CONFIG, NULL);
-
        win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
        gtk_container_add(GTK_CONTAINER(configwindow), win_vbox);
        gtk_widget_show(win_vbox);
@@ -1639,17 +1631,11 @@ void show_about_window(void)
                return;
                }
 
-       about = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       about = window_new(GTK_WINDOW_TOPLEVEL, "about", NULL, NULL, _("About"));
        gtk_window_set_type_hint(GTK_WINDOW(about), GDK_WINDOW_TYPE_HINT_DIALOG);
-       gtk_window_set_wmclass(GTK_WINDOW(about), "about", GQ_WMCLASS);
        g_signal_connect(G_OBJECT(about), "delete_event",
                         G_CALLBACK(about_delete_cb), NULL);
 
-       {
-       gchar *title = g_strdup_printf("%s - %s", _("About"), GQ_APPNAME);
-       gtk_window_set_title(GTK_WINDOW(about), title);
-       g_free(title);
-       }
        gtk_container_set_border_width(GTK_CONTAINER(about), PREF_PAD_BORDER);
 
        vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
@@ -1694,7 +1680,6 @@ void show_about_window(void)
        gtk_widget_grab_default(button);
        gtk_widget_show(button);
 
-       window_set_icon(about, NULL, NULL);
        gtk_widget_show(about);
 }
 

diff --git a/src/search.c b/src/search.c
index d455ebb..0b68598 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -2552,16 +2552,9 @@ void search_new(const gchar *path, const gchar *example_file)
        sd->search_idle_id = -1;
        sd->update_idle_id = -1;
 
-       sd->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       window_set_icon(sd->window, NULL, NULL);
+       sd->window = window_new(GTK_WINDOW_TOPLEVEL, "search", NULL, NULL, _("Image search"));
 
        gtk_window_set_resizable(GTK_WINDOW(sd->window), TRUE);
-       {
-       gchar *title = g_strdup_printf("%s - %s", _("Image search"), GQ_APPNAME);
-       gtk_window_set_title(GTK_WINDOW(sd->window), title);
-       g_free(title);
-       }
-       gtk_window_set_wmclass(GTK_WINDOW(sd->window), "search", GQ_WMCLASS);
 
        geometry.min_width = 32;
        geometry.min_height = 32;

diff --git a/src/ui_help.c b/src/ui_help.c
index a816b9e..61bafd6 100644 (file)
--- a/src/ui_help.c
+++ b/src/ui_help.c
@@ -20,6 +20,7 @@
 
 #include <gtk/gtk.h>
 
+#include "main.h"
 #include "ui_help.h"
 
 #include "ui_fileops.h"
@@ -198,17 +199,13 @@ GtkWidget *help_window_new(const gchar *title,
 
        /* window */
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = window_new(GTK_WINDOW_TOPLEVEL, subclass, NULL, NULL, title);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 #if 0
        gtk_container_set_border_width(GTK_CONTAINER(window), PREF_PAD_BORDER);
 #endif
-       gtk_window_set_wmclass(GTK_WINDOW(window), subclass, wmclass);
-
        gtk_window_set_default_size(GTK_WINDOW(window), HELP_WINDOW_WIDTH, HELP_WINDOW_HEIGHT);
 
-       gtk_window_set_title(GTK_WINDOW(window), title);
-
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(help_window_delete_cb), NULL);
 

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index e4352d2..3d818a4 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -217,9 +217,9 @@ static void generic_dialog_setup(GenericDialog *gd,
        gd->data = data;
        gd->cancel_cb = cancel_cb;
 
-       gd->dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gd->dialog = window_new(GTK_WINDOW_TOPLEVEL, wmsubclass, NULL, NULL, title);
        gtk_window_set_type_hint(GTK_WINDOW(gd->dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
-       gtk_window_set_wmclass(GTK_WINDOW(gd->dialog), wmsubclass, wmclass);
+
        if (parent)
                {
                GtkWindow *window = NULL;
@@ -245,7 +245,6 @@ static void generic_dialog_setup(GenericDialog *gd,
                         G_CALLBACK(generic_dialog_key_press_cb), gd);
 
        gtk_window_set_resizable(GTK_WINDOW(gd->dialog), TRUE);
-       gtk_window_set_title(GTK_WINDOW (gd->dialog), title);
        gtk_container_set_border_width(GTK_CONTAINER(gd->dialog), PREF_PAD_BORDER);
 
        vbox = gtk_vbox_new(FALSE, PREF_PAD_BUTTON_SPACE);