Forgot to add int version of setDisplaySize

This commit is contained in:
Kovid Goyal
2019-12-29 20:42:09 +05:30
parent fd8ee8bff0
commit 034d561be7
5 changed files with 7 additions and 5 deletions
+2 -2
View File
@@ -6,7 +6,7 @@ __copyright__ = '2009, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
from PyQt5.Qt import (
QDialog, pyqtSignal, Qt, QVBoxLayout, QLabel, QFont, QProgressBar,
QDialog, pyqtSignal, Qt, QVBoxLayout, QLabel, QFont, QProgressBar, QSize,
QDialogButtonBox, QApplication, QFontMetrics, QHBoxLayout, QIcon)
from calibre.gui2 import elided_text
@@ -145,7 +145,7 @@ class BlockingBusy(QDialog):
self.font.setPointSize(self.font.pointSize() + 8)
self.msg.setFont(self.font)
self.pi = ProgressIndicator(self)
self.pi.setDisplaySize(100)
self.pi.setDisplaySize(QSize(100, 100))
self._layout.addWidget(self.pi, 0, Qt.AlignHCenter)
self._layout.addSpacing(15)
self._layout.addWidget(self.msg, 0, Qt.AlignHCenter)
@@ -64,6 +64,7 @@ public slots:
* \sa displaySize
*/
void setDisplaySize(QSize size);
void setDisplaySize(int size) { setDisplaySize(QSize(size, size)); }
void setSizeHint(int size);
void setSizeHint(QSize size);
protected:
@@ -44,6 +44,7 @@ public slots:
void set_colors(const QColor & dark, const QColor & light);
void setDisplaySize(QSize size);
void setDisplaySize(int size);
void setSizeHint(int size);
void setSizeHint(QSize size);
+1 -1
View File
@@ -1001,7 +1001,7 @@ class TOCEditor(QDialog): # {{{
ll = self.ll = QVBoxLayout()
lw.setLayout(ll)
self.pi = pi = ProgressIndicator()
pi.setDisplaySize(200)
pi.setDisplaySize(QSize(200, 200))
pi.startAnimation()
ll.addWidget(pi, alignment=Qt.AlignHCenter|Qt.AlignCenter)
la = self.wait_label = QLabel(_('Loading %s, please wait...')%t)
+2 -2
View File
@@ -8,7 +8,7 @@ __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
import shutil, os, errno
from threading import Thread
from PyQt5.Qt import (QObject, pyqtSignal, QLabel, QWidget, QHBoxLayout, Qt)
from PyQt5.Qt import (QObject, pyqtSignal, QLabel, QWidget, QHBoxLayout, Qt, QSize)
from calibre.constants import iswindows
from calibre.ptempfile import PersistentTemporaryFile
@@ -110,7 +110,7 @@ class SaveWidget(QWidget):
self.stop()
def start(self):
self.pi.setDisplaySize(self.label.height())
self.pi.setDisplaySize(QSize(self.label.height(), self.label.height()))
self.pi.setVisible(True)
self.pi.startAnimation()
self.label.setText(_('Saving...'))