From: duplo Date: Mon, 31 May 2010 13:43:52 +0000 (+0000) Subject: Add bigger image in intro page and remove scaling code. X-Git-Tag: 2.5.0~29 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=7531748fcd14dda3624022a697a0d7a7f717db1e;p=bertos.git Add bigger image in intro page and remove scaling code. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3888 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/BIntroPage.py b/wizard/BIntroPage.py index 6352d20e..02ca9469 100644 --- a/wizard/BIntroPage.py +++ b/wizard/BIntroPage.py @@ -49,19 +49,8 @@ class BIntroPage(BWizardPage): def __init__(self): BWizardPage.__init__(self, UI_LOCATION + "/intro_page.ui") self.setTitle(self.tr("Welcome in BeRTOS Wizard!")) - self.image = QPixmap(":/images/logo.png") - - ## Overloaded QWidget methods ## - - def resizeEvent(self, event): - self._scalePicture() - BWizardPage.resizeEvent(self, event) - - def showEvent(self, event): - self._scalePicture() - BWizardPage.showEvent(self, event) - - ## + pixmap = self.pageContent.imageLabel.pixmap() + self.pageContent.imageLabel.setPixmap(pixmap.scaled(300, 400, Qt.KeepAspectRatio)) ## Overloaded QWizardPage methods ## @@ -71,13 +60,4 @@ class BIntroPage(BWizardPage): """ return True - #### - - def _scalePicture(self): - """ - I need this method because the scaledContent property of the QLabel - doesn't care the aspect ratio. - """ - label_size = self.pageContent.imageLabel.size() - scaled_image = self.image.scaled(label_size, Qt.KeepAspectRatio) - self.pageContent.imageLabel.setPixmap(scaled_image) + #### \ No newline at end of file diff --git a/wizard/images/logo.png b/wizard/images/logo.png index df6c7353..9012930b 100644 Binary files a/wizard/images/logo.png and b/wizard/images/logo.png differ diff --git a/wizard/ui/final_page.ui b/wizard/ui/final_page.ui index 8f90b808..e004b08e 100644 --- a/wizard/ui/final_page.ui +++ b/wizard/ui/final_page.ui @@ -41,10 +41,9 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Project created successfully!</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> -<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can now start developing your application.</p></body></html> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Project created successfully!</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can now start developing your application.</p></body></html> Qt::RichText @@ -72,8 +71,8 @@ p, li { white-space: pre-wrap; } 0 0 - 564 - 82 + 556 + 76