Changeset 750

Show
Ignore:
Timestamp:
07/29/08 06:03:00 (4 months ago)
Author:
sylvain
Message:

refresh subscriptions menu action

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • oss/jlib/jlib/gui/pubsub/node.py

    r747 r750  
    4040        if ui.exec_() == QtGui.QDialog.Accepted: 
    4141            self.pubsub.emit(QtCore.SIGNAL("createNode(PyQt_PyObject)"), unicode(ui.nodeName.text())) 
     42 
     43    def deleteNode(self): 
     44        model = self.nodes.model() 
     45        index = self.nodes.currentIndex() 
     46        item = model.itemFromIndex(index) 
     47        self.pubsub.emit(QtCore.SIGNAL("deleteNode(PyQt_PyObject)"), item.node) 
    4248 
    4349    def publishAtomEntry(self): 
    …… 
    9399            publishMenu.addAction(actionPublishAtomEntry) 
    94100 
     101            actionDeleteNode = QtGui.QAction(QtCore.QString("Delete node"), self.parent()) 
     102            QtCore.QObject.connect(actionDeleteNode, QtCore.SIGNAL("triggered()"), self.deleteNode) 
     103            menu.addAction(actionDeleteNode) 
     104 
    95105            actionPurgeNode = QtGui.QAction(QtCore.QString("Purge node"), self.parent()) 
    96106            QtCore.QObject.connect(actionPurgeNode, QtCore.SIGNAL("triggered()"), self.purgeNode) 

  • oss/jlib/jlib/gui/pubsub/subscription.py

    r749 r750  
    4343            QtGui.QMessageBox.warning(self, "Error", repr(information.error), QtGui.QMessageBox.Ok) 
    4444 
     45    def refreshSubscriptions(self): 
     46        self.discovery.emit(QtCore.SIGNAL("discoverSubscriptions()")) 
     47 
    4548    def subscribeNode(self): 
    4649        ui = jlibSubscribeNodeDialog() 
    …… 
    7477        menu = QtGui.QMenu(self.parent()) 
    7578 
    76         actionSubscribeNode = QtGui.QAction(QtCore.QString("Subscribe to a node"), self.parent()) 
    77         QtCore.QObject.connect(actionSubscribeNode, QtCore.SIGNAL("triggered()"), self.subscribeNode) 
    78         menu.addAction(actionSubscribeNode) 
     79        model = self.subscriptions.model() 
     80        index = self.subscriptions.currentIndex() 
    7981 
    80         actionUnsubscribeNode = QtGui.QAction(QtCore.QString("Unsubscribe from a node"), self.parent()) 
    81         QtCore.QObject.connect(actionUnsubscribeNode, QtCore.SIGNAL("triggered()"), self.unsubscribeNode) 
    82         menu.addAction(actionUnsubscribeNode) 
     82        if index.isValid(): 
     83            actionUnsubscribeNode = QtGui.QAction(QtCore.QString("Unsubscribe from node"), self.parent()) 
     84            QtCore.QObject.connect(actionUnsubscribeNode, QtCore.SIGNAL("triggered()"), self.unsubscribeNode) 
     85            menu.addAction(actionUnsubscribeNode) 
    8386 
    84         actionDiscoverNode = QtGui.QAction(QtCore.QString("Discover node"), self.parent()) 
    85         QtCore.QObject.connect(actionDiscoverNode, QtCore.SIGNAL("triggered()"), self.discoverNode) 
    86         menu.addAction(actionDiscoverNode) 
     87            actionDiscoverNode = QtGui.QAction(QtCore.QString("Discover node"), self.parent()) 
     88            QtCore.QObject.connect(actionDiscoverNode, QtCore.SIGNAL("triggered()"), self.discoverNode) 
     89            menu.addAction(actionDiscoverNode) 
    8790 
    88         actionDiscoverNodeInfo = QtGui.QAction(QtCore.QString("Discover node information"), self.parent()) 
    89         QtCore.QObject.connect(actionDiscoverNodeInfo, QtCore.SIGNAL("triggered()"), self.discoverNodeInfo) 
    90         menu.addAction(actionDiscoverNodeInfo) 
     91            actionDiscoverNodeInfo = QtGui.QAction(QtCore.QString("Discover node information"), self.parent()) 
     92            QtCore.QObject.connect(actionDiscoverNodeInfo, QtCore.SIGNAL("triggered()"), self.discoverNodeInfo) 
     93            menu.addAction(actionDiscoverNodeInfo) 
    9194 
    92         actionDiscoverItem = QtGui.QAction(QtCore.QString("Discover items"), self.parent()) 
    93         QtCore.QObject.connect(actionDiscoverItem, QtCore.SIGNAL("triggered()"), self.discoverItems) 
    94         menu.addAction(actionDiscoverItem) 
     95            actionDiscoverItem = QtGui.QAction(QtCore.QString("Discover items"), self.parent()) 
     96            QtCore.QObject.connect(actionDiscoverItem, QtCore.SIGNAL("triggered()"), self.discoverItems) 
     97            menu.addAction(actionDiscoverItem) 
     98        else: 
     99            actionSubscriptionsNode = QtGui.QAction(QtCore.QString("Refresh subscriptions"), self.parent()) 
     100            QtCore.QObject.connect(actionSubscriptionsNode, QtCore.SIGNAL("triggered()"), self.refreshSubscriptions) 
     101            menu.addAction(actionSubscriptionsNode) 
     102 
     103            actionSubscribeNode = QtGui.QAction(QtCore.QString("Subscribe to a node"), self.parent()) 
     104            QtCore.QObject.connect(actionSubscribeNode, QtCore.SIGNAL("triggered()"), self.subscribeNode) 
     105            menu.addAction(actionSubscribeNode) 
    95106 
    96107        menu.exec_(event.globalPos())