Changeset 3695

Timestamp:

08/31/08 20:27:28 (5 years ago)

Author:

devtar

Message:

updated setup.py. UmitBT works on Linux now. Appended static /usr path on paths.py under UmitBT/umitBTCore

Location:

branch/UmitBluetooth

Files:

• UmitBT/__init__.py (modified) (1 diff)
• UmitBT/share/__init__.py (modified) (1 diff)
• UmitBT/share/icons/__init__.py (modified) (1 diff)
• UmitBT/share/pixmaps/__init__.py (modified) (1 diff)
• UmitBT/umitBTCore/__init__.py (modified) (1 diff)
• UmitBT/umitBTCore/about.py (modified) (2 diffs)
• UmitBT/umitBTCore/btcore.py (modified) (5 diffs)
• UmitBT/umitBTCore/interface.py (modified) (2 diffs)
• UmitBT/umitBTCore/path.py (added)
• setup.py (modified) (1 diff)

branch/UmitBluetooth/UmitBT/__init__.py

@@ -19 +19 @@
 
 __author__ = "Devtar Singh <devtar@gmail.com>"
-__date__ = "9 August 2008"
-__version__ = "0.7RC1"
+__date__ = "1 September 2008"
+__version__ = "0.7RC2"

branch/UmitBluetooth/UmitBT/share/__init__.py

@@ -19 +19 @@
 
 __author__ = "Devtar Singh <devtar@gmail.com>"
-__date__ = "9 August 2008"
-__version__ = "0.7RC1"
+__date__ = "1 September 2008"
+__version__ = "0.7RC2"

branch/UmitBluetooth/UmitBT/share/icons/__init__.py

@@ -19 +19 @@
 
 __author__ = "Devtar Singh <devtar@gmail.com>"
-__date__ = "9 August 2008"
-__version__ = "0.7RC1"
+__date__ = "1 September 2008"
+__version__ = "0.7RC2"

branch/UmitBluetooth/UmitBT/share/pixmaps/__init__.py

@@ -19 +19 @@
 
 __author__ = "Devtar Singh <devtar@gmail.com>"
-__date__ = "9 August 2008"
-__version__ = "0.7RC1"
+__date__ = "1 September 2008"
+__version__ = "0.7RC2"

branch/UmitBluetooth/UmitBT/umitBTCore/__init__.py

@@ -19 +19 @@
 
 __author__ = "Devtar Singh <devtar@gmail.com>"
-__date__ = "9 August 2008"
-__version__ = "0.7RC1"
+__date__ = "1 September 2008"
+__version__ = "0.7RC2"

branch/UmitBluetooth/UmitBT/umitBTCore/about.py

@@ -23 +23 @@
 import os
 
+import path
+
 class about_dialog:
 
@@ -33 +35 @@
         self.about.set_authors(["Devtar Singh <devtar@gmail.com>"])
         self.about.set_website("www.umitproject.org")
-        umit_logo = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "icons", "umit_16.ico")))
+        umit_logo = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join(path.paths, "UmitBT", "share", "icons", "umit_16.ico")))
         self.about.set_icon(umit_logo)
         self.about.set_copyright("License: GNU GPL")

branch/UmitBluetooth/UmitBT/umitBTCore/btcore.py

@@ -43 +43 @@
 import interface
 import io
+import path
 
 # globals used due to functions such as set_info and ease of access in io.py. needs redesigning
@@ -69 +70 @@
         count = 1
         if(os.name=="mac"):
+                # Lightblue Output: [('00:0E:6D:71:A2:0B', u'My6600', 5243396)]. Yet to be tested.
                 btdevices = lightblue.findservices()
-                # Lightblue Output: [('00:0E:6D:71:A2:0B', u'My6600', 5243396)]
         else:
                 btdevices = bluetooth.discover_devices(flush_cache = True, lookup_names = True)
@@ -103 +104 @@
         print "BTID: " + str(btid)
         if(os.name=="mac"):
+                 # Lightblue Output: [('00:0D:93:19:C8:68', 10, 'OBEX Object Push')]. Yet to be tested.
                  sdpservices = lightblue.findservices(address=btmac[btid])
-                  # Lightblue Output: [('00:0D:93:19:C8:68', 10, 'OBEX Object Push')]
         else:   
                  sdpservices = bluetooth.find_service(address=btmac[btid])
@@ -127 +128 @@
         btnamesearch = [""]
         # btdb.db search                
-        if(os.path.exists(os.path.join("UmitBT", "config", "db", "btdb.db"))):
+        if(os.path.exists(os.path.join(path.paths, "UmitBT", "config", "db", "btdb.db"))):
                 print "start manufac detection"
-                btdb_dir = os.path.abspath(os.path.join("UmitBT", "config", "db", "btdb.db"))
+                btdb_dir = os.path.abspath(os.path.join(path.paths, "UmitBT", "config", "db", "btdb.db"))
                 btdb = open(btdb_dir, "rb")
                 while ((len(btname)-1) > count):
@@ -168 +169 @@
          count+=1
          if(btmanu[count].find("Nokia") > -1 ):
-          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "nokia.png")))
+          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join(path.paths, "UmitBT", "share", "pixmaps", "nokia.png")))
           interface.mapmodel.append([btname[count], pixbuf])
          elif(btmanu[count].find("Motorola") > -1):
-          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "moto.png")))
+          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join(path.paths, "UmitBT", "share", "pixmaps", "moto.png")))
           interface.mapmodel.append([btname[count], pixbuf])
          elif(btmanu[count].find("Sony") > -1):
-          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "sony-eric.png")))
+          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join(path.paths, "UmitBT", "share", "pixmaps", "sony-eric.png")))
           interface.mapmodel.append([btname[count], pixbuf])
          else:
-          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "bt.png")))
+          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join(path.paths, "UmitBT", "share", "pixmaps", "bt.png")))
           interface.mapmodel.append([btname[count], pixbuf])
 

branch/UmitBluetooth/UmitBT/umitBTCore/interface.py

@@ -30 +30 @@
 import about
 import btcore
+import path
 
 
@@ -56 +57 @@
         self.window.set_size_request(800, 500)
         self.window.set_title("Umit Bluetooth Scanner")
-        win_icon = os.path.join("UmitBT", "share", "icons", "umit_16.ico")
+        win_icon = os.path.join(path.paths, "UmitBT", "share", "icons", "umit_16.ico")
         self.window.set_icon_from_file(win_icon)
         self.window.set_position(gtk.WIN_POS_CENTER)

branch/UmitBluetooth/setup.py

@@ -28 +28 @@
 from stat import *
 
-#main_dir = os.path.join('UmitBT', 'umitBTCore')
-#higwidgets_dir = os.path.join('UmitBT','higwidgets')
 sample_dir = os.path.join('UmitBT','sample')
 pixmaps_dir = os.path.join('UmitBT','share', 'pixmaps')