Option to display window ID

Additional Preferences/Windows option to show the window ID in the
titlebar. Off by default.

diff --git a/doc/docbook/GuideOptionsWindow.xml b/doc/docbook/GuideOptionsWindow.xml
index 9a0a384..b99c86a 100644 (file)
--- a/doc/docbook/GuideOptionsWindow.xml
+++ b/doc/docbook/GuideOptionsWindow.xml
@@ -69,6 +69,21 @@
         </listitem>\r
       </varlistentry>\r
     </variablelist>\r
+    <variablelist>\r
+      <varlistentry>\r
+        <term>\r
+          <guilabel>Show window IDs</guilabel>\r
+        </term>\r
+        <listitem>\r
+          <para>\r
+            Show the window ID in the titlebar of each window. When multiple Geeqie windows are opened, this option shows a unique identifier for each window. It may be used in conjunction with the command line option:\r
+            <link linkend="Remotecommands">\r
+              <programlisting>--remote --id:&lt;ID&gt;</programlisting>\r
+            </link>\r
+          </para>\r
+        </listitem>\r
+      </varlistentry>\r
+    </variablelist>\r
   </section>\r
   <section id="Size">\r
     <title>Size</title>\r

diff --git a/src/image.c b/src/image.c
index 941b2d6..4ad1cd6 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -210,7 +210,7 @@ static void image_update_title(ImageWindow *imd)
                collection ? collection : "",
                imd->image_fd ? " - " : "",
                imd->title_right ? imd->title_right : "",
-               lw_ident ? lw_ident : ""
+               options->show_window_ids ? (lw_ident ? lw_ident : "") : ""
                );
        if (lw_ident)
                {

diff --git a/src/options.c b/src/options.c
index d972602..2fd5caa 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -59,7 +59,7 @@ ConfOptions *init_options(ConfOptions *options)
        options->save_window_positions = TRUE;
        options->use_saved_window_positions_for_new_windows = FALSE;
        options->tools_restore_state = TRUE;
-       options->save_dialog_window_positions = FALSE;
+       options->show_window_ids = FALSE;
 
        options->file_ops.confirm_delete = TRUE;
        options->file_ops.enable_delete_key = TRUE;

diff --git a/src/options.h b/src/options.h
index a119d81..6847ac7 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -57,6 +57,7 @@ struct _ConfOptions
        gboolean use_saved_window_positions_for_new_windows;
        gboolean tools_restore_state;
        gboolean save_dialog_window_positions;
+       gboolean show_window_ids;
 
        gint log_window_lines;
 

diff --git a/src/preferences.c b/src/preferences.c
index 3963c8b..3df77c1 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -256,6 +256,7 @@ static void config_window_apply(void)
        options->save_window_positions = c_options->save_window_positions;
        options->use_saved_window_positions_for_new_windows = c_options->use_saved_window_positions_for_new_windows;
        options->save_dialog_window_positions = c_options->save_dialog_window_positions;
+       options->show_window_ids = c_options->show_window_ids;
        options->image.scroll_reset_method = c_options->image.scroll_reset_method;
        options->image.zoom_2pass = c_options->image.zoom_2pass;
        options->image.fit_window_to_image = c_options->image.fit_window_to_image;
@@ -1806,6 +1807,9 @@ static void config_tab_windows(GtkWidget *notebook)
        pref_checkbox_new_int(group, _("Remember dialog window positions"),
                              options->save_dialog_window_positions, &c_options->save_dialog_window_positions);
 
+       pref_checkbox_new_int(group, _("Show window IDs"),
+                             options->show_window_ids, &c_options->show_window_ids);
+
        group = pref_group_new(vbox, FALSE, _("Size"), GTK_ORIENTATION_VERTICAL);
 
        pref_checkbox_new_int(group, _("Fit window to image when tools are hidden/floating"),

diff --git a/src/rcfile.c b/src/rcfile.c
index 7328f32..e0ccfd1 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -338,6 +338,7 @@ static void write_global_attributes(GString *outstr, gint indent)
        WRITE_NL(); WRITE_BOOL(*options, use_saved_window_positions_for_new_windows);
        WRITE_NL(); WRITE_BOOL(*options, tools_restore_state);
        WRITE_NL(); WRITE_BOOL(*options, save_dialog_window_positions);
+       WRITE_NL(); WRITE_BOOL(*options, show_window_ids);
 
        WRITE_NL(); WRITE_UINT(*options, log_window_lines);
        WRITE_NL(); WRITE_BOOL(*options, log_window.timer_data);
@@ -641,6 +642,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                if (READ_BOOL(*options, use_saved_window_positions_for_new_windows)) continue;
                if (READ_BOOL(*options, tools_restore_state)) continue;
                if (READ_BOOL(*options, save_dialog_window_positions)) continue;
+               if (READ_BOOL(*options, show_window_ids)) continue;
 
                if (READ_INT(*options, log_window_lines)) continue;
                if (READ_BOOL(*options, log_window.timer_data)) continue;

diff --git a/web/help/GuideOptionsWindow.html b/web/help/GuideOptionsWindow.html
index ee54442..e988776 100644 (file)
--- a/web/help/GuideOptionsWindow.html
+++ b/web/help/GuideOptionsWindow.html
@@ -516,6 +516,19 @@ dd.answer div.label { float: left; }
           <p class="para block block-first">This will maintain dialog windows size and position between Geeqie sessions.</p>
         </dd>
 </dl></div>
+<div class="block list variablelist"><dl class="variablelist">
+<dt class="term dt-first">
+          <span class="guilabel">Show window IDs</span>
+        </dt>
+<dd>
+          <p class="para block block-first">
+            Show the window ID in the titlebar of each window. When multiple Geeqie windows are opened, this option shows a unique identifier for each window. It may be used in conjunction with the command line option:
+            <a class="link" href="GuideReferenceCommandLine.html#Remotecommands" title="Remote commands">
+              <div dir="ltr" class=" block programlisting block-indent block-first"><pre class="programlisting">--remote --id:&lt;ID&gt;</pre></div>
+            </a>
+          </p>
+        </dd>
+</dl></div>
 </div>
 <div class="division section">
 <a name="Size"></a><div class="header"><h2 class="section title"><span class="title"><span class="label">11.3.2. </span>Size</span></h2></div>