Author: sh-sh-sh
Date: Fri Apr 11 18:20:19 2008
New Revision: 46445
URL: http://svn.opensuse.org/viewcvs/yast?rev=46445&view=rev
Log:
Reverted sub-wizard changes - dead end
Removed:
trunk/ycp-ui-bindings/examples/Wizard-SubWizard1.ycp
Modified:
trunk/libyui/VERSION
trunk/libyui/package/yast2-libyui.changes
trunk/libyui/src/YWidget.cc
trunk/libyui/src/YWidget.h
trunk/libyui/src/YWizard.cc
trunk/libyui/src/YWizard.h
trunk/qt/VERSION.cmake
trunk/qt/package/yast2-qt.changes
trunk/qt/src/YQWizard.cc
trunk/qt/src/YQWizard.h
trunk/qt/yast2-qt.spec.in
trunk/ycp-ui-bindings/VERSION
trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes
trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc
trunk/ycp-ui-bindings/src/YCPWizardCommandParser.h
trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in
Modified: trunk/libyui/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/libyui/VERSION (original)
+++ trunk/libyui/VERSION Fri Apr 11 18:20:19 2008
@@ -1 +1 @@
-2.16.42
+2.16.43
Modified: trunk/libyui/package/yast2-libyui.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.changes?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/libyui/package/yast2-libyui.changes (original)
+++ trunk/libyui/package/yast2-libyui.changes Fri Apr 11 18:20:19 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 11 18:17:05 CEST 2008 - sh@suse.de
+
+- Reverted last changes - sub-wizards seem to be a dead end
+- V 2.16.43
+
+-------------------------------------------------------------------
Thu Apr 10 19:51:35 CEST 2008 - sh@suse.de
- Added support for docked sub-wizards
Modified: trunk/libyui/src/YWidget.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YWidget.cc?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/libyui/src/YWidget.cc (original)
+++ trunk/libyui/src/YWidget.cc Fri Apr 11 18:20:19 2008
@@ -55,14 +55,13 @@
: magic( YWIDGET_MAGIC )
, childrenManager( manager )
, parent( parentWidget )
- , id( 0 )
, beingDestroyed( false )
, enabled( true )
, notify( false )
, sendKeyEvents( false )
, autoShortcut( false )
- , idEnabled( true )
, toolkitWidgetRep( 0 )
+ , id( 0 )
, functionKey( 0 )
{
stretch.hor = false;
@@ -78,14 +77,13 @@
int magic;
YWidgetChildrenManager * childrenManager;
YWidget * parent;
- YWidgetID * id;
bool beingDestroyed;
bool enabled;
bool notify;
bool sendKeyEvents;
bool autoShortcut;
- bool idEnabled;
void * toolkitWidgetRep;
+ YWidgetID * id;
YBothDim<bool> stretch;
YBothDim<int> weight;
int functionKey;
@@ -360,7 +358,7 @@
YWidgetID *
YWidget::id() const
{
- return (priv->idEnabled ? priv->id : 0 );
+ return priv->id;
}
@@ -379,18 +377,6 @@
}
-void YWidget::setIdEnabled( bool enabled )
-{
- priv->idEnabled = enabled;
-}
-
-
-bool YWidget::isIdEnabled() const
-{
- return priv->idEnabled;
-}
-
-
YDialog * YWidget::findDialog()
{
YWidget * widget = this;
Modified: trunk/libyui/src/YWidget.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YWidget.h?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/libyui/src/YWidget.h (original)
+++ trunk/libyui/src/YWidget.h Fri Apr 11 18:20:19 2008
@@ -196,7 +196,6 @@
**/
bool hasChildren() const
{ return childrenManager()->hasChildren(); }
-
/**
* Returns the first child or 0 if there is none.
* Useful mostly for children managers that handle only one child.
@@ -373,7 +372,7 @@
bool hasId() const;
/**
- * Returns this widget's ID unless the ID is disabled.
+ * Returns this widget's ID.
**/
YWidgetID * id() const;
@@ -560,21 +559,6 @@
**/
void setChildrenEnabled( bool enabled );
- /**
- * Enable or disable this widget's ID.
- *
- * As long as the ID is disabled, subsequent calls to id() will return 0.
- * Widget IDs are enabled by default. Disabling a widget ID makes sense
- * only in very rare cases - see YWizard for an example.
- **/
- void setIdEnabled( bool enabled = true );
- void setIdDisabled() { setIdEnabled( false ); }
-
- /**
- * Return 'true' if this widget's ID is enabled.
- **/
- bool isIdEnabled() const;
-
//
// Macro Recorder Support
//
Modified: trunk/libyui/src/YWizard.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YWizard.cc?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/libyui/src/YWizard.cc (original)
+++ trunk/libyui/src/YWizard.cc Fri Apr 11 18:20:19 2008
@@ -22,7 +22,6 @@
#include "YWizard.h"
#include "YPushButton.h"
-#include "YReplacePoint.h"
struct YWizardPrivate
@@ -30,12 +29,10 @@
YWizardPrivate( YWizardMode wizardMode )
: wizardMode( wizardMode )
, nextButtonIsProtected( false )
- , idsDisabledCount( 0 )
{}
YWizardMode wizardMode;
bool nextButtonIsProtected;
- int idsDisabledCount;
};
@@ -67,32 +64,6 @@
}
-YWizardMode
-YWizard::wizardMode() const
-{
- return priv->wizardMode;
-}
-
-
-YWizard *
-YWizard::wizardParent() const
-{
- YWidget * widget = parent();
-
- while ( widget )
- {
- YWizard * wizard = dynamic_cast (widget);
-
- if ( wizard )
- return wizard;
-
- widget = widget->parent();
- }
-
- return 0;
-}
-
-
bool
YWizard::nextButtonIsProtected() const
{
@@ -126,27 +97,6 @@
}
-void
-YWizard::setInternalIdsEnabled( bool enabled )
-{
- if ( enabled )
- priv->idsDisabledCount--;
- else
- priv->idsDisabledCount++;
-
- if ( enabled && priv->idsDisabledCount > 0 )
- return;
-
- this->setIdEnabled( enabled );
-
- if ( backButton() ) backButton ()->setIdEnabled( enabled );
- if ( abortButton() ) abortButton()->setIdEnabled( enabled );
- if ( nextButton() ) nextButton ()->setIdEnabled( enabled );
-
- if ( contentsReplacePoint() ) contentsReplacePoint()->setIdEnabled( enabled );
-}
-
-
const YPropertySet &
YWizard::propertySet()
{
Modified: trunk/libyui/src/YWizard.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YWizard.h?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/libyui/src/YWizard.h (original)
+++ trunk/libyui/src/YWizard.h Fri Apr 11 18:20:19 2008
@@ -114,11 +114,6 @@
//
// Wizard basics
//
-
- /**
- * Return this wizard's mode.
- **/
- YWizardMode wizardMode() const;
/**
* Return the wizard buttons or 0 if there is no such button.
@@ -170,46 +165,6 @@
**/
virtual void setDialogHeading( const string & headingText ) = 0;
- /**
- * Enable or disable the IDs of this wizard and its internal widgets:
- * backButton(), abortButton(), nextButton(), contentsReplacePoint().
- *
- * This wizard keeps count of those calls and really enables the IDs only
- * when the internal counter reaches 0.
- **/
- void setInternalIdsEnabled( bool enabled );
-
- //
- // Sub-Wizard Docking
- //
-
- /**
- * Dock a sub-wizard: Wizards in YWizardMode_Steps can "swallow" wizards
- * in YWizardMode_Standard so they will obscure the content + buttons part
- * of the "steps" wizard. The docked wizard must be created as the
- * immediate child of the "steps" wizard.
- *
- * Return 'true' upon success, 'false' upon failure.
- *
- * This default implementation always returns 'false'.
- **/
- virtual bool dockSubWizard( YWizard * subWizard ) { return false; }
-
- /**
- * Delete a sub-wizard.
- *
- * Return 'true' upon success, 'false' upon failure.
- *
- * This default implementation always returns 'false'.
- **/
- virtual bool deleteSubWizard( YWizard * subWizard ) { return false; }
-
- /**
- * Return the next widget parent upwards in the hierarchy of this wizard
- * or 0 if there is none.
- **/
- YWizard * wizardParent() const;
-
//
// Steps handling
Modified: trunk/qt/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/qt/VERSION.cmake (original)
+++ trunk/qt/VERSION.cmake Fri Apr 11 18:20:19 2008
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "36")
+SET(VERSION_PATCH "37")
Modified: trunk/qt/package/yast2-qt.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/qt/package/yast2-qt.changes (original)
+++ trunk/qt/package/yast2-qt.changes Fri Apr 11 18:20:19 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 11 18:18:38 CEST 2008 - sh@suse.de
+
+- Reverted sub-wizard changes - seems to be a dead end
+- V 2.16.37
+
+-------------------------------------------------------------------
Thu Apr 10 19:53:05 CEST 2008 - sh@suse.de
- Added basic support for docked sub-wizards
Modified: trunk/qt/src/YQWizard.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/qt/src/YQWizard.cc (original)
+++ trunk/qt/src/YQWizard.cc Fri Apr 11 18:20:19 2008
@@ -209,7 +209,6 @@
return vbox;
}
-
void YQWizard::layoutStepsPanel()
{
// Steps
@@ -234,7 +233,6 @@
_stepsDirty = true; // no layout yet
}
-
void YQWizard::addStep( const string & text, const string & id )
{
QString qId = fromUTF8( id );
@@ -604,10 +602,7 @@
QWidget *YQWizard::layoutWorkArea( QWidget * parent )
{
- _workingDock = new QStackedWidget( parent );
- _workingDock->installEventFilter( this );
-
- QFrame *workArea = new QFrame( _workingDock );
+ QFrame *workArea = new QFrame( parent );
workArea->setObjectName( "work_area" );
QY2Styler::self()->registerChildWidget( this, workArea );
@@ -768,6 +763,7 @@
return hbox;
}
+
void YQWizard::destroyButtons()
{
delete _backButton;
@@ -856,6 +852,7 @@
return "untitled YQWizard";
}
+
void YQWizard::setHelpText( const string & helpText )
{
_qHelpText = fromUTF8( helpText );
@@ -931,7 +928,6 @@
}
-
void YQWizard::addMenu( const string & text,
const string & id )
{
@@ -1065,44 +1061,17 @@
void YQWizard::resizeClientArea()
{
- yuiDebug() << "Resizing client area" << endl;
+ yuiDebug() << "resizing client area" << endl;
QRect contentsRect = _clientArea->contentsRect();
_contents->setSize( contentsRect.width(), contentsRect.height() );
}
-
bool YQWizard::eventFilter( QObject * obj, QEvent * ev )
{
- if ( ev->type() == QEvent::Resize )
+ if ( ev->type() == QEvent::Resize && obj == _contents )
{
- if ( obj == _contents )
- {
- resizeClientArea();
- return true; // Event handled
- }
-
- if ( obj == _workingDock )
- {
- yuiWarning() << "Resize event for _workingDock; currentWidget: "
- << hex << (void *) _workingDock->currentWidget() << dec << endl;
-
- YQWizard * wizard = dynamic_cast ( _workingDock->currentWidget() );
-
- if ( wizard )
- {
- yuiWarning() << "Resizing sub-wizard" << wizard << endl;
- QRect contentsRect = _workingDock->contentsRect();
-
- YWizard * yWizard = (YWizard *) wizard;
- yWizard->setSize( contentsRect.width(), contentsRect.height() );
-
- return true; // Event handled
- }
- }
- else
- {
- yuiWarning() << "Unknown resize event: " << hex << (void *) obj << dec << endl;
- }
+ resizeClientArea();
+ return true; // Event handled
}
return QWidget::eventFilter( obj, ev );
@@ -1116,8 +1085,7 @@
YQWizardButton * wizardButton = dynamic_cast (button);
- if ( wizardButton )
- {
+ if ( wizardButton ) {
// QWizardButton only implements hide and show, not setVisible
if ( newLabel.empty() )
wizardButton->hide();
@@ -1174,56 +1142,6 @@
}
-bool YQWizard::dockSubWizard( YWizard * ySubWizard )
-{
- YUI_CHECK_PTR( ySubWizard );
-
- if ( ySubWizard->parent() != this )
- YUI_THROW( YUIInvalidChildException<YWidget>( this, ySubWizard ) );
-
- yuiMilestone() << "Docking sub-wizard " << ySubWizard << " to " << this << endl;
-
- setInternalIdsEnabled( false ); // avoid duplicate widget IDs
- YQWizard * yqSubWizard = (YQWizard *) ySubWizard->widgetRep();
-
-#if 0
- ((QWidget *) yqSubWizard)->setParent( _workingDock );
-#endif
-
- int index = _workingDock->addWidget( yqSubWizard );
- yuiMilestone() << "Index " << index << endl;
- _workingDock->setCurrentWidget( yqSubWizard );
- yqSubWizard->installEventFilter( this );
-
- return true; // success
-}
-
-
-bool YQWizard::deleteSubWizard( YWizard * subWizard )
-{
- if ( subWizard )
- {
- yuiMilestone() << "Deleting sub-wizard " << subWizard << endl;
- delete subWizard;
-
- setInternalIdsEnabled( true ); // re-enable widget IDs if no more sub-wizard open
-
- // FIXME (?)
- // FIXME (?)
- // FIXME (?)
-
- // Make next-lower sub-wizard visible in widget stack, if necessary
-
- return true; // success
- }
- else
- {
- yuiWarning() << "No more sub-wizard" << endl;
- return false; // failure
- }
-}
-
-
void YQWizard::Step::deleteLabels()
{
delete _statusLabel;
Modified: trunk/qt/src/YQWizard.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.h?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/qt/src/YQWizard.h (original)
+++ trunk/qt/src/YQWizard.h Fri Apr 11 18:20:19 2008
@@ -133,25 +133,6 @@
**/
virtual void setDialogHeading( const string & headingText );
- /**
- * Dock a sub-wizard: Wizards in YWizardMode_Steps can "swallow" wizards
- * in YWizardMode_Standard so they will obscure the content + buttons part
- * of the "steps" wizard. The docked wizard must be created as the
- * immediate child of the "steps" wizard.
- *
- * Return 'true' upon success, 'false' upon failure.
- *
- * Reimplemented from YWizard.
- **/
- virtual bool dockSubWizard( YWizard * subWizard );
-
- /**
- * Delete a sub-wizard.
- * Return 'true' upon success, 'false' upon failure.
- *
- * Reimplemented from YWizard.
- **/
- virtual bool deleteSubWizard( YWizard * subWizard );
//
// Steps handling
@@ -455,13 +436,13 @@
// Layout functions
void layoutTitleBar ( QWidget * parent );
- QLayout *layoutSideBar ( QWidget * parent );
+ QLayout *layoutSideBar ( QWidget * parent );
void layoutSideBarButtonBox ( QWidget * parent, QPushButton * button );
void layoutStepsPanel();
void layoutTreePanel();
QWidget *layoutWorkArea ( QWidget * parent );
- void layoutClientArea( QWidget * parent );
- QLayout *layoutButtonBox( QWidget * parent );
+ void layoutClientArea ( QWidget * parent );
+ QLayout *layoutButtonBox ( QWidget * parent );
/**
* Destroy the button box's buttons
@@ -550,7 +531,6 @@
QFrame * _treePanel;
QY2ListView * _tree;
- QStackedWidget * _workingDock;
QWidget * _clientArea;
QMenuBar * _menuBar;
QLabel * _dialogIcon;
Modified: trunk/qt/yast2-qt.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/qt/yast2-qt.spec.in (original)
+++ trunk/qt/yast2-qt.spec.in Fri Apr 11 18:20:19 2008
@@ -16,8 +16,8 @@
Summary: -
BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.16.42
-Requires: yast2-libyui >= 2.16.42
+BuildRequires: yast2-libyui-devel >= 2.16.43
+Requires: yast2-libyui >= 2.16.43
Requires: yast2_theme >= 2.16.1
Provides: yast2_ui
Provides: y2base:/usr/lib/YaST2/servers/qt
Modified: trunk/ycp-ui-bindings/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/VERSION (original)
+++ trunk/ycp-ui-bindings/VERSION Fri Apr 11 18:20:19 2008
@@ -1 +1 @@
-2.16.42
+2.16.43
Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original)
+++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Fri Apr 11 18:20:19 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 11 18:17:47 CEST 2008 - sh@suse.de
+
+- Reverted last changes - sub-wizards seem to be a dead end
+- V 2.16.43
+
+-------------------------------------------------------------------
Thu Apr 10 19:51:59 CEST 2008 - sh@suse.de
- Added support for docked sub-wizards
Modified: trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc (original)
+++ trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc Fri Apr 11 18:20:19 2008
@@ -24,11 +24,6 @@
#include "YCPValueWidgetID.h"
#include "YWizard.h"
#include "YPushButton.h"
-#include "YReplacePoint.h"
-#include "YDialog.h"
-#include "YUISymbols.h"
-#include "YUI.h"
-#include "YOptionalWidgetFactory.h"
bool
@@ -95,14 +90,6 @@
if ( isCommand( "HideReleaseNotesButton()" , cmd ) ) { wizard->hideReleaseNotesButton(); return true; }
if ( isCommand( "RetranslateInternalButtons()" , cmd ) ) { wizard->retranslateInternalButtons() ; return true; }
if ( isCommand( "Ping()" , cmd ) ) { wizard->ping() ; return true; }
- if ( isCommand( "DockSubWizard( any, string, any, string, any, string )", cmd ) )
- {
- return dockSubWizard( wizard,
- anyArg( cmd, 0 ), stringArg( cmd, 1 ),
- anyArg( cmd, 2 ), stringArg( cmd, 3 ),
- anyArg( cmd, 4 ), stringArg( cmd, 5 ) );
- }
- if ( isCommand( "DeleteSubWizard()" , cmd ) ) { return deleteSubWizard( wizard ); }
y2error( "Undefined wizard command: %s", cmd->toString().c_str() );
return false;
}
@@ -345,64 +332,3 @@
y2error( "NULL widget" );
}
-
-bool
-YCPWizardCommandParser::dockSubWizard( YWizard * parentWizard,
- const YCPValue & backButtonId, const string & backButtonLabel,
- const YCPValue & abortButtonId, const string & abortButtonLabel,
- const YCPValue & nextButtonId, const string & nextButtonLabel )
-{
- try
- {
- if ( parentWizard && parentWizard->wizardMode() == YWizardMode_Steps )
- {
- YWizard * subWizard = YUI::optionalWidgetFactory()->createWizard( parentWizard,
- backButtonLabel,
- abortButtonLabel,
- nextButtonLabel,
- YWizardMode_Standard );
- YUI_CHECK_NEW( subWizard );
-
- if ( parentWizard->dockSubWizard( subWizard ) )
- {
- y2milestone( "Docking subwizard" );
-
- // All wizard widgets have a fixed ID `wizard
- subWizard->setId( new YCPValueWidgetID( YCPSymbol( YWizardID ) ) );
-
- // The wizard internal contents ReplacePoint has a fixed ID `contents
- subWizard->contentsReplacePoint()->setId( new YCPValueWidgetID( YCPSymbol( YWizardContentsReplacePointID ) ) );
-
- if ( subWizard->backButton() ) subWizard->backButton()->setId ( new YCPValueWidgetID( backButtonId ) );
- if ( subWizard->abortButton() ) subWizard->abortButton()->setId( new YCPValueWidgetID( abortButtonId ) );
- if ( subWizard->nextButton() ) subWizard->nextButton()->setId ( new YCPValueWidgetID( nextButtonId ) );
- }
- else // Docking failed
- {
- y2warning( "Docking subwizard failed" );
-
- delete subWizard;
- return false; // failure
- }
- }
-
- return true; // success
- }
- catch ( YUIException & exception )
- {
- YUI_CAUGHT( exception );
- return false; // failure
- }
-}
-
-
-bool
-YCPWizardCommandParser::deleteSubWizard( YWizard * subWizard )
-{
- YWizard * parentWizard = subWizard->wizardParent();
-
- if ( parentWizard )
- return parentWizard->deleteSubWizard( subWizard );
- else
- return false; // failure
-}
Modified: trunk/ycp-ui-bindings/src/YCPWizardCommandParser.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPWizardCommandParser.h?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/src/YCPWizardCommandParser.h (original)
+++ trunk/ycp-ui-bindings/src/YCPWizardCommandParser.h Fri Apr 11 18:20:19 2008
@@ -64,7 +64,7 @@
* Remove all whitespace (leading, trailing, and internal) from a string.
**/
static string stripWhitespace( const string & orig );
-
+
/**
* Return argument number 'argNo' from 'term' as string.
**/
@@ -88,7 +88,7 @@
/**
* Enable or disable a widget if it is non-null.
* Disabling the wizard's "Next" button is ignored if it is currently
- * proteced with YWizard::ProtectNextButton().
+ * proteced with YWizard::ProtectNextButton().
**/
static void enable( YWizard * wizard, YWidget * widget, bool enabled );
@@ -98,24 +98,6 @@
static void setFocus( YWidget * widget );
/**
- * Try to create a new wizard as a sub-wizard as the existing wizard, if
- * the current dialog has a wizard in "steps" mode.
- *
- * Returns 'true' on success, 'false' on failure.
- **/
- static bool dockSubWizard( YWizard * parentWizard,
- const YCPValue & backButtonId, const string & backButtonLabel,
- const YCPValue & abortButtonId, const string & abortButtonLabel,
- const YCPValue & nextButtonId, const string & nextButtonLabel );
-
- /**
- * Try to delete a sub-wizard.
- *
- * Returns 'true' on success, 'false' on failure.
- **/
- static bool deleteSubWizard( YWizard * subWizard );
-
- /**
* Constructor (disabled).
**/
YCPWizardCommandParser() {}
Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in?rev=46445&r1=46444&r2=46445&view=diff
==============================================================================
--- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original)
+++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Fri Apr 11 18:20:19 2008
@@ -19,8 +19,8 @@
# libycp includes crypto built-ins
BuildRequires: libxcrypt-devel
-Requires: yast2-libyui >= 2.16.42
-BuildRequires: yast2-libyui-devel >= 2.16.42
+Requires: yast2-libyui >= 2.16.43
+BuildRequires: yast2-libyui-devel >= 2.16.43
# libyui ImplPtr
BuildRequires: boost-devel
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org