[Thunar-workers] CVS: design/ui fallback.svg, NONE, 1.1 ChangeLog, 1.14, 1.15 ThunarMimeDatabase.py, 1.1, 1.2

Benedikt Meurer benny at xfce.org
Fri Mar 4 22:16:53 CET 2005


Update of /var/cvs/thunar/design/ui
In directory espresso.foo-projects.org:/tmp/cvs-serv25782

Modified Files:
	ChangeLog ThunarMimeDatabase.py 
Added Files:
	fallback.svg 
Log Message:
2005-03-04	Benedikt Meurer <benny at xfce.org>

	* fallback.svg, ThunarMimeDatabase.py: Add fallback icon, so people
	  with broken icon themes can still run the file manager. Check
	  standard mime-application:octect-stream before checking for the
	  GNOME fallback.




--- NEW FILE: fallback.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   id="svg1"
   sodipodi:version="0.32"
   inkscape:version="0.38.1"
   width="128.00000pt"
   height="128.00000pt"
   sodipodi:docbase="/usr/share/icons/Fuzzy/scalable/stock"
   sodipodi:docname="stock_missing_image.svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs
     id="defs3">
    <linearGradient
       id="linearGradient566">
      <stop
         style="stop-color:#ffff00;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop567" />
      <stop
         style="stop-color:#ffd800;stop-opacity:1.0000000;"
         offset="0.43829629"
         id="stop854" />
      <stop
         style="stop-color:#ffb200;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop568" />
    </linearGradient>
    <linearGradient
       id="linearGradient860">
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop861" />
      <stop
         style="stop-color:#ffea7d;stop-opacity:1.0000000;"
         offset="0.25000000"
         id="stop862" />
      <stop
         style="stop-color:#ffbf00;stop-opacity:1.0000;"
         offset="1"
         id="stop863" />
    </linearGradient>
    <linearGradient
       xlink:href="#linearGradient566"
       id="linearGradient569"
       x1="0.48750001"
       y1="0.48387095"
       x2="0.96249998"
       y2="0.48387095"
       spreadMethod="reflect" />
    <linearGradient
       xlink:href="#linearGradient566"
       id="linearGradient589"
       x1="0.44374999"
       y1="0.046875000"
       x2="0.44374999"
       y2="0.57812500"
       spreadMethod="reflect" />
    <linearGradient
       id="linearGradient849">
      <stop
         style="stop-color:#ffc900;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop850" />
      <stop
         style="stop-color:#5d5d5c;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop851" />
    </linearGradient>
    <linearGradient
       id="linearGradient843">
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop844" />
      <stop
         style="stop-color:#5c5d5c;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop845" />
    </linearGradient>
    <linearGradient
       id="linearGradient838">
      <stop
         style="stop-color:#ffd000;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop839" />
      <stop
         style="stop-color:#5c5d5c;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop840" />
    </linearGradient>
    <linearGradient
       xlink:href="#linearGradient838"
       id="linearGradient841"
       x1="0.35333332"
       y1="0.35135135"
       x2="0.47999999"
       y2="0.049549550" />
    <linearGradient
       xlink:href="#linearGradient843"
       id="linearGradient842"
       x1="0.80165291"
       y1="0.15765765"
       x2="0.43801653"
       y2="0.72522521" />
    <linearGradient
       xlink:href="#linearGradient849"
       id="linearGradient847"
       x1="0.53358209"
       y1="0.50450450"
       x2="0.33208954"
       y2="0.24324325" />
    <radialGradient
       xlink:href="#linearGradient566"
       id="radialGradient853"
       cx="0.32499999"
       cy="0.33021805"
       r="0.54695481"
       fx="0.32187498"
       fy="0.33021802" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="3.8227960"
     inkscape:cx="63.999998"
     inkscape:cy="63.999998"
     inkscape:window-width="752"
     inkscape:window-height="906"
     showgrid="true"
     snaptogrid="true"
     gridspacingx="1.0000000mm"
     gridspacingy="1.0000000mm"
     inkscape:window-x="74"
     inkscape:window-y="31" />
  <rect
     style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:10.000000;stroke-dasharray:none;"
     id="rect849"
     width="142.24673"
     height="145.27559"
     ry="23.300505"
     x="9.0634740"
     y="7.6377954" />
  <path
     style="fill:#000000;fill-opacity:0.40000001;fill-rule:evenodd;stroke:none;stroke-width:2.4340091;stroke-linecap:round;"
     d="M 40.182471,65.304808 L 110.80529,65.042455"
     id="path860" />
  <path
     style="fill:#000000;fill-opacity:0.40000001;fill-rule:evenodd;stroke:none;stroke-width:2.4340091;stroke-linecap:round;"
     d="M 75.848036,81.318345 L 158.65704,81.172778"
     id="path861" />
  <path
     style="fill:#000000;fill-opacity:0.40000001;fill-rule:evenodd;stroke:none;stroke-width:2.4340091;stroke-linecap:round;"
     d="M 75.615543,96.220471 L 121.40101,96.191695"
     id="path862" />
  <path
     style="fill:#000000;fill-opacity:0.40000001;fill-rule:evenodd;stroke:none;stroke-width:2.4340091;stroke-linecap:round;"
     d="M 40.414964,110.29236 L 123.22397,110.09921"
     id="path863" />
  <path
     style="fill:#000000;fill-opacity:0.40000001;fill-rule:evenodd;stroke:none;stroke-width:2.4340091;stroke-linecap:round;"
     d="M 40.647457,125.47568 L 85.967942,125.11813"
     id="path864" />
  <path
     style="fill:#000000;fill-opacity:0.40000001;fill-rule:evenodd;stroke:none;stroke-width:2.4340091;stroke-linecap:round;"
     d="M 41.661625,127.04067 L 124.23814,127.08107"
     id="path865" />
  <path
     style="fill:#df421e;fill-rule:evenodd;stroke:#df421e;stroke-width:7.3560872;fill-opacity:1.0000000;stroke-opacity:1.0000000;"
     d="M 124.01049,44.279555 C 123.93977,41.136749 122.67698,38.047413 120.26089,35.763896 C 115.42872,31.196863 107.82240,31.610599 103.20698,36.676288 L 79.738104,62.433816 L 55.862636,36.512526 C 51.220151,31.473435 43.736440,31.239241 39.079787,35.997843 C 34.423141,40.756444 34.414713,48.645121 39.057199,53.684211 L 63.519952,80.237157 L 38.921672,107.23461 C 34.306247,112.30030 34.473500,120.04980 39.305666,124.61683 C 44.137841,129.18387 51.744148,128.79353 56.359572,123.72784 L 79.851044,97.946920 L 103.72650,123.86821 C 108.36899,128.90730 115.85270,129.14150 120.50936,124.38290 C 125.16601,119.62429 125.17443,111.73561 120.53194,106.69653 L 96.069195,80.143578 L 120.66747,53.169528 C 122.97519,50.636684 124.08121,47.422360 124.01049,44.279555 z "
     id="path855" />
