[Goodies-commits] r3030 - in ristretto/trunk: icons/16x16 icons/48x48 icons/scalable src
Stephan Arts
stephan at xfce.org
Tue Aug 21 23:36:06 CEST 2007
Author: stephan
Date: 2007-08-21 21:36:06 +0000 (Tue, 21 Aug 2007)
New Revision: 3030
Modified:
ristretto/trunk/icons/16x16/ristretto.png
ristretto/trunk/icons/48x48/ristretto.png
ristretto/trunk/icons/scalable/ristretto.svg
ristretto/trunk/src/thumbnail_viewer.c
Log:
fix thumbnailer issue (and update the icon)
Modified: ristretto/trunk/icons/16x16/ristretto.png
===================================================================
(Binary files differ)
Modified: ristretto/trunk/icons/48x48/ristretto.png
===================================================================
(Binary files differ)
Modified: ristretto/trunk/icons/scalable/ristretto.svg
===================================================================
--- ristretto/trunk/icons/scalable/ristretto.svg 2007-08-21 16:52:21 UTC (rev 3029)
+++ ristretto/trunk/icons/scalable/ristretto.svg 2007-08-21 21:36:06 UTC (rev 3030)
@@ -11,13 +11,17 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
+ inkscape:version="0.45"
width="48"
height="48"
- sodipodi:docbase="/home/stephan"
+ version="1.0"
+ sodipodi:docbase="/home/stephan/svn-repo/ristretto/trunk/icons/scalable"
sodipodi:docname="ristretto.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0">
+ inkscape:export-filename="/home/stephan/svn-repo/ristretto/trunk/icons/16x16/ristretto.png"
+ inkscape:export-xdpi="30"
+ inkscape:export-ydpi="30"
+ sodipodi:modified="TRUE">
<metadata
id="metadata7">
<rdf:RDF>
@@ -32,34 +36,35 @@
<defs
id="defs5">
<linearGradient
- id="linearGradient3139">
+ id="linearGradient3140">
<stop
- style="stop-color:#e9b96e;stop-opacity:1;"
+ style="stop-color:#000000;stop-opacity:0;"
offset="0"
- id="stop3141" />
+ id="stop3142" />
<stop
- id="stop3147"
+ id="stop4117"
offset="0.5"
- style="stop-color:#c17d11;stop-opacity:1;" />
+ style="stop-color:#000000;stop-opacity:0.4224599;" />
<stop
- style="stop-color:#e9b96e;stop-opacity:1;"
+ style="stop-color:#000000;stop-opacity:0;"
offset="1"
- id="stop3143" />
+ id="stop3144" />
</linearGradient>
- <linearGradient
+ <radialGradient
inkscape:collect="always"
- xlink:href="#linearGradient3139"
- id="linearGradient3145"
- x1="0.051364001"
- y1="24.000006"
- x2="47.948635"
- y2="24.000006"
+ xlink:href="#linearGradient3140"
+ id="radialGradient7086"
gradientUnits="userSpaceOnUse"
- spreadMethod="pad" />
+ gradientTransform="matrix(1.8385456,3.8898335e-2,-1.774223e-2,1.2926432,-324.48363,-275.08499)"
+ cx="401.91992"
+ cy="707.04498"
+ fx="401.91992"
+ fy="707.04498"
+ r="139.39044" />
</defs>
<sodipodi:namedview
- inkscape:window-height="601"
- inkscape:window-width="822"
+ inkscape:window-height="703"
+ inkscape:window-width="1280"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
@@ -69,59 +74,49 @@
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
- showguides="true"
- inkscape:guide-bbox="true"
+ width="48px"
+ height="48px"
inkscape:zoom="1"
inkscape:cx="24"
inkscape:cy="24"
- inkscape:window-x="456"
- inkscape:window-y="136"
- inkscape:current-layer="svg2"
- width="48px"
- height="48px" />
- <g
- id="g3151">
- <path
- sodipodi:nodetypes="cccssccszcc"
- id="path2167"
- d="M 47.448637,13.60159 L 47.448637,38.14797 C 42.043457,35.24763 37.814297,34.29941 34.594287,34.29941 C 28.446997,34.29941 25.971627,37.76268 23.999997,37.81219 C 22.02837,37.86169 19.553005,34.39842 13.405712,34.39842 C 10.185701,34.39842 5.956544,35.34664 0.551364,38.24698 L 0.551364,13.7006 C 5.956545,10.80026 10.185701,9.85205 13.405712,9.85205 C 19.553005,9.85205 22.02837,13.31532 23.999997,13.26581 C 25.971637,13.2163 28.446997,9.75303 34.594287,9.75303 C 37.814297,9.75303 42.043457,10.70125 47.448637,13.60159 z "
- style="fill:url(#linearGradient3145);fill-opacity:1.0;fill-rule:evenodd;stroke:#8f5902;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- inkscape:transform-center-y="-13.920135"
- transform="matrix(0.9316459,0.3633675,-0.5061119,0.8624678,0,0)"
- y="9.6101084"
- x="12.986882"
- height="9.2001715"
- width="7.0004215"
- id="rect3160"
- style="fill:#729fcf;fill-opacity:1;stroke:#ffffff;stroke-width:1.00635028;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- transform="matrix(0.9836874,0.1798865,0,1,0,0)"
- y="17.703917"
- x="13.954771"
- height="12.157635"
- width="7.6807351"
- id="rect4131"
- style="fill:#4e9a0a;fill-opacity:1;stroke:#ffffff;stroke-width:1.00825751;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- transform="matrix(0.9707305,-0.2401712,0,1,0,0)"
- y="21.961527"
- x="27.589554"
- height="7.2316227"
- width="9.0595131"
- id="rect4133"
- style="fill:#f57900;fill-opacity:1;stroke:#ffffff;stroke-width:1.0149641;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- transform="matrix(0.9807924,0.1950546,0,1,0,0)"
- y="16.734434"
- x="36.028934"
- height="7.5044503"
- width="10.290956"
- id="rect4135"
- style="fill:#edd400;fill-opacity:1;stroke:#ffffff;stroke-width:1.00974441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- id="path5124"
- d="M 23.892367,13.15301 L 23.892367,37.31453"
- style="fill:none;fill-rule:evenodd;stroke:#8f5902;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- </g>
+ inkscape:window-x="0"
+ inkscape:window-y="32"
+ inkscape:current-layer="svg2" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#e6e6e6;fill-opacity:1;stroke:#666666;stroke-width:10.14638519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path2164"
+ sodipodi:cx="395.30356"
+ sodipodi:cy="691.78125"
+ sodipodi:rx="197.65178"
+ sodipodi:ry="325.85834"
+ d="M 592.95534,691.78125 A 197.65178,325.85834 0 0 1 197.65718,694.19028 L 395.30356,691.78125 z"
+ sodipodi:start="0"
+ sodipodi:end="3.1341997"
+ transform="matrix(9.9017785e-2,0,0,9.8098883e-2,-15.142351,-54.26156)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#ececec;fill-opacity:1;stroke:#666666;stroke-width:12.07019329;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path2159"
+ sodipodi:cx="372.60031"
+ sodipodi:cy="538.20044"
+ sodipodi:rx="204.32921"
+ sodipodi:ry="148.23883"
+ d="M 576.92952 538.20044 A 204.32921 148.23883 0 1 1 168.2711,538.20044 A 204.32921 148.23883 0 1 1 576.92952 538.20044 z"
+ transform="matrix(9.581905e-2,0,0,7.163408e-2,-11.702208,-25.50228)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#radialGradient7086);fill-opacity:1;stroke:#666666;stroke-width:9.3786726;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path2161"
+ sodipodi:cx="395.30356"
+ sodipodi:cy="540.8714"
+ sodipodi:rx="138.89044"
+ sodipodi:ry="94.819435"
+ d="M 534.194 540.8714 A 138.89044 94.819435 0 1 1 256.41312,540.8714 A 138.89044 94.819435 0 1 1 534.194 540.8714 z"
+ transform="matrix(0.1188065,0,0,9.5692311e-2,-22.964641,-37.79208)" />
+ <path
+ style="fill:#552200;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 16.263779,21.47417 C 25.518637,24.090024 32.902229,21.08114 32.902229,21.08114 C 32.902229,21.08114 24.910539,18.3299 16.263779,21.47417 z "
+ id="path3138"
+ sodipodi:nodetypes="ccc" />
</svg>
Modified: ristretto/trunk/src/thumbnail_viewer.c
===================================================================
--- ristretto/trunk/src/thumbnail_viewer.c 2007-08-21 16:52:21 UTC (rev 3029)
+++ ristretto/trunk/src/thumbnail_viewer.c 2007-08-21 21:36:06 UTC (rev 3030)
@@ -238,7 +238,7 @@
switch (viewer->priv->orientation)
{
case GTK_ORIENTATION_HORIZONTAL:
- end = widget->allocation.width / viewer->priv->dimension + begin;
+ end = widget->allocation.width / viewer->priv->dimension + begin + 1;
if (end > rstto_navigator_get_n_files(viewer->priv->navigator))
end = rstto_navigator_get_n_files(viewer->priv->navigator);
if (widget->allocation.width > (end * viewer->priv->dimension - viewer->priv->offset))
@@ -312,14 +312,20 @@
GDK_RGB_DITHER_NORMAL,
0, 0);
}
+
+ gint pixmap_offset = 0;
+ if (i == begin)
+ {
+ pixmap_offset = viewer->priv->offset - (begin * viewer->priv->dimension );
+ }
switch (viewer->priv->orientation)
{
case GTK_ORIENTATION_HORIZONTAL:
gdk_draw_drawable(GDK_DRAWABLE(widget->window),
gc,
pixmap,
- 0, 0,
- 16+(i*viewer->priv->dimension)-viewer->priv->offset,
+ pixmap_offset, 0,
+ 16 + ( i * viewer->priv->dimension) - viewer->priv->offset + pixmap_offset,
0,
-1,
-1);
@@ -329,9 +335,9 @@
gdk_draw_drawable(GDK_DRAWABLE(widget->window),
gc,
pixmap,
- 0, 0,
+ 0, pixmap_offset,
0,
- 16+(i*viewer->priv->dimension)-viewer->priv->offset,
+ 16 + ( i * viewer->priv->dimension) - viewer->priv->offset + pixmap_offset,
-1,
-1);
break;
More information about the Goodies-commits
mailing list