From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QZ1BY-00034P-N4 for garchives@archives.gentoo.org; Tue, 21 Jun 2011 13:40:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC3C71C034; Tue, 21 Jun 2011 13:40:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 672C71C034 for ; Tue, 21 Jun 2011 13:40:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D81DF1B4020 for ; Tue, 21 Jun 2011 13:40:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 337A48003C for ; Tue, 21 Jun 2011 13:40:00 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: <33a5078d06fbf8be54677c89e3524d59c013c1fa.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: iw/ X-VCS-Repository: proj/anaconda X-VCS-Files: iw/progress_gui.py X-VCS-Directories: iw/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 33a5078d06fbf8be54677c89e3524d59c013c1fa Date: Tue, 21 Jun 2011 13:40:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 86fc395a9c0ce30d997c1cd75e431642 commit: 33a5078d06fbf8be54677c89e3524d59c013c1fa Author: wiktor w brodlo brodlo net> AuthorDate: Tue Jun 21 13:39:38 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Tue Jun 21 13:39:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D33a5078d Removed adpix --- iw/progress_gui.py | 59 ++++++++--------------------------------------= ------ 1 files changed, 9 insertions(+), 50 deletions(-) diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 07545ae..b1f1012 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -85,70 +85,29 @@ class InstallProgressWindow (InstallWindow): raise ValueError, "Invalid value passed to setShowPercentage= " self._showPercentage =3D val =20 - def _getRnotes(self): - langs =3D [] - pixmaps =3D [] - if (os.environ.has_key('LANG')): - langs =3D language.expandLangs(os.environ['LANG']) - langs.append('') - - pixmaps =3D [] - # OEM path overrides built in - oem_pixmaps_path =3D "/etc/oem/anaconda/rnotes/%s/*.png" - oem_pixmaps_dir =3D "/etc/oem/anaconda/rnotes" - if os.path.isdir(oem_pixmaps_dir): - paths =3D ("/tmp/product/pixmaps/rnotes/%s/*.png", - oem_pixmaps_path) - else: - paths =3D ("/tmp/product/pixmaps/rnotes/%s/*.png", - "/usr/share/anaconda/pixmaps/rnotes/%s/*.png") - for p in paths: - for lang in langs: - path =3D p % lang - pixmaps =3D glob.glob(path) - if len(pixmaps) > 0: - break - - if len(pixmaps) > 0: - files =3D sorted([os.path.join("rnotes", os.path.basename(x)= ) for \ - x in pixmaps]) - else: - files =3D ["progress_first.png"] - - return files - =20 - def getScreen (self, anaconda): self.intf =3D anaconda.intf if anaconda.dir =3D=3D DISPATCH_BACK: self.intf.icw.prevClicked() return =20 - self.pixmaps =3D self._getRnotes() - # Create vbox to contain components of UI vbox =3D gtk.VBox (False, 12) =20 # Create rnote area # Gentoo uses the rnote area for emerge progress. - self.adpix =3D None self.adbox =3D None - self.terminal =3D VirtualTerminal() =20 - pix =3D gui.readImageFromFile(self.pixmaps[0]) - if pix: - frame =3D gtk.Frame() - frame.set_shadow_type(gtk.SHADOW_NONE) - box =3D gtk.EventBox() - self.adpix =3D pix - box.add(self.terminal) - self.adbox =3D box - frame.add(box) - vbox.pack_start(frame, True, True) - - # Just an example for now - #self.terminal.run_command('/bin/bash') + frame =3D gtk.Frame() + frame.set_shadow_type(gtk.SHADOW_NONE) + box =3D gtk.EventBox() + box.add(self.terminal) + self.adbox =3D box + frame.add(box) + vbox.pack_start(frame, True, True) + + self.terminal.run_command('echo Starting installation...'); =20 self.progress =3D gtk.ProgressBar() vbox.pack_start(self.progress, False, False)