</svg>

Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	4 Mar 2005 20:30:18 -0000	1.14
+++ ChangeLog	4 Mar 2005 21:16:50 -0000	1.15
@@ -1,5 +1,12 @@
 2005-03-04	Benedikt Meurer <benny at xfce.org>
 
+	* fallback.svg, ThunarMimeDatabase.py: Add fallback icon, so people
+	  with broken icon themes can still run the file manager. Check
+	  standard mime-application:octect-stream before checking for the
+	  GNOME fallback.
+
+2005-03-04	Benedikt Meurer <benny at xfce.org>
+
 	* ThunarSidePane.py: Use SHADOW_IN to be consistent with the main view.
 	* ThunarListView.py, ThunarIconView.py: Get the GType handling right.
 

Index: ThunarMimeDatabase.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarMimeDatabase.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ThunarMimeDatabase.py	27 Feb 2005 18:13:49 -0000	1.1
+++ ThunarMimeDatabase.py	4 Mar 2005 21:16:50 -0000	1.2
@@ -62,6 +62,13 @@
                         name = 'gnome-mime-' + type.split('/')[0]
                         icon = self.theme.load_icon(name, size, 0)
                     except gobject.GError:
-                        name = 'gnome-mime-application-octet-stream'
-                        icon = self.theme.load_icon(name, size, 0)
+                        try:
+                            name = 'mime-application:octet-stream'
+                            icon = self.theme.load_icon(name, size, 0)
+                        except gobject.GError:
+                            try:
+                                name = 'gnome-mime-application-octet-stream'
+                                icon = self.theme.load_icon(name, size, 0)
+                            except gobject.GError:
+                                icon = gtk.gdk.pixbuf_new_from_file_at_size('fallback.svg', size, size)
         return icon




More information about the Thunar-workers mailing list