Author: sh-sh-sh
Date: Thu Aug 23 16:36:52 2007
New Revision: 40437
URL: http://svn.opensuse.org/viewcvs/yast?rev=40437&view=rev
Log:
Beautification for bug #299787: Preserve spacings even with
over-long repo names
Modified:
trunk/packager/VERSION
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/repositories.ycp
Modified: trunk/packager/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=40437&r1=40436&r2=40437&view=diff
==============================================================================
--- trunk/packager/VERSION (original)
+++ trunk/packager/VERSION Thu Aug 23 16:36:52 2007
@@ -1 +1 @@
-2.15.65
+2.15.66
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=40437&r1=40436&r2=40437&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Thu Aug 23 16:36:52 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Aug 23 16:35:51 CEST 2007 - sh@suse.de
+
+- Beautification for bug #299787: Preserve spacings even with
+ over-long repo names
+- 2.15.66
+
+-------------------------------------------------------------------
Wed Aug 22 16:22:21 CEST 2007 - lslezak@suse.cz
- better error handling when adding Online Repositories (#302385)
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=40437&r1=40436&r2=40437&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Thu Aug 23 16:36:52 2007
@@ -121,20 +121,30 @@
UI::ChangeWidget( `id( `table ), `Items, items );
}
+ term repoInfoTerm(string name, string url, string category) {
+ term infoTerm =
+ `VBox (
+ `Left (`Heading ( name ) ),
+ `Left (`Label ( url ) ),
+ `Left (`Label ( category ) )
+ );
+
+ return infoTerm;
+ }
+
void fillRepoInfo(integer index, map source) {
map info = getSourceInfo (index, source);
- UI::ReplaceWidget (`id (`repo_rp), `VBox (
- // heading - in case repo name not found
- `Left (`Heading (info["name"]:_("Unknown repository name"))),
- // label, %1 is URL
- `Left (`Label (sformat (_("URL: %1"),
- // label to be used instead of URL if not found
- info["url"]:_("Unknown")))),
- // label, %1 is repo category (eg. YUM)
- `Left (`Label (sformat (_("Category: %1"),
- // label to be used instead of repo category if not known
- info["type"]:_("Unknown"))))
- ));
+
+ // heading - in case repo name not found
+ string name = info["name"]:_("Unknown repository name");
+
+ // label to be used instead of URL if not found
+ string url = sformat (_("URL: %1"), info["url"]:_("Unknown") );
+
+ // label, %1 is repo category (eg. YUM)
+ string category = sformat (_("Category: %1"), info["type"]:_("Unknown"));
+
+ UI::ReplaceWidget (`id (`repo_rp), repoInfoTerm( name, url, category ) );
UI::ChangeWidget (`id (`enable), `Value, info["enabled"]:true);
UI::ChangeWidget (`id (`autorefresh), `Value, info["autorefresh"]:true);
}
@@ -492,31 +502,34 @@
`HSpacing()
),
`HBox (
- `HSpacing(0.35),
- `Frame ("", `HBox (`HSpacing (1), `VBox (
- `ReplacePoint (`id (`repo_rp), `VBox (
- `Left (`Heading ("Repo Name")),
- `Left (`Label ("URL:")),
- `Left (`Label ("Category:"))
- )),
- `VSpacing (0.4),
- // label
- `Left (`Label (_("Properties"))),
- // check box
- `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))),
- // check box
- `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))),
- `VSpacing (0.4),
- (have_rug) ?
- `Left (`CheckBox (`id (`zmdsync),
- // Checkbox label
- _("Synchronize Changes with &ZENworks"),
- !norug && sync_zmd))
- : `Empty()
- ))),
- `HSpacing (1.35)
- ),
- `VSpacing(0.3),
+ `HSpacing(0.35),
+ `HWeight (1, `Frame ("",
+ `HBox (
+ `HSpacing (1),
+ `HWeight( 1, `VBox (
+ `ReplacePoint (`id (`repo_rp),
+ repoInfoTerm( "", "", "" )),
+ `VSpacing (0.4),
+ // label
+ `Left (`Label (_("Properties"))),
+ // check box
+ `Left (`CheckBox (`id (`enable), `opt (`notify), _("Enabled"))),
+ // check box
+ `Left (`CheckBox (`id (`autorefresh), `opt (`notify), _("Automatically Refresh"))),
+ `VSpacing (0.4),
+ (have_rug) ?
+ `Left (`CheckBox (`id (`zmdsync),
+ // Checkbox label
+ _("Synchronize Changes with &ZENworks"),
+ !norug && sync_zmd))
+ : `Empty()
+ )),
+ `HSpacing (0.4)
+ )
+ )),
+ `HSpacing (1.35)
+ ),
+ `VSpacing(0.3),
`HBox(
`PushButton (`id (`add), `opt(`key_F3),
Label::AddButton ()),
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org