Changeset 3754

Show
Ignore:
Timestamp:
08/25/08 21:28:21 (3 months ago)
Author:
mvoncken
Message:

label-plugin:re-enable sidebar popup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deluge/plugins/label/label/core.py

    r3730 r3754  
    9292 
    9393class Core(CorePluginBase): 
     94    """ 
     95    self.labels = {label_id:label_options_dict} 
     96    self.torrent_labels = {torrent_id:label_id} 
     97    """ 
    9498    def enable(self): 
    9599        log.info("*** Start Label plugin ***") 
     
    114118 
    115119        #register tree: 
    116         component.get("FilterManager").register_tree_field("label"
     120        component.get("FilterManager").register_tree_field("label", self.init_filter_dict
    117121 
    118122        log.debug("Label plugin enabled..") 
     
    126130        pass 
    127131 
     132    def init_filter_dict(self): 
     133        return dict( [(label, 0) for label in self.labels.keys()]) 
     134 
    128135    ## Plugin hooks ## 
     136 
     137 
    129138    def post_torrent_add(self, torrent_id): 
    130139        log.debug("post_torrent_add") 
  • trunk/deluge/plugins/label/label/gtkui/__init__.py

    r3729 r3754  
    4040from deluge.ui.client import aclient 
    4141 
    42 import sidebar 
     42import sidebar_menu 
    4343import label_config 
    4444import submenu 
     
    5959        log.debug("Label GtkUI plugin initalized..") 
    6060        self.labelcfg = None 
    61         self.sidebar = None 
     61        self.sidebar_menu = None 
    6262 
    6363    def enable(self): 
     
    7575        log.debug(1.2) 
    7676        #disabled: 
    77         #self.sidebar.unload() 
     77        #self.sidebar_menu.unload() 
    7878        log.debug(2) 
    7979 
     
    8282        return pkg_resources.resource_filename("blocklist", os.path.join("data", fname)) 
    8383 
    84  
    8584    def load_interface(self): 
    8685        #sidebar 
    8786        #disabled 
    88         #if not self.sidebar
    89         #    self.sidebar  = sidebar.LabelSideBar() 
     87        if not self.sidebar_menu
     88            self.sidebar_menu  = sidebar_menu.LabelSidebarMenu() 
    9089        #self.sidebar.load() 
    9190 
  • trunk/deluge/plugins/label/label/test.py

    r3730 r3754  
    2323sclient.label_set_torrent(id,"test") 
    2424 
    25 print scleint.get_torrents_status({"label":test},"name") 
     25print sclient.get_torrents_status({"label":"test"},"name") 
    2626 
    2727 
  • trunk/deluge/ui/gtkui/filtertreeview.py

    r3752 r3754  
    246246    def set_menu_sensitivity(self): 
    247247        #select-all/pause/resume 
    248         sensitive = (self.cat != "cat"
     248        sensitive = (self.cat != "cat" and self.count <> 0
    249249        for item in self.default_menu_items: 
    250250            item.set_sensitive(sensitive) 
  • trunk/deluge/ui/gtkui/glade/filtertree_menu.glade

    r3752 r3754  
    88      <widget class="GtkImageMenuItem" id="select_all"> 
    99        <property name="visible">True</property> 
    10         <property name="label" translatable="yes">Select All</property> 
     10        <property name="label" translatable="yes">_Select All</property> 
    1111        <property name="use_underline">True</property> 
    1212        <signal name="activate" handler="select_all"/> 
     
    2424        <property name="visible">True</property> 
    2525        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    26         <property name="label">_Pause</property> 
     26        <property name="label">_Pause All</property> 
    2727        <property name="use_underline">True</property> 
    2828        <signal name="activate" handler="pause_all"/> 
     
    4040        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    4141        <property name="tooltip" translatable="yes">Resume selected torrents.</property> 
    42         <property name="label" translatable="yes">Resu_me</property> 
     42        <property name="label" translatable="yes">Resu_me All</property> 
    4343        <property name="use_underline">True</property> 
    4444        <signal name="activate" handler="resume_all"/>