Author: rpmcruz Date: Sat Jul 10 19:43:34 2010 New Revision: 62214

URL: http://svn.opensuse.org/viewcvs/yast?rev=62214&view=rev Log: Copied over trunk changes.

Modified: branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog branches/SuSE-Linux-11_3-Branch/gtk/src/YGText.cc branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgdetailview.cc branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgmenubar.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/Cha... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog Sat Jul 10 19:43:34 2010 @@ -1,3 +1,30 @@ +2010-07-10 Ricardo Cruz rpmcruz@alunos.dcc.fc.up.pt + + * src/YGText.cc: glitch fix: don't glitch on + autoScroll (see sw_single install procedure). + +2010-07-10 Ricardo Cruz rpmcruz@alunos.dcc.fc.up.pt + + * src/pkg/ygtkpkgdetailview.cc: bug fix 620513: + final fix. + +2010-07-10 Ricardo Cruz rpmcruz@alunos.dcc.fc.up.pt + + * src/ygtkrichtext.c: bug fix 620513: possible fix + for this freeze, when sw_single dependencies box is + open. + +2010-07-06 Ricardo Cruz rpmcruz@alunos.dcc.fc.up.pt + + * src/pkg/ygtkpkgdetailview.cc: bug fix 620513: versions + box not visible enough: swap position with details box. + +2010-07-05 Ricardo Cruz rpmcruz@alunos.dcc.fc.up.pt + + * src/pkg/ygtkpkgmenubar.cc: bug fix 609778 (in part): + only present online-update configuration when on + online-update. Conversely for webpin-search. + 2010-07-02 Ricardo Cruz rpmcruz@alunos.dcc.fc.up.pt

* src/YGDialog.cc: bug fix 618951: sw_single too

Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/src... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGText.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGText.cc Sat Jul 10 19:43:34 2010 @@ -66,7 +66,21 @@

void scrollToBottom() { - YGUtils::scrollWidget (GTK_TEXT_VIEW (getWidget())->vadjustment, false); + //YGUtils::scrollWidget (GTK_TEXT_VIEW (getWidget())->vadjustment, false); + + GtkTextBuffer *buffer = getBuffer(); + GtkTextIter iter; + gtk_text_buffer_get_end_iter (buffer, &iter); + gtk_text_iter_set_line_offset (&iter, 0); + + GtkTextMark *mark = gtk_text_buffer_get_mark (buffer, "scroll"); + if (mark) + gtk_text_buffer_move_mark (buffer, mark, &iter); + else + mark = gtk_text_buffer_create_mark (buffer, "scroll", &iter, TRUE); + + GtkTextView *view = GTK_TEXT_VIEW (getWidget()); + gtk_text_view_scroll_mark_onscreen (view, mark); }

// Event callbacks

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... ============================================================================== --- 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 19:43:34 2010 @@ -710,16 +710,18 @@ void addLine (const std::string &col1, const std::string &col2, const std::string &col3, int dep) { - if (dep >= 0) - gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new(), FALSE, TRUE, 0); +// if (dep >= 0) +// gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new(), FALSE, TRUE, 0);

- GtkWidget *hbox = gtk_hbox_new (TRUE, 6); + GtkWidget *hbox = gtk_hbox_new (FALSE, 6); GtkWidget *col; col = ygtk_rich_text_new(); + gtk_widget_set_size_request (col, 120, -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); col = ygtk_rich_text_new(); + gtk_widget_set_size_request (col, 120, -1); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str()); if (dep == 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -729,6 +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); ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col3.c_str()); if (dep == 0) g_signal_connect (G_OBJECT (col), "link-clicked", @@ -756,7 +759,7 @@

clear(); std::string installed_str (_("<b>Installed Version</b>")); - std::string candidate_str (_("<b>Candidate Version</b>")); + std::string candidate_str (_("<b>Available Version</b>")); if (sel.hasInstalledVersion()) installed_str += "\n" + sel.installed().number(); if (sel.hasCandidateVersion()) @@ -1047,7 +1050,7 @@ Ypp::Selectable sel = list.get (0); std::string str (authors (sel)); if (str.empty()) - ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("<i>Unspecified attribute.</i>")); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("<i>Not specified.</i>")); else ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str()); } @@ -1161,14 +1164,14 @@

GtkWidget *side_vbox = gtk_vbox_new (FALSE, 0);

- widget = new VersionExpander(); - m_widgets.push_back (widget); - gtk_box_pack_start (GTK_BOX (side_vbox), widget->getWidget(), FALSE, TRUE, 0); if (!YGPackageSelector::get()->onlineUpdateMode()) { widget = new DetailsExpander(); m_widgets.push_back (widget); gtk_box_pack_start (GTK_BOX (side_vbox), widget->getWidget(), FALSE, TRUE, 0); } + widget = new VersionExpander(); + m_widgets.push_back (widget); + gtk_box_pack_start (GTK_BOX (side_vbox), widget->getWidget(), FALSE, TRUE, 0);

GtkWidget *main_vbox = gtk_vbox_new (FALSE, 0);

Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/src... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgmenubar.cc Sat Jul 10 19:43:34 2010 @@ -703,10 +703,12 @@ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); append_menu_item (submenu, _("Repositories..."), NULL, G_CALLBACK (repoManager), this); - append_menu_item (submenu, _("Online Update..."), NULL, - G_CALLBACK (onlineUpdateConfiguration), this); - append_menu_item (submenu, _("Search Packages on Web..."), NULL, - G_CALLBACK (webpinSearch), this); + if (selector->onlineUpdateMode()) + append_menu_item (submenu, _("Online Update..."), NULL, + G_CALLBACK (onlineUpdateConfiguration), this); + else + append_menu_item (submenu, _("Search Packages on Web..."), NULL, + G_CALLBACK (webpinSearch), this); } item = append_menu_item (menu_bar, _("Dependencies"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new()));

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... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkrichtext.c Sat Jul 10 19:43:34 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_CHAR); + gtk_text_view_set_wrap_mode (tview, GTK_WRAP_WORD); gtk_text_view_set_pixels_below_lines (tview, 4); gtk_text_view_set_left_margin (tview, 4);