[yast-commit] r40971 - /branches/tmp/sh/mod-ui/core/libyui/src/

Author: sh-sh-sh Date: Thu Sep 20 00:04:47 2007 New Revision: 40971 URL: http://svn.opensuse.org/viewcvs/yast?rev=40971&view=rev Log: better error reporting Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h branches/tmp/sh/mod-ui/core/libyui/src/YDate.h branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h branches/tmp/sh/mod-ui/core/libyui/src/YImage.h branches/tmp/sh/mod-ui/core/libyui/src/YInputField.h branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h branches/tmp/sh/mod-ui/core/libyui/src/YTable.h branches/tmp/sh/mod-ui/core/libyui/src/YTime.h branches/tmp/sh/mod-ui/core/libyui/src/YTree.h 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 branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h Thu Sep 20 00:04:47 2007 @@ -53,7 +53,7 @@ * Return a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YAlignment"; } + virtual const char * widgetClass() const { return "YAlignment"; } /** * Return the alignment in the specified dimension. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h Thu Sep 20 00:04:47 2007 @@ -37,7 +37,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YBarGraph"; } + virtual const char * widgetClass() const { return "YBarGraph"; } /** * Returns the current number of bar segments, i.e. the nuber of values. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Thu Sep 20 00:04:47 2007 @@ -307,21 +307,28 @@ if ( opt.isVStretchable.value() ) w->setStretchable( YD_VERT, true ); if ( opt.key_Fxx.value() > 0 ) w->setFunctionKey( opt.key_Fxx.value() ); - - w->setParent(p); - - if ( ! p->contains( w ) ) + if ( w->oldStyleConstructor() ) { // FIXME: Obsolete // FIXME: Obsolete // FIXME: Obsolete - y2warning( "Late adding child %s to %s", w->widgetClass(), p->widgetClass() ); - p->addChild( w ); + if ( p && ! w->hasParent() ) + { + w->setParent( p ); + } + + if ( ! p->contains( w ) ) + { + y2warning( "Late adding child %s to %s", w->widgetClass(), p->widgetClass() ); + p->addChild( w ); + } + // FIXME: Obsolete // FIXME: Obsolete // FIXME: Obsolete } + } else { Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h Thu Sep 20 00:04:47 2007 @@ -54,7 +54,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YCheckBox"; } + virtual const char * widgetClass() const { return "YCheckBox"; } /** Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h Thu Sep 20 00:04:47 2007 @@ -46,7 +46,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YCheckBoxFrame"; } + virtual const char * widgetClass() const { return "YCheckBoxFrame"; } /** * Return the label text on the CheckBoxFrame. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h Thu Sep 20 00:04:47 2007 @@ -66,7 +66,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YComboBox"; } + virtual const char * widgetClass() const { return "YComboBox"; } /** * Return 'true' if this ComboBox is editable, i.e. if the user can freely Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h Thu Sep 20 00:04:47 2007 @@ -45,7 +45,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YContainerWidget"; } + virtual const char * widgetClass() const { return "YContainerWidget"; } /** * Preferred width of the widget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDate.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDate.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YDate.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YDate.h Thu Sep 20 00:04:47 2007 @@ -37,7 +37,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YDate"; } + virtual const char * widgetClass() const { return "YDate"; } /** * Implements the ui command changeWidget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc Thu Sep 20 00:04:47 2007 @@ -42,11 +42,14 @@ _shortcutCheckPostponed = false; _dialogStack.push( this ); + + y2debug( "New YDialog at %p", this ); } YDialog::~YDialog() { + y2debug( "Destroying YDialog at %p", this ); } @@ -99,6 +102,7 @@ void YDialog::setInitialSize() { + y2debug( "Setting initial size for YDialog at %p", this ); // Trigger geometry management setSize( preferredWidth(), preferredHeight() ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h Thu Sep 20 00:04:47 2007 @@ -82,7 +82,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YDialog"; } + virtual const char * widgetClass() const { return "YDialog"; } /** * Sets the initial dialog size. Honors the `defaultsize option Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h Thu Sep 20 00:04:47 2007 @@ -40,7 +40,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YDownloadProgress"; } + virtual const char * widgetClass() const { return "YDownloadProgress"; } /** * Implements the ChangeWidget() UI command. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h Thu Sep 20 00:04:47 2007 @@ -36,7 +36,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YDumbTab"; } + virtual const char * widgetClass() const { return "YDumbTab"; } /** * Implements UI::ChangeWidget() Modified: branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h Thu Sep 20 00:04:47 2007 @@ -44,7 +44,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YEmpty"; } + virtual const char * widgetClass() const { return "YEmpty"; } /** * Preferred width of the widget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h Thu Sep 20 00:04:47 2007 @@ -45,7 +45,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YFrame"; } + virtual const char * widgetClass() const { return "YFrame"; } /** * Change the frame label. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YImage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YImage.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YImage.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YImage.h Thu Sep 20 00:04:47 2007 @@ -49,7 +49,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YImage"; } + virtual const char * widgetClass() const { return "YImage"; } /** * Return the file name of this widget's image. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YInputField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YInputField.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YInputField.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YInputField.h Thu Sep 20 00:04:47 2007 @@ -50,7 +50,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YInputField"; } + virtual const char * widgetClass() const { return "YInputField"; } /** * Get the current value (the text entered by the user or set from the Modified: branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h Thu Sep 20 00:04:47 2007 @@ -41,7 +41,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YIntField"; } + virtual const char * widgetClass() const { return "YIntField"; } /** * Implements the ChangeWidget() UI command. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h Thu Sep 20 00:04:47 2007 @@ -61,7 +61,7 @@ * * Reimplemented from YWidget. **/ - virtual const char * widgetClass() { return "YLabel"; } + virtual const char * widgetClass() const { return "YLabel"; } /** * Return the text the widget displays. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h Thu Sep 20 00:04:47 2007 @@ -49,7 +49,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() + virtual const char * widgetClass() const { return primary() == YD_VERT ? "YVBox" : "YHBox"; } /** @@ -119,7 +119,7 @@ * Reimplemented from YWidget. **/ virtual void setSize( int newWidth, int newHeight ); - + /** * Returns the stretchability of the layout box: * The layout box is stretchable if one of the children is stretchable in @@ -145,15 +145,15 @@ **/ int childrenTotalWeight( YUIDimension dimension ); - /** + /** * Return the maximum preferred size of all children in the specified - * dimension. + * dimension. **/ int childrenMaxPreferredSize( YUIDimension dimension ); /** * Add up all the non-weighted children's preferred sizes in the specified - * dimension. + * dimension. **/ int totalNonWeightedChildrenPreferredSize( YUIDimension dimension ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h Thu Sep 20 00:04:47 2007 @@ -42,7 +42,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YLogView"; } + virtual const char * widgetClass() const { return "YLogView"; } /** Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h Thu Sep 20 00:04:47 2007 @@ -46,7 +46,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YMenuButton"; } + virtual const char * widgetClass() const { return "YMenuButton"; } /** * Implements the ui command changeWidget for the widget specific Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h Thu Sep 20 00:04:47 2007 @@ -43,7 +43,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YMultiLineEdit"; } + virtual const char * widgetClass() const { return "YMultiLineEdit"; } /** * Get the current value (the text entered by the user or set from the Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h Thu Sep 20 00:04:47 2007 @@ -46,7 +46,7 @@ * Return a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YMultiProgressMeter"; } + virtual const char * widgetClass() const { return "YMultiProgressMeter"; } /** * Return the orientation of the MultiProgressBar. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h Thu Sep 20 00:04:47 2007 @@ -43,7 +43,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YMultiSelectionBox"; } + virtual const char * widgetClass() const { return "YMultiSelectionBox"; } /** * Return 'true' if this MultiSelectionBox should be very small. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h Thu Sep 20 00:04:47 2007 @@ -48,7 +48,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YPackageSelector"; } + virtual const char * widgetClass() const { return "YPackageSelector"; } /** * Check for the various modes. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h Thu Sep 20 00:04:47 2007 @@ -50,7 +50,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YPartitionSplitter"; } + virtual const char * widgetClass() const { return "YPartitionSplitter"; } /** * Implements the ChangeWidget() UI command. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h Thu Sep 20 00:04:47 2007 @@ -44,7 +44,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YProgressBar"; } + virtual const char * widgetClass() const { return "YProgressBar"; } /** * Get the label (the caption above the progress bar). Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h Thu Sep 20 00:04:47 2007 @@ -44,7 +44,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YPushButton"; } + virtual const char * widgetClass() const { return "YPushButton"; } /** * Get the label (the text on the RadioButton). Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h Thu Sep 20 00:04:47 2007 @@ -77,7 +77,7 @@ * * Reimplemented from YWidget. **/ - virtual const char * widgetClass() { return "YRadioButton"; } + virtual const char * widgetClass() const { return "YRadioButton"; } /** * Get the current on/off value: Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h Thu Sep 20 00:04:47 2007 @@ -47,7 +47,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YRadioButtonGroup"; } + virtual const char * widgetClass() const { return "YRadioButtonGroup"; } /** * Find the currently selected button. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h Thu Sep 20 00:04:47 2007 @@ -47,7 +47,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YReplacePoint"; } + virtual const char * widgetClass() const { return "YReplacePoint"; } }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h Thu Sep 20 00:04:47 2007 @@ -52,7 +52,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YRichText"; } + virtual const char * widgetClass() const { return "YRichText"; } /** * Change the text content of the RichText widget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h Thu Sep 20 00:04:47 2007 @@ -43,7 +43,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YSelectionBox"; } + virtual const char * widgetClass() const { return "YSelectionBox"; } /** * Return 'true' if this SelectionBox should be very small. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h Thu Sep 20 00:04:47 2007 @@ -59,7 +59,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YSelectionWidget"; } + virtual const char * widgetClass() const { return "YSelectionWidget"; } /** * Return this widget's label (the caption above the item list). Modified: branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h Thu Sep 20 00:04:47 2007 @@ -49,13 +49,13 @@ /** * Returns the YWidget this shortcut data belong to. **/ - YWidget * widget() { return _widget; } + YWidget * widget() const { return _widget; } /** * Returns the textual representation of the widget class of the widget * this shortcut data belongs to. **/ - const char *widgetClass() { return widget()->widgetClass(); } + const char *widgetClass() const { return widget()->widgetClass(); } /** * Returns 'true' if the widget that is associated with this shortcut is a Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h Thu Sep 20 00:04:47 2007 @@ -43,7 +43,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YSlider"; } + virtual const char * widgetClass() const { return "YSlider"; } /** * Implements the ChangeWidget() UI command. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h Thu Sep 20 00:04:47 2007 @@ -58,7 +58,7 @@ * Return a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YSpacing"; } + virtual const char * widgetClass() const { return "YSpacing"; } /** * Return the primary dimension of this Spacing/Stretch, Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h Thu Sep 20 00:04:47 2007 @@ -53,7 +53,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YSquash"; } + virtual const char * widgetClass() const { return "YSquash"; } /** * Returns 'true' if this widget squashes horizontally. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTable.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.h Thu Sep 20 00:04:47 2007 @@ -62,7 +62,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YTable"; } + virtual const char * widgetClass() const { return "YTable"; } /** * Adds an item to the table that is given as term Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTime.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTime.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTime.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTime.h Thu Sep 20 00:04:47 2007 @@ -37,7 +37,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YTime"; } + virtual const char * widgetClass() const { return "YTime"; } /** * Implements the ui command changeWidget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTree.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTree.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTree.h Thu Sep 20 00:04:47 2007 @@ -44,7 +44,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YTree"; } + virtual const char * widgetClass() const { return "YTree"; } /** * Rebuild the displayed tree from the internally stored YTreeItems. 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=40971&r1=40970&r2=40971&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 Thu Sep 20 00:04:47 2007 @@ -22,7 +22,8 @@ #define VERBOSE_COMMANDS // pretty verbose logging of each UI command -#define VERBOSE_REPLACE_WIDGET 0 +#define VERBOSE_REPLACE_WIDGET 0 +#define NONFATAL_OPENDIALOG_EXCEPTIONS 0 #include #include // pipe() @@ -777,8 +778,10 @@ if ( dialog ) { +#if NONFATAL_OPENDIALOG_EXCEPTIONS try { +#endif YWidget * child = YCPDialogParser::parseWidgetTreeTerm( dialog, dialog_term ); if ( child ) @@ -794,6 +797,7 @@ { YDialog::deleteTopmostDialog(); } +#if NONFATAL_OPENDIALOG_EXCEPTIONS } catch ( YUIException & exception ) { @@ -805,6 +809,7 @@ ycperror( "UI::OpenDialog(): Dialog term parse error" ); } +#endif } unblockEvents(); @@ -1086,7 +1091,10 @@ replacePoint->deleteChildren(); YWidget * child = YCPDialogParser::parseWidgetTreeTerm( replacePoint, newContentTerm ); - child->setParent( replacePoint ); + + if ( ! child->hasParent() ) + child->setParent( replacePoint ); + replacePoint->showChild(); #if VERBOSE_REPLACE_WIDGET 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=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Thu Sep 20 00:04:47 2007 @@ -42,6 +42,8 @@ #define MAX_DEBUG_LABEL_LEN 50 #define YWIDGET_MAGIC 42 +#define CHECK_FOR_DUPLICATE_CHILDREN 1 + using std::string; @@ -59,6 +61,7 @@ , notify( false ) , sendKeyEvents( false ) , autoShortcut( false ) + , oldStyleConstructor( false ) , toolkitWidgetRep( 0 ) , id( 0 ) , functionKey( 0 ) @@ -81,6 +84,7 @@ bool notify; bool sendKeyEvents; bool autoShortcut; + bool oldStyleConstructor; void * toolkitWidgetRep; YWidgetID * id; YBothDim<bool> stretch; @@ -97,6 +101,7 @@ : priv( new YWidgetPrivate( new YWidgetChildrenRejector( this ) ) ) { YUI_CHECK_NEW( priv ); + priv->oldStyleConstructor = true; } // FIXME: Obsolete // FIXME: Obsolete @@ -109,7 +114,7 @@ { YUI_CHECK_NEW( priv ); YUI_CHECK_NEW( priv->childrenManager ); - + if ( parent ) parent->addChild( this ); } @@ -130,7 +135,7 @@ if ( priv->id ) delete priv->id; - + invalidate(); } @@ -155,6 +160,15 @@ void YWidget::addChild( YWidget * child ) { +#if CHECK_FOR_DUPLICATE_CHILDREN + if ( child && childrenManager()->contains( child ) ) + { + y2error( "%s at %p already contains %s at %p!", + widgetClass(), this, child->widgetClass(), child ); + YUI_THROW( YUIInvalidChildException<YWidget>( this, child ) ); + } +#endif + childrenManager()->add( child ); } @@ -179,7 +193,7 @@ { YWidget * child = *it; ++it; - + if ( child->isValid() ) { // y2debug( "Deleting %s at %p", child->widgetClass(), child ); @@ -236,6 +250,16 @@ YWidget * YWidget::parent() const { + if ( oldStyleConstructor() && ! priv->parent ) + YUI_THROW( YUIException( string( "No parent set yet for " ) + widgetClass() ) ); + + return priv->parent; +} + + +bool +YWidget::hasParent() const +{ return priv->parent; } @@ -243,31 +267,46 @@ void YWidget::setParent( YWidget * newParent ) { + if ( newParent && priv->parent ) + { + YDialog::currentDialog()->dumpWidgetTree(); + y2warning( "%s::setParent( %p ) this: %p old parent: %p", + widgetClass(), newParent, this, priv->parent ); + YUI_THROW( YUIException( string( widgetClass() ) + " already has a parent!" ) ); + } + priv->parent = newParent; } -bool YWidget::sendKeyEvents() const +bool +YWidget::oldStyleConstructor() const +{ + return priv->oldStyleConstructor; +} + + +bool YWidget::sendKeyEvents() const { - return priv->sendKeyEvents; + return priv->sendKeyEvents; } -void YWidget::setSendKeyEvents( bool doSend ) +void YWidget::setSendKeyEvents( bool doSend ) { - priv->sendKeyEvents = doSend; + priv->sendKeyEvents = doSend; } -bool YWidget::autoShortcut() const +bool YWidget::autoShortcut() const { - return priv->autoShortcut; + return priv->autoShortcut; } -void YWidget::setAutoShortcut( bool newAutoShortcut ) +void YWidget::setAutoShortcut( bool newAutoShortcut ) { - priv->autoShortcut = newAutoShortcut; + priv->autoShortcut = newAutoShortcut; } @@ -345,7 +384,7 @@ * @property string DebugLabel (possibly translated) text describing this widget for debugging * @property string DialogDebugLabel (possibly translated) text describing this dialog for debugging **/ - + propSet.add( YProperty( YUIProperty_Enabled, YBoolProperty ) ); propSet.add( YProperty( YUIProperty_Notify, YBoolProperty ) ); propSet.add( YProperty( YUIProperty_WidgetClass, YStringProperty, true ) ); // read-only @@ -461,7 +500,7 @@ { case YD_HORIZ: return preferredWidth(); case YD_VERT : return preferredHeight(); - + default: YUI_THROW( YUIInvalidDimensionException() ); return 0; @@ -522,10 +561,10 @@ { if ( doThrow ) YUI_THROW( YUIWidgetNotFoundException( "Null ID" ) ); - + return 0; } - + for ( YWidgetListConstIterator it = childrenBegin(); it != childrenEnd(); ++it ) @@ -539,7 +578,7 @@ if ( child->hasChildren() ) { YWidget * found = child->findWidget( id, false ); - + if ( found ) return found; } @@ -547,7 +586,7 @@ if ( doThrow ) YUI_THROW( YUIWidgetNotFoundException( id->toString() ) ); - + return 0; } @@ -565,7 +604,7 @@ // y2debug( "Recursing into %s", child->debugLabel().c_str() ); child->setChildrenEnabled( enabled ); } - + // y2debug( "%s %s", enabled ? "Enabling" : "Disabling", child->debugLabel().c_str() ); child->setEnabled( enabled ); } @@ -592,7 +631,7 @@ ++it ) { YWidget * child = *it; - + if ( child->hasChildren() ) child->dumpWidgetTree ( indentationLevel + 1 ); else 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=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Thu Sep 20 00:04:47 2007 @@ -74,7 +74,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YWidget"; } + virtual const char * widgetClass() const { return "YWidget"; } /** * Returns a descriptive label of this widget instance. @@ -240,10 +240,33 @@ YWidget * parent() const; /** + * Return 'true' if this widget has a parent, 'false' if not. + **/ + bool hasParent() const; + + /** * Set this widget's parent. **/ void setParent( YWidget * newParent ); + + // FIXME: Throw this out once all widgets are ported! + // FIXME: Throw this out once all widgets are ported! + // FIXME: Throw this out once all widgets are ported! + /** + * Return 'true' if an old-style constructor was used to create this widget. + * In that case, setParent() needs to be called from the outside, and for + * the parent widget, addChild() needs to be called. + * + * NOTICE: This function will silently disappear once all widgets are + * ported in the libyui. + **/ + bool oldStyleConstructor() const; + // FIXME: Throw this out once all widgets are ported! + // FIXME: Throw this out once all widgets are ported! + // FIXME: Throw this out once all widgets are ported! + + /** * Traverse up the widget hierarchy and find the dialog this widget belongs * to. Returns 0 if there is none. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h?rev=40971&r1=40970&r2=40971&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h Thu Sep 20 00:04:47 2007 @@ -118,7 +118,7 @@ * Returns a descriptive name of this widget class for logging, * debugging etc. **/ - virtual const char * widgetClass() { return "YWizard"; } + virtual const char * widgetClass() const { return "YWizard"; } /** * Generic direct access to implementation-specific functions. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org