Retire pysol.xbm & .xpm & the unused code that uses them

MANIFEST.in

@@ -46,7 +46,7 @@ graft html-src
 #graft data/images
 recursive-include data/images *.gif *.png *.jpg
 graft data/tiles
-include data/pysol.xbm data/pysol.xpm data/pysol.ico data/PySol.icns
+include data/pysol.ico data/PySol.icns
 ##
 ## data - sound
 ##

data/pysol.xbm

@@ -1,20 +0,0 @@
-#define pysol_width 41
-#define pysol_height 40
-static char pysol_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x7c,
- 0x00,0x00,0xfe,0x00,0x00,0xff,0x01,0x00,0xfe,0x00,0x80,0xff,0x03,0x00,0xfe,
- 0x00,0xc0,0xff,0x07,0x00,0xfe,0x00,0xe0,0xff,0x0f,0x00,0xfe,0x00,0xe0,0xff,
- 0x0f,0x00,0xfe,0x00,0xf0,0xff,0x1f,0x00,0xfe,0x00,0xf0,0xff,0x1f,0x00,0xfe,
- 0x00,0xf0,0xff,0x1f,0x00,0xfe,0x00,0xf0,0xff,0x1f,0x00,0xfe,0x00,0xf0,0xff,
- 0x1f,0x00,0xfe,0x00,0xe0,0xff,0x0f,0x00,0xfe,0x00,0xe0,0xff,0x0f,0x00,0xfe,
- 0x00,0xc0,0xff,0x07,0x00,0xfe,0x00,0x9f,0xff,0xf3,0x01,0xfe,0xc0,0x7f,0xff,
- 0xfd,0x07,0xfe,0xe0,0xff,0x7c,0xfe,0x0f,0xfe,0xf0,0xff,0x39,0xff,0x1f,0xfe,
- 0xf8,0xff,0xbb,0xff,0x3f,0xfe,0xf8,0xff,0xbb,0xff,0x3f,0xfe,0xfc,0xff,0xff,
- 0xff,0x7f,0xfe,0xfc,0xff,0xff,0xff,0x7f,0xfe,0xfc,0xff,0xff,0xff,0x7f,0xfe,
- 0xfc,0xff,0xff,0xff,0x7f,0xfe,0xfc,0xff,0xff,0xff,0x7f,0xfe,0xf8,0xff,0xbb,
- 0xff,0x3f,0xfe,0xf8,0xff,0xbb,0xff,0x3f,0xfe,0xf0,0xff,0x39,0xff,0x1f,0xfe,
- 0xe0,0xff,0x39,0xfe,0x0f,0xfe,0xc0,0x7f,0x38,0xfc,0x07,0xfe,0x00,0x1f,0x7c,
- 0xf0,0x01,0xfe,0x00,0x00,0x7c,0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xfe,
- 0x00,0x00,0xfe,0x00,0x00,0xfe,0x00,0x00,0xff,0x01,0x00,0xfe,0x00,0x80,0xff,
- 0x03,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe
- };

data/pysol.xpm

