Author: gs
Date: Fri Jul 13 08:48:43 2007
New Revision: 39383
URL: http://svn.opensuse.org/viewcvs/yast?rev=39383&view=rev
Log:
parent is a YWidget *
Modified:
branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc
branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc
branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.h
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc?rev=39383&r1=39382&r2=39383&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Fri Jul 13 08:48:43 2007
@@ -60,8 +60,7 @@
YWidget * w = 0;
try
{
- w = new NCPackageSelectorStart ( dynamic_cast(parent), opt,
- YD_HORIZ );
+ w = new NCPackageSelectorStart ( parent, opt, YD_HORIZ );
}
catch (const std::exception & e)
{
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc?rev=39383&r1=39382&r2=39383&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc Fri Jul 13 08:48:43 2007
@@ -41,7 +41,7 @@
//
// DESCRIPTION :
//
-NCPackageSelectorStart::NCPackageSelectorStart( NCWidget * parent,
+NCPackageSelectorStart::NCPackageSelectorStart( YWidget * parent,
const YWidgetOpt & opt,
YUIDimension dimension )
: NCLayoutBox( parent, dimension )
@@ -71,6 +71,7 @@
else
{
pkgLayout = readLayoutFile( "/usr/share/YaST2/data/pkg_layout.ycp" );
+ //pkgLayout = readLayoutFile( "/usr/share/YaST2/data/test_layout.ycp" );
}
if ( ! pkgLayout.isNull() && ui )
@@ -78,9 +79,10 @@
YWidgetOpt childrenOpt( opt );
// widgetRoot = (YContainerWidget *)ui->createWidgetTree( dynamic_cast(parent),
// childrenOpt, 0, pkgLayout );
- widgetRoot = YCPDialogParser::parseWidgetTreeTerm( dynamic_cast(parent),
- childrenOpt,
- pkgLayout );
+
+ widgetRoot = YCPDialogParser::parseWidgetTreeTerm( this,
+ childrenOpt,
+ pkgLayout );
}
// create the PackageSelector (creation with 'new' is required because initialization
@@ -89,13 +91,16 @@
if ( widgetRoot )
{
+ NCMIL << "Widget tree of NCPackageSelector created" << endl;
+
packager = new NCPackageSelector( ui, widgetRoot, opt );
-
- this->addChild( widgetRoot );
- widgetRoot->setParent( this );
-
- NCDBG << "Widget tree of NCPackageSelector created" << endl;
+ // child handling is done by libyui now
+ //this->addChild( widgetRoot );
+ //widgetRoot->setParent( this );
+
+ //YDialog::currentDialog()->setInitialSize();
+
// get the widget ID of the package table
YWidget * pkg = YCPDialogParser::findWidgetWithId( widgetRoot, NCPkgNames::Packages() );
pkgList = dynamic_cast(pkg);
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.h?rev=39383&r1=39382&r2=39383&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.h (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.h Fri Jul 13 08:48:43 2007
@@ -67,7 +67,7 @@
* Constructor
* creates the widget tree of the package selector
*/
- NCPackageSelectorStart( NCWidget * parent,
+ NCPackageSelectorStart( YWidget * parent,
const YWidgetOpt & opt, YUIDimension dimension );
/**
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
