Author: coolo Date: Fri Feb 15 16:04:24 2008 New Revision: 44529 URL: http://svn.opensuse.org/viewcvs/yast?rev=44529&view=rev Log: commit some of the languages Modified: trunk/qt-pkg/src/CMakeLists.txt trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPkgLangList.cc trunk/qt-pkg/src/YQPkgLangList.h trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/CMakeLists.txt?rev=44529&r1=44528&r2=44529&view=diff ============================================================================== --- trunk/qt-pkg/src/CMakeLists.txt (original) +++ trunk/qt-pkg/src/CMakeLists.txt Fri Feb 15 16:04:24 2008 @@ -35,7 +35,7 @@ YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc -# YQPkgLangList.cc + YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc @@ -48,7 +48,6 @@ YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc -# YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?rev=44529&r1=44528&r2=44529&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Fri Feb 15 16:04:24 2008 @@ -328,8 +328,6 @@ // // Languages view // -#warning LangList -#if FIXME _langList = new YQPkgLangList( parent ); Q_CHECK_PTR( _langList ); @@ -342,7 +340,6 @@ connect( this, SIGNAL( refresh() ), _langList, SLOT ( updateItemStates() ) ); -#endif // // Repository view Modified: trunk/qt-pkg/src/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgLangList.cc?rev=44529&r1=44528&r2=44529&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgLangList.cc (original) +++ trunk/qt-pkg/src/YQPkgLangList.cc Fri Feb 15 16:04:24 2008 @@ -70,17 +70,12 @@ clear(); yuiDebug() << "Filling language list" << endl; - - for ( ZyppPoolIterator it = zyppLangBegin(); - it != zyppLangEnd(); + zypp::LocaleSet locales = zypp::getZYpp()->pool().getAvailableLocales(); + for ( zypp::LocaleSet::const_iterator it = locales.begin(); + it != locales.end(); ++it ) { - ZyppLang zyppLang = tryCastToZyppLang( (*it)->theObj() ); - - if ( zyppLang ) - addLangItem( *it, zyppLang ); - else - yuiError() << "Found non-Language selectable" << endl; + addLangItem( *it ); } yuiDebug() << "Language list filled" << endl; @@ -102,57 +97,12 @@ if ( selection() ) { - ZyppLang lang = selection()->zyppLang(); + zypp::Locale lang = selection()->zyppLang(); + + string currentLang = lang.name(); - if ( lang ) - { - string currentLang = lang->name(); - - // - // Iterate over all selectables in pool - // - - for ( ZyppPoolIterator it = zyppPkgBegin(); - it != zyppPkgEnd(); - ++it ) - { - ZyppObj zyppObj = (*it)->theObj(); - - if ( zyppObj ) - { - // - // Iterate over all "freshens" dependencies of this object - // - - zypp::CapSet freshens = zyppObj->dep( zypp::Dep::FRESHENS ); - - for ( zypp::CapSet::const_iterator cap_it = freshens.begin(); - cap_it != freshens.end(); - ++cap_it ) - { - if ( (*cap_it).index() == currentLang ) // obj freshens this language - { - ZyppPkg pkg = tryCastToZyppPkg( zyppObj ); - - if ( pkg ) - { - yuiDebug() << "Found pkg " << pkg->name() - << " for lang " << currentLang - << endl; - - emit filterMatch( *it, pkg ); - } - else - { - yuiWarning() << "Found non-pkg obj " << pkg->name() - << " for lang " << currentLang - << endl; - } - } - } - } - } - } +#warning FIXME: need a way to find out what packages provide language support + // not yet implemented } emit filterFinished(); @@ -160,16 +110,9 @@ void -YQPkgLangList::addLangItem( ZyppSel selectable, - ZyppLang zyppLang ) +YQPkgLangList::addLangItem( const zypp::Locale &zyppLang ) { - if ( ! selectable ) - { - yuiError() << "NULL ZyppSel!" << endl; - return; - } - - new YQPkgLangListItem( this, selectable, zyppLang ); + new YQPkgLangListItem( this, zyppLang ); } @@ -190,10 +133,8 @@ YQPkgLangListItem::YQPkgLangListItem( YQPkgLangList * langList, - ZyppSel selectable, - ZyppLang lang ) - : YQPkgObjListItem( langList, selectable, lang ) - , _langList( langList ) + const zypp::Locale &lang ) + : YQPkgObjListItem( langList, 0 ) , _zyppLang( lang ) { } Modified: trunk/qt-pkg/src/YQPkgLangList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgLangList.h?rev=44529&r1=44528&r2=44529&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgLangList.h (original) +++ trunk/qt-pkg/src/YQPkgLangList.h Fri Feb 15 16:04:24 2008 @@ -25,8 +25,6 @@ class YQPkgLangListItem; -typedef QString ZyppLang; - /** * @short Display a list of zypp::Selection objects. **/ @@ -69,9 +67,7 @@ * this slot. Remember to connect filterStart() to clear() (inherited from * QListView). **/ - void addLangItem( ZyppSel selectable, - ZyppLang lang ); - + void addLangItem( const zypp::Locale & lang ); public: @@ -120,8 +116,7 @@ * manager object that 'pkg' refers to. **/ YQPkgLangListItem( YQPkgLangList * pkgSelList, - ZyppSel selectable, - ZyppLang lang ); + const zypp::Locale &lang ); /** * Destructor @@ -131,7 +126,7 @@ /** * Returns the original object within the package manager backend. **/ - ZyppLang zyppLang() const { return _zyppLang; } + zypp::Locale zyppLang() const { return _zyppLang; } // Columns @@ -153,7 +148,7 @@ // Data members YQPkgLangList * _langList; - ZyppLang _zyppLang; + zypp::Locale _zyppLang; }; Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=44529&r1=44528&r2=44529&view=diff ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Fri Feb 15 16:04:24 2008 @@ -2,16 +2,16 @@ @HEADER@ -BuildRequires: libzypp-devel docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel +BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel BuildRequires: libxslt perl-XML-Writer libqt4-devel sgml-skel update-desktop-files Summary: - BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-core-devel >= 2.16.34 BuildRequires: yast2-qt-devel >= 2.16.25 +BuildRequires: libzypp-devel >= 4.2.4 Requires: yast2-core >= 2.16.34 Requires: yast2_theme >= 2.16.1 -Requires: libzypp >= 3.11.8 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 %description -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org