Skip to content

Commit

Permalink
Version 257 subscription hotfix
Browse files Browse the repository at this point in the history
w
e
w

l
a
d
  • Loading branch information
hydrusnetwork committed May 24, 2017
1 parent e4e7269 commit 92ea57e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion help/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h3>changelog</h3>
<ul>
<li><h3>version 257</h3></li>
<ul>
<li>?the duplicate filter will now maintain zoom on files with the same ratio</li>
<li>the duplicate filter will now maintain zoom on files with the same ratio</li>
<li>split the duplicate merge options into separate tag/rating controls--you may see some duplicate service entries, but these will be cleaned on your next shutdown</li>
<li>duplicate merge options now allow syncing 'archive' status</li>
<li>duplicate merge options now allow 'delete both files', which you may find use for in custom actions</li>
Expand Down
11 changes: 7 additions & 4 deletions include/ClientGUICommon.py
Original file line number Diff line number Diff line change
Expand Up @@ -2223,12 +2223,15 @@ def _SizeAndPositionAndShow( self ):
my_x = ( parent_width - my_width ) - 25
my_y = ( parent_height - my_height ) - 5

my_position = parent.ClientToScreenXY( my_x, my_y )

if my_position != self.GetPosition():
if parent.IsShown():

self.SetPosition( parent.ClientToScreenXY( my_x, my_y ) )
my_position = parent.ClientToScreenXY( my_x, my_y )

if my_position != self.GetPosition():

self.SetPosition( parent.ClientToScreenXY( my_x, my_y ) )




# Unhiding tends to raise the main gui tlp, which is annoying if a media viewer window has focus
Expand Down
2 changes: 1 addition & 1 deletion include/ClientGUIScrolledPanelsManagement.py
Original file line number Diff line number Diff line change
Expand Up @@ -2891,7 +2891,7 @@ def __init__( self, parent, new_options ):

self._estimated_number_thumbnails = wx.StaticText( media_panel, label = '' )

self._fullscreen_cache_size = wx.SpinCtrl( media_panel, min = 25, max = 3000 )
self._fullscreen_cache_size = wx.SpinCtrl( media_panel, min = 25, max = 8192 )
self._fullscreen_cache_size.Bind( wx.EVT_SPINCTRL, self.EventFullscreensUpdate )

self._estimated_number_fullscreens = wx.StaticText( media_panel, label = '' )
Expand Down
2 changes: 1 addition & 1 deletion include/ClientImporting.py
Original file line number Diff line number Diff line change
Expand Up @@ -2588,7 +2588,7 @@ def _SyncQuery( self, job_key ):

new_urls = [ url for url in urls_to_add_ordered if not self._seed_cache.HasSeed( url ) ]

self._seed_cache.AddSeeds( url )
self._seed_cache.AddSeeds( new_urls )



Expand Down

0 comments on commit 92ea57e

Please sign in to comment.