- YaST Commits

[yast-commit] r38325 - /branches/tmp/sh/mod-ui/qt/src/
by sh-sh-sh＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: sh-sh-sh Date: Wed Jun 6 16:55:19 2007 New Revision: 38325 URL: http://svn.opensuse.org/viewcvs/yast?rev=38325&view=rev Log: new base method name Modified: branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc branches/tmp/sh/mod-ui/qt/src/YQAlignment.h branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc branches/tmp/sh/mod-ui/qt/src/YQComboBox.h branches/tmp/sh/mod-ui/qt/src/YQDate.cc branches/tmp/sh/mod-ui/qt/src/YQDate.h branches/tmp/sh/mod-ui/qt/src/YQDialog.cc branches/tmp/sh/mod-ui/qt/src/YQDialog.h branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h branches/tmp/sh/mod-ui/qt/src/YQFrame.cc branches/tmp/sh/mod-ui/qt/src/YQFrame.h branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h branches/tmp/sh/mod-ui/qt/src/YQIntField.cc branches/tmp/sh/mod-ui/qt/src/YQIntField.h branches/tmp/sh/mod-ui/qt/src/YQLabel.cc branches/tmp/sh/mod-ui/qt/src/YQLabel.h branches/tmp/sh/mod-ui/qt/src/YQLogView.cc branches/tmp/sh/mod-ui/qt/src/YQLogView.h branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h branches/tmp/sh/mod-ui/qt/src/YQRichText.cc branches/tmp/sh/mod-ui/qt/src/YQRichText.h branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h branches/tmp/sh/mod-ui/qt/src/YQSlider.cc branches/tmp/sh/mod-ui/qt/src/YQSlider.h branches/tmp/sh/mod-ui/qt/src/YQSplit.cc branches/tmp/sh/mod-ui/qt/src/YQSplit.h branches/tmp/sh/mod-ui/qt/src/YQSquash.cc branches/tmp/sh/mod-ui/qt/src/YQSquash.h branches/tmp/sh/mod-ui/qt/src/YQTable.cc branches/tmp/sh/mod-ui/qt/src/YQTable.h branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h branches/tmp/sh/mod-ui/qt/src/YQTime.cc branches/tmp/sh/mod-ui/qt/src/YQTime.h branches/tmp/sh/mod-ui/qt/src/YQTree.cc branches/tmp/sh/mod-ui/qt/src/YQTree.h branches/tmp/sh/mod-ui/qt/src/YQWizard.cc Modified: branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQAlignm… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQAlignment.cc Wed Jun 6 16:55:19 2007 @@ -37,7 +37,7 @@ } -void YQAlignment::setEnabling( bool enabled ) +void YQAlignment::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQAlignm… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQAlignment.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQAlignment.h Wed Jun 6 16:55:19 2007 @@ -52,7 +52,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the size Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.cc Wed Jun 6 16:55:19 2007 @@ -52,7 +52,7 @@ } -void YQBarGraph::setEnabling( bool enabled ) +void YQBarGraph::setEnabled( bool enabled ) { _barGraph->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQBarGra… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQBarGraph.h Wed Jun 6 16:55:19 2007 @@ -43,7 +43,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBox.cc Wed Jun 6 16:55:19 2007 @@ -129,7 +129,7 @@ } -void YQCheckBox::setEnabling( bool enabled ) +void YQCheckBox::setEnabled( bool enabled ) { _qt_checkbox->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBox.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.cc Wed Jun 6 16:55:19 2007 @@ -65,7 +65,7 @@ } -void YQCheckBoxFrame::setEnabling( bool enabled ) +void YQCheckBoxFrame::setEnabled( bool enabled ) { if ( enabled ) { Modified: branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQCheckB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQCheckBoxFrame.h Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Set the size. Modified: branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQColore… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.cc Wed Jun 6 16:55:19 2007 @@ -51,7 +51,7 @@ } -void YQColoredLabel::setEnabling( bool enabled ) +void YQColoredLabel::setEnabled( bool enabled ) { QLabel::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQColore… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQColoredLabel.h Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQComboB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQComboBox.cc Wed Jun 6 16:55:19 2007 @@ -137,7 +137,7 @@ } -void YQComboBox::setEnabling( bool enabled ) +void YQComboBox::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_combo_box->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQComboB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQComboBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQComboBox.h Wed Jun 6 16:55:19 2007 @@ -45,7 +45,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQDate.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDate.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDate.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDate.cc Wed Jun 6 16:55:19 2007 @@ -65,7 +65,7 @@ } -void YQDate::setEnabling( bool enabled ) +void YQDate::setEnabled( bool enabled ) { setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDate.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDate.h… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDate.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDate.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDialog… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDialog.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDialog.cc Wed Jun 6 16:55:19 2007 @@ -147,7 +147,7 @@ } -void YQDialog::setEnabling( bool enabled ) +void YQDialog::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDialog… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDialog.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDialog.h Wed Jun 6 16:55:19 2007 @@ -81,7 +81,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the new size of the widget. Modified: branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDownlo… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.cc Wed Jun 6 16:55:19 2007 @@ -58,7 +58,7 @@ } -void YQDownloadProgress::setEnabling( bool enabled ) +void YQDownloadProgress::setEnabled( bool enabled ) { _qt_progress->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDownlo… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDownloadProgress.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDumbTa… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDumbTab.cc Wed Jun 6 16:55:19 2007 @@ -89,7 +89,7 @@ } -void YQDumbTab::setEnabling( bool enabled ) +void YQDumbTab::setEnabled( bool enabled ) { QVBox::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQDumbTa… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQDumbTab.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQFrame.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQFrame.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQFrame.cc Wed Jun 6 16:55:19 2007 @@ -39,7 +39,7 @@ setWidgetRep ( this ); } -void YQFrame::setEnabling( bool enabled ) +void YQFrame::setEnabled( bool enabled ) { QFrame::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQFrame.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQFrame.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQFrame.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Set the size. Modified: branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQGeneri… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQGenericButton.cc Wed Jun 6 16:55:19 2007 @@ -68,12 +68,12 @@ } -void YQGenericButton::setEnabling( bool enabled ) +void YQGenericButton::setEnabled( bool enabled ) { if ( _qPushButton ) _qPushButton->setEnabled( enabled ); - YWidget::setEnabling( enabled ); + YWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQGeneri… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQGenericButton.h Wed Jun 6 16:55:19 2007 @@ -60,7 +60,7 @@ * * Reimplemented from YWidget. **/ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Returns 'true' if this button is enabled, 'false' otherwise. Modified: branches/tmp/sh/mod-ui/qt/src/YQIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQIntFie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQIntField.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQIntField.cc Wed Jun 6 16:55:19 2007 @@ -60,7 +60,7 @@ } -void YQIntField::setEnabling( bool enabled ) +void YQIntField::setEnabled( bool enabled ) { _qt_label->setEnabled ( enabled ); _qt_spinbox->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQIntFie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQIntField.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQIntField.h Wed Jun 6 16:55:19 2007 @@ -54,7 +54,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLabel.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLabel.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLabel.cc Wed Jun 6 16:55:19 2007 @@ -63,7 +63,7 @@ } -void YQLabel::setEnabling( bool enabled ) +void YQLabel::setEnabled( bool enabled ) { QLabel::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLabel.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLabel.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLabel.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.cc Wed Jun 6 16:55:19 2007 @@ -59,7 +59,7 @@ } -void YQLogView::setEnabling( bool enabled ) +void YQLogView::setEnabled( bool enabled ) { _qt_text->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQLogVie… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQLogView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQLogView.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMenuBu… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMenuButton.cc Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ } void -YQMenuButton::setEnabling( bool enabled ) +YQMenuButton::setEnabled( bool enabled ) { _qt_pushbutton->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMenuBu… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMenuButton.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiL… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.cc Wed Jun 6 16:55:19 2007 @@ -66,7 +66,7 @@ } -void YQMultiLineEdit::setEnabling( bool enabled ) +void YQMultiLineEdit::setEnabled( bool enabled ) { _qt_textedit->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiL… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiLineEdit.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiP… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.cc Wed Jun 6 16:55:19 2007 @@ -355,7 +355,7 @@ } -void YQMultiProgressMeter::setEnabling( bool enabled ) +void YQMultiProgressMeter::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); QWidget::update(); Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiP… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiProgressMeter.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.cc Wed Jun 6 16:55:19 2007 @@ -107,7 +107,7 @@ void -YQMultiSelectionBox::setEnabling( bool enabled ) +YQMultiSelectionBox::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_listview->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQMultiS… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQMultiSelectionBox.h Wed Jun 6 16:55:19 2007 @@ -48,7 +48,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQPartit… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.cc Wed Jun 6 16:55:19 2007 @@ -142,7 +142,7 @@ } -void YQPartitionSplitter::setEnabling( bool enabled ) +void YQPartitionSplitter::setEnabled( bool enabled ) { _qt_freeFieldLabel->setEnabled ( enabled ); _qt_newPartFieldLabel->setEnabled ( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQPartit… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQPartitionSplitter.h Wed Jun 6 16:55:19 2007 @@ -58,7 +58,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.cc Wed Jun 6 16:55:19 2007 @@ -61,7 +61,7 @@ } -void YQProgressBar::setEnabling( bool enabled ) +void YQProgressBar::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_progressbar->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQProgre… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQProgressBar.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * Inherited from YWidget: Sets the enabled state of the * widget. Disabling a progress bar makes it grey */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButton.cc Wed Jun 6 16:55:19 2007 @@ -104,7 +104,7 @@ } -void YQRadioButton::setEnabling( bool enabled ) +void YQRadioButton::setEnabled( bool enabled ) { _qt_radiobutton->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButton.h Wed Jun 6 16:55:19 2007 @@ -63,7 +63,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.cc Wed Jun 6 16:55:19 2007 @@ -66,7 +66,7 @@ } -void YQRadioButtonGroup::setEnabling( bool enabled ) +void YQRadioButtonGroup::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRadioB… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRadioButtonGroup.h Wed Jun 6 16:55:19 2007 @@ -61,7 +61,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Resize this widget Modified: branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQReplac… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.cc Wed Jun 6 16:55:19 2007 @@ -40,7 +40,7 @@ } -void YQReplacePoint::setEnabling( bool enabled ) +void YQReplacePoint::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQReplac… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQReplacePoint.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the size Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.cc Wed Jun 6 16:55:19 2007 @@ -83,7 +83,7 @@ } -void YQRichText::setEnabling( bool enabled ) +void YQRichText::setEnabled( bool enabled ) { _textBrowser->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQRichTe… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQRichText.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQRichText.h Wed Jun 6 16:55:19 2007 @@ -47,7 +47,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSelect… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.cc Wed Jun 6 16:55:19 2007 @@ -129,7 +129,7 @@ } -void YQSelectionBox::setEnabling( bool enabled ) +void YQSelectionBox::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _qt_listbox->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSelect… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSelectionBox.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQSlider.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSlider… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSlider.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSlider.cc Wed Jun 6 16:55:19 2007 @@ -75,7 +75,7 @@ } -void YQSlider::setEnabling( bool enabled ) +void YQSlider::setEnabled( bool enabled ) { _qt_label->setEnabled ( enabled ); _qt_slider->setEnabled ( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQSlider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSlider… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSlider.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSlider.h Wed Jun 6 16:55:19 2007 @@ -55,7 +55,7 @@ * Sets the widget's enabled state. * Inherited from YWidget. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Preferred size. Modified: branches/tmp/sh/mod-ui/qt/src/YQSplit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSplit.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSplit.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSplit.cc Wed Jun 6 16:55:19 2007 @@ -33,7 +33,7 @@ } -void YQSplit::setEnabling( bool enabled ) +void YQSplit::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQSplit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSplit.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSplit.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSplit.h Wed Jun 6 16:55:19 2007 @@ -43,7 +43,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Inherited from YWidget. Sets the new size of the widget. Modified: branches/tmp/sh/mod-ui/qt/src/YQSquash.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSquash… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSquash.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSquash.cc Wed Jun 6 16:55:19 2007 @@ -31,7 +31,7 @@ } -void YQSquash::setEnabling( bool enabled ) +void YQSquash::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQSquash.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQSquash… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQSquash.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQSquash.h Wed Jun 6 16:55:19 2007 @@ -44,7 +44,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Sets the size Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.cc Wed Jun 6 16:55:19 2007 @@ -171,7 +171,7 @@ } -void YQTable::setEnabling( bool enabled ) +void YQTable::setEnabled( bool enabled ) { _qt_listview->setEnabled( enabled ); _qt_listview->triggerUpdate(); Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.h Wed Jun 6 16:55:19 2007 @@ -46,7 +46,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTextEn… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTextEntry.cc Wed Jun 6 16:55:19 2007 @@ -105,7 +105,7 @@ } -void YQTextEntry::setEnabling( bool enabled ) +void YQTextEntry::setEnabled( bool enabled ) { _qt_lineEdit->setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTextEn… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTextEntry.h Wed Jun 6 16:55:19 2007 @@ -96,7 +96,7 @@ * * Reimplemented from YWidget. **/ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQTime.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTime.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTime.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTime.cc Wed Jun 6 16:55:19 2007 @@ -64,7 +64,7 @@ } -void YQTime::setEnabling( bool enabled ) +void YQTime::setEnabled( bool enabled ) { setEnabled( enabled ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQTime.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTime.h… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTime.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTime.h Wed Jun 6 16:55:19 2007 @@ -49,7 +49,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTree.c… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTree.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTree.cc Wed Jun 6 16:55:19 2007 @@ -98,7 +98,7 @@ void -YQTree::setEnabling( bool enabled ) +YQTree::setEnabled( bool enabled ) { _qt_label->setEnabled( enabled ); _listView->setEnabled( enabled ); Modified: branches/tmp/sh/mod-ui/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTree.h… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTree.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTree.h Wed Jun 6 16:55:19 2007 @@ -50,7 +50,7 @@ * widget. All new widgets are enabled per definition. Only * enabled widgets can take user input. */ - void setEnabling( bool enabled ); + void setEnabled( bool enabled ); /** * Minimum size the widget should have to make it look and feel Modified: branches/tmp/sh/mod-ui/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWizard… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWizard.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWizard.cc Wed Jun 6 16:55:19 2007 @@ -1811,7 +1811,7 @@ return; if ( button ) - button->setEnabling( enabled ); + button->setEnabled( enabled ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38324 - /branches/tmp/sh/mod-ui/core/libyui/src/
by sh-sh-sh＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: sh-sh-sh Date: Wed Jun 6 16:55:02 2007 New Revision: 38324 URL: http://svn.opensuse.org/viewcvs/yast?rev=38324&view=rev Log: parent management Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.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/src/YCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc Wed Jun 6 16:55:02 2007 @@ -63,7 +63,7 @@ enabled ? "Enabling" : "Diabling", widgetClass(), debugLabel().c_str() ); - setChildrenEnabling( enabled ); + setChildrenEnabled( enabled ); } } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Wed Jun 6 16:55:02 2007 @@ -30,7 +30,7 @@ **/ template<class T> class YChildrenManager { -protected: +public: /** * Constructor. @@ -46,8 +46,7 @@ **/ virtual ~YChildrenManager() {} -public: - + typedef std::list<T *> ChildrenList; /** Modified: branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc Wed Jun 6 16:55:02 2007 @@ -91,12 +91,20 @@ void YContainerWidget::dumpDialogWidgetTree() { - YContainerWidget *dialog = dynamic_cast <YContainerWidget *> ( yDialog() ); +#if 0 + // FIXME + // FIXME + // FIXME + YDialog * dialog = findDialog(); if ( dialog ) dialog->dumpWidgetTree(); else dumpWidgetTree(); + // FIXME + // FIXME + // FIXME +#endif } @@ -152,7 +160,7 @@ } -void YContainerWidget::setChildrenEnabling( bool enabled ) +void YContainerWidget::setChildrenEnabled( bool enabled ) { for ( int i = 0; i < numChildren(); i++ ) { @@ -163,14 +171,14 @@ if ( container ) { // y2debug( "Recursing into %s", container->debugLabel().c_str() ); - container->setEnabling( enabled ); - container->setChildrenEnabling( enabled ); + container->setEnabled( enabled ); + container->setChildrenEnabled( enabled ); } } else { // y2debug( "%s %s", enabled ? "Enabling" : "Disabling", children[i]->debugLabel().c_str() ); - children[i]->setEnabling( enabled ); + children[i]->setEnabled( enabled ); } } } 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… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h Wed Jun 6 16:55:02 2007 @@ -151,7 +151,7 @@ /** * Enable or disable all widgets in this widget tree. **/ - void setChildrenEnabling( bool enabled ); + void setChildrenEnabled( bool enabled ); /** * Returns a (possibly translated) text describing this dialog for Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc Wed Jun 6 16:55:02 2007 @@ -146,16 +146,16 @@ YRadioButtonGroup * YRadioButton::findRadioButtonGroup() const { - YWidget * parent = yParent(); + YWidget * widget = parent(); - while ( parent ) + while ( widget ) { - YRadioButtonGroup * radioButtonGroup = dynamic_cast<YRadioButtonGroup *> (parent); + YRadioButtonGroup * radioButtonGroup = dynamic_cast<YRadioButtonGroup *> (widget); if ( radioButtonGroup ) return radioButtonGroup; else - parent = parent->yParent(); + widget = widget->parent(); } return 0; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Wed Jun 6 16:55:02 2007 @@ -143,13 +143,43 @@ #define YUI_CHECK_NEW( PTR ) \ do \ { \ - if ( ! ( PTR ) ) \ + if ( ! (PTR) ) \ { \ YUI_THROW( YUIOutOfMemoryException() ); \ } \ } while( 0 ) + +/** + * Check for null pointer. + * Throws YUINullPointerException if the pointer is 0. + **/ +#define YUI_CHECK_PTR( PTR ) \ + do \ + { \ + if ( ! (PTR) ) \ + { \ + YUI_THROW( YUINullPointerException() ); \ + } \ + } while( 0 ) + + +/** + * Check if a widget pointer is valid. + * Throws YUIInvalidWidgetException if it is 0 or invalid (already deleted). + **/ +#define YUI_CHECK_WIDGET( WIDGET ) \ + do \ + { \ + if ( ! (WIDGET) || ! (WIDGET)->isValid() ) \ + { \ + YUI_THROW( YUIInvalidWidgetException() ); \ + } \ + } while( 0 ) + + + /** * Helper class for UI exceptions: Store _FILE_, _FUNCTION_ and _LINE_. * Construct this using the YUI_EXCEPTION_CODE_LOCATION macro. @@ -323,6 +353,22 @@ /** + * Exception class for generic null pointer exceptions. + * When available, a more specialized exception class should be used. + **/ +class YUINullPointerException: public YUIException +{ +public: + YUINullPointerException() + : YUIException( "Null pointer" ) + {} + + virtual ~YUINullPointerException() throw() + {} +}; + + +/** * Exception class for "out of memory". * Typically used if operator new returned 0. **/ @@ -336,7 +382,23 @@ virtual ~YUIOutOfMemoryException() throw() {} -}; // class YUIOutOfMemoryException +}; + +/** + * Exception class vor invalid widgets. + * This is typically caused by widget pointers that continue living after the + * corresponding widget has already been deleted. + **/ +class YUIInvalidWidgetException: public YUIException +{ +public: + YUIInvalidWidgetException() + : YUIException( "Invalid widget" ) + {} + + virtual ~YUIInvalidWidgetException() throw() + {} +}; /** @@ -538,7 +600,7 @@ * Returns the child widget. **/ YWidget * child() const { return _child; } - + protected: /** @@ -560,7 +622,7 @@ << containerWidgetClass << std::endl; } - + private: YWidget * _container; 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… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc Wed Jun 6 16:55:02 2007 @@ -633,7 +633,7 @@ return 0; } - if ( widgetEvent->widget()->yDialog() != currentDialog() ) + if ( widgetEvent->widget()->findDialog() != currentDialog() ) { /** * Silently discard events from all but the current (topmost) dialog. @@ -1809,7 +1809,7 @@ YContainerWidget * container = dynamic_cast<YContainerWidget *>( widget ); if ( ! container ) - container = dynamic_cast<YContainerWidget *>( widget->yParent() ); + container = dynamic_cast<YContainerWidget *>( widget->parent() ); if ( container ) { Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_widgets.cc Wed Jun 6 16:55:02 2007 @@ -292,7 +292,7 @@ } if ( opt.isDisabled.value() ) - w->setEnabling( false ); + w->setDisabled(); w->setParent(p); } 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… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Wed Jun 6 16:55:02 2007 @@ -12,8 +12,7 @@ File: YWidget.cc - Author: Mathias Kettner <kettner(a)suse.de> - Maintainer: Stefan Hundhammer <sh(a)suse.de> + Author: Stefan Hundhammer <sh(a)suse.de> /-*/ @@ -30,6 +29,7 @@ #include "YUISymbols.h" #include "YShortcut.h" #include "YWidget.h" +#include "YDialog.h" #include "YUIComponent.h" #include "YUI.h" #include "YDialog.h" @@ -37,26 +37,38 @@ #include "YChildrenManager.h" -using std::string; - #define MAX_DEBUG_LABEL_LEN 50 +#define YWIDGET_MAGIC 42 + + +using std::string; struct YWidgetPrivate { /** * Constructor **/ - YWidgetPrivate( YWidget * widget ) - : childrenRejector( widget ) - , childrenManager( childrenRejector ) + YWidgetPrivate( YWidgetChildrenManager * manager ) + : magic( YWIDGET_MAGIC ) + , childrenManager( manager ) + , parent( 0 ) + , beingDestroyed( false ) + , enabled( true ) + , notify( false ) + , toolkitWidgetRep( 0 ) {} // // Data members // - - YWidgetChildrenRejector childrenRejector; // default: no children - YWidgetChildrenManager & childrenManager; + + int magic; + YWidgetChildrenManager * childrenManager; + YWidget * parent; + bool beingDestroyed; + bool enabled; + bool notify; + void * toolkitWidgetRep; }; @@ -64,11 +76,8 @@ YWidget::YWidget( const YWidgetOpt & opt ) - : priv( new YWidgetPrivate( this ) ) - , magic( YWIDGET_MAGIC ) + : priv( new YWidgetPrivate( new YWidgetChildrenRejector( this ) ) ) , user_widget_id( YCPNull() ) - , yparent(0) - , rep(0) , windowID( -1 ) { internal_widget_id = next_internal_widget_id++; @@ -82,27 +91,27 @@ _weight[ YD_HORIZ ] = opt.hWeight.value(); _weight[ YD_VERT ] = opt.vWeight.value(); - if ( ! enabled ) setEnabling( false ); + if ( ! enabled ) setDisabled(); if ( notify ) setNotify( notify ); } YWidget::~YWidget() { - if ( ! isValid() ) - { - y2error( "ERROR: Trying to destroy invalid widget" ); - return; - } + YUI_CHECK_WIDGET( this ); + setBeingDestroyed(); - if ( yparent && yparent->isValid() ) - yparent->childDeleted( this ); + deleteChildren(); + if ( parent() && ! parent()->isBeingDestroyed() ) + parent()->removeChild( this ); + + delete priv->childrenManager; invalidate(); } -YChildrenManager & +YWidgetChildrenManager * YWidget::childrenManager() const { return priv->childrenManager; @@ -110,8 +119,11 @@ void -YWidget::setChildrenManager( YChildrenManager & newChildrenManager ) +YWidget::setChildrenManager( YWidgetChildrenManager * newChildrenManager ) { + YUI_CHECK_PTR( newChildrenManager ); + + delete priv->childrenManager; priv->childrenManager = newChildrenManager; } @@ -119,14 +131,29 @@ void YWidget::addChild( YWidget * child ) { - childrenManager().addChild( child ); + childrenManager()->add( child ); } void YWidget::removeChild( YWidget * child ) { - childrenManager().removeChild( child ); + childrenManager()->remove( child ); +} + + +void +YWidget::deleteChildren() +{ + for ( YWidgetList::const_iterator it = childrenBegin(); + it != childrenEnd(); + ++it ) + { + if ( (*it)->isValid() ) + delete *it; + } + + childrenManager()->clear(); } @@ -145,60 +172,62 @@ } -void YWidget::setId( const YCPValue & id ) +bool +YWidget::isValid() const { - user_widget_id = id; + return priv->magic == YWIDGET_MAGIC; } -bool YWidget::hasId() const +void +YWidget::invalidate() { - return ( ! user_widget_id.isNull() && ! user_widget_id->isVoid() ); + priv->magic = 0; } -YCPValue YWidget::id() const +bool +YWidget::isBeingDestroyed() const { - if ( ! isValid() ) - { - y2error( "YWidget::id(): Invalid widget" ); - return YCPString( "<invalid widget>" ); - } + return priv->beingDestroyed; +} - if ( user_widget_id.isNull() ) - return YCPVoid(); - else - return user_widget_id; +void +YWidget::setBeingDestroyed() +{ + priv->beingDestroyed = true; } -void YWidget::setParent( YWidget *parent ) +YWidget * +YWidget::parent() const { - yparent = parent; + return priv->parent; } -YWidget * YWidget::yParent() const +void +YWidget::setParent( YWidget * newParent ) { - return yparent; + priv->parent = newParent; } -YWidget * YWidget::yDialog() +YDialog * YWidget::findDialog() { - YWidget *parent = this; + YWidget * widget = this; - while ( parent && ! parent->isDialog() ) + while ( widget ) { - parent = parent->yParent(); - } + YDialog * dialog = dynamic_cast<YDialog *> (widget); - if ( ! parent ) - { - y2warning( "Warning: No dialog parent for %s", widgetClass() ); + if ( dialog ) + return dialog; + else + widget = widget->parent(); } - return parent; + return 0; } @@ -234,8 +263,8 @@ throw; } - if ( propertyName == YUIProperty_Enabled ) setEnabling( val.boolVal() ); - else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); + if ( propertyName == YUIProperty_Enabled ) setEnabled( val.boolVal() ); + else if ( propertyName == YUIProperty_Notify ) setNotify ( val.boolVal() ); } @@ -252,115 +281,87 @@ throw; } - if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( getEnabling() ); + if ( propertyName == YUIProperty_Enabled ) return YPropertyValue( isEnabled() ); if ( propertyName == YUIProperty_Notify ) return YPropertyValue( getNotify() ); if ( propertyName == YUIProperty_WidgetClass ) return YPropertyValue( widgetClass() ); if ( propertyName == YUIProperty_DebugLabel ) return YPropertyValue( debugLabel() ); - if ( propertyName == YUIProperty_DialogDebugLabel ) return YPropertyValue( yDialog()->debugLabel() ); + if ( propertyName == YUIProperty_DialogDebugLabel ) + { + YDialog * dialog = findDialog(); + + if ( dialog ) + return YPropertyValue( dialog->debugLabel() ); + else + return YPropertyValue( debugLabel() ); + } return YPropertyValue( false ); // NOTREACHED } - -YCPValue YWidget::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) +void * +YWidget::widgetRep() const { - string symbol = property->symbol(); + return priv->toolkitWidgetRep; +} - if ( ! isValid() ) - { - y2error( "YWidget::changeWidget( %s ): ERROR: Invalid widget", symbol.c_str() ); - return YCPBoolean( false ); // Error - } +void +YWidget::setWidgetRep( void * rep ) +{ + priv->toolkitWidgetRep = rep; +} - /* - * @property boolean Enabled the current enabled/disabled state - */ - if ( symbol == YUIProperty_Enabled ) - { - if ( newvalue->isBoolean() ) - { - bool e = newvalue->asBoolean()->value(); - setEnabling(e); - enabled = e; - return YCPBoolean( true ); - } - else y2error( "Wrong argument %s for widget property `Enabled - boolean expected.", - newvalue->toString().c_str() ); - } - /* - * @property boolean Notify the current notify state (see also `opt( `notify )) - */ - if ( symbol == YUIProperty_Notify ) - { - if ( newvalue->isBoolean() ) - { - setNotify( newvalue->asBoolean()->value() ); - return YCPBoolean( true ); - } - else y2error( "Wrong argument %s for widget property `Notify - boolean expected.", - newvalue->toString().c_str() ); - } +void +YWidget::setEnabled( bool enabled ) +{ + priv->enabled = enabled; +} - return YCPBoolean( false ); + +bool +YWidget::isEnabled() const +{ + return priv->enabled; } -YCPValue YWidget::changeWidgetTerm( const YCPTerm & property, const YCPValue & newvalue ) +void YWidget::setShortcutString( const std::string & str ) { - y2warning( "Widget %s: Couldn't change unknown widget property %s to %s", - id()->toString().c_str(), property->toString().c_str(), newvalue->toString().c_str() ); - return YCPVoid(); + y2error( "Default setShortcutString() method called - " + "should be reimplemented in %s", widgetClass() ); } -YCPValue YWidget::queryWidget( const YCPSymbol & property ) + + + +void YWidget::setId( const YCPValue & id ) { - string symbol = property->symbol(); - if ( symbol == YUIProperty_Enabled ) return YCPBoolean( getEnabling() ); - if ( symbol == YUIProperty_Notify ) return YCPBoolean( getNotify() ); - if ( symbol == YUIProperty_WindowID ) return YCPInteger( windowID ); - /** - * @property string WidgetClass the widget class of this widget (YLabel, YPushButton, ...) - */ - if ( symbol == YUIProperty_WidgetClass ) return YCPString( widgetClass() ); - /** - * @property string DebugLabel a (possibly translated) text describing this widget for debugging - */ - if ( symbol == YUIProperty_DebugLabel ) return YCPString( debugLabel() ); - /** - * @property string DialogDebugLabel a (possibly translated) text describing this dialog for debugging - */ - if ( symbol == YUIProperty_DialogDebugLabel ) - { - return YUIComponent::ui()->currentDialog()->queryWidget( property ); - } - else - { - y2error( "Widget %s: Couldn't query unkown widget property %s", - id()->toString().c_str(), symbol.c_str() ); - return YCPVoid(); - } + user_widget_id = id; } -YCPValue YWidget::queryWidgetTerm( const YCPTerm & property ) +bool YWidget::hasId() const { - y2warning( "Widget %s: Couldn't query unkown widget property %s", - id()->toString().c_str(), property->toString().c_str() ); - return YCPVoid(); + return ( ! user_widget_id.isNull() && ! user_widget_id->isVoid() ); } -void YWidget::setShortcutString( const std::string & str ) +YCPValue YWidget::id() const { - y2error( "Default setShortcutString() method called - " - "should be reimplemented in %s", widgetClass() ); + YUI_CHECK_WIDGET( this ); + + if ( user_widget_id.isNull() ) + return YCPVoid(); + else + return user_widget_id; } + + void YWidget::setNotify( bool notify ) { this->notify = notify; @@ -373,12 +374,6 @@ } -bool YWidget::getEnabling() const -{ - return enabled; -} - - long YWidget::nicesize( YUIDimension dim ) { y2error( "YWidget::nicesize( YUIDimension dim ) called - " @@ -424,25 +419,6 @@ } -void YWidget::setEnabling( bool ) -{ - // Default implementation for widgets that can't be enabled - // or disabled -} - - -void *YWidget::widgetRep() -{ - return rep; -} - - -void YWidget::setWidgetRep( void *r ) -{ - rep = r; -} - - bool YWidget::isDialog() const { return false; @@ -487,3 +463,113 @@ */ } + + + + + + + + + + +// FIXME: Obsolete +// FIXME: Obsolete +// FIXME: Obsolete + + +YCPValue YWidget::changeWidget( const YCPSymbol & property, const YCPValue & newvalue ) +{ + string symbol = property->symbol(); + + if ( ! isValid() ) + { + y2error( "YWidget::changeWidget( %s ): ERROR: Invalid widget", symbol.c_str() ); + + return YCPBoolean( false ); // Error + } + + /* + * @property boolean Enabled the current enabled/disabled state + */ + if ( symbol == YUIProperty_Enabled ) + { + if ( newvalue->isBoolean() ) + { + bool e = newvalue->asBoolean()->value(); + setEnabled(e); + enabled = e; + return YCPBoolean( true ); + } + else y2error( "Wrong argument %s for widget property `Enabled - boolean expected.", + newvalue->toString().c_str() ); + } + + /* + * @property boolean Notify the current notify state (see also `opt( `notify )) + */ + if ( symbol == YUIProperty_Notify ) + { + if ( newvalue->isBoolean() ) + { + setNotify( newvalue->asBoolean()->value() ); + return YCPBoolean( true ); + } + else y2error( "Wrong argument %s for widget property `Notify - boolean expected.", + newvalue->toString().c_str() ); + } + + return YCPBoolean( false ); +} + + +YCPValue YWidget::changeWidgetTerm( const YCPTerm & property, const YCPValue & newvalue ) +{ + y2warning( "Widget %s: Couldn't change unknown widget property %s to %s", + id()->toString().c_str(), property->toString().c_str(), newvalue->toString().c_str() ); + return YCPVoid(); +} + + +YCPValue YWidget::queryWidget( const YCPSymbol & property ) +{ + string symbol = property->symbol(); + if ( symbol == YUIProperty_Enabled ) return YCPBoolean( isEnabled() ); + if ( symbol == YUIProperty_Notify ) return YCPBoolean( getNotify() ); + if ( symbol == YUIProperty_WindowID ) return YCPInteger( windowID ); + /** + * @property string WidgetClass the widget class of this widget (YLabel, YPushButton, ...) + */ + if ( symbol == YUIProperty_WidgetClass ) return YCPString( widgetClass() ); + /** + * @property string DebugLabel a (possibly translated) text describing this widget for debugging + */ + if ( symbol == YUIProperty_DebugLabel ) return YCPString( debugLabel() ); + /** + * @property string DialogDebugLabel a (possibly translated) text describing this dialog for debugging + */ + if ( symbol == YUIProperty_DialogDebugLabel ) + { + return YUIComponent::ui()->currentDialog()->queryWidget( property ); + } + else + { + y2error( "Widget %s: Couldn't query unkown widget property %s", + id()->toString().c_str(), symbol.c_str() ); + return YCPVoid(); + } +} + + +YCPValue YWidget::queryWidgetTerm( const YCPTerm & property ) +{ + y2warning( "Widget %s: Couldn't query unkown widget property %s", + id()->toString().c_str(), property->toString().c_str() ); + return YCPVoid(); +} + + +// 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… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Wed Jun 6 16:55:02 2007 @@ -30,10 +30,10 @@ #include "YChildrenManager.h" #include "ImplPtr.h" -#define YWIDGET_MAGIC 42 // what else? ;- ) class YCPSymbol; class YMacroRecorder; +class YDialog; #define YUIAllDimensions 2 @@ -51,26 +51,27 @@ class YWidgetPrivate; + /** - * @short Abstract base class of all ui widgets + * Abstract base class of all UI widgets */ class YWidget { public: /** - * Constructor - */ + * Constructor. + **/ YWidget( const YWidgetOpt & opt ); /** * Destructor - */ + **/ virtual ~YWidget(); /** * Returns a descriptive name of this widget class for logging, * debugging etc. - */ + **/ virtual const char * widgetClass() { return "YWidget"; } /** @@ -176,31 +177,31 @@ * Returns 'true' if this widget has any children. **/ bool hasChildren() const - { return childrenManager().hasChildren(); } + { return childrenManager()->hasChildren(); } /** * Returns the first child or 0 if there is none. * Useful mostly for children managers that handle only one child. **/ YWidget * firstChild() const - { return childrenManager().firstChild(); } + { return childrenManager()->firstChild(); } /** * Return an iterator that points to the first child or to childrenEnd() if * there are no children. **/ YWidgetListConstIterator childrenBegin() const - { return childrenManager().begin(); } + { return childrenManager()->begin(); } /** * Returns the current number of children. **/ - int childrenCount() const { return childrenManager().count(); } + int childrenCount() const { return childrenManager()->count(); } /** * Return an interator that points after the last child. **/ YWidgetListConstIterator childrenEnd() const - { return childrenManager().end(); } + { return childrenManager()->end(); } /** * Add a new child. @@ -216,21 +217,86 @@ **/ virtual void removeChild( YWidget * child ); + /** + * Delete all children and remove them from the children manager's list. + **/ + void deleteChildren(); + + /** + * Return this widget's parent or 0 if it doesn't have a parent. + **/ + YWidget * parent() const; + + /** + * Set this widget's parent. + **/ + void setParent( YWidget * newParent ); + + /** + * Traverse up the widget hierarchy and find the dialog this widget belongs + * to. Returns 0 if there is none. + **/ + YDialog * findDialog(); + // // Misc // - /** * Checks whether or not this object is valid. This is to enable - * dangling pointer error checking ( i.e. this object is already - * deallocated, but a pointer to it is still in use ). + * dangling pointer error checking (i.e. this object is already + * deallocated, but a pointer to it is still in use). + * + * See also the YUI_CHECK_WIDGET() macro in YUIException.h + **/ + bool isValid() const; + + /** + * Check if this widget is in the process of being destroyed. + **/ + bool isBeingDestroyed() const; + + /** + * Return a pointer to the underlying toolkit's (Qt, ...) widget + * representing this abstract UI widget. + **/ + void *widgetRep() const; + + /** + * set the pointer to the underlying toolkit's (Qt, ...) widget + * representing this abstract UI widget. + **/ + void setWidgetRep( void * toolkitWidgetRep ); + + /** + * Enable or disable this widget, i.e. make it accept or reject user input. + * + * Derived classes should call the base class method to update the internal + *"enabled" flag. */ - bool isValid() const { return magic == YWIDGET_MAGIC; } + virtual void setEnabled( bool enabled = true ); /** + * Disable this widget (overloaded for better readability). + **/ + void setDisabled() { setEnabled( false); } + + /** + * Returns 'true' if this widget is enabled. + **/ + virtual bool isEnabled() const; + + + + + + + + + + /** * Return the widget serial number (the internal widget ID). */ int internalId() const { return internal_widget_id; } @@ -251,22 +317,6 @@ YCPValue id() const; /** - * Set the parent YWidget of this widget. - */ - void setParent( YWidget *parent ); - - /** - * Return the parent YWidget of this widget. - */ - YWidget * yParent() const; - - /** - * Return the YDialog this widget belongs to. - * Returns 0 if there is no dialog parent. - */ - YWidget * yDialog(); - - /** * Notify a widget that can have children that a child has been deleted. * This is called in the YWidget destructor for the parent widget. * All container widgets should overwrite this function and update @@ -372,17 +422,6 @@ virtual void setSize( long newwidth, long newheight ); /** - * Sets the enabled state of the widget. All new widgets are enabled per - * definition. Only enabled widgets can take user input. - */ - virtual void setEnabling( bool enabled ); - - /** - * Queries the enabled of a widget. - */ - bool getEnabling() const; - - /** * Sets the Notify property */ void setNotify( bool notify ); @@ -448,16 +487,6 @@ virtual YCPValue queryWidgetTerm( const YCPTerm & property ); /** - * Returns a pointer to the ui specific widget implementation. - */ - void *widgetRep(); - - /** - * Sets the pointer to the ui specific widget implementation. - */ - void setWidgetRep( void * ); - - /** * Set the keyboard focus to this widget. * The default implementation just emits a warning message. * Overwrite this function for all widgets that can accept the @@ -539,10 +568,12 @@ /** * Returns this widget's children manager. **/ - YWidgetChildrenManager & childrenManager() const; + YWidgetChildrenManager * childrenManager() const; /** - * Sets a new children manager for this widget. + * Sets a new children manager for this widget. The widget assumes + * ownership of this children manager and will delete it when appropriate. + * * The default children manager (a YWidgetChildrenRejector) rejects all * children. This is useful for leaf widgets such as PushButton, ComboBox * etc. @@ -552,7 +583,17 @@ * children) or to a YSingleWidgetChildManager (the class that handles * exactly one child widget). **/ - void setChildrenManager( YWidgetChildrenManager & manager ); + void setChildrenManager( YWidgetChildrenManager * manager ); + + /** + * Set the "being destroyed" flag, i.e. indicate that this widget is in the + * process of being destroyed. The base class method already sets this, but + * sometimes it might be useful to call this in a derived class's + * destructor so certain optimizations work better. + * + * This status intentionally cannot be reverted to "not being destroyed". + **/ + void setBeingDestroyed(); private: @@ -560,13 +601,24 @@ /** * Make this widget invalid. This operation cannot be reversed. */ - void invalidate() { magic=0; } + void invalidate(); + + +private: + + ImplPtr<YWidgetPrivate> priv; + static YPropertySet _propertySet; - /** - * This object is only valid if this magic number is - * YWIDGET_MAGIC. Use YWidget::isValid() to check this. - */ - int magic; + + + + + + + + + + protected: @@ -590,11 +642,6 @@ static int next_internal_widget_id; /** - * The parent YWidget. - */ - YWidget *yparent; - - /** * Flag: Can this widget currently receive user input? */ bool enabled; @@ -616,12 +663,6 @@ bool _autoShortcut; /** - * Pointer to the UI specific widget representation that belongs to this - * widget. For Qt, this will be a pointer to a QWidget (subclass). - **/ - void * rep; - - /** * Stretchability in both dimensions. */ bool _stretch [ YUIAllDimensions ]; @@ -637,11 +678,20 @@ long windowID; -private: - ImplPtr<YWidgetPrivate *> priv; - static YPropertySet _propertySet; + + + + + + + + + // FIXME: Get this stuff out of here - it is utterly out of place + // FIXME: Get this stuff out of here - it is utterly out of place + // FIXME: Get this stuff out of here - it is utterly out of place + public: /** * Helper class that calls startMultipleChanges() in its constructor -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38323 - /branches/SuSE-SLE-10-SP2-Branch/
by mvidner＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: mvidner Date: Wed Jun 6 16:39:05 2007 New Revision: 38323 URL: http://svn.opensuse.org/viewcvs/yast?rev=38323&view=rev Log: Branched SLE10 SP2 development. The SP1 branch is for maintenance now. See also http://en.opensuse.org/YaST_Development_Branches Added: branches/SuSE-SLE-10-SP2-Branch/ - copied from r38322, branches/SuSE-SLE-10-SP1-Branch/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38322 - /tags/stable-2_15_40/network/
by mzugec＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: mzugec Date: Wed Jun 6 16:35:23 2007 New Revision: 38322 URL: http://svn.opensuse.org/viewcvs/yast?rev=38322&view=rev Log: Created tag stable-2_15_40 for network Added: tags/stable-2_15_40/network/ - copied from r38321, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38321 - in /trunk/network: VERSION package/yast2-network.changes src/dsl/dialogs.ycp src/lan/complex.ycp src/lan/hardware.ycp src/lan/virtual.ycp src/routines/complex.ycp src/routines/widgets.ycp
by mzugec＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: mzugec Date: Wed Jun 6 16:35:16 2007 New Revision: 38321 URL: http://svn.opensuse.org/viewcvs/yast?rev=38321&view=rev Log: values proposal for hardware dialog Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/dsl/dialogs.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/lan/virtual.ycp trunk/network/src/routines/complex.ycp trunk/network/src/routines/widgets.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38321&r1=383… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Jun 6 16:35:16 2007 @@ -1 +1 @@ -2.15.39 +2.15.40 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Jun 6 16:35:16 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 6 16:31:35 CEST 2007 - mzugec(a)suse.cz + +- values proposal for hardware dialog +- 2.15.40 + +------------------------------------------------------------------- Fri Jun 1 11:14:21 CEST 2007 - mzugec(a)suse.cz - save_network.ycp moved from routines/ to clients/ Modified: trunk/network/src/dsl/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/dsl/dialogs.ycp?rev=… ============================================================================== --- trunk/network/src/dsl/dialogs.ycp (original) +++ trunk/network/src/dsl/dialogs.ycp Wed Jun 6 16:35:16 2007 @@ -109,7 +109,6 @@ // define void UpdateInterfaces() { list<string> items = getNetDeviceItems(); if(size(items)>0 && interface=="") interface=items[0]:""; -y2internal("items %1", items); /* FIXME Why is not the current interface added? */ if(false && /*interface != "" && */!contains(ifaces, interface)) ifaces = add(ifaces, interface); @@ -138,7 +137,6 @@ // list<string> items = NetworkDevices::List(""); -// y2internal("network devices list %1", items); /* NetworkDevices::Read(); @@ -147,7 +145,6 @@ string connection_text = _("%1 - %2 (%3)"); */ -y2internal("interface %1", interface); /* DSL dialog contents */ term contents = `HBox( `HSpacing(6), Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Wed Jun 6 16:35:16 2007 @@ -76,8 +76,7 @@ Lan::AbortFunction = ``{return PollAbort();}; boolean ret = Lan::Read (`cache); - boolean xenbr = Lan::HaveXenBridge (); - if (xenbr) + if ( Lan::HaveXenBridge() ) { if (! Popup::ContinueCancel ( sformat ( @@ -263,6 +262,10 @@ else // configured { Lan::Edit(current); + foreach(map<string, any> row, o_items, { + if (row["id"]:"" == current && row["hw_num"]:-1 != -1) Lan::SelectHW(row["hw_num"]:-1); + }); +// Lan::SelectHW (1); if (Lan::startmode == "managed") { // Continue-Cancel popup Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Wed Jun 6 16:35:16 2007 @@ -90,7 +90,7 @@ // #38213, remember device id when we switch back from pcmcia/usb hardware["non_hotplug_device_id"] = hardware["device"]:""; hardware["hwcfg"] = Lan::nm_name; - if (Lan::nm_name=="" && Lan::nm_name_old!=nil) hardware["hwcfg"]=Lan::nm_name_old; + if (size(Lan::nm_name)==0 && size(Lan::nm_name_old)>0) hardware["hwcfg"]=Lan::nm_name_old; // FIXME duplicated in address.ycp hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; @@ -203,7 +203,7 @@ `HStretch() ); - term contents = `CheckBoxFrame(`id(`enable_hwconfig), caption, hardware["hwcfg"]:"" != "", + term contents = `CheckBoxFrame(`id(`enable_hwcfg), caption, hardware["hwcfg"]:"" != "", `HBox( `HSpacing(2), `VBox( @@ -221,7 +221,7 @@ UI::ReplaceWidget(`hw_content, contents); -if (Lan::nm_name=="" && Lan::nm_name_old!=nil) UI::ChangeWidget(`enable_hwconfig, `Value, false); +if (size(Lan::nm_name)==0 && size(Lan::nm_name_old)>0) UI::ChangeWidget(`enable_hwcfg, `Value, false); hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; UI::ChangeWidget(`id(`modul), `Enabled, hardware["no_hotplug_dummy"]:false); @@ -421,17 +421,13 @@ } void storeHW (string key, map event) { - if(!(boolean)UI::QueryWidget(`enable_hwconfig, `Value)) + if(!(boolean)UI::QueryWidget(`enable_hwcfg, `Value)) { - -NetworkModules::DeleteM(Lan::nm_name); -if(Lan::nm_name_old==nil) Lan::nm_name_old = Lan::nm_name; -Lan::nm_name=""; -map<string, any> tmp_current=$[]; -foreach(string key, any value, NetworkDevices::Current, { -if (key != "_nm_name") tmp_current[key]=value; -}); -NetworkDevices::Current=tmp_current; + NetworkModules::DeleteM(Lan::nm_name); + if(size(Lan::nm_name_old)==0) Lan::nm_name_old = Lan::nm_name; + Lan::nm_name=""; + NetworkDevices::Current["_nm_name"]=""; + NetworkDevices::Commit(); } else { if(UI::WidgetExists(`id(`hwcfg))) { @@ -466,10 +462,10 @@ if(UI::WidgetExists(`id(`num))) { string devic = (string) UI::QueryWidget(`id(`num), `Value); } - } - NetworkModules::Alias = (string) UI::QueryWidget(`id(`modul), `Value); NetworkModules::Options = (string) UI::QueryWidget(`id(`options), `Value); + } + if(UI::WidgetExists(`id(`num))) Lan::device = (string) UI::QueryWidget(`id(`num), `Value); Modified: trunk/network/src/lan/virtual.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/virtual.ycp?rev=… ============================================================================== --- trunk/network/src/lan/virtual.ycp (original) +++ trunk/network/src/lan/virtual.ycp Wed Jun 6 16:35:16 2007 @@ -98,7 +98,6 @@ item = VirtualEditDialog(cur, item, []/*forbidden*/); - y2internal("item=%1", item); if(item != nil) { table_items = maplist(term e, table_items, { Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp… ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Wed Jun 6 16:35:16 2007 @@ -518,10 +518,12 @@ // summary description of STARTMODE=off "off" : _("Will not be started at all") ]; +/* list<string> models = []; foreach(map<string, any>row, (list<map<string, any> >)SCR::Read (.probe.netcard), { models=add(models, row["model"]:""); }); +*/ maplist(string type, map devmap, Devs, { maplist(string k, map v, (map<string,map>)devmap, { @@ -581,12 +583,14 @@ , ip, v["NETMASK"]:""), ]; } -if (size(v["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ - foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) v["_aliases"]:$[], { - string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:""); - bullets = add(bullets, sformat("%1 (%2)", key, parameters) ); - }); -} + + // build aliases overview + if (size(v["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ + foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) v["_aliases"]:$[], { + string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:""); + bullets = add(bullets, sformat("%1 (%2)", key, parameters) ); + }); + } } // build the "Bond Slaves" entry of rich box @@ -603,21 +607,17 @@ string rich = descr; rich = HTML::Bold ( rich ) + getConnMacBusDescription(v, Hardware) + HTML::List (bullets); - item = `item(`id(dev), descr, ip, rich); + integer hw_id=-1; + boolean found=false; + foreach(map device, Hardware, { + hw_id=hw_id+1; + if (v["udi"]:(v["UDI"]:"")==device["udi"]:"") { found=true; break; } + }); + + item = `item(`id(dev), descr, ip, rich, (found) ? hw_id : -1); } overview = add(overview, item); - /* aliases summary */ -/* - map<string,map> aliasee = v["_aliases"]:$[]; - if(aliasee != $[]) - maplist(string aid, map amap, aliasee, { - string adev = NetworkDevices::alias_name(type, k, aid); - ip = DeviceProtocol(amap); - item = `item(`id(adev), DeviceType(adev), adev, ip); - overview = add(overview, item); - }); -*/ }); }); Modified: trunk/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/widgets.ycp… ============================================================================== --- trunk/network/src/routines/widgets.ycp (original) +++ trunk/network/src/routines/widgets.ycp Wed Jun 6 16:35:16 2007 @@ -212,7 +212,6 @@ NetworkDevices::Read(); list<string> items = NetworkDevices::List("eth"); items = filter (string i, items, ``( i != "lo" )); - y2internal("network devices list %1", items); return items; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38320 - /tags/stable-2_15_8/sound/
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 16:27:14 2007 New Revision: 38320 URL: http://svn.opensuse.org/viewcvs/yast?rev=38320&view=rev Log: Created tag stable-2_15_8 for sound Added: tags/stable-2_15_8/sound/ - copied from r38319, trunk/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38319 - in /trunk/sound: ./ VERSION agent-audio/doc/autodocs/ package/yast2-sound.changes sound/config/
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 16:24:05 2007 New Revision: 38319 URL: http://svn.opensuse.org/viewcvs/yast?rev=38319&view=rev Log: - use [Accept] button instead of [Finish] in the main dialog during installation (#270519) Modified: trunk/sound/ (props changed) trunk/sound/VERSION trunk/sound/agent-audio/doc/autodocs/ (props changed) trunk/sound/package/yast2-sound.changes trunk/sound/sound/config/ (props changed) Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=38319&r1=38318… ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Wed Jun 6 16:24:05 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Wed Jun 6 16:24:05 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Jun 6 15:01:09 CEST 2007 - lslezak(a)suse.cz + +- removed empty index.html file +- check existence of the files (#256442) +- use [Accept] button instead of [Finish] in the main dialog + during installation (#270519) +- 2.15.8 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38318 - /trunk/sound/sound/src/complex.ycp
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 16:22:49 2007 New Revision: 38318 URL: http://svn.opensuse.org/viewcvs/yast?rev=38318&view=rev Log: - use [Accept] button instead of [Finish] in the main dialog during installation (#270519) Modified: trunk/sound/sound/src/complex.ycp Modified: trunk/sound/sound/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/complex.ycp?rev=… ============================================================================== --- trunk/sound/sound/src/complex.ycp (original) +++ trunk/sound/sound/src/complex.ycp Wed Jun 6 16:22:49 2007 @@ -419,7 +419,14 @@ extra_buttons ); - Wizard::SetNextButton(`next, Label::FinishButton()); + if (!Mode::installation() && !Mode::config()) + { + Wizard::SetNextButton(`next, Label::FinishButton()); + } + else + { + Wizard::SetNextButton(`next, Label::AcceptButton()); + } symbol ret = `_dummy; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38317 - in /trunk/sound/sound/src: ./ read_routines.ycp volume_routines.ycp write_routines.ycp
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 15:59:58 2007 New Revision: 38317 URL: http://svn.opensuse.org/viewcvs/yast?rev=38317&view=rev Log: - check existence of the files (#256442) Modified: trunk/sound/sound/src/ (props changed) trunk/sound/sound/src/read_routines.ycp trunk/sound/sound/src/volume_routines.ycp trunk/sound/sound/src/write_routines.ycp Modified: trunk/sound/sound/src/read_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/read_routines.yc… ============================================================================== --- trunk/sound/sound/src/read_routines.ycp (original) +++ trunk/sound/sound/src/read_routines.ycp Wed Jun 6 15:59:58 2007 @@ -214,18 +214,33 @@ * @return list */ define list<map> read_save_info () ``{ + list<map> saved = []; // First, read from /etc/modprobe.d/sound - list<map> saved = read_modprobe (.modprobe_sound); - if (saved == []) + if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >= 0) { - // Nothing was there. So, try /etc/modprobe.conf... - saved = read_modprobe (.modules); - if (saved != []) + saved = read_modprobe (.modprobe_sound); + } + else + { + y2milestone("/etc/modprobe.d/sound doesn't exist"); + + // try /etc/modprobe.conf... + if (SCR::Read(.target.size, "/etc/modprobe.conf") >= 0) { - Sound::used_modprobe_conf = true; + saved = read_modprobe (.modules); + + if (saved != []) + { + Sound::used_modprobe_conf = true; + } + } + else + { + y2milestone("/etc/modprobe.conf doesn't exist"); } } + return saved; } Modified: trunk/sound/sound/src/volume_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/volume_routines.… ============================================================================== --- trunk/sound/sound/src/volume_routines.ycp (original) +++ trunk/sound/sound/src/volume_routines.ycp Wed Jun 6 15:59:58 2007 @@ -235,6 +235,14 @@ } } + boolean GlobExists(string glob) + { + map out = (map)SCR::Execute(.target.bash_output, sformat("echo -n %1", glob)); + y2debug("output: %1", out); + + return out["stdout"]:"" != glob; + } + /** * stops all programs using sound devices * @return boolean true if nothing's using sound, false otherwise @@ -244,7 +252,23 @@ { return true; } - integer fuser = (integer) SCR::Execute (.target.bash, "/bin/fuser /dev/dsp* /dev/audio* /dev/mixer* /dev/midi* /dev/mixer*", $[]); + + // list of files to check, * must be present! + list<string> audio_files = ["/dev/dsp*", "/dev/audio*", "/dev/mixer*", "/dev/midi*", "/dev/mixer*"]; + + audio_files = filter(string file, audio_files, {return GlobExists(file);}); + y2milestone("Checking audio files: %1", audio_files); + + if (size(audio_files) == 0) + { + y2milestone("No audio device file found, skipping fuser call"); + return true; + } + + string fuser_options = mergestring(audio_files, " "); + y2milestone("fuser options: %1", fuser_options); + + integer fuser = (integer) SCR::Execute (.target.bash, "/bin/fuser " + fuser_options, $[]); if (fuser == 0) { @@ -252,7 +276,7 @@ boolean terminate = Sound::use_ui ? Popup::YesNo (msg) : true; if (terminate) { - SCR::Execute (.target.bash, "/bin/fuser -k /dev/dsp* /dev/audio* /dev/mixer* /dev/midi* /dev/mixer*", $[]); + SCR::Execute (.target.bash, "/bin/fuser -k " + fuser_options, $[]); } else { Modified: trunk/sound/sound/src/write_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/write_routines.y… ============================================================================== --- trunk/sound/sound/src/write_routines.ycp (original) +++ trunk/sound/sound/src/write_routines.ycp Wed Jun 6 15:59:58 2007 @@ -211,7 +211,17 @@ ``(card["module"]:"off"))); // remove the options for unused modules - list<string> configured_options = SCR::Dir(.modprobe_sound.options); + list<string> configured_options = []; + + if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 ) + { + configured_options = SCR::Dir(.modprobe_sound.options); + } + else + { + // the file doesn't exist, create an empty file + SCR::Execute(.target.bash, "/usr/bin/touch /etc/modprobe.d/sound"); + } foreach(string op, configured_options, { @@ -234,14 +244,17 @@ * @param als list with old aliases */ define void removeOldEntries(list als) ``{ - maplist(string e, (list<string>) als, ``{ - if (is_snd_alias(e) || - issubstring(e, "sound-service-") || - issubstring(e, "sound-slot-")) - { - SCR::Write( add (.modprobe_sound.alias, e), nil); - } - }); + if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 ) + { + maplist(string e, (list<string>) als, ``{ + if (is_snd_alias(e) || + issubstring(e, "sound-service-") || + issubstring(e, "sound-slot-")) + { + SCR::Write( add (.modprobe_sound.alias, e), nil); + } + }); + } } /** @@ -321,7 +334,7 @@ list als=[]; string err_msg = ""; - if (contains(SCR::Dir(mod), "alias")) + if (SCR::Read(.target.size, "/etc/modprobe.d/sound") >=0 && contains(SCR::Dir(mod), "alias")) { als = (list)SCR::Read(mod_alias); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38316 - /tags/stable-2_15_8/samba-client/
by jsuchome＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: jsuchome Date: Wed Jun 6 15:52:54 2007 New Revision: 38316 URL: http://svn.opensuse.org/viewcvs/yast?rev=38316&view=rev Log: Created tag stable-2_15_8 for samba-client Added: tags/stable-2_15_8/samba-client/ - copied from r38315, trunk/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0