@@ -1,49 +0,0 @@
-/* XPM */
-static char *magick[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 11 1",
-"  c Gray0",
-". c #191919",
-"X c Gray20",
-"o c #4c4c4c",
-"O c #666667",
-"+ c Gray60",
-"@ c #b2b2b2",
-"# c Gray80",
-"$ c Gray90",
-"% c Gray100",
-"& c None",
-/* pixels */
-"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
-"&&&&&&&&&&&&&&+@@@&&&&&&&&&&&&&&",
-"&&&&&&&&&&&&@o    o@&&&&&&&&&&&&",
-"&&&&&&&&&&&#        #&&&&&&&&&&&",
-"&&&&&&&&&&#          #&&&&&&&&&&",
-"&&&&&&&&&&            &&&&&&&&&&",
-"&&&&&&&&&+            @&&&&&&&&&",
-"&&&&&&&&&o            o&&&&&&&&&",
-"&&&&&&&&&o            o&&&&&&&&&",
-"&&&&&&&&&o            o&&&&&&&&&",
-"&&&&&&&&&#            #&&&&&&&&&",
-"&&&&&&&&&&.          .&&&&&&&&&&",
-"&&&&&&$$$$&X        X&$$$$&&&&&&",
-"&&&&$@    +@X      X@+    @$&&&&",
-"&&&&X      .+@    @@       X&&&&",
-"&&&X        .&$  $&         X&&&",
-"&&o           $  $           o&&",
-"&&.           +  +           .$&",
-"&+                            +&",
-"&+                            +&",
-"&+                            +&",
-"&#            O  O            #&",
-"&&o           $  $           o&&",
-"&&$          @&  &@         .$&&",
-"&&&&        .$&  &&+        &&&&",
-"&&&&$O    o+&&+  +&&+o    O$&&&&",
-"&&&&&&@+@+&&&&    &&&&+@+@&&&&&&",
-"&&&&&&&&&&&&&O    O&&&&&&&&&&&&&",
-"&&&&&&&&&&&&&.    .&&&&&&&&&&&&&",
-"&&&&&&&&&&&$.      .$&&&&&&&&&&&",
-"&&&&&&&&&&&$+++@@@++$&&&&&&&&&&&",
-"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"
-};

pysollib/pysolgtk/progressbar.py

@@ -87,14 +87,7 @@ class PysolProgressBar:
             im.show()
             im.set_property('xpad', 10)
             im.set_property('ypad', 5)
-        # set icon
+
-        #  if app:
-        #      try:
-        #          name = app.dataloader.findFile('pysol.xpm')
-        #          bg = self.top.get_style().bg[gtk.STATE_NORMAL]
-        #          pixmap, mask = create_pixmap_from_xpm(self.top, bg, name)
-        #          self.top.set_icon(pixmap, mask)
-        #      except: pass
         setTransient(self.top, parent)
         self.top.show()
         self.top.window.set_cursor(gdk.Cursor(gdk.WATCH))

pysollib/pysolgtk/tkwrap.py

@@ -165,12 +165,7 @@ class _MfxToplevel(gtk.Window):
         pass
 
     def wm_iconbitmap(self, name):
-        print('wm_iconbitmap:', name)
+        pass
-        if name and name[0] == '@' and name[-4:] == '.xbm':
-            name = name[1:-4] + '.xpm'
-            # bg = self.get_style().bg[gtk.STATE_NORMAL]
-            # pixmap, mask = create_pixmap_from_xpm(self, bg, name)
-            # self.set_icon(pixmap, mask)
 
     def wm_iconname(self, name):
         pass

pysollib/util.py

@@ -161,12 +161,6 @@ class DataLoader:
         raise OSError("DataLoader could not find image "+filename +
                       " in "+self.dir+" "+str(subdirs))
 
-    def findIcon(self, filename='pysol', subdirs=None):
-        root, ext = os.path.splitext(filename)
-        if not ext:
-            filename += ('.ico' if os.name == 'nt' else '.xbm')
-        return self.findFile(filename, subdirs)
-
     def findAllIconSizes(self, filename='pysol.png'):
         try:
             icondir = self.findDir(os.path.join('images', 'icons'))

pysollib/winsystems/x11.py

@@ -44,10 +44,6 @@ def init_root_window(root, app):
 
     base_init_root_window(root, app)
 
-    #         if TOOLKIT == 'tk':
-    #             window.wm_iconbitmap("@"+filename)
-    #             window.wm_iconmask("@"+filename)
-
     # root.self.wm_maxsize(9999, 9999) # unlimited
     if TOOLKIT == 'gtk':
         pass

setup.py

@@ -50,7 +50,6 @@ for d in ddirs:
 data_files += get_data_files('locale', locale_dir)
 
 if os.name == 'posix':
-    data_files.append(('share/pixmaps', ['data/pysol.xbm', 'data/pysol.xpm']))
     for size in os.listdir('data/images/icons'):
         data_files.append(('share/icons/hicolor/%s/apps' % size,
                            ['data/images/icons/%s/pysol.png' % size]))