[yast-commit] r44164 - /trunk/core/libyui/src/

Author: sh-sh-sh Date: Tue Feb 5 16:12:15 2008 New Revision: 44164 URL: http://svn.opensuse.org/viewcvs/yast?rev=44164&view=rev Log: moved most macro recording to base class Modified: trunk/core/libyui/src/YBarGraph.cc trunk/core/libyui/src/YCheckBox.cc trunk/core/libyui/src/YCheckBox.h trunk/core/libyui/src/YCheckBoxFrame.cc trunk/core/libyui/src/YCheckBoxFrame.h trunk/core/libyui/src/YComboBox.cc trunk/core/libyui/src/YComboBox.h trunk/core/libyui/src/YDialog.h trunk/core/libyui/src/YInputField.h trunk/core/libyui/src/YIntField.cc trunk/core/libyui/src/YIntField.h trunk/core/libyui/src/YLayoutBox.h trunk/core/libyui/src/YMenuButton.h trunk/core/libyui/src/YMultiLineEdit.cc trunk/core/libyui/src/YMultiLineEdit.h trunk/core/libyui/src/YMultiSelectionBox.h trunk/core/libyui/src/YOptionalWidgetFactory.h trunk/core/libyui/src/YPackageSelector.h trunk/core/libyui/src/YPartitionSplitter.cc trunk/core/libyui/src/YPartitionSplitter.h trunk/core/libyui/src/YRadioButton.h trunk/core/libyui/src/YSelectionBox.cc trunk/core/libyui/src/YSelectionBox.h trunk/core/libyui/src/YShortcut.h trunk/core/libyui/src/YSimpleInputField.cc trunk/core/libyui/src/YSimpleInputField.h trunk/core/libyui/src/YSlider.h trunk/core/libyui/src/YTable.cc trunk/core/libyui/src/YTable.h trunk/core/libyui/src/YTree.cc trunk/core/libyui/src/YTree.h trunk/core/libyui/src/YUI_builtins.cc trunk/core/libyui/src/YWidget.cc trunk/core/libyui/src/YWidget.h Modified: trunk/core/libyui/src/YBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YBarGraph.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YBarGraph.cc (original) +++ trunk/core/libyui/src/YBarGraph.cc Tue Feb 5 16:12:15 2008 @@ -18,6 +18,7 @@ #include +#include <vector> #define YUILogComponent "ui" #include "YUILog.h" @@ -25,6 +26,9 @@ #include "YUISymbols.h" #include "YBarGraph.h" +using std::vector; + + #define CHECK_INDEX(index) \ do \ { \ Modified: trunk/core/libyui/src/YCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCheckBox.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YCheckBox.cc (original) +++ trunk/core/libyui/src/YCheckBox.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YCheckBox.h" @@ -125,10 +124,3 @@ } } - -void -YCheckBox::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} - Modified: trunk/core/libyui/src/YCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCheckBox.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YCheckBox.h (original) +++ trunk/core/libyui/src/YCheckBox.h Tue Feb 5 16:12:15 2008 @@ -25,7 +25,6 @@ #include "ImplPtr.h" using std::string; -class YMacroRecorder; class YCheckBoxPrivate; enum YCheckBoxState @@ -192,13 +191,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - ImplPtr<YCheckBoxPrivate> priv; }; Modified: trunk/core/libyui/src/YCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCheckBoxFrame.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YCheckBoxFrame.cc (original) +++ trunk/core/libyui/src/YCheckBoxFrame.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YUILog.h" #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YCheckBoxFrame.h" @@ -153,9 +152,3 @@ } } - -void -YCheckBoxFrame::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} Modified: trunk/core/libyui/src/YCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCheckBoxFrame.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YCheckBoxFrame.h (original) +++ trunk/core/libyui/src/YCheckBoxFrame.h Tue Feb 5 16:12:15 2008 @@ -172,18 +172,7 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - - ImplPtr<YCheckBoxFramePrivate> priv; - // - // Data members - // }; Modified: trunk/core/libyui/src/YComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YComboBox.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YComboBox.cc (original) +++ trunk/core/libyui/src/YComboBox.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YUILog.h" #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YComboBox.h" #include "YUIException.h" @@ -237,11 +236,3 @@ } } - - -void -YComboBox::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} - Modified: trunk/core/libyui/src/YComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YComboBox.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YComboBox.h (original) +++ trunk/core/libyui/src/YComboBox.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YSelectionWidget.h" -class YMacroRecorder; class YComboBoxPrivate; @@ -231,14 +230,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - - ImplPtr<YComboBoxPrivate> priv; }; Modified: trunk/core/libyui/src/YDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YDialog.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YDialog.h (original) +++ trunk/core/libyui/src/YDialog.h Tue Feb 5 16:12:15 2008 @@ -24,7 +24,6 @@ #include "YEvent.h" #include <stack> -class YMacroRecorder; class YShortcutManager; class YPushButton; class YDialogPrivate; Modified: trunk/core/libyui/src/YInputField.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YInputField.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YInputField.h (original) +++ trunk/core/libyui/src/YInputField.h Tue Feb 5 16:12:15 2008 @@ -22,7 +22,6 @@ #include <string> #include "YWidget.h" -class YMacroRecorder; class YInputFieldPrivate; using std::string; @@ -195,15 +194,14 @@ **/ const char * userInputProperty() { return YUIProperty_Value; } - -private: /** * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. + * + * Reimplemented from YWidget to avoid recording passwords. **/ virtual void saveUserInput( YMacroRecorder *macroRecorder ); +private: ImplPtr<YInputFieldPrivate> priv; }; Modified: trunk/core/libyui/src/YIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YIntField.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YIntField.cc (original) +++ trunk/core/libyui/src/YIntField.cc Tue Feb 5 16:12:15 2008 @@ -20,7 +20,6 @@ #define y2log_component "ui" #include -#include "YMacroRecorder.h" #include "YIntField.h" @@ -187,10 +186,3 @@ } } - -void -YIntField::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} - Modified: trunk/core/libyui/src/YIntField.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YIntField.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YIntField.h (original) +++ trunk/core/libyui/src/YIntField.h Tue Feb 5 16:12:15 2008 @@ -183,14 +183,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - - ImplPtr<YIntFieldPrivate> priv; }; Modified: trunk/core/libyui/src/YLayoutBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YLayoutBox.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YLayoutBox.h (original) +++ trunk/core/libyui/src/YLayoutBox.h Tue Feb 5 16:12:15 2008 @@ -19,9 +19,11 @@ #ifndef YLayoutBox_h #define YLayoutBox_h - +#include <vector> #include "YWidget.h" +using std::vector; + class YLayoutBoxPrivate; Modified: trunk/core/libyui/src/YMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YMenuButton.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YMenuButton.h (original) +++ trunk/core/libyui/src/YMenuButton.h Tue Feb 5 16:12:15 2008 @@ -22,7 +22,6 @@ #include "YSelectionWidget.h" #include "YMenuItem.h" -class YMacroRecorder; class YMenuItem; class YMenuButtonPrivate; Modified: trunk/core/libyui/src/YMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YMultiLineEdit.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YMultiLineEdit.cc (original) +++ trunk/core/libyui/src/YMultiLineEdit.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YMultiLineEdit.h" #define DEFAULT_VISIBLE_LINES 3 @@ -148,10 +147,3 @@ } } - -void -YMultiLineEdit::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} - Modified: trunk/core/libyui/src/YMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YMultiLineEdit.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YMultiLineEdit.h (original) +++ trunk/core/libyui/src/YMultiLineEdit.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YWidget.h" -class YMacroRecorder; class YMultiLineEditPrivate; @@ -169,13 +168,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - ImplPtr<YMultiLineEditPrivate> priv; }; Modified: trunk/core/libyui/src/YMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YMultiSelectionBox.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YMultiSelectionBox.h (original) +++ trunk/core/libyui/src/YMultiSelectionBox.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YSelectionWidget.h" -class YMacroRecorder; class YMultiSelectionBoxPrivate; @@ -120,14 +119,14 @@ **/ virtual void setCurrentItem( YItem * item ) = 0; -private: /** * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. + * + * Reimplemented from YWidget because two properties need to be recorded. **/ virtual void saveUserInput( YMacroRecorder *macroRecorder ); +private: ImplPtr<YMultiSelectionBoxPrivate> priv; }; Modified: trunk/core/libyui/src/YOptionalWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YOptionalWidgetFactory.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YOptionalWidgetFactory.h (original) +++ trunk/core/libyui/src/YOptionalWidgetFactory.h Tue Feb 5 16:12:15 2008 @@ -21,12 +21,14 @@ #include <string> #include <vector> +#include <map> #include "YTypes.h" #include "YWizard.h" using std::string; using std::vector; +using std::map; class YBarGraph; class YDateField; Modified: trunk/core/libyui/src/YPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YPackageSelector.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YPackageSelector.h (original) +++ trunk/core/libyui/src/YPackageSelector.h Tue Feb 5 16:12:15 2008 @@ -20,9 +20,6 @@ #define YPackageSelector_h #include "YWidget.h" -#include - -class YMacroRecorder; #define YPkg_TestMode 1 << 0 #define YPkg_OnlineUpdateMode 1 << 1 Modified: trunk/core/libyui/src/YPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YPartitionSplitter.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YPartitionSplitter.cc (original) +++ trunk/core/libyui/src/YPartitionSplitter.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YPartitionSplitter.h" @@ -196,10 +195,3 @@ } } - -void -YPartitionSplitter::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} - Modified: trunk/core/libyui/src/YPartitionSplitter.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YPartitionSplitter.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YPartitionSplitter.h (original) +++ trunk/core/libyui/src/YPartitionSplitter.h Tue Feb 5 16:12:15 2008 @@ -22,7 +22,6 @@ #include "YWidget.h" -class YMacroRecorder; class YPartitionSplitterPrivate; @@ -178,14 +177,7 @@ private: - /** - * Save the widget's user input to a macro recorder. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - ImplPtr<YPartitionSplitterPrivate> priv; - - }; Modified: trunk/core/libyui/src/YRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YRadioButton.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YRadioButton.h (original) +++ trunk/core/libyui/src/YRadioButton.h Tue Feb 5 16:12:15 2008 @@ -22,7 +22,6 @@ #include "YWidget.h" class YRadioButtonGroup; -class YMacroRecorder; class YRadioButtonPrivate; using std::string; @@ -188,15 +187,16 @@ **/ YRadioButtonGroup * findRadioButtonGroup() const; - -private: /** * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. + * + * Reimplemented from YWidget because only radio buttons that are on (no + * more than one per radio box) are recorded. **/ virtual void saveUserInput( YMacroRecorder *macroRecorder ); +private: + ImplPtr<YRadioButtonPrivate> priv; }; Modified: trunk/core/libyui/src/YSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSelectionBox.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YSelectionBox.cc (original) +++ trunk/core/libyui/src/YSelectionBox.cc Tue Feb 5 16:12:15 2008 @@ -23,7 +23,6 @@ #include "YSelectionBox.h" #include "YUISymbols.h" #include "YUIException.h" -#include "YMacroRecorder.h" struct YSelectionBoxPrivate @@ -147,9 +146,3 @@ } } - -void -YSelectionBox::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_CurrentItem ); -} Modified: trunk/core/libyui/src/YSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSelectionBox.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YSelectionBox.h (original) +++ trunk/core/libyui/src/YSelectionBox.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YSelectionWidget.h" -class YMacroRecorder; class YSelectionBoxPrivate; @@ -145,12 +144,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); ImplPtr<YSelectionBoxPrivate> priv; }; Modified: trunk/core/libyui/src/YShortcut.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YShortcut.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YShortcut.h (original) +++ trunk/core/libyui/src/YShortcut.h Tue Feb 5 16:12:15 2008 @@ -22,6 +22,9 @@ #include "YWidget.h" #include <string> +#include <vector> + +using std::vector; /** Modified: trunk/core/libyui/src/YSimpleInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSimpleInputField.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YSimpleInputField.cc (original) +++ trunk/core/libyui/src/YSimpleInputField.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YSimpleInputField.h" @@ -116,9 +115,3 @@ } } - -void -YSimpleInputField::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_Value ); -} Modified: trunk/core/libyui/src/YSimpleInputField.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSimpleInputField.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YSimpleInputField.h (original) +++ trunk/core/libyui/src/YSimpleInputField.h Tue Feb 5 16:12:15 2008 @@ -122,16 +122,6 @@ const char * userInputProperty() { return YUIProperty_Value; } -protected: - /** - * Save the widget's user input to a macro recorder. - * - * This sample implementation saves value(). This can be reimplemented in - * derived classes. Typically it does not make sense to call this base - * class method in new implementations. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - private: ImplPtr<YSimpleInputFieldPrivate> priv; Modified: trunk/core/libyui/src/YSlider.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YSlider.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YSlider.h (original) +++ trunk/core/libyui/src/YSlider.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YIntField.h" -class YMacroRecorder; class YSliderPrivate; Modified: trunk/core/libyui/src/YTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YTable.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YTable.cc (original) +++ trunk/core/libyui/src/YTable.cc Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include #include "YUISymbols.h" -#include "YMacroRecorder.h" #include "YTable.h" #include "YCPValueWidgetID.h" @@ -68,7 +67,7 @@ YTable::setTableHeader( YTableHeader * newHeader ) { YUI_CHECK_PTR( newHeader ); - + if ( priv->header->columns() != newHeader->columns() ) deleteAllItems(); @@ -205,10 +204,3 @@ } } - -void -YTable::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_CurrentItem ); -} - Modified: trunk/core/libyui/src/YTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YTable.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YTable.h (original) +++ trunk/core/libyui/src/YTable.h Tue Feb 5 16:12:15 2008 @@ -24,7 +24,6 @@ #include "YTableItem.h" #include "YTableHeader.h" -class YMacroRecorder; class YTablePrivate; using std::string; @@ -193,14 +192,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - - ImplPtr<YTablePrivate> priv; }; Modified: trunk/core/libyui/src/YTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YTree.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YTree.cc (original) +++ trunk/core/libyui/src/YTree.cc Tue Feb 5 16:12:15 2008 @@ -22,7 +22,6 @@ #include "YUISymbols.h" #include "YSelectionWidget.h" -#include "YMacroRecorder.h" #include "YTree.h" #include "YTreeItem.h" @@ -132,10 +131,3 @@ } } - -void -YTree::saveUserInput( YMacroRecorder *macroRecorder ) -{ - macroRecorder->recordWidgetProperty( this, YUIProperty_CurrentItem ); -} - Modified: trunk/core/libyui/src/YTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YTree.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YTree.h (original) +++ trunk/core/libyui/src/YTree.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include "YSelectionWidget.h" -class YMacroRecorder; class YTreeItem; class YTreePrivate; @@ -122,14 +121,6 @@ private: - /** - * Save the widget's user input to a macro recorder. - * Intentionally declared as "private" so all macro recording internals are - * handled by the abstract libyui level, not by a specific UI. - **/ - virtual void saveUserInput( YMacroRecorder *macroRecorder ); - - ImplPtr<YTreePrivate> priv; }; Modified: trunk/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YUI_builtins.cc (original) +++ trunk/core/libyui/src/YUI_builtins.cc Tue Feb 5 16:12:15 2008 @@ -538,8 +538,8 @@ if ( dialog->shortcutCheckPostponed() ) { - yuiError() << "Missing CheckShortcuts() before " << builtin_name - << "() after PostponeShortcutCheck()!" + yuiError() << "Missing UI::CheckShortcuts() before UI::" << builtin_name + << "() after UI::PostponeShortcutCheck()!" << endl; dialog->checkShortcuts( true ); Modified: trunk/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YWidget.cc?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YWidget.cc (original) +++ trunk/core/libyui/src/YWidget.cc Tue Feb 5 16:12:15 2008 @@ -33,6 +33,7 @@ #include "YUIException.h" #include "YWidgetID.h" #include "YBothDim.h" +#include "YMacroRecorder.h" #include "YChildrenManager.h" @@ -642,6 +643,19 @@ void YWidget::saveUserInput( YMacroRecorder *macroRecorder ) { + // + // Record this widget's user input property (if there is any) + // + + if ( userInputProperty() ) + { + macroRecorder->recordWidgetProperty( this, userInputProperty() ); + } + + // + // Record the child widgets' (if there are any) user input + // + for ( YWidgetListConstIterator it = childrenBegin(); it != childrenEnd(); ++it ) Modified: trunk/core/libyui/src/YWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YWidget.h?rev=44164&r1=44163&r2=44164&view=diff ============================================================================== --- trunk/core/libyui/src/YWidget.h (original) +++ trunk/core/libyui/src/YWidget.h Tue Feb 5 16:12:15 2008 @@ -21,7 +21,6 @@ #include <string> #include <iosfwd> -#include #include "YTypes.h" #include "YProperty.h" @@ -32,10 +31,9 @@ #include "ImplPtr.h" -class YCPSymbol; -class YMacroRecorder; class YDialog; class YWidgetID; +class YMacroRecorder; using std::string; @@ -537,12 +535,22 @@ // /** - * Recursively save the user input of all child widgets - * to a macro recorder: + * Recursively save the user input of all child widgets to a macro + * recorder: * * All child widgets that could contain data entered by the user * are requested to send their contents to the macro recorder, e.g. input * fields, check boxes etc. + * + * This default implementation records this widget's user input property + * (the property returned by userInputProperty) and then recursively calls + * saveUserInput() for all child widgets. This is suitable for most cases, + * for container widgets as well as for leaf widgets that have no or + * exactly one property that needs to be recorded. + * + * Widgets that need another number of properties recorded should + * reimplement this method (and NOT call this default method in the new + * implementation). **/ virtual void saveUserInput( YMacroRecorder *macroRecorder ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org