? components/catalog-view/.libs
? components/image-viewer/.libs
? doc/gthumb-C.omf
? libgthumb/async-pixbuf-ops.lo
? libgthumb/bookmarks.lo
? libgthumb/catalog.lo
? libgthumb/comments.lo
? libgthumb/cursors.lo
? libgthumb/dlg-save-image.lo
? libgthumb/eel-canvas-rect.lo
? libgthumb/file-data.lo
? libgthumb/file-utils.lo
? libgthumb/gconf-utils.lo
? libgthumb/glib-utils.lo
? libgthumb/gnome-print-font-dialog.lo
? libgthumb/gnome-print-font-picker.lo
? libgthumb/gstringlist.lo
? libgthumb/gth-exif-utils.lo
? libgthumb/gth-file-list.lo
? libgthumb/gth-file-view-list.lo
? libgthumb/gth-file-view-thumbs.lo
? libgthumb/gth-file-view.lo
? libgthumb/gth-image-list.lo
? libgthumb/gth-iviewer.lo
? libgthumb/gth-nav-window.lo
? libgthumb/gth-pixbuf-op.lo
? libgthumb/gth-utils.lo
? libgthumb/gthumb-enum-types.lo
? libgthumb/gthumb-error.lo
? libgthumb/gthumb-histogram.lo
? libgthumb/gthumb-info-bar.lo
? libgthumb/gthumb-init.lo
? libgthumb/gthumb-marshal.lo
? libgthumb/gthumb-module.lo
? libgthumb/gthumb-slide.lo
? libgthumb/gthumb-stock.lo
? libgthumb/gtk-utils.lo
? libgthumb/image-loader.lo
? libgthumb/image-viewer.lo
? libgthumb/jpeg-utils.lo
? libgthumb/libgthumb.la
? libgthumb/md5.lo
? libgthumb/nav-window.lo
? libgthumb/pixbuf-utils.lo
? libgthumb/preferences.lo
? libgthumb/print-callbacks.lo
? libgthumb/progress-dialog.lo
? libgthumb/search.lo
? libgthumb/thumb-cache.lo
? libgthumb/thumb-loader.lo
? libgthumb/jpegutils/jpeg-data.lo
? libgthumb/jpegutils/jpeg-marker.lo
? libgthumb/jpegutils/jpegtran.lo
? libgthumb/jpegutils/libgthumb-jpegutils.la
? libgthumb/jpegutils/transupp.lo
? m4/intltool.m4
? po/stamp-it
? src/albumtheme-private.lo
? src/albumtheme.lo
? src/catalog-png-exporter.lo
? src/catalog-web-exporter.lo
? src/dlg-duplicates.lo
? src/dlg-jpegtran.lo
? src/dlg-photo-importer.lo
? src/dlg-png-exporter.lo
? src/dlg-search.lo
? src/dlg-web-exporter.lo
? src/libduplicates.la
? src/libjpegtran.la
? src/libphotoimporter.la
? src/libpngexporter.la
? src/libsearch.la
? src/libwebexporter.la
Index: data/albumthemes/BestFit/BestFit.css
===================================================================
RCS file: /cvs/gnome/gthumb/data/albumthemes/BestFit/BestFit.css,v
retrieving revision 1.1
diff -B -d -u -r1.1 BestFit.css
--- data/albumthemes/BestFit/BestFit.css	7 Nov 2006 20:41:55 -0000	1.1
+++ data/albumthemes/BestFit/BestFit.css	9 Nov 2006 07:10:17 -0000
@@ -1,7 +1,7 @@
 /*************************************************
-* pictureview.css
-* Copyright (c) Rennie deGraaf, 2005.  All rights reserved.
-* $Id: BestFit.css,v 1.1 2006/11/07 20:41:55 mjc Exp $
+* BestFit.css
+* Copyright (C) 2005-2006 Free Software Foundation, Inc.
+* $Id: BestFit.css 9 2005-10-21 06:39:05Z degraaf $
 *
 * Stylesheet for DHTML photo album template
 *
@@ -151,7 +151,7 @@
   top: -50%; /* needs to be 50% of the height of the minimum bounding box */
 }
 
