Mercurial > hg > forks > geeqie

changeset 2730:45f1c76fd78b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 01 Mar 2018 22:57:28 +0200
parents 3c7dec71d9a2 (current diff) 92c66393fce2 (diff)
children 28978fd4c263
files
diffstat 5 files changed, 44 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/doc/docbook/GuideReferencePixbufLoaders.xml	Mon Feb 05 18:21:33 2018 +0200
+++ b/doc/docbook/GuideReferencePixbufLoaders.xml	Thu Mar 01 22:57:28 2018 +0200
@@ -16,6 +16,18 @@
     <para>
       <programlisting>https://github.com/aruiz/webp-pixbuf-loader</programlisting>
     </para>
+    <para>
+      Example installation script:
+      <programlisting>
+        sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libwebp-dev
+        wget https://github.com/aruiz/webp-pixbuf-loader/archive/master.zip
+        unzip master.zip
+        cd webp-pixbuf-loader-master
+        ./waf configure
+        ./waf build
+        sudo ./waf install
+      </programlisting>
+    </para>
     <para />
   </section>
   <section id="xcf">
--- a/src/layout_util.c	Mon Feb 05 18:21:33 2018 +0200
+++ b/src/layout_util.c	Thu Mar 01 22:57:28 2018 +0200
@@ -477,6 +477,7 @@
 	gint run_result;
 	GenericDialog *gd;
 	GString *message;
+	int cmdstatus;
 
 	if (!layout_valid(&lw)) return;
 
@@ -511,7 +512,8 @@
 		rotation = g_strdup_printf("%d", fd_n->user_orientation);
 		command = g_strconcat(GQ_BIN_DIR, "/geeqie-rotate -r ", rotation,
 								keep_date ? " -t \"" : " \"", fd_n->path, "\"", NULL);
-		run_result = WEXITSTATUS(runcmd(command));
+		cmdstatus = runcmd(command);
+		run_result = WEXITSTATUS(cmdstatus);
 		if (!run_result)
 			{
 			fd_n->user_orientation = 0;
--- a/web/help/GuideOptionsWindow.html	Mon Feb 05 18:21:33 2018 +0200
+++ b/web/help/GuideOptionsWindow.html	Thu Mar 01 22:57:28 2018 +0200
@@ -508,6 +508,14 @@
           </p>
         </dd>
 </dl></div>
+<div class="block list variablelist"><dl class="variablelist">
+<dt class="term dt-first">
+          <span class="guilabel">Remember dialog window positions</span>
+        </dt>
+<dd>
+          <p class="para block block-first">This will maintain dialog windows size and position between Geeqie sessions.</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>
@@ -624,14 +632,18 @@
 <td class="td-rowsep">JPEG image comment</td>
 </tr>
 <tr class="tr-shade">
+<td class="td-colsep td-rowsep">rating</td>
+<td class="td-rowsep">Image rating</td>
+</tr>
+<tr>
 <td class="td-colsep td-rowsep">&lt;meta_tag&gt;</td>
 <td class="td-rowsep">The Exif, XMP, or IPTC tag from metadata</td>
 </tr>
-<tr>
+<tr class="tr-shade">
 <td class="td-colsep td-rowsep">lua/&lt;lua_script&gt;/</td>
 <td class="td-rowsep">The output of a Lua script file</td>
 </tr>
-<tr class="tr-shade">
+<tr>
 <td class="td-colsep">lua//&lt;lua_command&gt;</td>
 <td>The output of a Lua command</td>
 </tr>
--- a/web/help/GuideReferencePixbufLoaders.html	Mon Feb 05 18:21:33 2018 +0200
+++ b/web/help/GuideReferencePixbufLoaders.html	Thu Mar 01 22:57:28 2018 +0200
@@ -493,6 +493,17 @@
 <p class="para block block-first">
       <div dir="ltr" class=" block programlisting block-indent block-first"><pre class="programlisting">https://github.com/aruiz/webp-pixbuf-loader</pre></div>
     </p>
+<p class="para block">
+      Example installation script:
+      <div dir="ltr" class=" block programlisting block-indent block-first"><pre class="programlisting">        sudo apt-get install libglib2.0-dev libgdk-pixbuf2.0-dev libwebp-dev
+        wget https://github.com/aruiz/webp-pixbuf-loader/archive/master.zip
+        unzip master.zip
+        cd webp-pixbuf-loader-master
+        ./waf configure
+        ./waf build
+        sudo ./waf install
+      </pre></div>
+    </p>
 <p class="para block"></p>
 </div>
 <div class="division section">
--- a/web/help/GuideReferenceSupportedFormats.html	Mon Feb 05 18:21:33 2018 +0200
+++ b/web/help/GuideReferenceSupportedFormats.html	Thu Mar 01 22:57:28 2018 +0200
@@ -464,6 +464,10 @@
     <a class="link" href="GuideReferencePixbufLoaders.html" title="Additional pixbuf loaders">Additional pixbuf loaders</a>
     for additional information.
   </p>
+<p class="para block">
+    Preview and thumbnails of video clips can be displayed. Clips can be run via a defined external program - see
+    <a class="link" href="GuideOptionsBehavior.html#Behaviour" title="Behavior">Play video by left click on image</a>.
+  </p>
 </div></div>
 <div class="navbar navbar-bottom"><table class="navbar"><tr>
 <td class="navbar-prev"><a class="navbar-prev" href="GuideReferenceXmpExif.html" title="XMP, Exif and IPTC">XMP, Exif and IPTC</a></td>