Author: locilka
Date: Mon May 19 15:40:07 2008
New Revision: 47672
URL: http://svn.opensuse.org/viewcvs/yast?rev=47672&view=rev
Log:
- Workaround for as-big-dialog-as-possible in License Agreement
dialog (bnc #385257).
- Adding FACTORY repositories with priority 120, update source with
priority 20 (bnc #392039).
Modified:
trunk/installation/control/control.openSUSE.xml
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/inst_complex_welcome.ycp
Modified: trunk/installation/control/control.openSUSE.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=47672&r1=47671&r2=47672&view=diff
==============================================================================
--- trunk/installation/control/control.openSUSE.xml (original)
+++ trunk/installation/control/control.openSUSE.xml Mon May 19 15:40:07 2008
@@ -75,7 +75,7 @@
/
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">true</autorefresh>
- <priority config:type="integer">120</priority>
+ <priority config:type="integer">20</priority>
<!-- Replacement for EXTRAURLS and OPTIONALURLS -->
@@ -86,7 +86,7 @@
/
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">false</autorefresh>
- <priority config:type="integer">20</priority>
+ <priority config:type="integer">120</priority>
<baseurl>http://download.opensuse.org/distribution/SL-Factory-non-oss/inst-source-ext...</baseurl>
@@ -95,7 +95,7 @@
/
<enabled config:type="boolean">true</enabled>
<autorefresh config:type="boolean">false</autorefresh>
- <priority config:type="integer">20</priority>
+ <priority config:type="integer">120</priority>
<baseurl>http://download.opensuse.org/distribution/SL-OSS-factory-debug/inst-source-d...</baseurl>
@@ -104,7 +104,7 @@
/
<enabled config:type="boolean">false</enabled>
<autorefresh config:type="boolean">false</autorefresh>
- <priority config:type="integer">20</priority>
+ <priority config:type="integer">120</priority>
</software>
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=47672&r1=47671&r2=47672&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon May 19 15:40:07 2008
@@ -4,6 +4,10 @@
- Creating SuSEConfig hook file at installation_settings_finish
in case of update. The file has to be created to force the
SuSEConfig run on first boot (bnc #390930).
+- Workaround for as-big-dialog-as-possible in License Agreement
+ dialog (bnc #385257).
+- Adding FACTORY repositories with priority 120, update source with
+ priority 20 (bnc #392039).
-------------------------------------------------------------------
Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz
Modified: trunk/installation/src/clients/inst_complex_welcome.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_complex_welcome.ycp?rev=47672&r1=47671&r2=47672&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_complex_welcome.ycp (original)
+++ trunk/installation/src/clients/inst_complex_welcome.ycp Mon May 19 15:40:07 2008
@@ -117,17 +117,25 @@
);
term AllLicensesDialog () {
- return `MinHeight ((text_mode ? 20 : 25), `VBox (
- `Left (`HBox (
- Icon::Simple ("yast-license"),
- // TRANSLATORS: dialog caption
- `Heading (_("License Agreement"))
- )),
- `VSpacing (text_mode ? 0.1 : 0.5),
- `HSpacing (60),
- `ReplacePoint (`id (`full_screen_license_rp), `Empty()),
- `PushButton (`id (`close), Label::OKButton())
- ));
+ // As long as possible
+ // bnc #385257
+ return `HBox (
+ `VSpacing (text_mode ? 21 : 25),
+ `VBox (
+ `Left (`HBox (
+ Icon::Simple ("yast-license"),
+ // TRANSLATORS: dialog caption
+ `Heading (_("License Agreement"))
+ )),
+ `VSpacing (text_mode ? 0.1 : 0.5),
+ `HSpacing (82),
+ `HBox (
+ `VStretch (),
+ `ReplacePoint (`id (`full_screen_license_rp), `opt (`vstretch), `Empty())
+ ),
+ `PushButton (`id (`close), Label::OKButton())
+ )
+ );
}
// help text for initial (first time) language screen
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