-div.caption {
+div.caption, table.caption {
   padding: 1ex;
   font-size: 12pt;
   line-height: 12pt;
Index: data/albumthemes/BestFit/BestFit.js
===================================================================
RCS file: /cvs/gnome/gthumb/data/albumthemes/BestFit/BestFit.js,v
retrieving revision 1.1
diff -B -d -u -r1.1 BestFit.js
--- data/albumthemes/BestFit/BestFit.js	7 Nov 2006 20:41:55 -0000	1.1
+++ data/albumthemes/BestFit/BestFit.js	9 Nov 2006 07:10:17 -0000
@@ -1,7 +1,7 @@
 /*************************************************
 * BestFit.js
-* Copyright (c) Rennie deGraaf, 2005.  All rights reserved.
-* $Id: BestFit.js,v 1.1 2006/11/07 20:41:55 mjc Exp $
+* Copyright (C) 2005-2006 Free Software Foundation, Inc.
+* $Id: BestFit.js 9 2005-10-21 06:39:05Z degraaf $
 *
 * Scripts for DHTML photo album template
 * The script in this file runs every time the page is reloaded or resized, and
@@ -84,6 +84,14 @@
         // constrained by height
         image.height = Math.min(panelHeight, imageHeight);
         image.width = Math.min((imageWidth*panelHeight/imageHeight), imageWidth);
+    }
+
+    // adjust right column if there's space
+    propertyWidth = getObjWidth(document.getElementById("propertyPanel"));
+    tableWidth = getObjWidth(document.getElementById("propertyTable")) + getHBorder(document.getElementById("propertyTable"));
+    if ((tableWidth > propertyWidth) && (image.width+(tableWidth-propertyWidth) < panelWidth))
+    {
+        setProperty(document.getElementById("propertyPanel"), "width", tableWidth+"px");
     }
 }
 
Index: data/albumthemes/BestFit/image.gthtml
===================================================================
RCS file: /cvs/gnome/gthumb/data/albumthemes/BestFit/image.gthtml,v
retrieving revision 1.1
diff -B -d -u -r1.1 image.gthtml
--- data/albumthemes/BestFit/image.gthtml	7 Nov 2006 20:41:55 -0000	1.1
+++ data/albumthemes/BestFit/image.gthtml	9 Nov 2006 07:10:17 -0000
@@ -3,8 +3,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <!--
  index.ghtml
- Copyright (c) Rennie deGraaf, 2005.  All rights reserved.
- $Id: image.gthtml,v 1.1 2006/11/07 20:41:55 mjc Exp $
+ Copyright (C) 2005-2006 Free Software Foundation, Inc.
+ $Id: image.gthtml 9 2005-10-21 06:39:05Z degraaf $
  
  DHTML photo album template for use with gthumb - photo preview page
 -->
@@ -140,130 +140,126 @@
     </div>
     
     <div id="propertyPanel">
-      <!-- Image properties -->
       <gthumb:if "file_name_visibility_image || image_dim_visibility_image 
         || file_size_visibility_image || exif_date_time_visibility_image
         || exif_exposure_time_visibility_image || exif_exposure_mode_visibility_image
         || exif_flash_visibility_image || exif_shutter_speed_visibility_image
         || exif_aperture_value_visibility_image || exif_focal_length_visibility_image
         || exif_camera_model_visibility_image" />
-        <div class="caption">
-          <!--Image properties-->
-          <table>
-            <col width="0*" />
-            <col width="100%" />
-            <gthumb:if "file_name_visibility_image"/>
-              <tr>
-                <td>
-                  <span class="property"><gthumb:text>Image</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:file_name/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "image_dim_visibility_image"/>
-              <tr>
-                <td>
-                  <span class="property"><gthumb:text>Dimensions</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:image_dim/> <gthumb:text>pixels</gthumb:text>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "file_size_visibility_image"/>
-              <tr>
-                <td>
-                  <span class="property"><gthumb:text>Bytes</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:file_size/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_date_time_visibility_image"/>
-              <tr>
-                <td>
-                  <span class="property"><gthumb:text>Date</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:date_time/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_exposure_time_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Exposure time</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:exposure_time/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_exposure_mode_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Exposure mode</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:exposure_mode/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_flash_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Flash</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:flash/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_shutter_speed_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Shutter speed</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:shutter_speed/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_aperture_value_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Aperture value</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:aperture_value/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_focal_length_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Focal length</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:focal_length/>
-                </td>
-              </tr>
-            <gthumb:end/>
-            <gthumb:if "exif_camera_model_visibility_image"/>
-              <tr align="left">
-                <td>
-                  <span class="property"><gthumb:text>Camera model</gthumb:text></span>
-                </td>
-                <td>
-                  <gthumb:exif:camera_model/>
-                </td>
-              </tr>
-            <gthumb:end/>
-          </table>
-        </div>
+        <table class="caption" id="propertyTable">
+          <col width="0*" />
+          <col width="100%" />
+          <gthumb:if "file_name_visibility_image"/>
+            <tr>
+              <td>
+                <span class="property"><gthumb:text>Image</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:file_name/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "image_dim_visibility_image"/>
+            <tr>
+              <td>
+                <span class="property"><gthumb:text>Dimensions</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:image_dim/> <gthumb:text>pixels</gthumb:text>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "file_size_visibility_image"/>
+            <tr>
+              <td>
+                <span class="property"><gthumb:text>Bytes</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:file_size/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_date_time_visibility_image"/>
+            <tr>
+              <td>
+                <span class="property"><gthumb:text>Date</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:date_time/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_exposure_time_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Exposure time</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:exposure_time/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_exposure_mode_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Exposure mode</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:exposure_mode/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_flash_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Flash</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:flash/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_shutter_speed_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Shutter speed</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:shutter_speed/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_aperture_value_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Aperture value</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:aperture_value/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_focal_length_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Focal length</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:focal_length/>
+              </td>
+            </tr>
+          <gthumb:end/>
+          <gthumb:if "exif_camera_model_visibility_image"/>
+            <tr align="left">
+              <td>
+                <span class="property"><gthumb:text>Camera model</gthumb:text></span>
+              </td>
+              <td>
+                <gthumb:exif:camera_model/>
+              </td>
+            </tr>
+          <gthumb:end/>
+        </table>
       <gthumb:end/>
     </div>
     
Index: data/albumthemes/BestFit/index.gthtml
===================================================================
RCS file: /cvs/gnome/gthumb/data/albumthemes/BestFit/index.gthtml,v
retrieving revision 1.1
diff -B -d -u -r1.1 index.gthtml
--- data/albumthemes/BestFit/index.gthtml	7 Nov 2006 20:41:55 -0000	1.1
+++ data/albumthemes/BestFit/index.gthtml	9 Nov 2006 07:10:17 -0000
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <!--
  index.ghtml
- Copyright (c) Rennie deGraaf, 2005.  All rights reserved.
+ Copyright (C) 2005-2006 Free Software Foundation, Inc.
  $Id: index.gthtml,v 1.1 2006/11/07 20:41:55 mjc Exp $
  
  DHTML photo album template for use with gthumb - thumbnail index page
Index: data/albumthemes/BestFit/index.js
===================================================================
RCS file: /cvs/gnome/gthumb/data/albumthemes/BestFit/index.js,v
retrieving revision 1.1
diff -B -d -u -r1.1 index.js
--- data/albumthemes/BestFit/index.js	7 Nov 2006 20:41:55 -0000	1.1
+++ data/albumthemes/BestFit/index.js	9 Nov 2006 07:10:17 -0000
@@ -1,6 +1,6 @@
 /*************************************************
 * index.js
-* Copyright (c) Rennie deGraaf, 2005.  All rights reserved.
+* Copyright (C) 2005-2006 Free Software Foundation, Inc.
 * $Id: index.js,v 1.1 2006/11/07 20:41:55 mjc Exp $
 *
 * Scripts for DHTML photo album template index page
Index: data/albumthemes/BestFit/lib.js
===================================================================
RCS file: /cvs/gnome/gthumb/data/albumthemes/BestFit/lib.js,v
retrieving revision 1.1
diff -B -d -u -r1.1 lib.js
--- data/albumthemes/BestFit/lib.js	7 Nov 2006 20:41:55 -0000	1.1
+++ data/albumthemes/BestFit/lib.js	9 Nov 2006 07:10:18 -0000
@@ -1,6 +1,6 @@
 /*************************************************
 * lib.js
-* Copyright (c) Rennie deGraaf, 2005.  All rights reserved.
+* Copyright (C) 2005-2006 Free Software Foundation, Inc.
 * $Id: lib.js,v 1.1 2006/11/07 20:41:55 mjc Exp $
 *
 * Scripts for DHTML photo album template
