Author: rpmcruz
Date: Sat Jul 10 22:56:43 2010
New Revision: 62216
URL: http://svn.opensuse.org/viewcvs/yast?rev=62216&view=rev
Log:
Sync with trunk.
Modified:
branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog
branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc
branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c
Modified: branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog?rev=62216&r1=62215&r2=62216&view=diff
==============================================================================
--- branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog (original)
+++ branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog Sat Jul 10 22:56:43 2010
@@ -1,5 +1,10 @@
2010-07-10 Ricardo Cruz
+ * src/pkg/ygtkpkgdetailview.cc & src/ygtkrichtext.c:
+ cosmetic fixes related to bug fix 620513.
+
+2010-07-10 Ricardo Cruz
+
* src/YGText.cc: glitch fix: don't glitch on
autoScroll (see sw_single install procedure).
Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc?rev=62216&r1=62215&r2=62216&view=diff
==============================================================================
--- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc (original)
+++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc Sat Jul 10 22:56:43 2010
@@ -716,12 +716,12 @@
GtkWidget *hbox = gtk_hbox_new (FALSE, 6);
GtkWidget *col;
col = ygtk_rich_text_new();
- gtk_widget_set_size_request (col, 120, -1);
+ gtk_widget_set_size_request (col, 100, -1);
ygtk_rich_text_set_text (YGTK_RICH_TEXT (col),
("<b>" + col1 + "</b>").c_str());
- gtk_box_pack_start (GTK_BOX (hbox), col, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0);
col = ygtk_rich_text_new();
- gtk_widget_set_size_request (col, 120, -1);
+ gtk_widget_set_size_request (col, 1, -1);
ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str());
if (dep == 0)
g_signal_connect (G_OBJECT (col), "link-clicked",
@@ -731,7 +731,7 @@
G_CALLBACK (provides_link_cb), NULL);
gtk_box_pack_start (GTK_BOX (hbox), col, TRUE, TRUE, 0);
col = ygtk_rich_text_new();
- gtk_widget_set_size_request (col, 120, -1);
+ gtk_widget_set_size_request (col, 1, -1);
ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col3.c_str());
if (dep == 0)
g_signal_connect (G_OBJECT (col), "link-clicked",
@@ -761,9 +761,9 @@
std::string installed_str (_("<b>Installed Version</b>"));
std::string candidate_str (_("<b>Available Version</b>"));
if (sel.hasInstalledVersion())
- installed_str += "\n" + sel.installed().number();
+ installed_str += "<br>" + sel.installed().number();
if (sel.hasCandidateVersion())
- candidate_str += "\n" + sel.candidate().number();
+ candidate_str += "<br>" + sel.candidate().number();
addLine ("", installed_str, candidate_str, -1);
for (int dep = 0; dep < VersionDependencies::total(); dep++) {
std::string inst, cand;
Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c?rev=62216&r1=62215&r2=62216&view=diff
==============================================================================
--- branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c (original)
+++ branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c Sat Jul 10 22:56:43 2010
@@ -99,7 +99,7 @@
GtkWidget *widget = GTK_WIDGET (rtext);
GtkTextView *tview = GTK_TEXT_VIEW (rtext);
gtk_text_view_set_editable (tview, FALSE);
- gtk_text_view_set_wrap_mode (tview, GTK_WRAP_WORD);
+ gtk_text_view_set_wrap_mode (tview, GTK_WRAP_WORD_CHAR);
gtk_text_view_set_pixels_below_lines (tview, 4);
gtk_text_view_set_left_margin (tview, 4);
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
