Changeset 3522

Show
Ignore:
Timestamp:
08/18/08 09:48:04 (5 years ago)
Author:
devtar
Message:

update on UmitBT structure for setup.py.

Location:
branch/UmitBluetooth
Files:
8 added
8 modified

Legend:

Unmodified
Added
Removed

  • branch/UmitBluetooth/MANIFEST.in

    r3520 r3522  
    1 include umitbt README COPYING COPYING_HIGWIDGETS 
    2 recursive-include share/pixmaps *.png  
    3 recursive-include share/icons *.ico 
    4 recursive-include test *.ubt 
    5 recursive-include UmitBTCore *.py 
    6 recursive-include config/db btdb.db 
    7 recursive-include higwidgets *.py 
     1include umitbluetooth README COPYING COPYING_HIGWIDGETS setup.py 
     2recursive-include UmitBT/share/pixmaps *.png  
     3recursive-include UmitBT/share/icons *.ico 
     4recursive-include UmitBT/test *.ubt 
     5recursive-include UmitBT/UmitBTCore *.py 
     6recursive-include UmitBT/config/db btdb.db 
     7recursive-include UmitBT/higwidgets *.py 

  • branch/UmitBluetooth/UmitBT/higwidgets/higexpanders.py

    r3388 r3522  
    3232import gtk 
    3333 
    34 from higwidgets.higboxes import HIGHBox, hig_box_space_holder 
     34from UmitBT.higwidgets.higboxes import HIGHBox, hig_box_space_holder 
    3535 
    3636class HIGExpander(gtk.Expander): 

  • branch/UmitBluetooth/UmitBT/umitBTCore/about.py

    r3388 r3522  
    3333        self.about.set_authors(["Devtar Singh <devtar@gmail.com>"]) 
    3434        self.about.set_website("www.umitproject.org") 
    35         umit_logo = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("share", "icons", "umit_16.ico"))) 
     35        umit_logo = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "icons", "umit_16.ico"))) 
    3636        self.about.set_icon(umit_logo) 
    3737        self.about.set_copyright("License: GNU GPL") 

  • branch/UmitBluetooth/UmitBT/umitBTCore/btcore.py

    r3388 r3522  
    3939 
    4040#from umitCore.I18N import _ 
    41 from higwidgets.higdialogs import HIGAlertDialog 
     41from UmitBT.higwidgets.higdialogs import HIGAlertDialog 
    4242 
    4343import interface 
    … …  
    127127        btnamesearch = [""] 
    128128        # btdb.db search                 
    129         if(os.path.exists(os.path.join("config", "db", "btdb.db"))): 
     129        if(os.path.exists(os.path.join("UmitBT", "config", "db", "btdb.db"))): 
    130130                print "start manufac detection" 
    131                 btdb_dir = os.path.abspath(os.path.join("config", "db", "btdb.db")) 
     131                btdb_dir = os.path.abspath(os.path.join("UmitBT", "config", "db", "btdb.db")) 
    132132                btdb = open(btdb_dir, "rb") 
    133133                while ((len(btname)-1) > count): 
    … …  
    168168         count+=1 
    169169         if(btmanu[count].find("Nokia") > -1 ): 
    170           pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("share", "pixmaps", "nokia.png"))) 
     170          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "nokia.png"))) 
    171171          interface.mapmodel.append([btname[count], pixbuf]) 
    172172         elif(btmanu[count].find("Motorola") > -1): 
    173           pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("share", "pixmaps", "moto.png"))) 
     173          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "moto.png"))) 
    174174          interface.mapmodel.append([btname[count], pixbuf]) 
    175175         elif(btmanu[count].find("Sony") > -1): 
    176           pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("share", "pixmaps", "sony-eric.png"))) 
     176          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "sony-eric.png"))) 
    177177          interface.mapmodel.append([btname[count], pixbuf]) 
    178178         else: 
    179           pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("share", "pixmaps", "bt.png"))) 
     179          pixbuf = gtk.gdk.pixbuf_new_from_file(os.path.abspath(os.path.join("UmitBT", "share", "pixmaps", "bt.png"))) 
    180180          interface.mapmodel.append([btname[count], pixbuf]) 
    181181 

  • branch/UmitBluetooth/UmitBT/umitBTCore/interface.py

    r3388 r3522  
    5656        self.window.set_size_request(800, 500) 
    5757        self.window.set_title("Umit Bluetooth Scanner") 
    58         win_icon = os.path.join("share", "icons", "umit_16.ico") 
     58        win_icon = os.path.join("UmitBT", "share", "icons", "umit_16.ico") 
    5959        self.window.set_icon_from_file(win_icon) 
    6060        self.window.set_position(gtk.WIN_POS_CENTER) 

  • branch/UmitBluetooth/UmitBT/umitBTCore/io.py

    r3388 r3522  
    2525import gtk 
    2626 
    27 from higwidgets.higdialogs import HIGAlertDialog 
     27from UmitBT.higwidgets.higdialogs import HIGAlertDialog 
    2828 
    2929import btcore 

  • branch/UmitBluetooth/setup.py

    r3520 r3522  
    2828from stat import * 
    2929 
    30 main_dir = os.path.join('umitBTCore') 
    31 higwidgets_dir = os.path.join('higwidgets') 
    32 test_dir = os.path.join('test') 
    33 pixmaps_dir = os.path.join('share', 'pixmaps') 
    34 icons_dir = os.path.join('share', 'icons') 
    35 btdb_dir = os.path.join('config', 'db') 
     30main_dir = os.path.join('UmitBT', 'umitBTCore') 
     31higwidgets_dir = os.path.join('UmitBT','higwidgets') 
     32test_dir = os.path.join('UmitBT','test') 
     33pixmaps_dir = os.path.join('UmitBT','share', 'pixmaps') 
     34icons_dir = os.path.join('UmitBT','share', 'icons') 
     35btdb_dir = os.path.join('UmitBT','config', 'db') 
    3636 
    3737data_files = [  (main_dir, glob(os.path.join(main_dir, '*.py'))), 
    … …  
    5959          'Programming Language :: Python', 
    6060    ], 
    61     scripts=['umitbt'], 
     61    scripts=['umitbluetooth'], 
    6262    data_files = data_files 
    6363) 

  • branch/UmitBluetooth/utils/win/generate_win_installer.py

    r3388 r3522  
    2828 
    2929setup( 
    30         version = 'UmitBT_1_alpha1', 
     30        version = 'UmitBT_1_alpha2', 
    3131        description = 'UmitBT', 
    3232        name = 'UmitBT', 
    3333        py_modules=['btcore','interface','io','ubt_parser', 'about'], 
    34         windows=["umitbt"], 
    35         data_files=[("config/db", ["config/db/btdb.db"]), 
    36                 ("share/pixmaps", ["share/pixmaps/bt.png"]), 
    37                 ("share/pixmaps", ["share/pixmaps/moto.png"]), 
    38                 ("share/pixmaps", ["share/pixmaps/nokia.png"]), 
    39                 ("share/pixmaps", ["share/pixmaps/sony-eric.png"]), 
    40                 ("share/icons", ["share/icons/umit_16.ico"]), 
    41                 ("share/icons", ["share/icons/umit_48.ico"])] 
     34        windows=["umitbluetooth"], 
     35        data_files=[("UmitBT/config/db", ["UmitBT/config/db/btdb.db"]), 
     36                ("UmitBT/share/pixmaps", ["UmitBT/share/pixmaps/bt.png"]), 
     37                ("UmitBT/share/pixmaps", ["UmitBT/share/pixmaps/moto.png"]), 
     38                ("UmitBT/share/pixmaps", ["UmitBT/share/pixmaps/nokia.png"]), 
     39                ("UmitBT/share/pixmaps", ["UmitBT/share/pixmaps/sony-eric.png"]), 
     40                ("UmitBT/share/icons", ["UmitBT/share/icons/umit_16.ico"]), 
     41                ("UmitBT/share/icons", ["UmitBT/share/icons/umit_48.ico"])] 
    4242) 
    4343