lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better resizing in page list editor

Browse Source 
git-svn-id: http://comictagger.googlecode.com/svn/trunk@243 6c5673fe-1810-88d6-992b-cd32ca31540c
This commit is contained in:
beville@gmail.com 2012-12-10 20:05:14 +00:00
parent 1e5f40121c
commit 3364e437c6
2 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pagelisteditor.py
View File

@ -203,28 +203,28 @@ class PageListEditor(QWidget):
def setDisplayPixmap( self, delta_w , delta_h ):
# the deltas let us know what the new width and height of the label will be
new_h = self.label.height() + delta_h
new_w = self.label.width() + delta_w
#account for the border
new_h -= 4
new_w -= 2
new_h = self.frame.height() + delta_h
new_w = self.frame.width() + delta_w
#allow for the user to force a reduce by making it a bit smaller than the label
new_h -= 10
new_w -= 10
new_h -= 2
new_w -= 2
if new_h < 0:
new_h = 0;
if new_w < 0:
new_w = 0;
if new_w > 1000 or new_h > 1000:
return
# scale the pixmap to fit in the frame
scaled_pixmap = self.current_pixmap.scaled(new_w, new_h, Qt.KeepAspectRatio)
self.label.setPixmap( scaled_pixmap )
self.label.setPixmap( scaled_pixmap )
# ,pve and resize the label to be centered in the fame
img_w = scaled_pixmap.width()
img_h = scaled_pixmap.height()
self.label.resize( img_w, img_h )
self.label.move( (new_w - img_w)/2, (new_h - img_h)/2 )
def setData( self, comic_archive, pages_list ):
self.comic_archive = comic_archive
self.pages_list = pages_list
@ -288,13 +288,6 @@ class PageListEditor(QWidget):
pass
def showEvent( self, event ):
self.label.show()
# make sure to adjust the size and pos of the pixmap based on frame size
self.setDisplayPixmap( 0,0 )
def hideEvent( self, event ):
# make the image tiny so that other tabs can resize?
self.show()
self.setDisplayPixmap( -10000,-10000 )
QCoreApplication.processEvents()
self.label.hide()
QCoreApplication.processEvents()

33
pagelisteditor.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>511</width>
<height>294</height>
<width>527</width>
<height>323</height>
</rect>
</property>
<property name="windowTitle">
@ -98,7 +98,7 @@
</layout>
</item>
<item>
<widget class="QLabel" name="label">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -106,23 +106,24 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Panel</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="text">
<string>TextLabel</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="indent">
<number>0</number>
</property>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>151</width>
<height>141</height>
</rect>
</property>
<property name="text">
<string/>
</property>
</widget>
</widget>
</item>
</layout>