Commit 72b00c7c authored by Damian Johnson's avatar Damian Johnson
Browse files

Dropping the descriptor popup stubs from the new interface. This was feature... 

Dropping the descriptor popup stubs from the new interface. This was feature creep and its capabilities will be almost entirely redundant with raw control port access (which is coming in a couple releases).



svn:r24593
parent 879791ea

ChangeLog

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ This release chiefly consists of a fully reimplemented connection panel. Besides 
    * fix: the 'startup.dataDirectory' config option was being ignored

    * fix: recognizing the proper private ip ranges of the 172.* block

    * fix: missing 'is default' option from config sort ordering

    * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard)

    * fix (4/4/11, r24562): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard)



1/7/11 - version 1.4.1 (r24054)

Platform specific enhancements including BSD compatibility and vastly improved performance on Linux.

src/interface/connections/connEntry.py

+0 −15
Original line number Diff line number Diff line
@@ -332,21 +332,6 @@ class ConnectionLine(entries.ConnectionPanelLine): 
    detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()])

    return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)]

  

  def _getDescriptors(self, width):

    """

    Provides raw descriptor information for the relay.

    

    Arguments:

      width - available space to display in

    """

    

    # TODO: Porting and refactoring the descriptorPopup.py functionality is

    # gonna take quite a bit of work. This is a very rarely used feature and

    # not worth delaying the 1.4.2 release any further, so this will be a part

    # of 1.4.3.

    

    return []

  

  def resetDisplay(self):

    entries.ConnectionPanelLine.resetDisplay(self)

    self.cachedType = None

src/interface/connections/entries.py

+0 −19
Original line number Diff line number Diff line
@@ -154,25 +154,6 @@ class ConnectionPanelLine: 
    # implementation of getDetails

    return []

  

  def getDescriptor(self, width):

    """

    Provides a list of DrawEntry instances with descriptor information for

    this connection.

    

    Arguments:

      width - available space to display in

    """

    

    if self._descriptorCacheArgs != width:

      self._descriptorCache = self._getDescriptor(width)

      self._descriptorCacheArgs = width

    

    return self._descriptorCache

  

  def _getDescriptor(self, width):

    # implementation of getDescriptor

    return []

  

  def resetDisplay(self):

    """

    Flushes cached display results.