Mercurial > hg > forks > geeqie

changeset 2740:808983eb036e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Option to display window ID Additional Preferences/Windows option to show the window ID in the titlebar. Off by default.
author Colin Clark <colin.clark@cclark.uk>
date Tue, 03 Apr 2018 12:41:35 +0100
parents a03b5446e68f
children fa71e9331b53
files doc/docbook/GuideOptionsWindow.xml src/image.c src/options.c src/options.h src/preferences.c src/rcfile.c web/help/GuideOptionsWindow.html
diffstat 7 files changed, 37 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/doc/docbook/GuideOptionsWindow.xml	Sun Apr 01 11:36:20 2018 +0100
+++ b/doc/docbook/GuideOptionsWindow.xml	Tue Apr 03 12:41:35 2018 +0100
@@ -69,6 +69,21 @@
         </listitem>
       </varlistentry>
     </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <guilabel>Show window IDs</guilabel>
+        </term>
+        <listitem>
+          <para>
+            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:
+            <link linkend="Remotecommands">
+              <programlisting>--remote --id:&lt;ID&gt;</programlisting>
+            </link>
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
   </section>
   <section id="Size">
     <title>Size</title>
--- a/src/image.c	Sun Apr 01 11:36:20 2018 +0100
+++ b/src/image.c	Tue Apr 03 12:41:35 2018 +0100
@@ -210,7 +210,7 @@
 		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)
 		{
--- a/src/options.c	Sun Apr 01 11:36:20 2018 +0100
+++ b/src/options.c	Tue Apr 03 12:41:35 2018 +0100
@@ -59,7 +59,7 @@
 	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;
--- a/src/options.h	Sun Apr 01 11:36:20 2018 +0100
+++ b/src/options.h	Tue Apr 03 12:41:35 2018 +0100
@@ -57,6 +57,7 @@
 	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;
 
--- a/src/preferences.c	Sun Apr 01 11:36:20 2018 +0100
+++ b/src/preferences.c	Tue Apr 03 12:41:35 2018 +0100
@@ -256,6 +256,7 @@
 	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 @@
 	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"),
--- a/src/rcfile.c	Sun Apr 01 11:36:20 2018 +0100
+++ b/src/rcfile.c	Tue Apr 03 12:41:35 2018 +0100
@@ -338,6 +338,7 @@
 	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 @@
 		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;
--- a/web/help/GuideOptionsWindow.html	Sun Apr 01 11:36:20 2018 +0100
+++ b/web/help/GuideOptionsWindow.html	Tue Apr 03 12:41:35 2018 +0100
@@ -516,6 +516,19 @@
           <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>