alex/mangle
1
Fork 0
Code Releases 1 Activity

Rename Stretch to ScaleCrop

Browse Source
This commit is contained in:
Alex Xu 2021-03-25 16:36:09 -07:00
parent c1e8a8c2e4
commit 38832b8196
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mangle/image.py
View File

@ -24,7 +24,7 @@ class ImageFlags:
Resize = 1 << 1 Resize = 1 << 1
Frame = 1 << 2 Frame = 1 << 2
Quantize = 1 << 3 Quantize = 1 << 3
Stretch = 1 << 4 ScaleCrop = 1 << 4
SplitRightLeft = 1 << 5 # split right then left SplitRightLeft = 1 << 5 # split right then left
SplitRight = 1 << 6 # split only the right page SplitRight = 1 << 6 # split only the right page
SplitLeft = 1 << 7 # split only the left page SplitLeft = 1 << 7 # split only the left page
@ -134,7 +134,7 @@ def quantizeImage(image, palette):
@protect_bad_image @protect_bad_image
def stretchImage(image, size): def scaleCropImage(image, size):
return ImageOps.fit(image, size, Image.ANTIALIAS) return ImageOps.fit(image, size, Image.ANTIALIAS)
@ -275,7 +275,7 @@ def convertImage(source, target, device, flags):
image = orientImage(image, size) image = orientImage(image, size)
if flags & ImageFlags.Resize: if flags & ImageFlags.Resize:
image = resizeImage(image, size) image = resizeImage(image, size)
if flags & ImageFlags.Stretch: if flags & ImageFlags.ScaleCrop:
image = stretchImage(image, size) image = stretchImage(image, size)
if flags & ImageFlags.Frame: if flags & ImageFlags.Frame:
image = frameImage(image, tuple(palette[:3]), tuple(palette[-3:]), size) image = frameImage(image, tuple(palette[:3]), tuple(palette[-3:]), size)

6
mangle/options.py
View File

@ -43,7 +43,7 @@ class DialogOptions(QtGui.QDialog):
self.checkboxOverwrite.setChecked(self.book.overwrite) self.checkboxOverwrite.setChecked(self.book.overwrite)
self.checkboxOrient.setChecked(self.book.imageFlags & ImageFlags.Orient) self.checkboxOrient.setChecked(self.book.imageFlags & ImageFlags.Orient)
self.checkboxResize.setChecked(self.book.imageFlags & ImageFlags.Resize) self.checkboxResize.setChecked(self.book.imageFlags & ImageFlags.Resize)
self.checkboxStretch.setChecked(self.book.imageFlags & ImageFlags.Stretch) self.checkboxScaleCrop.setChecked(self.book.imageFlags & ImageFlags.ScaleCrop)
self.checkboxQuantize.setChecked(self.book.imageFlags & ImageFlags.Quantize) self.checkboxQuantize.setChecked(self.book.imageFlags & ImageFlags.Quantize)
self.checkboxFrame.setChecked(self.book.imageFlags & ImageFlags.Frame) self.checkboxFrame.setChecked(self.book.imageFlags & ImageFlags.Frame)
@ -62,8 +62,8 @@ class DialogOptions(QtGui.QDialog):
imageFlags |= ImageFlags.Orient imageFlags |= ImageFlags.Orient
if self.checkboxResize.isChecked(): if self.checkboxResize.isChecked():
imageFlags |= ImageFlags.Resize imageFlags |= ImageFlags.Resize
if self.checkboxStretch.isChecked(): if self.checkboxScaleCrop.isChecked():
imageFlags |= ImageFlags.Stretch imageFlags |= ImageFlags.ScaleCrop
if self.checkboxQuantize.isChecked(): if self.checkboxQuantize.isChecked():
imageFlags |= ImageFlags.Quantize imageFlags |= ImageFlags.Quantize
if self.checkboxFrame.isChecked(): if self.checkboxFrame.isChecked():

2
mangle/ui/options.ui
View File

@ -215,7 +215,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QRadioButton" name="checkboxStretch"> <widget class="QRadioButton" name="checkboxScaleCrop">
<property name="text"> <property name="text">
<string>Scale and crop images to fill the screen</string> <string>Scale and crop images to fill the screen</string>
</property> </property>