Author: sh-sh-sh
Date: Wed Jul 11 11:44:18 2007
New Revision: 39313
URL: http://svn.opensuse.org/viewcvs/yast?rev=39313&view=rev
Log:
obsolete
Modified:
branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp
branches/tmp/sh/mod-ui/core/libyui/src/YUI.h
branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h
branches/tmp/sh/mod-ui/core/libyui/src/YUI_bindings.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc
branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc
branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h
Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp (original)
+++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/Events.ycp Wed Jul 11 11:44:18 2007
@@ -245,17 +245,6 @@
{
UI::ChangeWidget(`send_mafioso, `Value, nil );
}
- if ( event["ID"]:nil == `info )
- {
- list > widget_contents = UI::CollectUserInput();
- y2milestone( "CollectUserInput() returned %1", widget_contents );
-
- foreach( map widget, widget_contents,
- {
- y2milestone( "Widget contents: %1", widget );
- });
- }
-
} until ( event["ID"]:nil == `close );
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI.h?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Wed Jul 11 11:44:18 2007
@@ -295,8 +295,6 @@
void evaluateBeep ();
YCPValue evaluateChangeWidget ( const YCPValue & value_id, const YCPValue & property, const YCPValue & new_value );
void evaluateCheckShortcuts ();
- YCPValue evaluateCollectUserInput ();
- YCPValue evaluateCollectUserInput ( const YCPTerm & widgetId );
YCPValue evaluateCloseDialog ();
void evaluateDumpWidgetTree ();
void evaluateFakeUserInput ( const YCPValue & next_input );
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h Wed Jul 11 11:44:18 2007
@@ -29,7 +29,6 @@
#define YUIBuiltin_BusyCursor "BusyCursor"
#define YUIBuiltin_ChangeWidget "ChangeWidget"
#define YUIBuiltin_CloseDialog "CloseDialog"
-#define YUIBuiltin_CollectUserInput "CollectUserInput"
#define YUIBuiltin_DumpWidgetTree "DumpWidgetTree"
#define YUIBuiltin_GetDisplayInfo "GetDisplayInfo"
#define YUIBuiltin_GetLanguage "GetLanguage"
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_bindings.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_bindings.cc?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUI_bindings.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_bindings.cc Wed Jul 11 11:44:18 2007
@@ -587,30 +587,6 @@
}
-
-
-static YCPValue
-UICollectUserInput( const YCPTerm & widget_id, const YCPSymbol & property )
-{
- if ( YUIComponent::ui() )
- return YUIComponent::ui()->evaluateCollectUserInput();
- else
- return YCPVoid();
-}
-
-
-static YCPValue
-UICollectUserInputTerm( const YCPTerm & widget_id, const YCPTerm & property )
-{
- if ( YUIComponent::ui() )
- return YUIComponent::ui()->evaluateCollectUserInput();
- else
- return YCPVoid();
-}
-
-
-
-
static YCPValue
UICallHandler( void * ptr, int argc, YCPValue argv[] )
{
@@ -698,8 +674,6 @@
{ "SetModulename", "void (string)", (void*) UISetModulename },
{ "HasSpecialWidget", "boolean (symbol)", (void*) UIHasSpecialWidget },
{ "WizardCommand", "boolean (term)", (void*) UIWizardCommand },
- { "CollectUserInput", "list> ()", (void*) UICollectUserInput },
- { "CollectUserInput", "list> ( term )", (void*) UICollectUserInputTerm },
{ 0, 0, 0, 0, 0, 0, 0 }
};
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Wed Jul 11 11:44:18 2007
@@ -1717,69 +1717,6 @@
}
/**
- * @builtin CollectUserInput
- * @short Collects the content of all input widgets in a dialog or in a container
- * @description
- * This function returns a list of maps describing the content of all input widgets
- * in the current dialog (or in the widget with the specified ID, if any is
- * given), such as InputField, ComboBox, SelectionBox, ... widgets (but not
- * Labels, RichText, etc., that don't accept user input).
- *
- * This function returns a list with a map for each input widget:
- *
- * $[
- * "ID" : (widget ID)
- * "Value" : (current value of this widget, depending on "Property")
- * "Property" : (what property this is, `Value, `CurrentItem or whatever)
- *
- * "WidgetClass" : (one of "InputField", "ComboBox", "SelectionBox", ...)
- * "DebugLabel : ((translated) label of this widget, possibly shortened: "Name", ...)
- * ]
- *
- * @param term ID (optional)
- * @return list>
- * @usage list> fieldContents = CollectUserInput();
- */
-
-YCPValue YUI::evaluateCollectUserInput()
-{
- YCPList userInputList;
-#if 0
- // FIXME
- // FIXME
- // FIXME
- YDialog::currentDialog()->collectUserInput( userInputList );
- // FIXME
- // FIXME
- // FIXME
-#endif
-
- return userInputList;
-}
-
-
-YCPValue YUI::evaluateCollectUserInput( const YCPTerm & widgetId )
-{
- if ( ! YCPDialogParser::isSymbolOrId( widgetId ) )
- {
- return YCPNull();
- }
-
- YCPValue id = YCPDialogParser::parseIdTerm( widgetId );
- YWidget * widget = YCPDialogParser::findWidgetWithId( id,
- false ); // don't throw if not found
-
- if ( ! widget )
- return YCPVoid();
-
- YCPList userInputList;
- widget->collectUserInput( userInputList );
-
- return userInputList;
-}
-
-
-/**
* @builtin SetFunctionKeys
* @short Sets the (default) function keys for a number of buttons.
* @description
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Wed Jul 11 11:44:18 2007
@@ -663,69 +663,6 @@
}
-
-// FIXME
-// FIXME
-#include "YCPValueWidgetID.h"
-// FIXME
-// FIXME
-
-void YWidget::collectUserInput( YCPList & contentsList )
-{
- for ( YWidgetListConstIterator it = childrenBegin();
- it != childrenEnd();
- ++it )
- {
- YWidget *widget = *it;
-
- if ( widget->hasChildren() )
- {
- widget->collectUserInput( contentsList );
- }
- else if ( widget->hasId() && // No use without an ID
- widget->userInputProperty() ) // Only for widgets that hold user input
- {
- YCPMap map;
-
- YCPValueWidgetID * widgetId = id() ? dynamic_cast ( id() ) : 0;
-
- if ( widgetId )
- map->add( YCPString( "ID" ), widgetId->value() );
-
- map->add( YCPString( "Property" ), YCPSymbol( widget->userInputProperty() ) );
- map->add( YCPString( "Value" ), widget->queryWidget( YCPSymbol( widget->userInputProperty() ) ) );
-
- // Add WidgetClass
-
- const char * widgetClass = widget->widgetClass();
-
- if ( widgetClass )
- {
- if ( *widgetClass == 'Y' ) // skip leading "Y" (YPushButton, YInputField, ...)
- widgetClass++;
-
- map->add( YCPString( "WidgetClass" ), YCPSymbol( widgetClass ) );
- }
-
-
- // Add the Widget's debug label.
- // This is usually the label (translated to the user's locale).
-
- string debugLabel = widget->debugLabel();
-
- if ( ! debugLabel.empty() )
- map->add( YCPString( "DebugLabel" ), YCPString( debugLabel ) );
-
- contentsList->add( map );
- }
- }
-}
-
-
-
-
-
-
// FIXME: Obsolete
// FIXME: Obsolete
// FIXME: Obsolete
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h?rev=39313&r1=39312&r2=39313&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Wed Jul 11 11:44:18 2007
@@ -557,13 +557,6 @@
**/
virtual void saveUserInput( YMacroRecorder *macroRecorder );
- /**
- * (Recursively) collect the content of all input fields or other
- * interactive widgets in this container and its children and add them to
- * 'fieldContents'.
- **/
- virtual void collectUserInput( YCPList & fieldContents );
-
// NCurses optimizations
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
