December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42689 - /trunk/installation/package/yast2-installation.changes
by coolo＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: coolo Date: Wed Dec 5 10:07:33 2007 New Revision: 42689 URL: http://svn.opensuse.org/viewcvs/yast?rev=42689&view=rev Log: fix changes order Modified: trunk/installation/package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Dec 5 10:07:33 2007 @@ -377,6 +377,11 @@ - updated for live CD installation ------------------------------------------------------------------- +Thu Jun 21 17:38:09 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- Thu Jun 21 10:34:10 CEST 2007 - locilka(a)suse.cz - Added handling for "Suggested Installation Sources" during the @@ -428,11 +433,6 @@ half-started firewall after YOU kernel-update (#282871). ------------------------------------------------------------------- -Thu Jun 21 17:38:09 CEST 2007 - adrian(a)suse.de - -- fix changelog entry order - -------------------------------------------------------------------- Mon Jun 11 18:30:48 CEST 2007 - locilka(a)suse.cz - Added lost fix from Andreas Schwab for startup scripts. The patch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42688 - /trunk/yast2/package/yast2.changes
by coolo＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: coolo Date: Wed Dec 5 10:06:31 2007 New Revision: 42688 URL: http://svn.opensuse.org/viewcvs/yast?rev=42688&view=rev Log: fix the changes order Modified: trunk/yast2/package/yast2.changes Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Dec 5 10:06:31 2007 @@ -368,15 +368,15 @@ - several updates for live CD installation ------------------------------------------------------------------- -Wed Jun 20 11:56:36 CEST 2007 - locilka(a)suse.cz +Thu Jun 21 17:35:48 CEST 2007 - adrian(a)suse.de -- Extending Installation module to provide persistent information - in Instalaltion Mode dialog. +- fix changelog entry order ------------------------------------------------------------------- -Thu Jun 21 17:35:48 CEST 2007 - adrian(a)suse.de +Wed Jun 20 11:56:36 CEST 2007 - locilka(a)suse.cz -- fix changelog entry order +- Extending Installation module to provide persistent information + in Instalaltion Mode dialog. ------------------------------------------------------------------- Tue Jun 19 13:02:27 CEST 2007 - kmachalkova(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42687 - in /trunk/python-bindings/src: YCP.cc YPython.cc YPython.h
by juhliarik＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: juhliarik Date: Wed Dec 5 09:55:10 2007 New Revision: 42687 URL: http://svn.opensuse.org/viewcvs/yast?rev=42687&view=rev Log: bugfixing: bug# 345133 - Python-Bindings: Calling function with None as argument failed bug# 343283 - Python-Bindings: Missing error messages Modified: trunk/python-bindings/src/YCP.cc trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPython.h Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Wed Dec 5 09:55:10 2007 @@ -20,6 +20,7 @@ #include <ycp/YCPPath.h> #include <ycp/YCPTerm.h> #include <ycp/YCPString.h> +#include <ycp/YCPVoid.h> #include <ycp/SymbolTable.h> #include "YPython.h" @@ -201,9 +202,13 @@ //cout << textdomain << endl; - string _fun = "_ = gettext.gettext"; + string _fun = + "def _(str): \n\ + return gettext.gettext(str)"; + PyRun_SimpleString("import sys, traceback"); + PyRun_SimpleString(_fun.c_str()); Self = Py_InitModule("ycp", YCPMethods); initYCPTypes(Self); @@ -738,12 +743,14 @@ pPythonValue = PyTuple_GetItem(args, i); if (pPythonValue) { ycpArg = ypython->PythonTypeToYCPType(pPythonValue); - + //transform YCPNull to YCPVoid + if (ycpArg.isNull()) { + ycpArg = YCPVoid(); + } /*XXX if (fun_type->parameterType(i-2)->matchvalue(ycpArg) != 0) { y2error ("Wrong type of argumment %d",i-2); return PyExc_TypeError; - }*/ bool ok = func_call->appendParameter (ycpArg); if (!ok) { Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Wed Dec 5 09:55:10 2007 @@ -151,7 +151,9 @@ y2error("Can't import module %s", module_name.c_str()); if (PyErr_Occurred() != NULL){ - PyErr_Print(); + //string err = PyErrorHandler(); + y2error("Python error: %s", PyErrorHandler().c_str()); + //PyErr_Print(); } return YCPError("The module was not imported"); @@ -212,8 +214,10 @@ result = PythonTypeToYCPType(pReturn); // create YCP value else{ y2error("PyObject_CallObject(pFunc, pArgs) failed!"); - PyErr_Print(); - y2error("pReturn == 0"); + if (PyErr_Occurred() != NULL){ + y2error("Python error: %s", PyErrorHandler().c_str()); + //PyErr_Print(); + } } //delete pReturn Py_CLEAR(pReturn); @@ -805,6 +809,62 @@ +string YPython::PyErrorHandler() { + /* process Python-related errors */ + /* call after Python API raises an exception */ + + PyObject *errobj, *errdata, *errtraceback, *pystring; + + string result = "error type: "; + /* get latest python exception info */ + PyErr_Fetch(&errobj, &errdata, &errtraceback); + + pystring = NULL; + if (errobj != NULL && + (pystring = PyObject_Str(errobj)) != NULL && /* str(object) */ + (PyString_Check(pystring)) + ) + //strcpy(save_error_type, PyString_AsString(pystring)); + result += PyString_AsString(pystring); + else + result += "<unknown exception type>"; + Py_XDECREF(pystring); + result +="; error value: "; + + pystring = NULL; + if (errdata != NULL && + (pystring = PyObject_Str(errdata)) != NULL && + (PyString_Check(pystring)) + ) + //strcpy(save_error_info, PyString_AsString(pystring)); + result += PyString_AsString(pystring); + else + //strcpy(save_error_info, "<unknown exception data>"); + result += "<unknown exception value>"; + Py_XDECREF(pystring); + + result +="; error traceback: "; + + pystring = NULL; + if (errdata != NULL && + (pystring = PyObject_Str(errtraceback)) != NULL && + (PyString_Check(pystring)) + ) + //strcpy(save_error_info, PyString_AsString(pystring)); + result += PyString_AsString(pystring); + else + //strcpy(save_error_info, "<unknown exception data>"); + result += "<unknown exception traceback>"; + Py_XDECREF(pystring); + //printf("%s\n%s\n", save_error_type, save_error_info); + Py_XDECREF(errobj); + Py_XDECREF(errdata); /* caller owns all 3 */ + Py_XDECREF(errtraceback); /* already NULL'd out */ + return result; + +} + + YPythonCode::YPythonCode (PyObject *pFunc):YCode() { m_kind = YCode::yeReference; _pFunc = pFunc; @@ -833,7 +893,10 @@ result = YPython::yPython()->PythonTypeToYCPType(pReturn); // create YCP value } else { y2error("pReturn == 0"); - PyErr_Print(); + if (PyErr_Occurred() != NULL){ + y2error("Python error: %s", YPython::PyErrorHandler().c_str()); + //PyErr_Print(); + } } } return result; Modified: trunk/python-bindings/src/YPython.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.h?re… ============================================================================== --- trunk/python-bindings/src/YPython.h (original) +++ trunk/python-bindings/src/YPython.h Wed Dec 5 09:55:10 2007 @@ -113,7 +113,11 @@ */ PyObject *YCPTypeToPythonType(YCPValue); - + /** + * Handler for python errors, info will be saved into yast logs + * FUnction saves info from void PyErr_Fetch(PyObject **ptype, PyObject **pvalue, PyObject **ptraceback) + **/ + static string PyErrorHandler(); private: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42686 - in /trunk/pkg-bindings/src: PkgModuleError.cc PkgModuleError.h
by lslezak＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: lslezak Date: Wed Dec 5 08:53:15 2007 New Revision: 42686 URL: http://svn.opensuse.org/viewcvs/yast?rev=42686&view=rev Log: - removed unused files (PkgModuleError.*) Removed: trunk/pkg-bindings/src/PkgModuleError.cc trunk/pkg-bindings/src/PkgModuleError.h -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42685 - in /trunk/pkg-bindings/src: PkgModule.cc Resolvable.cc Source.cc
by lslezak＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: lslezak Date: Wed Dec 5 08:46:16 2007 New Revision: 42685 URL: http://svn.opensuse.org/viewcvs/yast?rev=42685&view=rev Log: - removed unused includes Modified: trunk/pkg-bindings/src/PkgModule.cc trunk/pkg-bindings/src/Resolvable.cc trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/PkgModule.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgModule.cc?re… ============================================================================== --- trunk/pkg-bindings/src/PkgModule.cc (original) +++ trunk/pkg-bindings/src/PkgModule.cc Wed Dec 5 08:46:16 2007 @@ -25,11 +25,7 @@ #include <y2util/y2log.h> #include <zypp/base/Logger.h> #include <zypp/base/LogControl.h> -#include <zypp/Pathname.h> -// it is never deleted :-/ -// which may be a good thing, because ~PkgModuleFunctions would call -// the badly designed SourceFinishAll. #176013 PkgModule* PkgModule::current_pkg = NULL; struct YaSTZyppLogger : public zypp::base::LogControl::LineWriter Modified: trunk/pkg-bindings/src/Resolvable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Resolvable.cc (original) +++ trunk/pkg-bindings/src/Resolvable.cc Wed Dec 5 08:46:16 2007 @@ -37,7 +37,6 @@ #include <zypp/Pattern.h> #include <zypp/Language.h> #include <zypp/Package.h> -#include <zypp/base/PtrTypes.h> #include <zypp/Dep.h> #include <zypp/CapSet.h> #include <zypp/PoolItem.h> Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Wed Dec 5 08:46:16 2007 @@ -34,7 +34,6 @@ #include <Callbacks.YCP.h> #include <zypp/Product.h> -#include <zypp/target/store/PersistentStorage.h> #include <zypp/media/MediaManager.h> #include <zypp/media/Mount.h> #include <zypp/Pathname.h> @@ -47,8 +46,6 @@ #include <zypp/ExternalProgram.h> #include <zypp/ProgressData.h> -#include <zypp/base/String.h> - #include <sstream> // ostringstream #include <boost/bind.hpp> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42684 - /trunk/pkg-bindings/src/Source.cc
by lslezak＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: lslezak Date: Wed Dec 5 08:15:53 2007 New Revision: 42684 URL: http://svn.opensuse.org/viewcvs/yast?rev=42684&view=rev Log: - ugly global pointer replaced by using boost::bind Modified: trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Wed Dec 5 08:15:53 2007 @@ -51,6 +51,7 @@ #include <sstream> // ostringstream +#include <boost/bind.hpp> /* Textdomain "pkg-bindings" @@ -403,18 +404,6 @@ return true; } -PkgModuleFunctions *ptr = NULL; - -bool source_receiver(const zypp::ProgressData &progress) -{ - if (ptr != NULL) - { - return ptr->SourceLoadReceiver(progress); - } - - return true; -} - /**************************************************************************************** * @builtin SourceLoad * @@ -437,14 +426,11 @@ // mark refreshing as in progress now ProcessNextStage(); - ptr = this; - - YCPValue ret = SourceLoadImpl(source_receiver); + // boost::bind(&PkgModuleFunctions::SourceLoadReceiver, this, _1); + YCPValue ret = SourceLoadImpl(boost::bind(&PkgModuleFunctions::SourceLoadReceiver, this, _1)); ProcessDone(); - ptr = NULL; - return ret; } @@ -472,7 +458,7 @@ } } - // set max. value (3 steps per repository) + // set max. value (3 steps per repository - refresh, rebuild, load) zypp::ProgressData prog_total(repos_to_load * 3); prog_total.sendTo(progress); @@ -592,8 +578,6 @@ } } - ProcessNextStage(); - // report 100% prog_total.toMax(); @@ -628,16 +612,13 @@ // mark refreshing as in progress now ProcessNextStage(); - - ptr = this; } - YCPValue ret = SourceStartManagerImpl(enable, source_receiver); + YCPValue ret = SourceStartManagerImpl(enable, boost::bind(&PkgModuleFunctions::SourceLoadReceiver, this, _1)); if (enable->value()) { ProcessDone(); - ptr = NULL; } return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42683 - in /branches/tmp/coolo/qt4-port/src: QY2ComboTabWidget.cc pkg/YQPackageSelector.cc pkg/YQPackageSelector.h pkg/YQPackageSelectorBase.cc
by dmacvicar＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: dmacvicar Date: Wed Dec 5 00:01:38 2007 New Revision: 42683 URL: http://svn.opensuse.org/viewcvs/yast?rev=42683&view=rev Log: now it starts to look like a package selector, QY2ComboTabWidget was the guilty one Modified: branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Modified: branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/QY2Com… ============================================================================== --- branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc (original) +++ branches/tmp/coolo/qt4-port/src/QY2ComboTabWidget.cc Wed Dec 5 00:01:38 2007 @@ -42,14 +42,18 @@ const char * name ) : QWidget(parent) { + QVBoxLayout *vbox = new QVBoxLayout(this); + setLayout(vbox); + QHBoxLayout *hbox = new QHBoxLayout(this); + Q_CHECK_PTR( hbox ); // hbox->setFrameStyle( QFrame::Panel | QFrame::Raised ); // hbox->setLineWidth(2); // hbox->setMidLineWidth(2); hbox->setSpacing( SPACING ); hbox->setMargin ( MARGIN ); - Q_CHECK_PTR( hbox ); + vbox->addLayout(hbox); //this->setSpacing( SPACING ); this->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert @@ -68,6 +72,7 @@ widget_stack = new QStackedWidget( this ); Q_CHECK_PTR( widget_stack ); + vbox->addWidget(widget_stack); } Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.cc Wed Dec 5 00:01:38 2007 @@ -215,20 +215,18 @@ void YQPackageSelector::basicLayout() { - - layoutMenuBar(layout()); + QVBoxLayout *layout = new QVBoxLayout(this); + setLayout(layout); + layoutMenuBar(this); QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); - QVBoxLayout *layout = new QVBoxLayout(outer_splitter); - outer_splitter->setLayout(layout); - Q_CHECK_PTR( outer_splitter ); - QWidget * left_pane = layoutLeftPane ( outer_splitter->layout() ); - this->layout()->addWidget(left_pane); + layout->addWidget(outer_splitter); + + QWidget * left_pane = layoutLeftPane ( outer_splitter ); - QWidget * right_pane = layoutRightPane( outer_splitter->layout() ); - this->layout()->addWidget(right_pane); + QWidget * right_pane = layoutRightPane( outer_splitter ); outer_splitter->setResizeMode( left_pane, QSplitter::KeepSize ); outer_splitter->setResizeMode( right_pane, QSplitter::Stretch ); @@ -236,19 +234,18 @@ QWidget * -YQPackageSelector::layoutLeftPane( QLayout *parent_layout ) +YQPackageSelector::layoutLeftPane( QWidget *parent ) { - QSplitter * splitter = new QSplitter( Qt::Vertical, this ); + QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); Q_CHECK_PTR( splitter ); splitter->setMargin( MARGIN ); - parent_layout->addWidget(splitter); QWidget * upper_vbox = new QWidget( splitter ); QVBoxLayout *layout = new QVBoxLayout(upper_vbox); upper_vbox->setLayout(layout); Q_CHECK_PTR( upper_vbox ); - layoutFilters( upper_vbox->layout() ); + layoutFilters( upper_vbox ); addVSpacing( upper_vbox, MARGIN ); QWidget * lower_vbox = new QWidget( splitter ); @@ -268,11 +265,11 @@ void -YQPackageSelector::layoutFilters( QLayout *parent_layout ) +YQPackageSelector::layoutFilters( QWidget *parent ) { - _filters = new QY2ComboTabWidget( _( "Fi&lter:" ), this ); + _filters = new QY2ComboTabWidget( _( "Fi&lter:" ), parent ); Q_CHECK_PTR( _filters ); - parent_layout->addWidget(_filters); + parent->layout()->addWidget(_filters); // // Update problem view @@ -283,7 +280,7 @@ if ( YQPkgUpdateProblemFilterView::haveProblematicPackages() || testMode() ) { - _updateProblemFilterView = new YQPkgUpdateProblemFilterView( this ); + _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent); Q_CHECK_PTR( _updateProblemFilterView ); _filters->addPage( _( "Update Problems" ), _updateProblemFilterView ); } @@ -308,7 +305,7 @@ if ( ! zyppPool().empty<zypp::Pattern>() || testMode() ) { - _patternList = new YQPkgPatternList( this, true ); + _patternList = new YQPkgPatternList( parent, true ); Q_CHECK_PTR( _patternList ); _filters->addPage( _( "Patterns" ), _patternList ); @@ -333,7 +330,7 @@ if ( ! zyppPool().empty<zypp::Selection>() || testMode() ) { - _selList = new YQPkgSelList( this, true ); + _selList = new YQPkgSelList( parent, true ); Q_CHECK_PTR( _selList ); _filters->addPage( _( "Selections" ), _selList ); @@ -355,7 +352,7 @@ // RPM group tags view // - _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( this ); + _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); Q_CHECK_PTR( _rpmGroupTagsFilterView ); _filters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); @@ -367,7 +364,7 @@ // Languages view // - _langList = new YQPkgLangList( this ); + _langList = new YQPkgLangList( parent ); Q_CHECK_PTR( _langList ); _filters->addPage( _( "Languages" ), _langList ); @@ -384,7 +381,7 @@ // Repository view // - _repoFilterView = new YQPkgRepoFilterView( this ); + _repoFilterView = new YQPkgRepoFilterView( parent ); Q_CHECK_PTR( _repoFilterView ); _filters->addPage( _( "Repositories" ), _repoFilterView ); @@ -393,7 +390,7 @@ // Package search view // - _searchFilterView = new YQPkgSearchFilterView( this ); + _searchFilterView = new YQPkgSearchFilterView( parent ); Q_CHECK_PTR( _searchFilterView ); _filters->addPage( _( "Search" ), _searchFilterView ); @@ -402,7 +399,7 @@ // Status change view // - _statusFilterView = new YQPkgStatusFilterView( this ); + _statusFilterView = new YQPkgStatusFilterView( parent ); Q_CHECK_PTR( _statusFilterView ); _filters->addPage( _( "Installation Summary" ), _statusFilterView ); @@ -418,15 +415,14 @@ QWidget * -YQPackageSelector::layoutRightPane( QLayout *parent_layout ) +YQPackageSelector::layoutRightPane( QWidget *parent ) { - QWidget * right_pane_vbox = new QWidget( this ); + QWidget * right_pane_vbox = new QWidget( parent ); QVBoxLayout *layout = new QVBoxLayout(right_pane_vbox); right_pane_vbox->setLayout(layout); Q_CHECK_PTR( right_pane_vbox ); - parent_layout->addWidget(right_pane_vbox); layout->setMargin( MARGIN ); @@ -435,27 +431,23 @@ Q_CHECK_PTR( splitter ); layout->addWidget(splitter); - QWidget * splitter_vbox = new QWidget( splitter ); - layout = new QVBoxLayout(splitter_vbox); - splitter_vbox->setLayout(layout); + Q_CHECK_PTR( splitter ); + layoutPkgList( splitter ); - Q_CHECK_PTR( splitter_vbox ); - layoutPkgList( right_pane_vbox->layout() ); - addVSpacing( splitter_vbox, MARGIN ); + addVSpacing( splitter, MARGIN ); - layoutDetailsViews( right_pane_vbox->layout() ); + layoutDetailsViews( splitter ); - layoutButtons( right_pane_vbox->layout() ); + layoutButtons( splitter ); return right_pane_vbox; } void -YQPackageSelector::layoutPkgList( QLayout *parent_layout ) +YQPackageSelector::layoutPkgList( QWidget *parent ) { - _pkgList= new YQPkgList( this ); - parent_layout->addWidget(_pkgList); + _pkgList= new YQPkgList( parent ); Q_CHECK_PTR( _pkgList ); connect( _pkgList, SIGNAL( statusChanged() ), @@ -464,13 +456,12 @@ void -YQPackageSelector::layoutDetailsViews( QLayout *parent_layout ) +YQPackageSelector::layoutDetailsViews( QWidget *parent ) { bool haveInstalledPkgs = YQPkgList::haveInstalledPkgs(); - QWidget * details_vbox = new QWidget( this ); + QWidget * details_vbox = new QWidget( parent ); Q_CHECK_PTR( details_vbox ); - parent_layout->addWidget(details_vbox); QVBoxLayout *layout = new QVBoxLayout(details_vbox); details_vbox->setLayout(layout); @@ -578,11 +569,10 @@ void -YQPackageSelector::layoutButtons( QLayout *parent_layout ) +YQPackageSelector::layoutButtons( QWidget *parent ) { - QWidget * button_box = new QWidget( this ); + QWidget * button_box = new QWidget( parent ); Q_CHECK_PTR( button_box ); - parent_layout->addWidget(button_box); QHBoxLayout *layout = new QHBoxLayout(button_box); button_box->setLayout(layout); @@ -635,12 +625,13 @@ void -YQPackageSelector::layoutMenuBar( QLayout *parent_layout ) +YQPackageSelector::layoutMenuBar( QWidget *parent ) { - _menuBar = new QMenuBar( this ); - parent_layout->addWidget(_menuBar); + _menuBar = new QMenuBar( parent ); Q_CHECK_PTR( _menuBar ); + parent->layout()->addWidget(_menuBar); + _fileMenu = 0; _viewMenu = 0; _pkgMenu = 0; Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelector.h Wed Dec 5 00:01:38 2007 @@ -202,13 +202,13 @@ void basicLayout(); - QWidget * layoutLeftPane ( QLayout *parent_layout ); - QWidget * layoutRightPane ( QLayout *parent_layout ); - void layoutFilters ( QLayout *parent_layout ); - void layoutPkgList ( QLayout *parent_layout ); - void layoutDetailsViews ( QLayout *parent_layout ); - void layoutButtons ( QLayout *parent_layout ); - void layoutMenuBar ( QLayout *parent_layout ); + QWidget * layoutLeftPane ( QWidget *parent ); + QWidget * layoutRightPane ( QWidget *parent ); + void layoutFilters ( QWidget *parent ); + void layoutPkgList ( QWidget *parent ); + void layoutDetailsViews ( QWidget *parent ); + void layoutButtons ( QWidget *parent ); + void layoutMenuBar ( QWidget *parent ); /** * Establish Qt signal / slot connections. Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Wed Dec 5 00:01:38 2007 @@ -26,6 +26,7 @@ #include <QAction> #include <QVBoxLayout> +#include <QHBoxLayout> #include "QY2LayoutUtils.h" #include "YQPackageSelectorBase.h" @@ -55,8 +56,8 @@ { setWidgetRep( this ); - QVBoxLayout *layout = new QVBoxLayout(this); - setLayout(layout); +// QHBoxLayout *layout = new QHBoxLayout(this); +// setLayout(layout); _showChangesDialog = false; _pkgConflictDialog = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42682 - in /trunk/gtk/unstable: ChangeLog src/Makefile.am src/YGImage.cc src/ygdkmngloader.c tests/ImageMng.ycp
by rpmcruz＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: rpmcruz Date: Tue Dec 4 22:57:38 2007 New Revision: 42682 URL: http://svn.opensuse.org/viewcvs/yast?rev=42682&view=rev Log: * src/ygtkimage.h/c: moved YGImage stuff to an actual widget impl. Added dim/gray when disabled as asked by bug #345506. Used the same code as gtk -- done at expose-time, using style engine. * src/YGImage.cc: according changes. Much smaller, of course. * tests/ImageMng.ycp: added Enable option, to test this. Very cool. * src/ygdkmngloader.c: bug fix: when fopen() fails, it returns null, so don't call fclose() on null, on error case. Modified: trunk/gtk/unstable/ChangeLog trunk/gtk/unstable/src/Makefile.am trunk/gtk/unstable/src/YGImage.cc trunk/gtk/unstable/src/ygdkmngloader.c trunk/gtk/unstable/tests/ImageMng.ycp Modified: trunk/gtk/unstable/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/ChangeLog?rev=42682… ============================================================================== --- trunk/gtk/unstable/ChangeLog (original) +++ trunk/gtk/unstable/ChangeLog Tue Dec 4 22:57:38 2007 @@ -1,3 +1,15 @@ +2007-12-04 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkimage.h/c: moved YGImage stuff to an actual widget impl. Added + dim/gray when disabled as asked by bug #345506. Used the same code as gtk + -- done at expose-time, using style engine. + * src/YGImage.cc: according changes. Much smaller, of course. + + * tests/ImageMng.ycp: added Enable option, to test this. Very cool. + + * src/ygdkmngloader.c: bug fix: when fopen() fails, it returns null, so don't + call fclose() on null, on error case. + 2007-12-03 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkwizard.c: set label title centered (visible on our Package Selector Modified: trunk/gtk/unstable/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/Makefile.am?rev… ============================================================================== --- trunk/gtk/unstable/src/Makefile.am (original) +++ trunk/gtk/unstable/src/Makefile.am Tue Dec 4 22:57:38 2007 @@ -48,6 +48,7 @@ ygtkwizard.c \ ygtkfindentry.c \ ygdkmngloader.c \ + ygtkimage.c \ ygtkhtmlwrap.c \ ygtkrichtext.c \ yzyppwrapper.cc \ Modified: trunk/gtk/unstable/src/YGImage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/YGImage.cc?rev=… ============================================================================== --- trunk/gtk/unstable/src/YGImage.cc (original) +++ trunk/gtk/unstable/src/YGImage.cc Tue Dec 4 22:57:38 2007 @@ -5,266 +5,57 @@ #include "ygdkmngloader.h" #include <config.h> #include <ycp/y2log.h> -#include <YGUI.h> -#include "YEvent.h" +#include "YGUI.h" #include "YGWidget.h" #include "YImage.h" +#include "ygtkimage.h" class YGImage : public YImage, public YGWidget { - bool m_hasZeroWidth, m_hasZeroHeight, m_isScaled, m_isTiled, m_isAnimation; - bool m_imageLoaded; - - struct Animation { - GdkPixbufAnimation *pixbuf; - GdkPixbufAnimationIter *frame; - guint timeout_id; - }; - union { - GdkPixbuf *m_pixbuf; - Animation *m_animation; - }; - gchar *alt_text; - - void initOptions (const YWidgetOpt &opt) + void setProps (const YWidgetOpt &opt, const YCPString &alt_text) { - IMPL - m_imageLoaded = false; - m_hasZeroWidth = opt.zeroWidth.value(); - m_hasZeroHeight = opt.zeroHeight.value(); - m_isAnimation = opt.animated.value(); - m_isScaled = opt.scaleToFit.value(); - m_isTiled = opt.tiled.value(); + bool scale = opt.scaleToFit.value(), tile = opt.tiled.value(); + YGtkImageAlign align = CENTER_IMAGE_ALIGN; + if (tile) + align = TILE_IMAGE_ALIGN; + if (scale) + align = SCALE_IMAGE_ALIGN; + if (scale && tile) + y2warning ("YImage can't be scaled and tiled at the same time"); + ygtk_image_set_props (YGTK_IMAGE (getWidget()), align, alt_text->value_cstr()); - if (m_hasZeroWidth || m_isScaled || m_isTiled) + bool zeroWidth = opt.zeroWidth.value(), zeroHeight = opt.zeroHeight.value(); + if (zeroWidth || scale || tile) setStretchable (YD_HORIZ, true); - if (m_hasZeroHeight || m_isScaled || m_isTiled) + if (zeroHeight || scale || tile) setStretchable (YD_VERT, true); - - if (m_isScaled && m_isTiled) { - y2warning ("YImage can't be scaled and tiled at the same time"); - m_isTiled = false; - } - - if (m_isAnimation) - m_animation = NULL; - else - m_pixbuf = NULL; - - g_signal_connect (G_OBJECT (getWidget()), "expose-event", - G_CALLBACK (expose_event_cb), this); - gtk_widget_queue_draw (getWidget()); - } - - void loadImage (GdkPixbuf *pixbuf, const char *error_msg) - { - IMPL - if (pixbuf == NULL) { - g_warning ("Couldn't load image - %s", error_msg); - return; - } - - m_imageLoaded = true; - m_pixbuf = pixbuf; - gtk_widget_set_size_request (getWidget(), m_hasZeroWidth ? -1 : gdk_pixbuf_get_width (pixbuf), - m_hasZeroHeight ? -1 : gdk_pixbuf_get_height (pixbuf)); - } - - void loadAnimation (GdkPixbufAnimation *pixbuf, const char *error_msg) - { - IMPL - if (pixbuf == NULL) { - g_warning ("Couldn't load animation - %s", error_msg); - return; - } - - m_imageLoaded = true; - m_animation = new Animation; - m_animation->pixbuf = pixbuf; - - m_animation->frame = NULL; - advance_frame_cb (this); - - g_signal_connect (G_OBJECT (getWidget()), "expose-event", - G_CALLBACK (expose_event_cb), this); - gtk_widget_queue_draw (getWidget()); + gtk_widget_set_size_request (getWidget(), zeroWidth ? 1 : -1, zeroHeight ? 1 : -1); } public: YGImage (const YWidgetOpt &opt, YGWidget *parent, const YCPString &filename_str, const YCPString &text) : YImage (opt), - YGWidget (this, parent, true, GTK_TYPE_DRAWING_AREA, NULL) + YGWidget (this, parent, true, YGTK_TYPE_IMAGE, NULL) { IMPL - alt_text = g_strdup (text->value_cstr()); - initOptions (opt); - + setProps (opt, text); const char *filename = filename_str->value_cstr(); - GError *error = 0; - if (m_isAnimation) { - GdkPixbufAnimation *pixbuf; - if (ygdk_mng_pixbuf_is_file_mng (filename)) - pixbuf = ygdk_mng_pixbuf_new_from_file (filename, &error); - else - pixbuf = gdk_pixbuf_animation_new_from_file (filename, &error); - loadAnimation (pixbuf, error ? error->message : "(undefined)"); - } - else { - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (filename, &error); - loadImage (pixbuf, error ? error->message : "(undefined)"); - } + bool animated = opt.animated.value(); + ygtk_image_set_from_file (YGTK_IMAGE (getWidget()), filename, animated); } YGImage (const YWidgetOpt &opt, YGWidget *parent, const YCPByteblock &byteblock, const YCPString &text) : YImage (opt), - YGWidget (this, parent, true, GTK_TYPE_DRAWING_AREA, NULL) - { - IMPL - alt_text = g_strdup (text->value_cstr()); - initOptions (opt); - - GError *error = 0; - if (m_isAnimation && ygdk_mng_pixbuf_is_data_mng (byteblock->value(), byteblock->size())) - { - GdkPixbufAnimation *pixbuf; - pixbuf = ygdk_mng_pixbuf_new_from_data (byteblock->value(), byteblock->size(), &error); - loadAnimation (pixbuf, error ? error->message : "(undefined)"); - } - else - { - GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); - g_signal_connect (G_OBJECT (loader), "area-prepared", - G_CALLBACK (image_loaded_cb), this); - - if (!gdk_pixbuf_loader_write (loader, - byteblock->value(), byteblock->size(), &error)) - g_warning ("Could not load image from data blocks: %s", error->message); - gdk_pixbuf_loader_close (loader, &error); - } - } - - virtual ~YGImage() - { - IMPL - if (m_imageLoaded) { - if (m_isAnimation) { - g_object_unref (G_OBJECT (m_animation->pixbuf)); - if (m_animation->timeout_id) - g_source_remove (m_animation->timeout_id); - delete m_animation; - } - else - g_object_unref (G_OBJECT (m_pixbuf)); - } - g_free (alt_text); - } - - // callback for image loading - static void image_loaded_cb (GdkPixbufLoader *loader, YGImage *pThis) - { - IMPL - if (pThis->m_isAnimation) { - if (pThis->m_animation) { - // a new frame loaded -- just redraw the widget - if (gdk_pixbuf_animation_iter_on_currently_loading_frame - (pThis->m_animation->frame)) - gtk_widget_queue_draw (pThis->getWidget()); - } - else { - GdkPixbufAnimation *pixbuf = gdk_pixbuf_loader_get_animation (loader); - g_object_ref (G_OBJECT (pixbuf)); - pThis->loadAnimation (pixbuf, " on block data reading callback"); - } - } - else { - GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - g_object_ref (G_OBJECT (pixbuf)); - pThis->loadImage (pixbuf, " on block data reading callback"); - } - } - - // callback for image displaying - static gboolean advance_frame_cb (void *pData) - { - IMPL - YGImage *pThis = (YGImage *) pData; - Animation *animation = pThis->m_animation; - - if (!animation->frame) // no frame yet loaded - animation->frame = gdk_pixbuf_animation_get_iter (animation->pixbuf, NULL); - else - if (gdk_pixbuf_animation_iter_advance (animation->frame, NULL)) - gtk_widget_queue_draw (pThis->getWidget()); - - // shedule next frame - int delay = gdk_pixbuf_animation_iter_get_delay_time (animation->frame); - if (delay != -1) - animation->timeout_id = g_timeout_add (delay, advance_frame_cb, pThis); - - GdkPixbuf *pixbuf = gdk_pixbuf_animation_iter_get_pixbuf (pThis->m_animation->frame); - gtk_widget_set_size_request (pThis->getWidget(), gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf)); - return FALSE; - } - - static gboolean expose_event_cb (GtkWidget *widget, GdkEventExpose *event, - YGImage *pThis) + YGWidget (this, parent, true, YGTK_TYPE_IMAGE, NULL) { IMPL - int x, y, width, height; - x = widget->allocation.x + 6; - y = widget->allocation.y + 6; - width = widget->allocation.width; - height = widget->allocation.height; - - cairo_t *cr = gdk_cairo_create (widget->window); - - if (!pThis->m_imageLoaded) { - // show default text if no image was loaded - PangoLayout *layout; - layout = gtk_widget_create_pango_layout (widget, pThis->alt_text); - - int text_width, text_height; - pango_layout_get_size (layout, &text_width, &text_height); - text_width /= PANGO_SCALE; - text_height /= PANGO_SCALE; - - x += (width - text_width) / 2; - y += (height - text_height) / 2; - - cairo_move_to (cr, x, y); - pango_cairo_show_layout (cr, layout); - - g_object_unref (layout); - cairo_destroy (cr); - return TRUE; - } - - GdkPixbuf *pixbuf; - if (pThis->m_isAnimation) - pixbuf = gdk_pixbuf_animation_iter_get_pixbuf (pThis->m_animation->frame); - else - pixbuf = pThis->m_pixbuf; - gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); - - if (pThis->m_isTiled) - cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); - - if (pThis->m_isScaled) { - double scale_x = (double) gdk_pixbuf_get_width (pixbuf) / width; - double scale_y = (double) gdk_pixbuf_get_height (pixbuf) / height; - cairo_matrix_t matrix; - cairo_matrix_init_scale (&matrix, scale_x, scale_y); - cairo_pattern_set_matrix (cairo_get_source (cr), &matrix); - } - - cairo_rectangle (cr, 0, 0, width, height); - cairo_fill (cr); - - cairo_destroy (cr); - return TRUE; + setProps (opt, text); + const guint8 *data = byteblock->value(); + long data_size = byteblock->size(); + bool animated = opt.animated.value(); + ygtk_image_set_from_data (YGTK_IMAGE (getWidget()), data, data_size, animated); } YGWIDGET_IMPL_COMMON Modified: trunk/gtk/unstable/src/ygdkmngloader.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/ygdkmngloader.c… ============================================================================== --- trunk/gtk/unstable/src/ygdkmngloader.c (original) +++ trunk/gtk/unstable/src/ygdkmngloader.c Tue Dec 4 22:57:38 2007 @@ -113,7 +113,8 @@ return ret; is_file_mng_failed: - fclose (file); + if (file) + fclose (file); return FALSE; } Modified: trunk/gtk/unstable/tests/ImageMng.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/tests/ImageMng.ycp?… ============================================================================== --- trunk/gtk/unstable/tests/ImageMng.ycp (original) +++ trunk/gtk/unstable/tests/ImageMng.ycp Tue Dec 4 22:57:38 2007 @@ -4,35 +4,42 @@ { UI::OpenDialog ( `VBox ( + `Heading ("Movie"), `ReplacePoint (`id (`replace_image), - `ColoredLabel ("Choose an image first!", `rgb (0, 0, 0), - `rgb (255, 0, 0), 5) + `ColoredLabel (`opt(`hstretch, `vstretch), "Pick an image!", + `rgb (0, 0, 0), `rgb (255, 0, 0), 5) ), - `Frame ("Which MNG file:", - `RadioButtonGroup (`id(`rb), - `VBox( - `Left (`RadioButton(`id (`movie1), `opt(`notify), "&Movie1")), - `Left (`RadioButton(`id (`movie2), `opt(`notify), "&Movie2")), - `Left (`RadioButton(`id (`movie3), `opt(`notify), "&Movie3")), - `Left (`RadioButton(`id (`movie4), `opt(`notify), "&Movie4")), - `Left (`RadioButton(`id (`movie5), `opt(`notify), "&Movie5")), - `Left (`RadioButton(`id (`movie6), `opt(`notify), "&Movie6")), - `Left (`RadioButton(`id (`movie7), `opt(`notify), "&Movie7")), - `Left (`RadioButton(`id (`movie8), `opt(`notify), "&Movie8")) + `VSquash (`HBox ( + `Top (`Frame ("Which MNG file:", + `RadioButtonGroup (`id(`rb), + `VBox( + `Left (`RadioButton(`id (`movie1), `opt(`notify), "&Movie1")), + `Left (`RadioButton(`id (`movie2), `opt(`notify), "&Movie2")), + `Left (`RadioButton(`id (`movie3), `opt(`notify), "&Movie3")), + `Left (`RadioButton(`id (`movie4), `opt(`notify), "&Movie4")), + `Left (`RadioButton(`id (`movie5), `opt(`notify), "&Movie5")), + `Left (`RadioButton(`id (`movie6), `opt(`notify), "&Movie6")), + `Left (`RadioButton(`id (`movie7), `opt(`notify), "&Movie7")), + `Left (`RadioButton(`id (`movie8), `opt(`notify), "&Movie8")) + ) ) - ) - ), + )), + + `Top (`VBox ( + `Frame ("Image effect:", + `RadioButtonGroup (`id(`rb), + `VBox( + `Left (`RadioButton(`id (`no_effect), `opt(`notify), "&None", true)), + `Left (`RadioButton(`id (`tiled_effect),`opt(`notify), "&Tiled")), + `Left (`RadioButton(`id (`scaled_effect), `opt(`notify), "&Scaled")) + ) + ) + ), + `Left (`CheckBox(`id (`enabled), `opt(`notify), "&Enabled", true)) + )) + )), - `Frame ("Image effect:", - `RadioButtonGroup (`id(`rb), - `VBox( - `Left (`RadioButton(`id (`no_effect), `opt(`notify), "&None", true)), - `Left (`RadioButton(`id (`tiled_effect),`opt(`notify), "&Tiled")), - `Left (`RadioButton(`id (`scaled_effect), `opt(`notify), "&Scaled")) - ) - ) - ), `Right (`Label ("Resize the window!")), `PushButton(`id (`close), "&Close") ) @@ -77,13 +84,18 @@ else filename = "tests/movie8.mng"; + any enabled_opt = nil; + boolean check = (boolean) UI::QueryWidget(`enabled, `Value); + if (!check) + enabled_opt = `disabled; + // to test inline images, uncomment next line and pass it to `Image //byteblock data = (byteblock) SCR::Read (.target.byte, filename); + term image = `Image (`id (`image), + `opt (`animated, effect_opt, enabled_opt, `hstretch, `vstretch), + filename, filename + " not found"); - UI::ReplaceWidget (`replace_image, - `Image (`opt (`animated, effect_opt, zerowidth, zeroheight), - filename, filename + " not found")); - + UI::ReplaceWidget (`replace_image, image); } UI::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42681 - /trunk/gtk/unstable/src/ygdkmngloader.c-old
by rpmcruz＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: rpmcruz Date: Tue Dec 4 20:19:11 2007 New Revision: 42681 URL: http://svn.opensuse.org/viewcvs/yast?rev=42681&view=rev Log: Commited this backup file... Removed: trunk/gtk/unstable/src/ygdkmngloader.c-old -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42680 - /trunk/gtk/unstable/src/YGPackageSelector.cc-ori
by rpmcruz＠svn.opensuse.org 04 Dec '07

04 Dec '07

Author: rpmcruz Date: Tue Dec 4 19:58:33 2007 New Revision: 42680 URL: http://svn.opensuse.org/viewcvs/yast?rev=42680&view=rev Log: Removed old package selector implementation. Its available on the stable. Besides, it won't compile here due to missing cell renderer. Removed: trunk/gtk/unstable/src/YGPackageSelector.cc-ori -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0