March 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45804 - in /trunk/storage: package/yast2-storage.changes storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: aschnell Date: Thu Mar 27 16:39:59 2008 New Revision: 45804 URL: http://svn.opensuse.org/viewcvs/yast?rev=45804&view=rev Log: - Unified Button Labels (fate #120373) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Mar 27 16:39:59 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 27 16:39:14 CET 2008 - aschnell(a)suse.de + +- Unified Button Labels (fate #120373) + +------------------------------------------------------------------- Wed Mar 26 17:18:52 CET 2008 - aschnell(a)suse.de - fixed DeviceMatchFstab for non kernel name devices (bnc #361250) Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Thu Mar 27 16:39:59 2008 @@ -2650,13 +2650,12 @@ if( Stage::initial () ) { back_label = Label::BackButton(); - next_label = Label::AcceptButton(); + next_label = Label::NextButton(); } else { - back_label = Label::QuitButton(); - // button text - next_label = _("&Apply"); + back_label = Label::CancelButton(); + next_label = Label::OKButton(); Wizard::HideAbortButton(); } -- 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] r45803 - /trunk/ncurses-pkg/src/
by kmachalkova＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: kmachalkova Date: Thu Mar 27 16:26:55 2008 New Revision: 45803 URL: http://svn.opensuse.org/viewcvs/yast?rev=45803&view=rev Log: old version Removed: trunk/ncurses-pkg/src/ -- 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] r45802 - /trunk/ncurses-pkg/
by kmachalkova＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: kmachalkova Date: Thu Mar 27 15:51:20 2008 New Revision: 45802 URL: http://svn.opensuse.org/viewcvs/yast?rev=45802&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "44592-45801" from http://svn.opensuse.org/svn/yast/branches/tmp/bubli/ncurses-pkg Modified: trunk/ncurses-pkg/ (props changed) -- 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] r45801 - /tags/stable-2_16_1/pam/
by jsuchome＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: jsuchome Date: Thu Mar 27 15:37:15 2008 New Revision: 45801 URL: http://svn.opensuse.org/viewcvs/yast?rev=45801&view=rev Log: Created tag stable-2_16_1 for pam Added: tags/stable-2_16_1/pam/ - copied from r45800, trunk/pam/ -- 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] r45800 - in /trunk/pam: VERSION package/yast2-pam.changes src/Autologin.ycp src/PamSettings.ycp
by jsuchome＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: jsuchome Date: Thu Mar 27 15:36:53 2008 New Revision: 45800 URL: http://svn.opensuse.org/viewcvs/yast?rev=45800&view=rev Log: - return default value of hash method - kdm could be in different packages Modified: trunk/pam/VERSION trunk/pam/package/yast2-pam.changes trunk/pam/src/Autologin.ycp trunk/pam/src/PamSettings.ycp Modified: trunk/pam/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/VERSION?rev=45800&r1=45799&r… ============================================================================== --- trunk/pam/VERSION (original) +++ trunk/pam/VERSION Thu Mar 27 15:36:53 2008 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/pam/package/yast2-pam.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/package/yast2-pam.changes?re… ============================================================================== --- trunk/pam/package/yast2-pam.changes (original) +++ trunk/pam/package/yast2-pam.changes Thu Mar 27 15:36:53 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 27 15:31:47 CET 2008 - jsuchome(a)suse.cz + +- kdm could be in kde4-kdm package +- 2.16.1 + +------------------------------------------------------------------- Fri Oct 19 11:07:04 CEST 2007 - jsuchome(a)suse.cz - check for empty lines in passwd/group/shadow (#333305) Modified: trunk/pam/src/Autologin.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/src/Autologin.ycp?rev=45800&… ============================================================================== --- trunk/pam/src/Autologin.ycp (original) +++ trunk/pam/src/Autologin.ycp Thu Mar 27 15:36:53 2008 @@ -61,7 +61,7 @@ } string dm = (string) SCR::Read (.sysconfig.displaymanager.DISPLAYMANAGER); - if ((dm == "kdm" && Package::Installed ("kdebase3-kdm")) || + if ((dm == "kdm" && Package::InstalledAny (["kdebase3-kdm", "kde4-kdm"])) || dm == "gdm" && Package::Installed ("gdm")) { available = true; Modified: trunk/pam/src/PamSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/src/PamSettings.ycp?rev=4580… ============================================================================== --- trunk/pam/src/PamSettings.ycp (original) +++ trunk/pam/src/PamSettings.ycp Thu Mar 27 15:36:53 2008 @@ -173,7 +173,10 @@ * Reads the value of default crypt hash (defined in /etc/default/passwd) */ global define string GetHashMethod () { - return (string) SCR::Read (.etc.default.passwd.crypt); + string m = (string) SCR::Read (.etc.default.passwd.crypt); + if (m == nil || m == "") + m = "md5"; + return m; } /** -- 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] r45799 - /tags/stable-2_16_29/packager/
by lslezak＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: lslezak Date: Thu Mar 27 15:36:15 2008 New Revision: 45799 URL: http://svn.opensuse.org/viewcvs/yast?rev=45799&view=rev Log: Created tag stable-2_16_29 for packager Added: tags/stable-2_16_29/packager/ - copied from r45798, trunk/packager/ -- 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] r45798 - in /trunk/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp src/modules/SourceDialogs.ycp
by lslezak＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: lslezak Date: Thu Mar 27 15:36:12 2008 New Revision: 45798 URL: http://svn.opensuse.org/viewcvs/yast?rev=45798&view=rev Log: - repositories - preselect "URL" type when adding a new repository (bnc#301659) - 2.16.29 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/repositories.ycp trunk/packager/src/modules/SourceDialogs.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=45798&r1=45… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Mar 27 15:36:12 2008 @@ -1 +1 @@ -2.16.28 +2.16.29 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Mar 27 15:36:12 2008 @@ -2,6 +2,9 @@ Thu Mar 27 11:42:17 CET 2008 - lslezak(a)suse.cz - repositories - display and edit priorities (bnc#369827) +- repositories - preselect "URL" type when adding a new repository + (bnc#301659) +- 2.16.29 ------------------------------------------------------------------- Wed Mar 26 16:08:59 CET 2008 - lslezak(a)suse.cz Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Thu Mar 27 15:36:12 2008 @@ -24,6 +24,7 @@ // SourceManager overlaps quite a bit with inst_source, // so far we only use it for ZMD sync, TODO refactor better import "SourceManager"; + import "SourceDialogs"; import "Wizard"; import "Label"; @@ -1081,6 +1082,8 @@ symbol TypeDialog() { SourceDialogs::SetDownloadOption(true); + // reset the stored URL + SourceDialogs::SetURL(""); map<string,any> td = SourceDialogs::TypeDialogDownloadOpt(); symbol ret = td["ui"]:`next; Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Thu Mar 27 15:36:12 2008 @@ -1602,6 +1602,10 @@ `Left (`RadioButton(`id(`slp), _("&Scan Using SLP..."))), // radio button `Left (`RadioButton(`id(`comm_repos), _("Commun&ity Repositories"))), + `VSpacing(0.4), + // radio button + `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), + `VSpacing(0.4), // radio button `Left (`RadioButton(`id(`ftp), _("&FTP..."))), // radio button @@ -1624,8 +1628,6 @@ `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), // radio button `Left (`RadioButton(`id(`local_iso), _("&Local ISO Image..."))), - // radio button - `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), // check box (download_widget) ? `VBox( `VSpacing(2), @@ -1642,6 +1644,9 @@ `RadioButtonGroup (`id (`type), `VBox ( `VStretch (), // radio button + `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), + `VSpacing(0.4), + // radio button `Left (`RadioButton(`id(`cd), _("&CD..."))), // radio button `Left (`RadioButton(`id(`dvd), _("&DVD..."))), @@ -1653,8 +1658,6 @@ `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), // radio button `Left (`RadioButton(`id(`local_iso), _("&Local ISO Image..."))), - // radio button - `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), // check box (download_widget) ? `VBox( `VSpacing(2), @@ -1807,8 +1810,11 @@ else if ( _url == "file://" ) current = `local_iso; else if ( _url == "slp://" ) current = `slp; else if ( _url == "commrepos://" ) current = `comm_repos; - - else y2warning ("Unknown URL scheme '%1'", _url); + else + { + y2warning ("Unknown URL scheme '%1'", _url); + current = `specify_url; + } if (current != nil) { -- 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] r45797 - /branches/tmp/bubli/ncurses-pkg/src/
by kmachalkova＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: kmachalkova Date: Thu Mar 27 15:34:37 2008 New Revision: 45797 URL: http://svn.opensuse.org/viewcvs/yast?rev=45797&view=rev Log: cleanup/consistent naming Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.h branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.h branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.h branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Thu Mar 27 15:34:37 2008 @@ -321,7 +321,7 @@ } else if ( event.widget == searchButton ) { - retVal = searchPopup->postAgain(); + retVal = searchPopup->showSearchResultPackages(); } } else if ( event == NCursesEvent::menu ) @@ -897,8 +897,7 @@ patternPopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Pattern ); patternPopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); patternPopup->Redraw(); - patternPopup->showSelectionPopup(); - //show the package description of the current item + patternPopup->showContainerPackages(); break; } case Languages: @@ -907,8 +906,7 @@ languagePopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Language ); languagePopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); languagePopup->Redraw(); - languagePopup->showSelectionPopup(); - //show the package description of the current item + languagePopup->showContainerPackages(); break; } case Repositories: @@ -917,8 +915,7 @@ repoPopup = new NCPkgRepoTable( replPoint, hhh, this ); repoPopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); repoPopup->Redraw(); - repoPopup->fillRepoList(); - repoPopup->showRepoPopup(); + repoPopup->showRepoPackages(); break; } case RPMGroups: @@ -932,10 +929,7 @@ if ( defaultGroup ) { yuiMilestone() << "default RPM group: " << defaultGroup->value().translation() << endl; - filterPopup->fillPackageList ( defaultGroup->value().translation(), defaultGroup ); - // show the package description of the current item - //pkgList->showInformation (); - ///infoText->update( pkgList->getDataPointer(0), pkgList->getSelPointer(0), NCPkgTable::I_Descr ); + filterPopup->showRPMGroupPackages ( defaultGroup->value().translation(), defaultGroup ); } else { @@ -1838,7 +1832,7 @@ case NCPkgTable::T_Packages: { pkgList->setVisibleInfo(NCPkgTable::I_Descr); - patternPopup->showSelectionPopup(); + patternPopup->showContainerPackages(); // show the package description of the current item pkgList->showInformation (); break; Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.cc Thu Mar 27 15:34:37 2008 @@ -50,19 +50,14 @@ // // DESCRIPTION : // -//NCPkgFilterContainer::NCPkgFilterContainer( const wpos at, NCPackageSelector * pkg, SelType type ) -// : NCPopup( at, false ) NCPkgFilterContainer::NCPkgFilterContainer( YWidget *parent, YTableHeader *header, NCPackageSelector * pkg, SelType type ) : NCPkgTable( parent, header ) - //, sel( 0 ) - //, okButton( 0 ) , packager( pkg ) , type( type ) { switch ( type ) { - case S_Pattern: - case S_Selection: { + case S_Pattern: { createLayout( parent, NCPkgStrings::LanguageLabel() ); break; } @@ -75,8 +70,7 @@ } setNotify(true); - //fillSelectionList( sel, type ); - fillSelectionList( type ); + fillContainerList( type ); } /////////////////////////////////////////////////////////////////// @@ -102,22 +96,15 @@ // void NCPkgFilterContainer::createLayout( YWidget *parent, const string & label ) { - // the vertical split is the (only) child of the dialog - //NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - - //new NCLabel( split, label, true, false ); // isHeading = true YTableHeader * tableHeader = new YTableHeader(); - // add the selection list - //sel = new NCPkgTable( parent, tableHeader ); setPackager( packager ); // set status strategy NCPkgStatusStrategy * strat = new SelectionStatStrategy(); switch (type) { - case S_Pattern: - case S_Selection: { + case S_Pattern: { setTableType( NCPkgTable::T_Selections, strat ); break; } @@ -133,19 +120,9 @@ fillHeader(); - // a help line for the selction/pattern/language popup - //new NCLabel( split, _( " [+] Select [-] Delete [>] Update " ), false, false ); - - //new NCSpacing( split, YD_VERT, false, 0.4 ); - - // add an OK button - //okButton = new NCPushButton( split, NCPkgStrings::OKLabel() ); - //okButton->setFunctionKey(10); - - //new NCSpacing( split, YD_VERT, false, 0.4 ); } -bool NCPkgFilterContainer::showMetapackageContent( const set<string> & wanted ) +bool NCPkgFilterContainer::showContainerContent( const set<string> & wanted ) { NCPkgTable * packageList = packager->PackageList(); @@ -202,17 +179,6 @@ packageList->drawList(); packageList->showInformation(); - //if ( ! label.empty() ) - //{ - // NCDBG << "Filter: " << label << endl; - - // // show the selected filter label - // if ( packageLabel ) - // { - // packageLabel->setLabel( label ); - // } - //} - return true; } @@ -221,91 +187,63 @@ // NCursesEvent & showSelectionPopup () // // -void NCPkgFilterContainer::showSelectionPopup( ) +void NCPkgFilterContainer::showContainerPackages( ) { -// postevent = NCursesEvent(); -// -// if ( !sel ) -// return postevent; -// -// sel->updateTable(); -// sel->setKeyboardFocus(); -// -// // event loop -// do { -// popupDialog(); -// } while ( postAgain() ); -// -// popdownDialog(); -// -// if ( !packager ) -// return postevent; -// -// // if OK is clicked get the current item and show the package list -// if ( postevent.detail == NCursesEvent::USERDEF ) -// { - int index = getCurrentItem(); - ZyppObj objPtr = getDataPointer( index ); - if ( objPtr ) - { - yuiMilestone() << "Current selection: " << getCurrentLine() << endl; - - // show the package list - std::set<std::string> packages; - ZyppPattern patPtr = tryCastToZyppPattern (objPtr); - //ZyppLang langPtr = tryCastToZyppLang (objPtr); - if (patPtr) - { - zypp::ui::PatternContents patternContents( patPtr ); - packager->FilterDescription()->setText ( showDescription( objPtr ) ); - packages = patternContents.install_packages(); - - } - #if 0 //FIXME - else if (langPtr) - { - string currentLang = langPtr->name(); - - for ( ZyppPoolIterator it = zyppPkgBegin(); it != zyppPkgEnd(); ++it ) + int index = getCurrentItem(); + ZyppObj objPtr = getDataPointer( index ); + if ( objPtr ) + { + yuiMilestone() << "Current selection: " << getCurrentLine() << endl; + + // show the package list + std::set<std::string> packages; + ZyppPattern patPtr = tryCastToZyppPattern (objPtr); + //ZyppLang langPtr = tryCastToZyppLang (objPtr); + if (patPtr) + { + zypp::ui::PatternContents patternContents( patPtr ); + packager->FilterDescription()->setText ( showDescription( objPtr ) ); + packages = patternContents.install_packages(); + + } + #if 0 //FIXME + else if (langPtr) + { + string currentLang = langPtr->name(); + + for ( ZyppPoolIterator it = zyppPkgBegin(); it != zyppPkgEnd(); ++it ) + { + ZyppObj zyppObj = (*it)->theObj(); + + if ( zyppObj ) { - ZyppObj zyppObj = (*it)->theObj(); - - if ( zyppObj ) + //find 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 ) { - //find 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 { - if ( (*cap_it).index() == currentLang ) // obj freshens this language + ZyppPkg pkg = tryCastToZyppPkg( zyppObj ); + + if ( pkg ) { - ZyppPkg pkg = tryCastToZyppPkg( zyppObj ); - - if ( pkg ) - { - NCDBG << "Found pkg " << pkg->name().c_str() << "for lang " - << currentLang.c_str() << endl; - - packages.insert( pkg->name() ); - } + NCDBG << "Found pkg " << pkg->name().c_str() << "for lang " + << currentLang.c_str() << endl; + + packages.insert( pkg->name() ); } } } } - - } + } + + } #endif - //packager->showSelPackages( getCurrentLine(), packages ); - showMetapackageContent( packages ); - // showDiskSpace() moved to NCPkgTable.cc (show/check diskspace -// // on every status change) -// // packager->showDiskSpace(); + showContainerContent( packages ); } -// } -// -// return postevent; } @@ -327,31 +265,6 @@ return ( selPtr?selPtr->summary(LOCALE):"" ); } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterContainer::preferredWidth -// METHOD TYPE : int -// -//int NCPkgFilterContainer::preferredWidth() -//{ -// return NCurses::cols()*2/3; -//} -// -///////////////////////////////////////////////////////////////////// -//// -//// -//// METHOD NAME : NCPkgFilterContainer::preferredHeight -//// METHOD TYPE : int -//// -//int NCPkgFilterContainer::preferredHeight() -//{ -// if ( NCurses::lines() > 20 ) -// return 20; -// else -// return NCurses::lines()-4; -//} - string NCPkgFilterContainer::showDescription( ZyppObj objPtr ) { switch (type) @@ -383,8 +296,6 @@ // NCursesEvent NCPkgFilterContainer::wHandleInput( wint_t ch ) { -// if ( ch == 27 ) // ESC -// return NCursesEvent::cancel; NCursesEvent ret = NCursesEvent::none; // call handleInput of NCPad @@ -398,7 +309,6 @@ case KEY_PPAGE: case KEY_END: case KEY_HOME: { - // show the corresponding information ret = NCursesEvent::handled; break; } @@ -407,41 +317,12 @@ ret = NCPkgTable::wHandleInput( ch ) ; } - showSelectionPopup( ); + showContainerPackages( ); return ret; } /////////////////////////////////////////////////////////////////// // -// -// METHOD NAME : NCPkgFilterContainer::postAgain -// METHOD TYPE : bool -// -// DESCRIPTION : -// -//bool NCPkgFilterContainer::postAgain( ) -//{ -// if( !postevent.widget ) -// return false; -// -// postevent.detail = NCursesEvent::NODETAIL; -// -// if ( postevent.widget == okButton ) -// { -// postevent.detail = NCursesEvent::USERDEF ; -// // return false means: close the popup -// return false; -// } -// -// if (postevent == NCursesEvent::cancel) -// return false; -// -// return true; -//} - - -/////////////////////////////////////////////////////////////////// -// // OrderFuncPattern // bool orderPattern( ZyppSel slb1, ZyppSel slb2 ) @@ -472,12 +353,12 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterContainer::fillSelectionList +// METHOD NAME : NCPkgFilterContainer::fillContainerList // METHOD TYPE : bool // // DESCRIPTION : // -bool NCPkgFilterContainer::fillSelectionList( /*NCPkgTable * sel,*/ SelType type ) +bool NCPkgFilterContainer::fillContainerList( SelType type ) { // if ( !sel ) // return false; @@ -527,7 +408,7 @@ } #endif default: - yuiError() << "Selecion type not handled: " << type << endl; + yuiError() << "Container type not handled: " << type << endl; } list<ZyppSel>::iterator listIt; @@ -538,8 +419,7 @@ pkgLine.clear(); switch (type) { - case S_Pattern: - case S_Selection: { + case S_Pattern: { pkgLine.push_back( resPtr->summary(LOCALE) ); // the description break; } @@ -554,7 +434,7 @@ addLine( (*listIt)->status(), // the status pkgLine, - resPtr, // ZyppSelection or ZyppPattern + resPtr, // ZyppPattern (*listIt) ); // ZyppSel } Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterContainer.h Thu Mar 27 15:34:37 2008 @@ -42,34 +42,24 @@ private: - NCPkgTable *sel; // selection list -// NCPushButton * okButton; - NCPackageSelector * packager; // connection to the PackageSelector, protected: std::string getCurrentLine(); - // virtual bool postAgain(); - virtual NCursesEvent wHandleInput( wint_t ch ); public: enum SelType { - S_Selection, S_Pattern, S_Language, S_Unknown }; - //NCPkgFilterContainer( const wpos at, NCPackageSelector * pkg, SelType type ); NCPkgFilterContainer( YWidget *parent, YTableHeader *header, NCPackageSelector * pkg, SelType type ); virtual ~NCPkgFilterContainer(); - - //virtual int preferredWidth(); - //virtual int preferredHeight(); void createLayout( YWidget *parent, const string & label ); @@ -77,16 +67,16 @@ * Fills the list with the available selections (and the status info) * @return bool */ - bool fillSelectionList ( /*NCPkgTable * table,*/ SelType type ); + bool fillContainerList ( SelType type ); - bool showMetapackageContent( const set<string> & wanted ); + bool showContainerContent( const set<string> & wanted ); string showDescription( ZyppObj objPtr ); /** * Shows the popup with the add ons (package categories). * @return NCursesEvent */ - void showSelectionPopup( ); + void showContainerPackages( ); private: Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.cc Thu Mar 27 15:34:37 2008 @@ -78,10 +78,7 @@ // // DESCRIPTION : // -//NCPkgFilterRPMGroups::NCPkgFilterRPMGroups( const wpos at, NCPackageSelector * pkg ) -// : NCPopup( at, false ) -// , filterTree( 0 ) -// , packager ( pkg ) + NCPkgFilterRPMGroups::NCPkgFilterRPMGroups( YWidget *parent, string label, NCPackageSelector * pkg ) : NCTree( parent, label ) , filterTree( this ) @@ -89,7 +86,6 @@ , _rpmGroupsTree (0) { // create the layout (the NCTree) - //createLayout( NCPkgStrings::RpmTreeLabel() ); setNotify(true); _rpmGroupsTree = new YRpmGroupsTree (); @@ -130,26 +126,6 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterRPMGroups::createList -// METHOD TYPE : void -// -// DESCRIPTION : -// -void NCPkgFilterRPMGroups::createLayout( const string & label ) -{ - // the vertical split is the (only) child of the dialog - NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - - // create the tree - filterTree = new NCTree( split, label ); - YUI_CHECK_NEW( filterTree ); - - filterTree->setNotify( true ); -} - -/////////////////////////////////////////////////////////////////// -// -// // METHOD NAME : NCPkgFilterRPMGroups::showFilterPopup // METHOD TYPE : void // @@ -157,49 +133,34 @@ // bool NCPkgFilterRPMGroups::handleEvent( ) { -// postevent = NCursesEvent(); -// -// // event loop -// do { -// popupDialog(); -// } while ( postAgain() ); -// -// popdownDialog(); -// -// if ( !packager || !filterTree ) -// return postevent; -// - YStringTreeItem * origItem; -// -// // get the currently selected rpm group and show the package list -// if ( postevent.detail == NCursesEvent::USERDEF ) -// { - const YTreeItem * item = filterTree->getCurrentItem(); - - if ( item ) - { - const NCRpmGroupItem * rpmGroupItem = dynamic_cast<const NCRpmGroupItem *>(item); - if ( rpmGroupItem ) - { - // get the original rpm group item (YStringTreeItem) - origItem = rpmGroupItem->getOrigItem(); - - if ( origItem ) - { - string label = origItem->value().translation(); - - // fill the package list - fillPackageList( label, origItem ); - - yuiMilestone() << "Selected RPM group: " << label << endl; - } - } - } - else - { - yuiError() << "Current item not valid" << endl; - } + YStringTreeItem * origItem; + const YTreeItem * item = filterTree->getCurrentItem(); + + if ( item ) + { + const NCRpmGroupItem * rpmGroupItem = dynamic_cast<const NCRpmGroupItem *>(item); + + if ( rpmGroupItem ) + { + // get the original rpm group item (YStringTreeItem) + origItem = rpmGroupItem->getOrigItem(); + + if ( origItem ) + { + string label = origItem->value().translation(); + + // fill the package list + showRPMGroupPackages( label, origItem ); + + yuiMilestone() << "Selected RPM group: " << label << endl; + } + } + } + else + { + yuiError() << "Current item not valid" << endl; + } return true; } @@ -245,7 +206,7 @@ } } -bool NCPkgFilterRPMGroups::fillPackageList ( const string & label, YStringTreeItem *rpmGroup ) +bool NCPkgFilterRPMGroups::showRPMGroupPackages ( const string & label, YStringTreeItem *rpmGroup ) { NCPkgTable * packageList = packager->PackageList(); @@ -313,33 +274,6 @@ return true; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterRPMGroups::preferredWidth -// METHOD TYPE : int -// -//int NCPkgFilterRPMGroups::preferredWidth() -//{ -// return NCurses::cols()/2; -//} -// -///////////////////////////////////////////////////////////////////// -//// -//// -//// METHOD NAME : NCPkgFilterRPMGroups::preferredHeight -//// METHOD TYPE : int -//// -//int NCPkgFilterRPMGroups::preferredHeight() -//{ -// int vdim; -// if ( NCurses::lines() > 20 ) -// vdim = 20; -// else -// vdim = NCurses::lines()-4; -// -// return vdim; -//} /////////////////////////////////////////////////////////////////// // @@ -361,21 +295,6 @@ } - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterRPMGroups::wHandleHotkey -// METHOD TYPE : NCursesEvent -// -// DESCRIPTION : -// -//NCursesEvent NCPkgFilterRPMGroups::wHandleHotkey( wint_t key ) -//{ -// -// return NCursesEvent::none; -//} -// ///////////////////////////////////////////////////////////////////// //// //// @@ -386,38 +305,8 @@ //// NCursesEvent NCPkgFilterRPMGroups::wHandleInput( wint_t ch ) { -// if ( ch == 27 ) // ESC -// return NCursesEvent::cancel; - return NCTree::wHandleInput( ch ); } -// -///////////////////////////////////////////////////////////////////// -//// -//// -//// METHOD NAME : NCPkgFilterRPMGroups::postAgain -//// METHOD TYPE : bool -//// -//// DESCRIPTION : -//// -//bool NCPkgFilterRPMGroups::postAgain() -//{ -// postevent.detail = NCursesEvent::NODETAIL; -// -// if ( postevent == NCursesEvent::button -// && postevent.reason == YEvent::Activated ) -// { -// postevent.detail = NCursesEvent::USERDEF ; -// -// // return false means: close the popup -// return false; -// } -// -// if ( postevent == NCursesEvent::cancel ) -// return false; -// -// return true; -//} /////////////////////////////////////////////////////////////////// // Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRPMGroups.h Thu Mar 27 15:34:37 2008 @@ -62,35 +62,23 @@ void setCurrentItem( int index ); - //virtual NCursesEvent wHandleHotkey( wint_t ch ); - - //virtual bool postAgain(); - virtual NCursesEvent wHandleInput( wint_t ch ); public: - //NCPkgFilterRPMGroups( const wpos at, NCPackageSelector * packager ); NCPkgFilterRPMGroups( YWidget *parent, string label, NCPackageSelector * packager ); virtual ~NCPkgFilterRPMGroups(); - //virtual int preferredWidth(); - //virtual int preferredHeight(); - - void createLayout( const string & label ); - bool handleEvent(); YStringTreeItem * getDefaultRpmGroup(); bool checkPackage( ZyppObj opkg, ZyppSel slb, YStringTreeItem *rpmGroup); - bool fillPackageList ( const string & label, YStringTreeItem *rpmGroup ); + bool showRPMGroupPackages ( const string & label, YStringTreeItem *rpmGroup ); void addItem( YTreeItem * newItem ); - //NCursesEvent showFilterPopup( ); - }; /////////////////////////////////////////////////////////////////// Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.cc Thu Mar 27 15:34:37 2008 @@ -38,7 +38,6 @@ NCPkgRepoTag::NCPkgRepoTag ( ZyppRepo repoPtr) : YTableCell(string(" ")) - //: NCTableCol (NCstring(" "), SEPARATOR) , repo (repoPtr) { @@ -58,6 +57,7 @@ ,packager(pkg) { fillHeader(); + fillRepoList(); } /////////////////////////////////////////////////////////////////// @@ -160,74 +160,6 @@ } } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterRepo::NCPkgFilterRepo -// METHOD TYPE : Constructor -// -// DESCRIPTION : -// - -//NCPkgFilterRepo::NCPkgFilterRepo (YWidget *parent, YTableHeader *header, NCPackageSelector *pkg) -// : NCPkgRepoTable ( parent, header ) -// //, repolist( 0 ) -// //, okButton( 0 ) -// , packager( pkg ) -//{ -// createLayout( parent ); -// -// fillRepoList( ); -//} -// -///////////////////////////////////////////////////////////////////// -//// -//// -//// METHOD NAME : NCPkgFilterRepo::~NCPkgFilterRepo -//// METHOD TYPE : Destructor -//// -//// DESCRIPTION : -//// -// -//NCPkgFilterRepo::~NCPkgFilterRepo() -//{ -// //NOP -//} -// -///////////////////////////////////////////////////////////////////// -//// -//// -//// METHOD NAME : NCPkgFilterRepo::createLayout -//// METHOD TYPE : void -//// -//// DESCRIPTION : Create visual layout of the popup window -//// (header label, NCPkgRepoTable, OK button) -//// -// -//void NCPkgFilterRepo::createLayout( YWidget *parent ) -//{ -// -// // the vertical split is the (only) child of the dialog -// // NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); -// -// //the headline -// //new NCLabel( split, label, true, false ); -// -// // the repositories table -// //YTableHeader *tableHeader = new YTableHeader(); -// //repolist = new NCPkgRepoTable( parent, tableHeader ); -// //repolist->fillHeader(); -// -// //new NCSpacing( split, YD_VERT, false, 0.4 ); -// -// ////the cute button -// //okButton = new NCPushButton( split, NCPkgStrings::OKLabel() ); -// //okButton->setFunctionKey(10); -// -// //new NCSpacing( split, YD_VERT, false, 0.4 ); -// -//} -// ///////////////////////////////////////////////////////////////////// //// //// @@ -275,8 +207,12 @@ return true; } -bool NCPkgRepoTable::fillRepoFilterList( ZyppRepo repo ) +bool NCPkgRepoTable::showRepoPackages( ) { + int index = getCurrentItem(); + ZyppRepo repo = getRepo( index ); + + yuiMilestone() << "Selected repository " << repo.info().alias().c_str() << endl; yuiMilestone() << "Collecting packages in selected repository" << endl; NCPkgTable *pkgList = packager->PackageList(); @@ -390,28 +326,6 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterRepo::nicesize -// METHOD TYPE : long -// -// DESCRIPTION : default boring setting nice size -// - -////int NCPkgFilterRepo::preferredWidth() -////{ -//// return NCurses::cols()*2/3; -////} -//// -////int NCPkgFilterRepo::preferredHeight() -////{ -//// if ( NCurses::lines() > 20 ) -//// return 20; -//// else -//// return NCurses::lines()-4; -////} -// -/////////////////////////////////////////////////////////////////// -// -// // METHOD NAME : NCPkgFilterRepo::wHandleInput // METHOD TYPE : NCursesEvent // @@ -420,81 +334,26 @@ NCursesEvent NCPkgRepoTable::wHandleInput( wint_t ch ) { - //if ( ch == 27 ) // ESC - // return NCursesEvent::cancel; - + NCursesEvent ret = NCursesEvent::none; + handleInput( ch ); - NCursesEvent ret = NCTable::wHandleInput( ch ); - showRepoPopup(); + switch ( ch ) + { + case KEY_UP: + case KEY_DOWN: + case KEY_NPAGE: + case KEY_PPAGE: + case KEY_END: + case KEY_HOME: { + ret = NCursesEvent::handled; + showRepoPackages(); + break; + } + + default: + ret = NCTable::wHandleInput( ch ) ; + } return ret; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterRepo::postAgain -// METHOD TYPE : bool -// -// DESCRIPTION : default boring postAgain -// - -//bool NCPkgFilterRepo::postAgain() -//{ -// if( !postevent.widget ) -// return false; -// -// postevent.detail = NCursesEvent::NODETAIL; -// -// if ( postevent.widget == okButton ) -// { -// postevent.detail = NCursesEvent::USERDEF ; -// // return false means: close the popup -// return false; -// } -// -// if (postevent == NCursesEvent::cancel) -// return false; -// -// return true; -//} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterRepo::showRepoPopup -// METHOD TYPE : NCursesEvent & -// -// DESCRIPTION : Do actual work - show popup to the user, -// collect packages for selected repository -// (calls NCPackageSelector::fillRepoFilterList) -// - -bool NCPkgRepoTable::showRepoPopup() -{ -// postevent = NCursesEvent(); -// -// if (!repolist) -// return postevent; -// -// do { -// popupDialog(); -// } while ( postAgain() ); -// -// popdownDialog(); - -// if ( postevent.detail == NCursesEvent::USERDEF ) -// { - //get current table line and its repository reference - int index = getCurrentItem(); - ZyppRepo repo = getRepo( index ); - - yuiMilestone() << "Selected repository " << repo.info().alias().c_str() << endl; - - //and show associated packages to the user - fillRepoFilterList( repo ); - -// } -// return postevent; - return true; -} Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterRepo.h Thu Mar 27 15:34:37 2008 @@ -116,68 +116,26 @@ ZyppRepo getRepo( int index ); -//class NCPkgPopupRepo : public NCPkgRepoTable { -// -// NCPkgPopupRepo & operator=( const NCPkgPopupRepo & ); -// NCPkgPopupRepo ( const NCPkgPopupRepo &); -// -//private: -//// NCPkgRepoTable *repolist; -//// NCPushButton *okButton; -// -//protected: -// -// virtual bool postAgain(); -// + virtual NCursesEvent wHandleInput ( wint_t ch ); -// -//public: -// /** -// * Repository table popup class, holds repository table data, -// * creates layout, processes user input -// * @param at Where to draw the popup -// * @param pkger Connection to package selector -// */ -// NCPkgPopupRepo ( YWidget *parent, YTableHeader *header, NCPackageSelector *pkger); -// -// virtual ~NCPkgPopupRepo(); -// -// /** -// * Find single zypp::Product for this repository -// * (null product if multiple products found) -// * @param repo zypp::Repository -// * @return ZyppProduct -// */ -// + + /** + * Find single zypp::Product for this repository + * (null product if multiple products found) + * @param repo zypp::Repository + * @return ZyppProduct + */ + ZyppProduct findProductForRepo (ZyppRepo repo); -// -// //virtual int preferredWidth(); -// -// //virtual int preferredHeight(); -// -// /** -// * Create visual layout of the popup window -// * (header label, NCPkgRepoTable, OK button) -// * @param label Header label -// */ -// -// void createLayout( YWidget *parent ); -// -// /** -// * Add items to the repository list (assoc. -// * product name, if any, and URL) -// * @return bool (always true ;-) ) -// */ + + /** + * Add items to the repository list (assoc. + * product name, if any, and URL) + * @return bool (always true ;-) ) + */ bool fillRepoList( ); - bool fillRepoFilterList( ZyppRepo repo ); -// -// /** -// * Do actual work - show popup to the user, -// * collect packages for selected repository -// * (calls NCPackageSelector::fillRepoFilterList) -// * @return NCursesEvent -// */ - bool showRepoPopup(); + bool showRepoPackages( ); + }; #endif Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.cc Thu Mar 27 15:34:37 2008 @@ -51,24 +51,13 @@ // // DESCRIPTION : // -//NCPkgFilterSearch::NCPkgFilterSearch( const wpos at, NCPackageSelector * pkger ) -// : NCPopup( at, false ) NCPkgFilterSearch::NCPkgFilterSearch( YWidget *parent, YUIDimension dim, NCPackageSelector *pkger ) : NCLayoutBox( parent, dim ) , searchExpr( 0 ) , ignoreCase( 0 ) - , checkName( 0 ) - , checkSummary( 0 ) - , checkDescr( 0 ) - , checkProvides( 0 ) - , checkRequires( 0 ) - , cancelButton( 0 ) , searchButton( 0 ) , packager( pkger ) { - // if ( !packager->isYouMode() ) - // createLayout( _( "Package Search" ) ); - // else createLayout( parent ); } @@ -94,14 +83,6 @@ // void NCPkgFilterSearch::createLayout( YWidget *parent ) { - // vertical split is the (only) child of the dialog - //NCLayoutBox * vSplit = new NCLayoutBox( parent, YD_VERT ); - -// new NCSpacing( vSplit, YD_VERT, false, 0.8 ); // stretchable = false - - // new NCLabel( vSplit, headline, true, false ); // isHeading = true - - // new NCSpacing( vSplit, YD_VERT, false, 0.6 ); NCFrame * frame0 = new NCFrame( this, "" ); @@ -127,77 +108,15 @@ if ( !packager->isYouMode() ) { // add the checkBox ignore case - //NCLayoutBox * hSplit2 = new NCLayoutBox( this, YD_HORIZ ); NCAlignment *left = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); ignoreCase = new NCCheckBox( left, NCPkgStrings::IgnoreCase(), true ); new NCSpacing( vSplit, YD_VERT, true, 0.5 ); -// new NCSpacing( this, YD_VERT, false, 0.6 ); - - // label of a frame in search popup (without hotkey) - #if 0 - NCFrame * frame = new NCFrame( this, _( " Search in " ) ); - NCLayoutBox * vSplit3 = new NCLayoutBox( frame, YD_VERT ); - - checkName = new NCCheckBox( vSplit3, NCPkgStrings::CheckName(), true ); - checkName->setStretchable(YD_HORIZ, true ); - - checkSummary = new NCCheckBox( vSplit3, NCPkgStrings::CheckSummary(), true ); - checkSummary->setStretchable(YD_HORIZ, true ); - - checkDescr = new NCCheckBox( vSplit3, NCPkgStrings::CheckDescr(), false ); - checkDescr->setStretchable(YD_HORIZ, true ); - checkProvides = new NCCheckBox( vSplit3, NCPkgStrings::CheckProvides(), false ); - checkProvides->setStretchable(YD_HORIZ, true ); - - checkRequires = new NCCheckBox( vSplit3, NCPkgStrings::CheckRequires(), false ); - checkRequires->setStretchable(YD_HORIZ, true ); - #endif - -// new NCSpacing( this, YD_VERT, false, 0.8 ); } - - //NCLayoutBox * hSplit3 = new NCLayoutBox( vSplit, YD_HORIZ ); - - //new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - - //// add the cancel and the ok button - //okButton = new NCPushButton( hSplit3, NCPkgStrings::OKLabel() ); - //okButton->setFunctionKey( 10 ); - - //new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); - - //cancelButton = new NCPushButton( hSplit3, NCPkgStrings::CancelLabel() ); - //cancelButton->setFunctionKey( 9 ); - // - //new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - + } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterSearch::showSearchPopup -// METHOD TYPE : void -// -// DESCRIPTION : -// -//NCursesEvent & NCPkgFilterSearch::showSearchPopup( ) -//{ -// postevent = NCursesEvent(); -// do { -// popupDialog(); -// if ( searchExpr ) -// { -// searchExpr->setKeyboardFocus(); -// } -// } while ( postAgain() ); -// -// popdownDialog(); -// -// return postevent; -//} /////////////////////////////////////////////////////////////////// // @@ -214,12 +133,6 @@ // value = searchExpr->getValue(); value = searchExpr->text(); - i = searchExpr->getListSize(); -#if 0 - searchExpr->itemAdded( value, // the search expression - i, // index - true ); // selected -#endif searchExpr->addItem( value, true ); } @@ -332,32 +245,7 @@ return true; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgFilterSearch::niceSize -// METHOD TYPE : void -// -// DESCRIPTION : -// -//long NCPkgFilterSearch::nicesize(YUIDimension dim) -//{ -// long vdim; -// -// if ( !packager->isYouMode() ) -// { -// if ( NCurses::lines() > 20 ) -// vdim = 20; -// else -// vdim = NCurses::lines()-4; -// } -// else -// { -// vdim = 10; -// } -// -// return ( dim == YD_HORIZ ? NCurses::cols()/2 : vdim ); -//} + /////////////////////////////////////////////////////////////////// // // @@ -369,18 +257,13 @@ NCursesEvent NCPkgFilterSearch::wHandleInput( wint_t ch ) { NCursesEvent ret = NCursesEvent::none; - if ( ch == 27 ) // ESC - ret = NCursesEvent::cancel; // start package search if Return is pressed - else if ( ch == KEY_RETURN ) + if ( ch == KEY_RETURN ) ret = NCursesEvent::button; else ret = NCWidget::wHandleInput( ch ); - if (ret.widget == searchButton) - yuiError() << "porn bat" << endl; - return ret; } @@ -392,48 +275,28 @@ // // DESCRIPTION : // -bool NCPkgFilterSearch::postAgain() +bool NCPkgFilterSearch::showSearchResultPackages() { - // if ( ! postevent.widget ) - // return false; - - // postevent.result = ""; - - // if ( postevent.widget == cancelButton ) - // { - // postevent = NCursesEvent::cancel; - // } -// else if ( postevent == NCursesEvent::button ) -// { -// // get the search expression -// postevent.result = getSearchExpression(); -// - NCPkgSearchSettings *settings = packager->SearchSettings(); - string filter = getSearchExpression(); -// - if ( !packager->isYouMode() ) - { - // fill the package list with packages matching the search expression - fillSearchList( filter, - getCheckBoxValue( ignoreCase ), - settings->doCheckName(), - settings->doCheckSummary(), - settings->doCheckDescr(), - settings->doCheckProvides(), - settings->doCheckRequires() - ); - } - else - { - packager->fillPatchSearchList( filter ); - } -// } + NCPkgSearchSettings *settings = packager->SearchSettings(); + string filter = getSearchExpression(); + + if ( !packager->isYouMode() ) + { + // fill the package list with packages matching the search expression + fillSearchList( filter, + getCheckBoxValue( ignoreCase ), + settings->doCheckName(), + settings->doCheckSummary(), + settings->doCheckDescr(), + settings->doCheckProvides(), + settings->doCheckRequires() + ); + } + else + { + packager->fillPatchSearchList( filter ); + } - // if ( postevent == NCursesEvent::button || postevent == NCursesEvent::cancel ) - // { - // // return false means: close the popup dialog - // return false; - // } return true; } @@ -445,10 +308,6 @@ { value = checkBox->value(); - // return whether the option is selected or not - //if ( !value.isNull() ) - // return ( value->asBoolean()->toString() == "true" ? true : false ); - return ( value == YCheckBox_on ? true : false ); } Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgFilterSearch.h Thu Mar 27 15:34:37 2008 @@ -52,14 +52,7 @@ NCComboBox * searchExpr; NCCheckBox * ignoreCase; - NCCheckBox * checkName; - NCCheckBox * checkSummary; - NCCheckBox * checkDescr; - NCCheckBox * checkProvides; - NCCheckBox * checkRequires; - NCPushButton * cancelButton; - NCPushButton * okButton; NCPushButton * searchButton; NCPackageSelector * packager; // connection to the package selector @@ -75,18 +68,14 @@ public: - //NCPkgFilterSearch( const wpos at, NCPackageSelector *pkger ); NCPkgFilterSearch( YWidget *parent, YUIDimension dim, NCPackageSelector *pkger ); virtual ~NCPkgFilterSearch(); - //virtual long nicesize(YUIDimension dim); - void createLayout( YWidget *parent ); - virtual bool postAgain(); + virtual bool showSearchResultPackages(); bool match ( string s1, string s2, bool ignoreCase ); - // NCursesEvent & showSearchPopup( ); bool fillSearchList( const string & expr, bool ignoreCase, bool checkName, -- 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] r45796 - /tags/stable-2_16_22/pkg-bindings/
by lslezak＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: lslezak Date: Thu Mar 27 15:17:14 2008 New Revision: 45796 URL: http://svn.opensuse.org/viewcvs/yast?rev=45796&view=rev Log: Created tag stable-2_16_22 for pkg-bindings Added: tags/stable-2_16_22/pkg-bindings/ - copied from r45795, trunk/pkg-bindings/ -- 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] r45795 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn.opensuse.org 27 Mar '08

27 Mar '08

Author: lslezak Date: Thu Mar 27 15:17:09 2008 New Revision: 45795 URL: http://svn.opensuse.org/viewcvs/yast?rev=45795&view=rev Log: - 2.16.22 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=45795&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Mar 27 15:17:09 2008 @@ -1 +1 @@ -2.16.21 +2.16.22 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Mar 27 15:17:09 2008 @@ -5,6 +5,7 @@ Pkg::SourceRaisePriority(), added "priority" key in Pkg::SourceEditSet(), Pkg::SourceEditGet() and Pkg::SourceGeneralData() (bnc#369827) +- 2.16.22 ------------------------------------------------------------------- Tue Mar 25 10:33:48 CET 2008 - lslezak(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