Author: rpmcruz Date: Mon Dec 17 11:12:39 2007 New Revision: 43114 URL: http://svn.opensuse.org/viewcvs/yast?rev=43114&view=rev Log: * src/YGPackageSelector.cc (Filters): adjust the interface first before processing the query. bug fix: query was being built against old categories value. * src/yzyppwrapper.cc: ensure the packages primitive pool is built when we ask for its category. Modified: trunk/gtk/unstable-libyui/ChangeLog trunk/gtk/unstable-libyui/src/YGPackageSelector.cc trunk/gtk/unstable-libyui/src/yzyppwrapper.cc Modified: trunk/gtk/unstable-libyui/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/ChangeLog?rev... ============================================================================== --- trunk/gtk/unstable-libyui/ChangeLog (original) +++ trunk/gtk/unstable-libyui/ChangeLog Mon Dec 17 11:12:39 2007 @@ -1,3 +1,12 @@ +2007-12-17 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc (Filters): adjust the interface first before + processing the query. bug fix: query was being built against old categories + value. + + * src/yzyppwrapper.cc: ensure the packages primitive pool is built when we + ask for its category. + 2007-12-16 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc: added tooltip to search entry. Modified: trunk/gtk/unstable-libyui/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/src/YGPackage... ============================================================================== --- trunk/gtk/unstable-libyui/src/YGPackageSelector.cc (original) +++ trunk/gtk/unstable-libyui/src/YGPackageSelector.cc Mon Dec 17 11:12:39 2007 @@ -467,7 +467,7 @@ struct View { virtual GtkWidget *getWidget() = 0; - virtual void setQuery (Ypp::Query *query) = 0; + virtual void writeQuery (Ypp::Query *query) = 0; Filters *m_filters; View (Filters *filters) @@ -602,7 +602,7 @@ pThis->m_filters->signalChanged(); } - virtual void setQuery (Ypp::Query *query) + virtual void writeQuery (Ypp::Query *query) { Ypp::Node *node = getActive(); if (node) @@ -657,7 +657,7 @@ m_filters->signalChanged(); } - virtual void setQuery (Ypp::Query *query) + virtual void writeQuery (Ypp::Query *query) { if (!m_selected.empty()) query->setCollection (m_selected.front()); @@ -723,10 +723,10 @@ } } - void setQuery (Ypp::Query *query) + void writeQuery (Ypp::Query *query) { if (m_view) - m_view->setQuery (query); + m_view->writeQuery (query); } }; @@ -870,6 +870,13 @@ Ypp::Package::Type type = (Ypp::Package::Type) gtk_combo_box_get_active (GTK_COMBO_BOX (m_type)); + // adjust interface + if (type != m_selectedType) { + m_collection->setType (type); + m_selectedType = type; + } + + // create query Ypp::Query *query = new Ypp::Query(); if (type == Ypp::Package::PATCH_TYPE) query->setType (Ypp::Package::PATCH_TYPE); @@ -888,7 +895,7 @@ case 3: default: break; } - m_collection->setQuery (query); + m_collection->writeQuery (query); if (selectedRepo() >= 0) { std::list <int> reposQuery; @@ -897,11 +904,6 @@ } m_listener->doQuery (query); - - if (type != m_selectedType) { - m_collection->setType (type); - m_selectedType = type; - } } void signalChangedDelay() Modified: trunk/gtk/unstable-libyui/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/src/yzyppwrap... ============================================================================== --- trunk/gtk/unstable-libyui/src/yzyppwrapper.cc (original) +++ trunk/gtk/unstable-libyui/src/yzyppwrapper.cc Mon Dec 17 11:12:39 2007 @@ -983,6 +983,7 @@ Ypp::Node *Ypp::getFirstCategory (Ypp::Package::Type type) { + impl->getPackages (type); // ensure they are initialized return impl->categories[type]->getFirst(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org