Author: coolo Date: Thu Jan 31 20:10:39 2008 New Revision: 44085 URL: http://svn.opensuse.org/viewcvs/yast?rev=44085&view=rev Log: make it compile at least Modified: trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGMultiLineEdit.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=44085&r1=44084&r2=44085&view=diff ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Jan 31 20:10:39 2008 @@ -421,3 +421,24 @@ return new YGDialog (dialogType, colorMode); } +void +YGDialog::openInternal() +{ +#if 0 + ensureOnlyOneDefaultButton(); + QWidget::show(); + QWidget::raise(); // FIXME: is this really necessary? + QWidget::update(); +#endif +} + + +void +YGDialog::activate() +{ +#if 0 + QWidget::raise(); + QWidget::update(); +#endif +} + Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=44085&r1=44084&r2=44085&view=diff ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Thu Jan 31 20:10:39 2008 @@ -33,6 +33,9 @@ virtual int preferredWidth() { return 0; } virtual int preferredHeight() { return 0; } + virtual void activate(); + virtual void openInternal(); + YGWIDGET_IMPL_CHILD_ADDED (m_containee) YGWIDGET_IMPL_CHILD_REMOVED (m_containee) }; Modified: trunk/gtk/src/YGMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMultiLineEdit.cc?rev=44085&r1=44084&r2=44085&view=diff ============================================================================== --- trunk/gtk/src/YGMultiLineEdit.cc (original) +++ trunk/gtk/src/YGMultiLineEdit.cc Thu Jan 31 20:10:39 2008 @@ -216,7 +216,7 @@ static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis) { - YGUI::ui()->sendEvent (new YMenuEvent (YCPString (url))); + YGUI::ui()->sendEvent (new YMenuEvent (url)); } YGWIDGET_IMPL_COMMON Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=44085&r1=44084&r2=44085&view=diff ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Jan 31 20:10:39 2008 @@ -1651,7 +1651,7 @@ if (!strcmp (action, "accept")) { y2milestone ("Closing PackageSelector with 'accept'"); - YGUI::ui()->sendEvent (new YMenuEvent (YCPSymbol ("accept"))); + YGUI::ui()->sendEvent (new YMenuEvent ("accept")); } else if (!strcmp (action, "cancel")) { y2milestone ("Closing PackageSelector with 'cancel'"); Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=44085&r1=44084&r2=44085&view=diff ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Thu Jan 31 20:10:39 2008 @@ -297,13 +297,16 @@ dialog->normalCursor(); } -YCPValue YGUI::runPkgSelection (YWidget *packageSelector) +YEvent* YGUI::runPkgSelection (YWidget *packageSelector) { y2milestone( "Running package selection..." ); - YCPValue input = YCPVoid(); + YEvent *event = 0; try { - input = evaluateUserInput(); + do + { + event = filterInvalidEvents( userInput(0) ); + } while ( ! event ); } catch (const std::exception &e) { y2error ("UI::RunPkgSelection() error: %s", e.what()); y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); @@ -312,8 +315,8 @@ y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); } - y2milestone ("Package selection done - returning %s", input->toString().c_str()); - return input; + // y2milestone ("Package selection done - returning %s", input->toString().c_str()); + return event; } void YGUI::makeScreenShot (string filename) Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=44085&r1=44084&r2=44085&view=diff ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Thu Jan 31 20:10:39 2008 @@ -85,7 +85,7 @@ virtual void makeScreenShot (string filename); virtual void beep(); - virtual YCPValue runPkgSelection (YWidget *packageSelector); + virtual YEvent * runPkgSelection (YWidget *packageSelector); void toggleRecordMacro(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org