Hi Mary
Looks good to me too.
Regards
Nirmal
On 6/5/2012 11:31 PM, Mary Ding wrote:
Hi:
Can I get two code reviewers for the following bug fix:
CR: http://monaco.sfbay/detail.jsf?cr=7154037 window titles like
"window1" in gui-install.xml are marked translatable but seems
actually not
Web rev is here:
https://cr.opensolaris.org/action/browse/caiman/md5645/7154037/
While trying to fix this bug, I found out there are unused code here
in gui-install.xml and
screen_manager.py
1. We do not support upgrade but some how screen_manager.py still
refer to upgrade as follow:
"on_upgradebutton_clicked": self.no_op,
2. In gui-install.xml, there is various reference to upgrade and we
do not support upgrade anyway:
indiana-build{mmding}86: grep upgrade *xml
gui-install.xml: <object class="GtkButton" id="upgradebutton">
gui-install.xml: <signal name="clicked"
handler="on_upgradebutton_clicked"/>
gui-install.xml: <object class="GtkWindow" id="upgrade_window">
gui-install.xml: <object class="GtkVBox" id="upgrade_vbox">
gui-install.xml: <property name="label" translatable="yes"><span
font_desc="Bold">Select the Solaris file system to be
upgraded.</span></property>
gui-install.xml: <object class="GtkScrolledWindow" id="upgrade_scroll">
gui-install.xml: <object class="GtkViewport" id="upgrade_viewport">
gui-install.xml: <object class="GtkVBox" id="upgradedetection_vbox">
gui-install.xml: <object class="GtkImage" id="upgrade_image">
gui-install.xml: <object class="GtkWindow" id="upgrade_space_win">
gui-install.xml: <property name="label" translatable="yes"><span
font_desc="Bold">Checking for sufficient free space on the Oracle
Solaris environment to perform Oracle Solaris
upgrade.</span></property>
indiana-build{mmding}87:
3. In gui-install.xml, we still had reference to Language and
Territory which we do not support:
indiana-build{mmding}123: grep Language *
gui-install.xml: <relation type="labelled-by" target="labelLanguage"/>
gui-install.xml: <object class="GtkLabel" id="labelLanguage">
gui-install.xml: <property name="label" translatable="yes"><span
font_desc="Bold">_Language:</span></property>
indiana-build{mmding}124: grep Terrio *
indiana-build{mmding}125: grep Terr *
gui-install.xml: <object class="GtkLabel" id="labelTerritory">
gui-install.xml: <property name="label" translatable="yes"><span
font_desc="Bold">_Territory:</span></property>
gui-install.xml: <relation type="labelled-by" target="labelTerritory"/>
indiana-build{mmding}126:
Dermot McClukey suggested that I removed them from the xml and advised
me on how to do it with glade-3.
Testing had been done this way:
1. I used glade-3 to edit the gui-install.xml to remove the obseleted
references to upgrade, language and territory screen. I also remove
the translatable=yes for the window title for window1. After saving
the xml file, I manually reinserted the copyright header comments back.
2. I compiled slim_source and look at the
solaris_install_guiinstall.po, it no longer contains the window1,
upgrade and language/territory reference.
3. I also do a livecd build with the new packages. I did a livecd
install and it works.
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
_______________________________________________
caiman-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/caiman-discuss
