Author: sh-sh-sh Date: Fri Sep 21 15:08:24 2007 New Revision: 41022 URL: http://svn.opensuse.org/viewcvs/yast?rev=41022&view=rev Log: merged mvidner's namespace changes to mod-ui Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h?rev=41022&r1=41021&r2=41022&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinCalls.h Fri Sep 21 15:08:24 2007 @@ -28,8 +28,8 @@ case 27: return m_instance->BusyCursor (); case 28: return m_instance->RedrawScreen (); case 29: return m_instance->NormalCursor (); - case 30: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} return m_instance->MakeScreenshot (m_param1->asString()); - case 31: return m_instance->MakeScreenshot (); + case 30: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} return m_instance->MakeScreenShot (m_param1->asString()); + case 31: return m_instance->MakeScreenShot (); case 32: return m_instance->DumpWidgetTree (); case 33: return m_instance->Beep (); case 34: if (m_param1->isVoid()) {y2error("ERROR: Parameter 1 is nil, String is required"); return YCPVoid();} return m_instance->RecordMacro (m_param1->asString()); Modified: branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h?rev=41022&r1=41021&r2=41022&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/UIBuiltinTable.h Fri Sep 21 15:08:24 2007 @@ -58,10 +58,10 @@ _registered_functions.push_back ("RedrawScreen"); enterSymbol (new SymbolEntry (this, 29, "NormalCursor", SymbolEntry::c_function, Type::fromSignature ("void ()") ) ); _registered_functions.push_back ("NormalCursor"); - enterSymbol (new SymbolEntry (this, 30, "MakeScreenshot", SymbolEntry::c_function, Type::fromSignature ("void (string)") ) ); - _registered_functions.push_back ("MakeScreenshot"); - enterSymbol (new SymbolEntry (this, 31, "MakeScreenshot", SymbolEntry::c_function, Type::fromSignature ("void ()") ) ); - _registered_functions.push_back ("MakeScreenshot"); + enterSymbol (new SymbolEntry (this, 30, "MakeScreenShot", SymbolEntry::c_function, Type::fromSignature ("void (string)") ) ); + _registered_functions.push_back ("MakeScreenShot"); + enterSymbol (new SymbolEntry (this, 31, "MakeScreenShot", SymbolEntry::c_function, Type::fromSignature ("void ()") ) ); + _registered_functions.push_back ("MakeScreenShot"); enterSymbol (new SymbolEntry (this, 32, "DumpWidgetTree", SymbolEntry::c_function, Type::fromSignature ("void ()") ) ); _registered_functions.push_back ("DumpWidgetTree"); enterSymbol (new SymbolEntry (this, 33, "Beep", SymbolEntry::c_function, Type::fromSignature ("void ()") ) ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc?rev=41022&r1=41021&r2=41022&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.cc Fri Sep 21 15:08:24 2007 @@ -219,7 +219,10 @@ YCPValue Y2UINamespace::ChangeWidget( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value ) { - return ChangeWidget( widget_id, property, new_value ); + if ( YUIComponent::ui() ) + return YUIComponent::ui()->evaluateChangeWidget( widget_id, property, new_value ); + else + return YCPVoid(); } @@ -334,7 +337,7 @@ YCPValue -Y2UINamespace::MakeScreenshot( const YCPString & filename ) +Y2UINamespace::MakeScreenShot( const YCPString & filename ) { if ( YUIComponent::ui() ) YUIComponent::ui()->evaluateMakeScreenShot( filename ); @@ -344,10 +347,10 @@ YCPValue -Y2UINamespace::MakeScreenshot() +Y2UINamespace::MakeScreenShot() { if ( YUIComponent::ui() ) - return MakeScreenshot( YCPNull() ); + return MakeScreenShot( YCPNull() ); else return YCPVoid(); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h?rev=41022&r1=41021&r2=41022&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Y2UINamespace.h Fri Sep 21 15:08:24 2007 @@ -229,10 +229,10 @@ YCPValue NormalCursor (); /* TYPEINFO: void (string) */ - YCPValue MakeScreenshot ( const YCPString & filename ); + YCPValue MakeScreenShot ( const YCPString & filename ); /* TYPEINFO: void () */ - YCPValue MakeScreenshot (); + YCPValue MakeScreenShot (); /* TYPEINFO: void () */ YCPValue DumpWidgetTree (); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org