Author: sh-sh-sh
Date: Thu Jun 14 16:03:29 2007
New Revision: 38458
URL: http://svn.opensuse.org/viewcvs/yast?rev=38458&view=rev
Log:
new children management
Added:
branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.h
Modified:
branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am
branches/tmp/sh/mod-ui/core/libyui/src/TreeItem.h
branches/tmp/sh/mod-ui/core/libyui/src/UI.h
branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc
branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h
branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc
branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h
branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.cc
branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h
branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc
branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h
branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h
branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.cc
branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.h
branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.cc
branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.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/YDate.cc
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.cc
branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h
branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.cc
branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h
branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.cc
branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h
branches/tmp/sh/mod-ui/core/libyui/src/YEvent.cc
branches/tmp/sh/mod-ui/core/libyui/src/YEvent.h
branches/tmp/sh/mod-ui/core/libyui/src/YFrame.cc
branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h
branches/tmp/sh/mod-ui/core/libyui/src/YImage.cc
branches/tmp/sh/mod-ui/core/libyui/src/YImage.h
branches/tmp/sh/mod-ui/core/libyui/src/YIntField.cc
branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h
branches/tmp/sh/mod-ui/core/libyui/src/YLabel.cc
branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h
branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc
branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h
branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc
branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h
branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.cc
branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.h
branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.cc
branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.h
branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.cc
branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h
branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.cc
branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h
branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc
branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h
branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.cc
branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h
branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.cc
branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h
branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelectorPlugin.h
branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.cc
branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h
branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc
branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h
branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc
branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h
branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc
branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h
branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc
branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h
branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc
branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h
branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc
branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h
branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc
branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h
branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h
branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h
branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.cc
branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h
branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.cc
branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.h
branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.h
branches/tmp/sh/mod-ui/core/libyui/src/YSlider.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h
branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h
branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc
branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h
branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc
branches/tmp/sh/mod-ui/core/libyui/src/YTable.h
branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.cc
branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.h
branches/tmp/sh/mod-ui/core/libyui/src/YTime.cc
branches/tmp/sh/mod-ui/core/libyui/src/YTime.h
branches/tmp/sh/mod-ui/core/libyui/src/YTransText.h
branches/tmp/sh/mod-ui/core/libyui/src/YTree.cc
branches/tmp/sh/mod-ui/core/libyui/src/YTree.h
branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h
branches/tmp/sh/mod-ui/core/libyui/src/YUI.h
branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.h
branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h
branches/tmp/sh/mod-ui/core/libyui/src/YUIPlugin.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUIPlugin.h
branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h
branches/tmp/sh/mod-ui/core/libyui/src/YUI_bindings.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUI_builtins.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUI_special_widgets.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUI_util.cc
branches/tmp/sh/mod-ui/core/libyui/src/YUI_util.h
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
branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.cc
branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h
branches/tmp/sh/mod-ui/core/libyui/src/YWidgetOpt.h
branches/tmp/sh/mod-ui/core/libyui/src/YWizard.cc
branches/tmp/sh/mod-ui/core/libyui/src/YWizard.h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Thu Jun 14 16:03:29 2007
@@ -57,9 +57,11 @@
YReplacePoint.cc \
YRichText.cc \
YSelectionBox.cc \
+ YSelectionWidget.cc \
YShortcut.cc \
YShortcutManager.cc \
YSimpleEventHandler.cc \
+ YSingleChildContainer.cc \
YSlider.cc \
YSpacing.cc \
YSquash.cc \
@@ -68,8 +70,7 @@
YTime.cc \
YTree.cc \
YWidget.cc \
- YWizard.cc \
- YSelectionWidget.cc
+ YWizard.cc
pkgincludedir = $(includedir)/yui
@@ -128,6 +129,7 @@
YShortcut.h \
YShortcutManager.h \
YSimpleEventHandler.h \
+ YSingleChildContainer.h \
YSlider.h \
YSpacing.h \
YSquash.h \
Modified: branches/tmp/sh/mod-ui/core/libyui/src/TreeItem.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/TreeItem.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/TreeItem.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/TreeItem.h Thu Jun 14 16:03:29 2007
@@ -12,8 +12,6 @@
File: TreeItem.h
- Purpose: Generic tree handling
-
Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/UI.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/UI.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/UI.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/UI.h Thu Jun 14 16:03:29 2007
@@ -13,10 +13,9 @@
File: UI.h
Author: Klaus Kaempf
- Maintainer: Klaus Kaempf
+ Author: Klaus Kaempf
/-*/
-// -*- c++ -*-
#ifndef UI_h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YAlignment.cc
+ File: YAlignment.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YAlignment.h
+ File: YAlignment.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YBarGraph.cc
+ File: YBarGraph.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YBarGraph.h Thu Jun 14 16:03:29 2007
@@ -10,14 +10,12 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YBarGraph.h
+ File: YBarGraph.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
-// -*- c++ -*-
-
#ifndef YBarGraph_h
#define YBarGraph_h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YCheckBox.cc
+ File: YCheckBox.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -54,7 +53,7 @@
if ( s == YUIProperty_Value )
{
if ( newvalue->isBoolean() ||
- newvalue->isVoid() ) // -> tri-state - neither on nor off
+ newvalue->isVoid() ) // -> tri-state - neither on nor off
{
setValue( newvalue );
return YCPBoolean( true );
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBox.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YCheckBox.h
+ File: YCheckBox.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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/YCheckBoxFrame.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YCheckBoxFrame.cc
+ File: YCheckBoxFrame.cc
- Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YCheckBoxFrame.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YCheckBoxFrame.h
+ File: YCheckBoxFrame.h
- Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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/YChildrenManager.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YChildrenManager.h
+ File: YChildrenManager.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -113,7 +113,7 @@
**/
bool contains( T * child ) const
{
- return ( find( _children, _children.begin(), _children.end() )
+ return ( find( _children.begin(), _children.end(), child )
!= _children.end() );
}
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YColoredLabel.cc
+ File: YColoredLabel.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YColoredLabel.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YColoredLabel.h
+ File: YColoredLabel.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YComboBox.cc
+ File: YComboBox.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YComboBox.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YComboBox.h
+ File: YComboBox.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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/YContainerWidget.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YContainerWidget.cc
+ File: YContainerWidget.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -228,31 +227,6 @@
}
-YWidget *YContainerWidget::findWidget( const YCPValue & id ) const
-{
- for ( int c=0; cisValid() )
- {
- if ( children[c]->id()->equal( id ) )
- return children[c];
-
- if ( children[c]->isContainer() )
- {
- YWidget *found = ( dynamic_cast ( children[c] ) )->findWidget( id );
- if ( found ) return found;
- }
- }
- else
- {
- y2error( "ERROR: Invalid widget child #%d - ignored", c );
- }
- }
-
- return 0;
-}
-
-
bool YContainerWidget::isContainer() const
{
return true;
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YContainerWidget.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YContainerWidget.h
+ File: YContainerWidget.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -99,13 +99,6 @@
void removeChildren();
/**
- * Looks for a child widget with a certain ID. Searches
- * recursively.
- * @return A pointer to the found widget or 0 if non has been found
- */
- YWidget *findWidget( const YCPValue & id ) const;
-
- /**
* Returns true, since this is a container widget.
*/
bool isContainer() const;
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDate.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDate.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDate.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDate.cc Thu Jun 14 16:03:29 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDate.cc
+ File: YDate.cc
Author: Anas Nashif
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDate.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDate.h Thu Jun 14 16:03:29 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDate.h
+ File: YDate.h
Author: Anas Nashif
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDialog.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDialog.cc
+ File: YDialog.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -28,7 +27,7 @@
YDialog::YDialog( const YWidgetOpt & opt )
- : YContainerWidget( opt )
+ : YSingleChildContainer( 0 )
{
_hasDefaultSize.setValue( opt.hasDefaultSize.value() );
_hasWarnColor.setValue( opt.hasWarnColor.value() );
@@ -94,34 +93,32 @@
}
-void YDialog::fillWidgetList( YWidgetList & widgetList,
- const YContainerWidget * parent ) const
+void YDialog::fillWidgetList( YWidgetList & widgetList,
+ const YWidget * parent ) const
{
if ( ! parent )
return;
- for ( int i = 0; i < parent->numChildren(); i++ )
+ for ( YWidgetListConstIterator it = parent->childrenBegin();
+ it != parent->childrenEnd();
+ ++it )
{
- YWidget * child = parent->child(i);
+ YWidget * child = *it;
+ widgetList.push_back( child );
- if ( ! child->isDialog() )
- {
- widgetList.push_back( child );
- YContainerWidget * container = dynamic_cast ( child );
-
- if ( container )
- fillWidgetList( widgetList, container );
- }
- else
- {
- y2milestone( "Found dialog: %s", child->widgetClass() );
- }
+ if ( child->hasChildren() )
+ fillWidgetList( widgetList, child );
}
}
string YDialog::dialogDebugLabel()
{
+#if 0
+ // FIXME
+ // FIXME
+ // FIXME
+
if ( _debugLabelWidget )
{
string label = _debugLabelWidget->debugLabel();
@@ -130,17 +127,21 @@
return formatDebugLabel( _debugLabelWidget, label );
}
- for ( int i=0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator * it = parent->childrenBegin();
+ it != parent->childrenEnd();
+ ++it )
{
- if ( child(i) && child(i)->isValid() )
- {
- string label = child(i)->debugLabel();
-
- if ( ! label.empty() )
- return formatDebugLabel( child(i), label );
- }
+ string label = (*it)->debugLabel();
+
+ if ( ! label.empty() )
+ return formatDebugLabel( child(i), label );
}
+ // FIXME
+ // FIXME
+ // FIXME
+#endif
+
return widgetClass();
}
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDialog.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDialog.h
+ File: YDialog.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -21,7 +20,7 @@
#ifndef YDialog_h
#define YDialog_h
-#include "YContainerWidget.h"
+#include "YSingleChildContainer.h"
class YMacroRecorder;
class YShortcutManager;
@@ -31,7 +30,7 @@
* @short Realizes a dialog A dialog itself is a container widget. It is never
* contained in another widget.
*/
-class YDialog : public YContainerWidget
+class YDialog : public YSingleChildContainer
{
public:
/**
@@ -141,8 +140,8 @@
* Recursively fill a widgets list with all children and grandchildren of
* 'parent' that are in the same dialog.
**/
- void fillWidgetList( YWidgetList & widgetList,
- const YContainerWidget * parent ) const;
+ void fillWidgetList( YWidgetList & widgetList,
+ const YWidget * parent ) const;
/**
* Format a debug label.
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDownloadProgress.cc
+ File: YDownloadProgress.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDownloadProgress.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDownloadProgress.h
+ File: YDownloadProgress.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDumbTab.cc
+ File: YDumbTab.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YDumbTab.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YDumbTab.h
+ File: YDumbTab.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YEmpty.cc
+ File: YEmpty.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YEmpty.h Thu Jun 14 16:03:29 2007
@@ -10,15 +10,12 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YEmpty.h
+ File: YEmpty.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
-// -*- c++ -*-
-
#ifndef YEmpty_h
#define YEmpty_h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YEvent.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YEvent.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YEvent.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YEvent.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YEvent.cc
+ File: YEvent.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -29,7 +29,7 @@
using std::string;
-unsigned long YEvent::_nextSerial = 0;
+unsigned long YEvent::_nextSerial = 0;
int YEvent::_activeEvents = 0;
@@ -60,7 +60,7 @@
{
switch ( eventType )
{
- case NoEvent: return "NoEvent";
+ case NoEvent: return "NoEvent";
case UnknownEvent: return "UnknownEvent";
case WidgetEvent: return "WidgetEvent";
case MenuEvent: return "MenuEvent";
@@ -105,8 +105,8 @@
{
YCPMap map;
- map->add( YCPString( "EventType" ), YCPString ( toString( eventType() ) ) );
- map->add( YCPString( "EventSerialNo" ), YCPInteger( serial() ) );
+ map->add( YCPString( "EventType" ), YCPString ( toString( eventType() ) ) );
+ map->add( YCPString( "EventSerialNo" ), YCPInteger( serial() ) );
return map;
}
@@ -117,8 +117,8 @@
YWidgetEvent::YWidgetEvent( YWidget * widget,
- EventReason reason,
- EventType eventType )
+ EventReason reason,
+ EventType eventType )
: YEvent( eventType )
, _widget( widget )
, _reason( reason )
@@ -243,7 +243,7 @@
-YSimpleEvent::YSimpleEvent( EventType eventType,
+YSimpleEvent::YSimpleEvent( EventType eventType,
const YCPValue & id )
: YEvent( eventType )
, _id( id )
@@ -251,16 +251,16 @@
}
-YSimpleEvent::YSimpleEvent( EventType eventType,
- const char * id )
+YSimpleEvent::YSimpleEvent( EventType eventType,
+ const char * id )
: YEvent( eventType )
, _id( YCPSymbol( id ) )
{
}
-YSimpleEvent::YSimpleEvent( EventType eventType,
- const string & id )
+YSimpleEvent::YSimpleEvent( EventType eventType,
+ const string & id )
: YEvent( eventType )
, _id( YCPSymbol( id.c_str() ) )
{
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YEvent.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YEvent.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YEvent.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YEvent.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YEvent.h
+ File: YEvent.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YFrame.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YFrame.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YFrame.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YFrame.cc
+ File: YFrame.cc
- Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YFrame.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YFrame.h
+ File: YFrame.h
- Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YImage.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YImage.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YImage.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YImage.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YImage.cc
+ File: YImage.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YImage.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YImage.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YImage.h
+ File: YImage.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YIntField.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YIntField.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YIntField.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YIntField.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YIntField.cc
+ File: YIntField.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YIntField.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YIntField.h
+ File: YIntField.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLabel.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YLabel.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YLabel.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YLabel.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YLabel.cc
+ File: YLabel.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YLabel.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YLabel.h
+ File: YLabel.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc Thu Jun 14 16:03:29 2007
@@ -24,27 +24,81 @@
#include "YAlignment.h"
#include "YUI.h"
-// std::max instead of the deprecated gcc extension
#include <algorithm>
-YLayoutBox::YLayoutBox( const YWidgetOpt & opt, YUIDimension dimension )
- : YContainerWidget( opt )
- , primary( dimension )
- , secondary( dimension == YD_HORIZ ? YD_VERT : YD_HORIZ )
+struct YLayoutBoxPrivate
{
- debugLayout = opt.debugLayoutMode.value();
+ /**
+ * Constructor
+ **/
+ YLayoutBoxPrivate( YUIDimension prim )
+ : primary( prim )
+ , secondary( prim == YD_HORIZ ? YD_VERT : YD_HORIZ )
+ , debugLayout( false )
+ {}
- if ( debugLayout )
- {
- y2debug( "YLayoutBox: Layout debugging enabled" );
- }
+ //
+ // Data members
+ //
+
+ YUIDimension primary;
+ YUIDimension secondary;
+ bool debugLayout;
+};
+
+
+
+
+YLayoutBox::YLayoutBox( YWidget * parent, YUIDimension primaryDimension )
+ : YWidget( parent )
+ , priv( new YLayoutBoxPrivate( primaryDimension ) )
+{
+ setChildrenManager( new YWidgetChildrenManager( this ) );
}
-long YLayoutBox::nicesize( YUIDimension dimension )
+YLayoutBox::~YLayoutBox()
{
- if ( dimension != primary ) // the easy case first: secondary dimension
+ // NOP
+}
+
+
+inline YUIDimension
+YLayoutBox::primary() const
+{
+ return priv->primary;
+}
+
+
+inline YUIDimension
+YLayoutBox::secondary() const
+{
+ return priv->secondary;
+}
+
+
+bool
+YLayoutBox::debugLayout() const
+{
+ return priv->debugLayout;
+}
+
+void
+YLayoutBox::setDebugLayout( bool deb )
+{
+ priv->debugLayout = deb;
+
+ y2debug( "YLayoutBox: Layout debugging %s",
+ deb ? "enabled" : "disabled" );
+
+}
+
+
+long
+YLayoutBox::nicesize( YUIDimension dimension )
+{
+ if ( dimension == secondary() ) // the easy case first: secondary dimension
{
return childrenMaxNiceSize( dimension );
}
@@ -65,16 +119,16 @@
long size = 0L;
// Search for the boss
- int boss = bossChild();
+ YWidget * boss = bossChild();
- if ( boss > -1 ) // is there a boss child? (0 would be valid!)
+ if ( boss )
{
// Calculate size of all weighted widgets.
// The boss decides this size - that's why he is called the boss.
- size = child( boss )->nicesize( primary )
- * childrenTotalWeight( primary )
- / child( boss )->weight( primary );
+ size = boss->nicesize( primary() )
+ * childrenTotalWeight( primary() )
+ / boss->weight( primary() );
// maintain this order of calculation in order to minimize integer
// rounding errors!
@@ -84,7 +138,7 @@
// Add up the size of all non-weighted children;
// they will get their respective nice size.
- size += totalNonWeightedChildrenNiceSize( primary );
+ size += totalNonWeightedChildrenNiceSize( primary() );
return size;
}
@@ -100,42 +154,45 @@
* weighted children need to be stretched accordingly so the weight
* ratios can be maintained.
*
- * If there is no boss ( i.e. there are only non-weighted children ),
- * -1 will be returned.
+ * Returns 0 if there is no boss, i.e. if there are only non-weighted children.
*/
-int YLayoutBox::bossChild()
+YWidget *
+YLayoutBox::bossChild()
{
- int boss = -1;
- double bossRatio = 0.0;
- double ratio;
-
- for ( int i = 0; i < numChildren(); i++ )
+ YWidget * boss = 0;
+ double bossRatio = 0.0;
+ double ratio;
+
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( child(i)->weight( primary ) != 0 ) // avoid division by zero
+ YWidget * child = *it;
+
+ if ( child->weight( primary() ) != 0 ) // avoid division by zero
{
- ratio = ( ( double ) child(i)->nicesize( primary ) )
- / child(i)->weight( primary );
+ ratio = ( ( double ) child->nicesize( primary() ) )
+ / child->weight( primary() );
if ( ratio > bossRatio ) // we have a new boss
{
- boss = i;
+ boss = child;
bossRatio = ratio;
}
}
}
- if ( debugLayout )
+ if ( debugLayout() )
{
if ( boss >= 0 )
{
y2debug( "YLayoutBox::boss(): "
- "Found boss child: #%d ( %s ) - nice size: %ld, weight: %ld",
- boss,
- child( boss )->widgetClass(),
- child( boss )->nicesize( primary ),
- child( boss )->weight( primary ) );
+ "Found boss child: %s - nice size: %ld, weight: %ld",
+ boss->widgetClass(),
+ boss->nicesize( primary() ),
+ boss->weight( primary() ) );
}
else
{
@@ -147,53 +204,65 @@
}
-long YLayoutBox::childrenMaxNiceSize( YUIDimension dimension )
+long
+YLayoutBox::childrenMaxNiceSize( YUIDimension dimension )
{
long maxNiceSize = 0L;
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- maxNiceSize = std::max ( child(i)->nicesize( dimension ), maxNiceSize );
+ maxNiceSize = std::max( (*it)->nicesize( dimension ), maxNiceSize );
}
return maxNiceSize;
}
-long YLayoutBox::childrenTotalWeight( YUIDimension dimension )
+long
+YLayoutBox::childrenTotalWeight( YUIDimension dimension )
{
long totalWeight = 0L;
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- totalWeight += child(i)->weight( dimension );
+ totalWeight += (*it)->weight( dimension );
}
return totalWeight;
}
-long YLayoutBox::totalNonWeightedChildrenNiceSize( YUIDimension dimension )
+long
+YLayoutBox::totalNonWeightedChildrenNiceSize( YUIDimension dimension )
{
long size = 0L;
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( ! child(i)->hasWeight( dimension ) ) // non-weighted children only
- size += child(i)->nicesize( dimension );
+ if ( ! (*it)->hasWeight( dimension ) ) // non-weighted children only
+ size += (*it)->nicesize( dimension );
}
return size;
}
-int YLayoutBox::countNonWeightedChildren( YUIDimension dimension )
+int
+YLayoutBox::countNonWeightedChildren( YUIDimension dimension )
{
int count = 0;
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( ! child(i)->hasWeight( dimension ) )
+ if ( ! (*it)->hasWeight( dimension ) )
count++;
}
@@ -201,14 +270,17 @@
}
-int YLayoutBox::countStretchableChildren( YUIDimension dimension )
+int
+YLayoutBox::countStretchableChildren( YUIDimension dimension )
{
int count = 0;
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( ! child(i)->hasWeight( dimension ) &&
- child(i)->stretchable( dimension ) )
+ if ( ! (*it)->hasWeight( dimension ) &&
+ (*it)->stretchable( dimension ) )
count++;
}
@@ -216,14 +288,17 @@
}
-int YLayoutBox::countLayoutStretchChildren( YUIDimension dimension )
+int
+YLayoutBox::countLayoutStretchChildren( YUIDimension dimension )
{
int count = 0;
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( ! child(i)->hasWeight( dimension ) &&
- child(i)->isLayoutStretch( dimension ) )
+ if ( ! (*it)->hasWeight( dimension ) &&
+ (*it)->isLayoutStretch( dimension ) )
count++;
}
@@ -231,12 +306,15 @@
}
-bool YLayoutBox::stretchable( YUIDimension dimension ) const
+bool
+YLayoutBox::stretchable( YUIDimension dimension ) const
{
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( child(i)->stretchable( dimension ) ||
- child(i)->hasWeight( dimension ) )
+ if ( (*it)->stretchable( dimension ) ||
+ (*it)->hasWeight( dimension ) )
return true;
}
@@ -244,15 +322,16 @@
}
-void YLayoutBox::setSize( long newWidth, long newHeight )
+void
+YLayoutBox::setSize( long newWidth, long newHeight )
{
- int childrenCount = numChildren();
- sizeVector widths ( childrenCount );
- sizeVector heights ( childrenCount );
- posVector x_pos ( childrenCount );
- posVector y_pos ( childrenCount );
+ int count = childrenCount();
+ sizeVector widths ( count );
+ sizeVector heights ( count );
+ posVector x_pos ( count );
+ posVector y_pos ( count );
- if ( primary == YD_HORIZ )
+ if ( primary() == YD_HORIZ )
{
calcPrimaryGeometry ( newWidth, widths, x_pos );
calcSecondaryGeometry( newHeight, heights, y_pos );
@@ -268,7 +347,7 @@
// Mirror the widget X geometry for languages with left-to-right
// writing direction (Arabic, Hebrew).
- for ( int i = 0; i < numChildren(); i++ )
+ for ( int i = 0; i < childrenCount(); i++ )
x_pos[i] = newWidth - x_pos[i] - widths[i];
}
@@ -276,12 +355,13 @@
}
-void YLayoutBox::calcPrimaryGeometry( long newSize,
- sizeVector & childSize,
- posVector & childPos )
+void
+YLayoutBox::calcPrimaryGeometry( long newSize,
+ sizeVector & childSize,
+ posVector & childPos )
{
long pos = 0L;
- long distributableSize = newSize - totalNonWeightedChildrenNiceSize( primary );
+ long distributableSize = newSize - totalNonWeightedChildrenNiceSize( primary() );
if ( distributableSize >= 0L )
{
@@ -291,7 +371,7 @@
// according to their respective weight ratios.
long nonWeightedExtra = 0L;
- long totalWeight = childrenTotalWeight( primary );
+ long totalWeight = childrenTotalWeight( primary() );
int rubberBands = 0;
long rubberBandExtra = 0L;
@@ -301,7 +381,7 @@
// extra space among the stretchable children (if any).
// This includes any layout stretch spaces.
- int stretchableChildren = countStretchableChildren( primary );
+ int stretchableChildren = countStretchableChildren( primary() );
if ( stretchableChildren > 0 ) // avoid division by zero
nonWeightedExtra = distributableSize / stretchableChildren;
@@ -317,11 +397,11 @@
// of equal size: Give all buttons a weight of 1 and insert a
// stretch (without weight!) between each.
- long surplusSize = newSize - nicesize( primary );
+ long surplusSize = newSize - nicesize( primary() );
if ( surplusSize > 0L )
{
- rubberBands = countLayoutStretchChildren( primary );
+ rubberBands = countLayoutStretchChildren( primary() );
if ( rubberBands > 0 )
{
@@ -331,7 +411,7 @@
}
}
- if ( debugLayout )
+ if ( debugLayout() )
{
y2debug( "Distributing extra space" );
y2debug( "new size: %ld", newSize );
@@ -342,29 +422,34 @@
y2debug( "non weighted extra: %ld", nonWeightedExtra );
}
- for ( int i = 0; i < numChildren(); i++ )
- {
- if ( child(i)->hasWeight( primary ) )
+ int i=0;
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it, i++ )
+ {
+ YWidget * child = *it;
+
+ if ( child->hasWeight( primary() ) )
{
// Weighted children will get their share.
- childSize[i] = distributableSize * child(i)->weight( primary ) / totalWeight;
+ childSize[i] = distributableSize * child->weight( primary() ) / totalWeight;
- if ( childSize[i] < child(i)->nicesize( primary ) )
+ if ( childSize[i] < child->nicesize( primary() ) )
{
y2debug( "Resizing child widget #%d (%s) below its nice size of %ld to %ld "
"- check the layout!",
- i, child(i)->widgetClass(), child(i)->nicesize( primary ), childSize[i] );
+ i, child->widgetClass(), child->nicesize( primary() ), childSize[i] );
}
}
else
{
// Non-weighted children will get their nice size.
- childSize[i] = child(i)->nicesize( primary );
+ childSize[i] = child->nicesize( primary() );
- if ( child(i)->stretchable( primary ) )
+ if ( child->stretchable( primary() ) )
{
// If there are only non-weighted children (and only then),
// the stretchable children will get their fair share of the
@@ -373,7 +458,7 @@
childSize[i] += nonWeightedExtra;
}
- if ( child(i)->isLayoutStretch( primary ) )
+ if ( child->isLayoutStretch( primary() ) )
{
// If there is more than the total nice size and there
// are rubber bands, distribute surplus space among the
@@ -409,15 +494,17 @@
// Maybe some of the children are YAlignments with margins that can be reduced
- for ( int i = 0; i < numChildren(); i++ )
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it )
{
- if ( ! child(i)->hasWeight( primary ) ) // children with weights will get nothing anyway
+ if ( ! (*it)->hasWeight( primary() ) ) // children with weights will get nothing anyway
{
- YAlignment * alignment = dynamic_cast ( child(i) );
+ YAlignment * alignment = dynamic_cast (*it);
if ( alignment )
{
- totalMargins += alignment->totalMargins( primary );
+ totalMargins += alignment->totalMargins( primary() );
y2debug( "Found alignment with margins" );
}
}
@@ -443,18 +530,21 @@
// Calculate initial sizes
- for ( int i = 0; i < numChildren(); i++ )
+ int i=0;
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it, i++ )
{
- if ( ! child(i)->hasWeight( primary ) )
+ if ( ! (*it)->hasWeight( primary() ) )
{
loserCount++;
- childSize[i] = child(i)->nicesize( primary );
+ childSize[i] = (*it)->nicesize( primary() );
- YAlignment * alignment = dynamic_cast ( child(i) );
+ YAlignment * alignment = dynamic_cast (*it);
if ( alignment ) // Alignment widgets may have margins we can reduce
{
- long margins = alignment->totalMargins( primary );
+ long margins = alignment->totalMargins( primary() );
childSize[i] -= margins; // Strip off original margin
if ( remainingMargins > 0 ) // Anything left to redistribute?
@@ -479,7 +569,7 @@
while ( tooSmall > 0 && loserCount > 0 )
{
- if ( debugLayout )
+ if ( debugLayout() )
{
y2debug( "Distributing insufficient space of %ld amoung %d losers",
tooSmall, loserCount );
@@ -487,7 +577,10 @@
long dividedLoss = std::max( tooSmall / loserCount, 1L );
- for ( int i = 0; i < numChildren() && tooSmall > 0; i++ )
+ int i=0;
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd() && tooSmall > 0;
+ ++it, i++ )
{
if ( childSize[i] < dividedLoss )
{
@@ -511,16 +604,18 @@
tooSmall -= dividedLoss;
}
- if ( debugLayout )
+ if ( debugLayout() )
{
+ YWidget * child = *it;
+
y2debug( "child #%d ( %s ) will get %ld - %ld too small "
"(nice size: %ld, weight: %ld, stretchable: %s), pos %ld",
- i, child(i)->widgetClass(),
+ i, child->widgetClass(),
childSize[i],
- child(i)->nicesize( primary ) - childSize[i],
- child(i)->nicesize( primary ),
- child(i)->weight( primary ),
- child(i)->stretchable( primary ) ? "yes" : "no",
+ child->nicesize( primary() ) - childSize[i],
+ child->nicesize( primary() ),
+ child->weight( primary() ),
+ child->stretchable( primary() ) ? "yes" : "no",
childPos[i] );
}
}
@@ -529,7 +624,7 @@
// Calculate postitions
- for ( int i = 0, pos=0; i < numChildren(); i++ )
+ for ( int i = 0, pos=0; i < childrenCount(); i++ )
{
childPos[i] = pos;
pos += childSize[i];
@@ -540,15 +635,20 @@
}
-void YLayoutBox::calcSecondaryGeometry( long newSize,
- sizeVector & childSize,
- posVector & childPos )
-{
- for ( int i = 0; i < numChildren(); i++ )
+void
+YLayoutBox::calcSecondaryGeometry( long newSize,
+ sizeVector & childSize,
+ posVector & childPos )
+{
+ int i=0;
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it, i++ )
{
- long nice = child(i)->nicesize( secondary );
+ YWidget * child = *it;
+ long nice = child->nicesize( secondary() );
- if ( child(i)->stretchable( secondary ) || newSize < nice )
+ if ( child->stretchable( secondary() ) || newSize < nice )
{
childSize[i] = newSize;
childPos [i] = 0L;
@@ -563,46 +663,52 @@
{
y2debug( "Resizing child widget #%d (%s) below its nice size of %ld to %ld "
"- check the layout!",
- i, child(i)->widgetClass(), nice, childSize[i] );
+ i, child->widgetClass(), nice, childSize[i] );
}
- if ( debugLayout )
+ if ( debugLayout() )
{
y2debug( "child #%d (%s) will get %ld "
"(nice size: %ld, weight: %ld, stretchable: %s), pos %ld",
- i, child(i)->widgetClass(),
+ i, child->widgetClass(),
childSize[i],
nice,
- child(i)->weight( secondary ),
- child(i)->stretchable( secondary ) ? "yes" : "no",
+ child->weight( secondary() ),
+ child->stretchable( secondary() ) ? "yes" : "no",
childPos[i] );
}
}
}
-void YLayoutBox::doResize( sizeVector & width,
- sizeVector & height,
- posVector & x_pos,
- posVector & y_pos )
+void
+YLayoutBox::doResize( sizeVector & width,
+ sizeVector & height,
+ posVector & x_pos,
+ posVector & y_pos )
{
- for ( int i = 0; i < numChildren(); i++ )
+ int i=0;
+ for ( YWidgetListConstIterator it = childrenBegin();
+ it != childrenEnd();
+ ++it, i++ )
{
- YWidget *w = child(i);
+ YWidget * child = *it;
- w->setSize( width[i], height[i] );
- moveChild( w, x_pos[i], y_pos[i] );
+ child->setSize( width[i], height[i] );
+ moveChild( child, x_pos[i], y_pos[i] );
- if ( debugLayout )
+ if ( debugLayout() )
{
- string label = w->debugLabel();
+ string label = child->debugLabel();
if ( ! label.empty() )
label = "\"" + label + "\"";
y2milestone( "x: %4ld y: %4ld w: %4ld h: %4ld %s %s",
x_pos[i], y_pos[i], width[i], height[i],
- w->widgetClass(), label.c_str() );
+ child->widgetClass(), label.c_str() );
}
}
}
+
+
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.h Thu Jun 14 16:03:29 2007
@@ -20,34 +20,56 @@
#define YLayoutBox_h
-#include "YContainerWidget.h"
+#include "YWidget.h"
-/**
- * @short Implementation of the Split widget.
- */
-class YLayoutBox : public YContainerWidget
+class YLayoutBoxPrivate;
+
+
+class YLayoutBox : public YWidget
{
public:
- typedef vector<long>sizeVector;
- typedef vector<long>posVector;
+ typedef vector<long> sizeVector;
+ typedef vector<long> posVector;
/**
- * Creates a new YLayoutBox
+ * Constructor.
+ *
+ * Creates a VBox for dim == YD_VERT or a HBox for YD_HORIZ.
*/
- YLayoutBox( const YWidgetOpt & opt, YUIDimension newPrimaryDimension );
+ YLayoutBox( YWidget * parent, YUIDimension dim );
+
+ /**
+ * Destructor.
+ **/
+ virtual ~YLayoutBox();
/**
* Returns a descriptive name of this widget class for logging,
* debugging etc.
*/
- virtual const char * widgetClass() { return "YLayoutBox"; }
+ virtual const char * widgetClass()
+ { return primary() == YD_VERT ? "YVBox" : "YHBox"; }
/**
- * Returns the dimensions.
- */
- YUIDimension dimension() const { return primary; }
- YUIDimension primaryDimension() const { return primary; }
- YUIDimension secondaryDimension() const { return secondary; }
+ * Return the primary dimension, i.e., the dimension this LayoutBox lays
+ * out its children in: YD_VERT for a VBox, YD_HORIZ for a HBox.
+ **/
+ YUIDimension primary() const;
+
+ /**
+ * Return the secondary dimension.
+ **/
+ YUIDimension secondary() const;
+
+ /**
+ * Returns 'true' if layout debugging (verbose logging during layout) is on.
+ **/
+ bool debugLayout() const;
+
+ /**
+ * Enable or disable layout debugging.
+ **/
+ void setDebugLayout( bool deb = true );
/**
* Minimum size the widget should have to make it look and feel
@@ -66,14 +88,14 @@
virtual long nicesize( YUIDimension dimension );
/**
- * The split is stretchable if one of the children is stretchable in
+ * The layout box is stretchable if one of the children is stretchable in
* that dimension.
* @param dim Dimension, either YD_HORIZ or YD_VERT
*/
virtual bool stretchable( YUIDimension dimension ) const;
/**
- * Sets the size of the Split. Here the layout policy
+ * Sets the size of the layout box. Here the layout policy
* is implemented. The ui specific widget must call this
* method at the end of it's own setSize method.
*/
@@ -84,6 +106,8 @@
*/
virtual void moveChild( YWidget *child, long newx, long newy ) = 0;
+
+
protected:
@@ -123,10 +147,10 @@
/**
* Determine the number of the "boss child" - the child widget that
* determines the overall size with respect to its weight.
- * Returns -1 if there is no boss, i.e. none of the children has a
+ * Returns 0 if there is no boss, i.e. none of the children has a
* weight specified.
*/
- int bossChild();
+ YWidget * bossChild();
/**
* Calculate the sizes and positions of all children in the primary
@@ -157,15 +181,14 @@
posVector & y_pos );
-protected:
+private:
- /**
- * Dimensions of the split. YD_HORIZ or YD_VERT
- */
- YUIDimension primary;
- YUIDimension secondary;
- bool debugLayout;
+ ImplPtr<YLayoutBoxPrivate> priv;
};
+typedef YLayoutBox YVBox;
+typedef YLayoutBox YHBox;
+
+
#endif // YLayoutBox_h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YLogView.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YLogView.cc
+ File: YLogView.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YLogView.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YLogView.h
+ File: YLogView.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMacroPlayer.cc
+ File: YMacroPlayer.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -80,7 +80,7 @@
macroFileName.c_str() );
return;
}
-
+
_macro = static_cast <YBlockPtr> (parsed) ;
y2debug( "Playing macro from file %s - %d macro blocks",
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMacroPlayer.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMacroPlayer.h
+ File: YMacroPlayer.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMacroRecorder.cc
+ File: YMacroRecorder.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -41,7 +41,7 @@
-#define YMACRO_INDENT " " // 4 blanks
+#define YMACRO_INDENT " " // 4 blanks
YMacroRecorder::YMacroRecorder( const string & macroFileName )
@@ -95,7 +95,7 @@
"// YaST2 UI macro file generated by UI macro recorder\n"
"//\n"
"// Qt UI: Alt-Ctrl-Shift-M: start/stop Macro recorder\n"
- "// Alt-Ctrl-Shift-P: Play macro\n"
+ "// Alt-Ctrl-Shift-P: Play macro\n"
"//\n"
"// Each block will be executed just before the next UserInput().\n"
"// 'return' before the closing brace ( '}' ) of each block relinquishes control\n"
@@ -120,7 +120,7 @@
{
extern ExecutionEnvironment ee; // YCP interpreter status
ExecutionEnvironment::CallStack callStack( ee.callstack() );
-
+
if ( ! callStack.empty() )
{
const CallFrame * frame = callStack.back();
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMacroRecorder.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMacroRecorder.h
+ File: YMacroRecorder.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMenuButton.cc
+ File: YMenuButton.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMenuButton.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMenuButton.h
+ File: YMenuButton.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMultiLineEdit.cc
+ File: YMultiLineEdit.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiLineEdit.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMultiLineEdit.h
+ File: YMultiLineEdit.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMultiProgressMeter.cc
+ File: YMultiProgressMeter.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMultiProgressMeter.h
+ File: YMultiProgressMeter.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YMultiSelectionBox.cc
+ File: YMultiSelectionBox.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiSelectionBox.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSelectionBox.h
+ File: YSelectionBox.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPackageSelector.cc
+ File: YPackageSelector.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPackageSelector.h
+ File: YPackageSelector.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelectorPlugin.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelectorPlugin.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelectorPlugin.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelectorPlugin.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPackageSelectorPlugin.h
+ File: YPackageSelectorPlugin.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPartitionSplitter.cc
+ File: YPartitionSplitter.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -28,27 +28,27 @@
YPartitionSplitter::YPartitionSplitter( const YWidgetOpt & opt,
- int usedSize,
- int totalFreeSize,
- int newPartSize,
- int minNewPartSize,
- int minFreeSize,
+ int usedSize,
+ int totalFreeSize,
+ int newPartSize,
+ int minNewPartSize,
+ int minFreeSize,
const YCPString & usedLabel,
const YCPString & freeLabel,
const YCPString & newPartLabel,
const YCPString & freeFieldLabel,
const YCPString & newPartFieldLabel )
: YWidget ( opt )
- , _usedSize ( usedSize )
- , _totalFreeSize ( totalFreeSize )
- , _newPartSize ( newPartSize )
- , _minNewPartSize ( minNewPartSize )
- , _minFreeSize ( minFreeSize )
- , _usedLabel ( usedLabel )
- , _freeLabel ( freeLabel )
- , _newPartLabel ( newPartLabel )
- , _freeFieldLabel ( freeFieldLabel )
- , _newPartFieldLabel ( newPartFieldLabel )
+ , _usedSize ( usedSize )
+ , _totalFreeSize ( totalFreeSize )
+ , _newPartSize ( newPartSize )
+ , _minNewPartSize ( minNewPartSize )
+ , _minFreeSize ( minFreeSize )
+ , _usedLabel ( usedLabel )
+ , _freeLabel ( freeLabel )
+ , _newPartLabel ( newPartLabel )
+ , _freeFieldLabel ( freeFieldLabel )
+ , _newPartFieldLabel ( newPartFieldLabel )
{
setDefaultStretchable( YD_HORIZ, true );
setStretchable( YD_VERT, false );
@@ -113,7 +113,7 @@
YCPValue YPartitionSplitter::queryWidget( const YCPSymbol & property )
{
string s = property->symbol();
- if ( s == YUIProperty_Value ) return YCPInteger( newPartSize() );
+ if ( s == YUIProperty_Value ) return YCPInteger( newPartSize() );
else return YWidget::queryWidget( property );
}
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPartitionSplitter.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPartitionSplitter.h
+ File: YPartitionSplitter.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YProgressBar.cc
+ File: YProgressBar.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -27,9 +26,9 @@
#include "YProgressBar.h"
-YProgressBar::YProgressBar( const YWidgetOpt & opt,
- const YCPString & label,
- const YCPInteger & maxProgress,
+YProgressBar::YProgressBar( const YWidgetOpt & opt,
+ const YCPString & label,
+ const YCPInteger & maxProgress,
const YCPInteger & progress )
: YWidget( opt )
, label( label )
@@ -125,7 +124,7 @@
YCPValue YProgressBar::queryWidget( const YCPSymbol & property )
{
string s = property->symbol();
- if ( s == YUIProperty_Value ) return getProgress();
+ if ( s == YUIProperty_Value ) return getProgress();
else if ( s == YUIProperty_Label ) return getLabel();
else return YWidget::queryWidget( property );
}
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YProgressBar.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YProgressBar.h
+ File: YProgressBar.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.cc Thu Jun 14 16:03:29 2007
@@ -11,9 +11,9 @@
| (c) SuSE Linux Products GmbH |
\----------------------------------------------------------------------/
- File: YProperty.cc
+ File: YProperty.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YProperty.h Thu Jun 14 16:03:29 2007
@@ -11,9 +11,9 @@
| (c) SuSE Linux Products GmbH |
\----------------------------------------------------------------------/
- File: YProperty.h
+ File: YProperty.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPushButton.cc
+ File: YPushButton.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YPushButton.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YPushButton.h
+ File: YPushButton.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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/YRadioButton.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YRadioButton.cc
+ File: YRadioButton.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -35,9 +34,6 @@
struct YRadioButtonPrivate
{
- std::string label;
- YRadioButtonGroup * radioButtonGroup;
-
/**
* Constructor
**/
@@ -45,6 +41,13 @@
: label( label )
, radioButtonGroup( 0 )
{}
+
+ //
+ // Data members
+ //
+
+ std::string label;
+ YRadioButtonGroup * radioButtonGroup;
};
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButton.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YRadioButton.h
+ File: YRadioButton.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YRadioButtonGroup.cc
+ File: YRadioButtonGroup.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YRadioButtonGroup.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YRadioButtonGroup.h
+ File: YRadioButtonGroup.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YReplacePoint.cc
+ File: YReplacePoint.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YReplacePoint.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YReplacePoint.h
+ File: YReplacePoint.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YRichText.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YRichText.cc
+ File: YRichText.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YRichText.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YRichText.h
+ File: YRichText.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSelectionBox.cc
+ File: YSelectionBox.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSelectionBox.h
+ File: YSelectionBox.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.cc Thu Jun 14 16:03:29 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSelectionWidget.cc
+ File: YSelectionWidget.cc
Author: Holger Macht
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionWidget.h Thu Jun 14 16:03:29 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSelectionWidget.h
+ File: YSelectionWidget.h
Author: Holger Macht
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YShortcut.cc
+ File: YShortcut.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YShortcut.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YShortcut.h
+ File: YShortcut.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YShortcutManager.cc
+ File: YShortcutManager.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YShortcutManager.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YShortcutManager.h
+ File: YShortcutManager.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YEvent.cc
+ File: YEvent.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -81,10 +81,10 @@
// Avoid memory leak: The event handler assumes ownership of the newly
// created event, so we have to clean it up here.
delete event;
-
+
return;
}
-
+
if ( _pending_event )
{
/**
@@ -103,7 +103,7 @@
#if VERBOSE_EVENTS
y2debug( "New pending event: %s", YEvent::toString( event->eventType() ) );
#endif
-
+
_pending_event = event;
}
@@ -126,6 +126,6 @@
if ( block ) y2debug( "Blocking events" );
else y2debug( "Unblocking events" );
#endif
-
+
_events_blocked = block;
}
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSimpleEventHandler.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSimpleEventHandler.h
+ File: YSimpleEventHandler.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Added: branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.cc?rev=38458&view=auto
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.cc (added)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.cc Thu Jun 14 16:03:29 2007
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YSingleChildContainer.cc
+
+ Author: Stefan Hundhammer
+
+/-*/
+
+
+#include "YSingleChildContainer.h"
+
+
+YSingleChildContainer::YSingleChildContainer( YWidget * parent )
+ : YWidget( parent )
+{
+ setChildrenManager( new YSingleWidgetChildManager( this ) );
+}
+
+
+YSingleChildContainer::~YSingleChildContainer()
+{
+ // NOP
+}
+
+
+long
+YSingleChildContainer::nicesize( YUIDimension dim )
+{
+ if ( hasChildren() )
+ return firstChild()->nicesize( dim );
+ else
+ return YWidget::nicesize( dim );
+}
+
+
+bool
+YSingleChildContainer::stretchable( YUIDimension dim ) const
+{
+ if ( hasChildren() )
+ return firstChild()->stretchable( dim );
+ else
+ return YWidget::stretchable( dim );
+}
+
+
+void
+YSingleChildContainer::setSize( long width, long height )
+{
+ if ( hasChildren() )
+ firstChild()->setSize( width , height );
+ else
+ YWidget::setSize( width, height );
+}
+
+
+string
+YSingleChildContainer::debugLabel()
+{
+ string str = widgetClass();
+
+ if ( hasChildren() )
+ {
+ str += " with ";
+ str += firstChild()->debugLabel();
+ }
+
+ return str;
+}
Added: branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.h?rev=38458&view=auto
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.h (added)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSingleChildContainer.h Thu Jun 14 16:03:29 2007
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: YSingleChildContainer.h
+
+ Author: Stefan Hundhammer
+
+/-*/
+
+#ifndef YSingleChildContainer_h
+#define YSingleChildContainer_h
+
+#include "YWidget.h"
+
+using std::string;
+
+/**
+ * Container widget class that manages one child.
+ **/
+class YSingleChildContainer: public YWidget
+{
+public:
+ /**
+ * Constructor.
+ **/
+ YSingleChildContainer( YWidget * parent );
+
+ /**
+ * Destructor.
+ **/
+ virtual ~YSingleChildContainer();
+
+ /**
+ * Returns the preferred size of this widget.
+ * In this case, the preferred size of the single child is returned.
+ *
+ * Reimplemented from YWidget.
+ **/
+ virtual long nicesize( YUIDimension dim );
+
+ /**
+ * Sets the size of this widget.
+ * In this case, the size of the single child is set.
+ *
+ * Reimplemented from YWidget.
+ **/
+ virtual void setSize( long newwidth, long newheight );
+
+ /**
+ * Returns 'true' if this widget is stretchable in the specified dimension.
+ * In this case, the stretchability of the single child is returned.
+ *
+ * Reimplemented from YWidget.
+ **/
+ virtual bool stretchable( YUIDimension dim ) const;
+
+ /**
+ * Descriptive label for debugging. Derived from this widget's only child
+ * (if there is one).
+ **/
+ virtual string debugLabel();
+};
+
+
+
+#endif // YSingleChildContainer_h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSlider.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSlider.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSlider.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSlider.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSlider.cc
+ File: YSlider.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSlider.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSlider.h
+ File: YSlider.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.cc Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YEmpty.cc
+ File: YEmpty.cc
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSpacing.h Thu Jun 14 16:03:29 2007
@@ -10,14 +10,12 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSpacing.h
+ File: YSpacing.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
-// -*- c++ -*-
-
#ifndef YSpacing_h
#define YSpacing_h
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSquash.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSquash.cc
+ File: YSquash.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YSquash.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YSquash.h
+ File: YSquash.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTable.cc
+ File: YTable.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -114,7 +113,7 @@
else if ( newvalue->isInteger() ) newtext = newvalue->asInteger()->toString();
else
{
- y2error( "Table %s: Invalid value for cell ( %s|%d ). Must be string or integer",
+ y2error( "Table %s: Invalid value for cell (%s|%d). Must be string or integer",
id()->toString().c_str(), itemid->toString().c_str(), colnum );
return YCPBoolean( false );
}
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTable.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTable.h
+ File: YTable.h
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTextEntry.cc
+ File: YTextEntry.cc
- Author: Mathias Kettner
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTextEntry.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTextEntry.h
+ File: YTextEntry.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTime.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTime.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTime.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTime.cc Thu Jun 14 16:03:29 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTime.cc
+ File: YTime.cc
Author: Anas Nashif
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTime.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTime.h Thu Jun 14 16:03:29 2007
@@ -10,7 +10,7 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTime.h
+ File: YTime.h
Author: Anas Nashif
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTransText.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTransText.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTransText.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTransText.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTransText.h
+ File: YTransText.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTree.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTree.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTree.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTree.cc Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTree.cc
+ File: YTree.cc
- Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
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=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTree.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTree.h Thu Jun 14 16:03:29 2007
@@ -10,10 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTree.h
+ File: YTree.h
- Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h Thu Jun 14 16:03:29 2007
@@ -10,9 +10,9 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YTypes.h
+ File: YTypes.h
- Author: Stefan Hundhammer
+ Author: Stefan Hundhammer
Header file for frequently used simple types to reduce interdependencies
between important headers (e.g., YWidget.h, YUI.h).
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUI.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUI.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUI.h Thu Jun 14 16:03:29 2007
@@ -12,10 +12,7 @@
File: YUI.h
- Authors: Mathias Kettner
- Stefan Hundhammer
-
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
@@ -502,11 +499,6 @@
virtual YDialog *createDialog( YWidgetOpt & opt ) = 0;
/**
- * Creates a split
- */
- virtual YContainerWidget *createSplit( YWidget *parent, YWidgetOpt & opt, YUIDimension dimension ) = 0;
-
- /**
* Creates a replace point.
*/
virtual YContainerWidget *createReplacePoint( YWidget *parent, YWidgetOpt & opt ) = 0;
@@ -1196,9 +1188,9 @@
*
* @param dim Dimension of the layoutbox
*/
- YWidget *createLBox( YWidget *parent, YWidgetOpt & opt,
- const YCPTerm & term, const YCPList & optList, int argnr,
- YUIDimension dim );
+ YWidget *createLayoutBox( YWidget *parent, YWidgetOpt & opt,
+ const YCPTerm & term, const YCPList & optList, int argnr,
+ YUIDimension dim );
/**
* Helper function of createWidgetTree.
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.cc Thu Jun 14 16:03:29 2007
@@ -12,9 +12,7 @@
File: YUIComponent.cc
- Authors: Stefan Hundhammer
-
- Maintainer: Stefan Hundhammer
+ Author: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUIComponent.h Thu Jun 14 16:03:29 2007
@@ -13,7 +13,6 @@
File: YUIComponent.h
Author: Stefan Hundhammer
- Maintainer: Stefan Hundhammer
/-*/
Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc Thu Jun 14 16:03:29 2007
@@ -10,12 +10,12 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YUIException.cc
+ File: YUIException.cc
- Stolen from zypp/libzypp/base/Exception.cc
+ Stolen from zypp/libzypp/base/Exception.cc
- Author: Michael Andres
- Maintainer: Stefan Hundhammer
+ Author: Michael Andres
+ Maintainer: Stefan Hundhammer
/-*/
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/YUIException.h?rev=38458&r1=38457&r2=38458&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original)
+++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Thu Jun 14 16:03:29 2007
@@ -10,12 +10,12 @@
| (C) SuSE GmbH |
\----------------------------------------------------------------------/
- File: YUIException.h
+ File: YUIException.h
- Stolen from zypp/libzypp/base/Exception.h
+ Stolen from zypp/libzypp/base/Exception.h
- Author: Michael Andres
- Maintainer: Stefan Hundhammer
+ Author: Michael Andres
+ Maintainer: Stefan Hundhammer