Author: rpmcruz Date: Wed Dec 2 16:48:53 2009 New Revision: 59908 URL: http://svn.opensuse.org/viewcvs/yast?rev=59908&view=rev Log: * src/YGPackageSelector.cc: fix online update launch. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/YGPushButton.cc trunk/gtk/src/YGUI.h trunk/gtk/src/pkg/YGPackageSelector.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=59908&r1=59907&... ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Wed Dec 2 16:48:53 2009 @@ -3,6 +3,9 @@ * src/YGUtils.cc: bug fix 549943: HTML to XHTML conversor was tripping in the breakline. + * src/YGPackageSelector.cc: fix online update + launch. + 2009-12-01 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/YGUtils.cc: bug fix 559226: Allow '&' to be escaped. Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginSt... ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Wed Dec 2 16:48:53 2009 @@ -25,7 +25,7 @@ } void YGUI::pkgSelectorSize (int *width, int *height) -{ *width = 700; *height = 800; } +{ *width = 700; *height = 750; } class YGPackageSelectorPluginStub : public YPackageSelectorPlugin { Modified: trunk/gtk/src/YGPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=59908... ============================================================================== --- trunk/gtk/src/YGPushButton.cc (original) +++ trunk/gtk/src/YGPushButton.cc Wed Dec 2 16:48:53 2009 @@ -122,7 +122,6 @@ struct inner { static void realize_cb (GtkWidget *widget) { - GtkWidget *window = gtk_widget_get_toplevel (widget); gtk_widget_grab_default (widget); gtk_widget_grab_focus (widget); } Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=59908&r1=59907... ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Wed Dec 2 16:48:53 2009 @@ -67,9 +67,10 @@ int m_default_width, m_default_height; bool pkgSelectorParse (const char *arg); - void pkgSelectorSize (int *width, int *height); public: + void pkgSelectorSize (int *width, int *height); + // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } bool hasWM() const { return m_have_wm; } Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?... ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Wed Dec 2 16:48:53 2009 @@ -2403,7 +2403,9 @@ bool onlineUpdate = onlineUpdateMode(); YGDialog *dialog = YGDialog::currentDialog(); dialog->setCloseCallback (confirm_cb, this); - dialog->setMinSize (700, 800); // enlarge + int width, height; + YGUI::ui()->pkgSelectorSize (&width, &height); + dialog->setMinSize (width, height); YGtkWizard *wizard = YGTK_WIZARD (getWidget()); ygtk_wizard_set_header_icon (wizard, @@ -2523,6 +2525,7 @@ if (GTK_WIDGET_VISIBLE (m_progressbar)) { gtk_widget_hide (m_progressbar); while (g_main_context_iteration (NULL, FALSE)) ; + //gtk_widget_set_sensitive (getWidget(), TRUE); } YGUI::ui()->normalCursor(); } @@ -2530,6 +2533,7 @@ if (progress == 0) YGUI::ui()->busyCursor(); else { // progress=0 may be to trigger cursor only + //gtk_widget_set_sensitive (getWidget(), FALSE); gtk_widget_show (m_progressbar); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (m_progressbar), progress); } @@ -2545,21 +2549,21 @@ YPackageSelector * YGPackageSelectorPluginImpl::createPackageSelector (YWidget *parent, long modeFlags) { - modeFlags &= YPkg_SearchMode; + modeFlags |= YPkg_SearchMode; return new YGPackageSelector (parent, modeFlags); } YWidget * YGPackageSelectorPluginImpl::createPatternSelector (YWidget *parent, long modeFlags) { - modeFlags ^= YPkg_SearchMode; + modeFlags &= YPkg_SearchMode; return new YGPackageSelector (parent, modeFlags); } YWidget * YGPackageSelectorPluginImpl::createSimplePatchSelector (YWidget *parent, long modeFlags) { - modeFlags &= YPkg_OnlineUpdateMode; + modeFlags |= YPkg_OnlineUpdateMode; return new YGPackageSelector (parent, modeFlags); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org