Author: rpmcruz
Date: Sat Jan 17 02:18:04 2009
New Revision: 54741
URL: http://svn.opensuse.org/viewcvs/yast?rev=54741&view=rev
Log:
* src/ygtkwizard.c: bug fix 464900: reduce space between buttons,
added some border to contents.
* src/YGUtils.cc: process &product; entity here, at least for now.
* src/pkg-selector-help.h: bug fix 448192 & 459457: improved
pkg selector help a bit.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/YGPackageSelector.cc
trunk/gtk/src/YGText.cc
trunk/gtk/src/YGUtils.cc
trunk/gtk/src/pkg-selector-help.h
trunk/gtk/src/ygtkwizard.c
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=54741&r1=54740&r2=54741&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Sat Jan 17 02:18:04 2009
@@ -1,3 +1,13 @@
+2009-01-17 Ricardo Cruz
+
+ * src/ygtkwizard.c: bug fix 464900: reduce space between buttons,
+ added some border to contents.
+
+ * src/YGUtils.cc: process &product; entity here, at least for now.
+
+ * src/pkg-selector-help.h: bug fix 448192 & 459457: improved
+ pkg selector help a bit.
+
2009-01-08 Ricardo Cruz
* src/YGUI.cc: bug fix 461617: return opposite arrow glyph for
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=54741&r1=54740&r2=54741&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Sat Jan 17 02:18:04 2009
@@ -3160,7 +3160,7 @@
ygtk_menu_button_set_popup (YGTK_MENU_BUTTON (button), popup);
gtk_widget_show_all (popup);
- GtkWidget *box = gtk_hbox_new (FALSE, 12);
+ GtkWidget *box = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box),
m_package_selector->m_disk->getWidget(), FALSE, TRUE, 0);
Modified: trunk/gtk/src/YGText.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGText.cc?rev=54741&r1=54740&r2=54741&view=diff
==============================================================================
--- trunk/gtk/src/YGText.cc (original)
+++ trunk/gtk/src/YGText.cc Sat Jan 17 02:18:04 2009
@@ -187,11 +187,14 @@
ygtk_html_wrap_set_text (getWidget(), text.c_str(), TRUE);
}
- void setRichText (const string &_text)
+ void setRichText (const string &text)
{
+#if 0 // current done at the XHTML treatment level, we may want to enable
+ // this code so that we replace the entity for all widgets
string text (_text);
std::string productName = YUI::app()->productName();
YGUtils::replace (text, "&product;", 9, productName.c_str());
+#endif
ygtk_html_wrap_set_text (getWidget(), text.c_str(), FALSE);
}
Modified: trunk/gtk/src/YGUtils.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=54741&r1=54740&r2=54741&view=diff
==============================================================================
--- trunk/gtk/src/YGUtils.cc (original)
+++ trunk/gtk/src/YGUtils.cc Sat Jan 17 02:18:04 2009
@@ -100,6 +100,7 @@
static const EntityMap entities[] = {
{ "nbsp", " " },
+ { "product", 0 }, // dynamic
};
static const EntityMap *lookup_entity (const char *html)
@@ -238,7 +239,10 @@
else if (instr[i] == '&') { // Entity
const EntityMap *entity = lookup_entity (instr+i);
if (entity) {
- g_string_append (outp, entity->text);
+ if (!strcmp (entity->html, "product"))
+ g_string_append (outp, YUI::app()->productName().c_str());
+ else
+ g_string_append (outp, entity->text);
i += strlen (entity->html);
if (instr[i+1] == ';') i++;
}
Modified: trunk/gtk/src/pkg-selector-help.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg-selector-help.h?rev=54741&r1=54740&r2=54741&view=diff
==============================================================================
--- trunk/gtk/src/pkg-selector-help.h (original)
+++ trunk/gtk/src/pkg-selector-help.h Sat Jan 17 02:18:04 2009
@@ -5,7 +5,7 @@
static const char *pkg_help =
__("<h1>Purpose</h1>"
"<p>This tool lets you install, remove, and update applications.</p>"
-"<p>openSUSE's software management is also called 'package management'. A package is "
+"<p>&product; 's software management is also called 'package management'. A package is "
"generally an application bundle, but multiple packages that extend the application "
"may be offered in order to avoid clutter (e.g. games tend to de-couple the music "
"data in another package, since its not essential and requires significant disk space). "
@@ -21,7 +21,7 @@
"<p>You will find both packages installed on your system, and packages that are made "
"available through the setup-ed repositories. You cans either install or upgrade "
"an available package, or remove an installed one.</p>"
-"<blockquote>A repository is a packages media; it can either be local (like your Suse CDs), "
+"<blockquote>A repository is a packages media; it can either be local (such as the &product; CDs), "
"or a remote internet server. You can find utilities to setup repositories "
"on the YaST control center.</blockquote>"
""
@@ -39,17 +39,15 @@
"AbiWord which carries the word 'office' in its description). You can also "
"choose to view software from a specific repository.</p>"
""
-"<h2>Categories & Collections</h2>"
-"<p>Software for openSUSE is indexed so that you can find software for a specific "
+"<h2>Groups & Collections</h2>"
+"<p>Software for &product; is indexed so that you can find software for a specific "
"task when you don't know the name of the software you are looking for. Browse "
-"indices of software by using the tree-view in the left column; you can view the "
-"available software by their Package names, or grouped in 'Categories' or 'Patterns' "
-"by the selecting a view-mode from the drop-down-menu below. Categories' are simple, "
-"hierarchical classifications of software packages, like 'Multimedia/Video', while "
-"'Patterns' are task-oriented collections of multiple packages that install like one "
-"(the installation of the 'server'-pattern for example will install various software "
-"needed for running a server). By using 'Install All' you make sure that future "
-"collection changes, when you upgrade openSUSE, will be honored.</p>"
+"indexes of software through the Groups pane. A more detailed, hierarchical classification "
+"of software packages, like 'Multimedia/Video' is available through the 'Detailed' check "
+"button. 'Patterns' and 'Languages' are task-oriented collections of multiple packages that "
+"install like one (the installation of the 'server'-pattern for example will install various "
+"software needed for running a server). By using 'Install All' you make sure that future "
+"collection changes, when you upgrade &product;, will be honored.</p>"
""
"<h2>Software details in the box below</h2>"
"<p>In the package detail view you can perform actions affecting this software; "
@@ -61,14 +59,14 @@
"<p>The lock button can be used to lock the selected package state; it won't allow "
"some automatic operation to install, upgrade or remove the package. This is only "
"useful in very unusual cases: for instance, you may not want to install some "
-"drivers because they interfer with your system, yet you want to install some "
+"drivers because they interfere with your system, yet you want to install some "
"collection that includes them.</p>"
-"<p>The changes will be performed once you decide to click the 'perform changes' "
+"<p>The changes will be performed once you decide to click the Apply "
"button in the lower-right corner. If you want to leave the software-manager "
-"without performing any changes, simply press the button labeled 'Abort'.</p>"
+"without performing any changes, simply press 'Cancel'.</p>"
""
"<blockquote><i>Developed by Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt><br>"
-"Thanks to Christian Jager for co-designing this tool.</i></blockquote>");
+"Thanks to Christian Jaeger for co-designing this tool.</i></blockquote>");
static const char *patch_help =
__("<h1>Purpose</h1>"
@@ -85,7 +83,7 @@
"performance slowdown)</li>"
"<li>Optional: ones that only apply to few users.</li>"
"</ul>"
-"<p>Only patches that apply to your system will be visible. openSUSE developers "
+"<p>Only patches that apply to your system will be visible. &product; developers "
"are very restrained in pushing patches; you can be sure that all patches are "
"of signficant severity.</p>"
"<p>If you are looking for applications enhancements, you should check for Upgrades "
Modified: trunk/gtk/src/ygtkwizard.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=54741&r1=54740&r2=54741&view=diff
==============================================================================
--- trunk/gtk/src/ygtkwizard.c (original)
+++ trunk/gtk/src/ygtkwizard.c Sat Jan 17 02:18:04 2009
@@ -591,7 +591,7 @@
g_signal_connect (G_OBJECT (wizard->help_button), "toggled",
G_CALLBACK (help_button_toggled_cb), wizard);
- wizard->m_buttons = gtk_hbox_new (FALSE, 12);
+ wizard->m_buttons = gtk_hbox_new (FALSE, 6);
gtk_widget_show (wizard->m_buttons);
gtk_box_pack_start (GTK_BOX (wizard->m_buttons), wizard->help_button, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (wizard->m_buttons), wizard->release_notes_button,
@@ -618,19 +618,17 @@
wizard->m_menu_box = gtk_event_box_new();
wizard->m_pane = gtk_hpaned_new();
- GtkWidget *contents_align = gtk_alignment_new (0, 0, 1, 1);
- gtk_alignment_set_padding (GTK_ALIGNMENT (contents_align), 6, 12, 0, 0);
- gtk_container_add (GTK_CONTAINER (contents_align), wizard->m_pane);
- gtk_widget_show_all (contents_align);
+ gtk_widget_show (wizard->m_pane);
wizard->m_contents_box = gtk_hbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), contents_align, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), wizard->m_pane, TRUE, TRUE, 0);
gtk_widget_show (wizard->m_contents_box);
GtkWidget *vbox;
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_vbox_new (FALSE, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); // content's border
gtk_box_pack_start (GTK_BOX (vbox), wizard->m_contents_box, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), wizard->m_buttons, FALSE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox), wizard->m_buttons, FALSE, TRUE, 0);
gtk_widget_show (vbox);
wizard->m_contents_buttons_box = gtk_hbox_new (FALSE, 6);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org