From owner-p4-projects@FreeBSD.ORG Sat May 26 23:02:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C868016A468; Sat, 26 May 2007 23:02:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7531B16A400 for ; Sat, 26 May 2007 23:02:24 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6568913C447 for ; Sat, 26 May 2007 23:02:24 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4QN2ORo026753 for ; Sat, 26 May 2007 23:02:24 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4QN2ODE026744 for perforce@freebsd.org; Sat, 26 May 2007 23:02:24 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 26 May 2007 23:02:24 GMT Message-Id: <200705262302.l4QN2ODE026744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 120435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 May 2007 23:02:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=120435 Change 120435 by ivoras@ivoras_finstall on 2007/05/26 23:02:14 - Add window icon decoration (bobblehead) - Add "Help" dialog and corresponding infrastructure Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#2 edit .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#7 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/helpdialog.glade#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#6 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/ndisks.glade#2 edit .. //depot/projects/soc2007/ivoras_finstall/installer/help/generic.txt#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/helpdialog.py#1 add Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#2 (text+ko) ==== @@ -1,3 +1,4 @@ +import os.path from types import MethodType import gtk, gtk.gdk, gtk.glade @@ -38,10 +39,11 @@ return dict - def _load_label(self, file_name): + def _load_label(self, label, file_name, dir="text"): """Returns the content of a text/* file with formatting replacements so it looks decent when Pango renders it""" - return file("text/%s" % file_name).read().replace("\n", " ").replace("
", "\n").replace("\n ", "\n") + label.set_text(file("%s/%s" % (dir, file_name)).read().replace("\n", " ").replace("
", "\n").replace("\n ", "\n")) + label.set_use_markup(True) def _clear_container(self, cont): ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#7 (text+ko) ==== @@ -3,6 +3,7 @@ import gtk, gtk.gdk, gtk.glade from basewin import BaseWin +from helpdialog import HelpDialog class MainWin(BaseWin): @@ -100,10 +101,14 @@ self._load_tile_nr(self.step_current) + def on_button_help_clicked(self, obj): + help = HelpDialog(self.step_track[self.step_current]["tile"]) + help.window.show() + + # Handlers for "intro" tile def intro_on_load(self): - self["label2"].set_text(self._load_label("intro.txt")) - self["label2"].set_use_markup(True) + self._load_label(self["label2"], "intro.txt") return True @@ -119,8 +124,7 @@ # Handlers for "ndisks" def ndisks_on_load(self): - self["label2"].set_text(self._load_label("ndisks.txt")) - self["label2"].set_use_markup(True) + self._load_label(self["label2"], "ndisks.txt") return True ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#6 (text+ko) ==== @@ -11,6 +11,7 @@ GTK_WIN_POS_CENTER 750 450 + logo.png ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/ndisks.glade#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -47,9 +47,11 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 True + 6 2