January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r54393 - in /branches/SuSE-Code-11-Branch/pkg-bindings: package/ src/
by lslezak＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: lslezak Date: Tue Jan 6 12:43:53 2009 New Revision: 54393 URL: http://svn.opensuse.org/viewcvs/yast?rev=54393&view=rev Log: - Translate the help texts displayed when loading/saving the package manager (bnc#446054) Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Create.cc branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Download.cc branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Load.cc branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Save.cc branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Set.cc branches/SuSE-Code-11-Branch/pkg-bindings/src/Target_Load.cc Modified: branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Tue Jan 6 12:43:53 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 6 12:30:01 CET 2009 - lslezak(a)suse.cz + +- Translate the help texts displayed when loading/saving the + package manager (bnc#446054) + +------------------------------------------------------------------- Mon Dec 15 13:14:06 CET 2008 - lslezak(a)suse.cz - Pkg::SetSolverFlags() - support for "reset" key in the map Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Create.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Create.cc Tue Jan 6 12:43:53 2009 @@ -620,7 +620,7 @@ stages.push_back(_("Load Data")); } - pkgprogress.Start(_("Adding the Repository..."), stages, HelpTexts::create_help); + pkgprogress.Start(_("Adding the Repository..."), stages, _(HelpTexts::create_help)); zypp::ProgressData prg(100); prg.sendTo(pkgprogress.Receiver()); Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Download.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Download.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Download.cc Tue Jan 6 12:43:53 2009 @@ -408,7 +408,7 @@ prog_total.sendTo(pkgprogress.Receiver()); // 3 steps per repository (download, cache rebuild, load resolvables) - pkgprogress.Start(_("Refreshing Repository..."), stages, HelpTexts::refresh_help); + pkgprogress.Start(_("Refreshing Repository..."), stages, _(HelpTexts::refresh_help)); try { Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Load.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Load.cc Tue Jan 6 12:43:53 2009 @@ -170,7 +170,7 @@ PkgProgress pkgprogress(_callbackHandler); // 3 steps per repository (download, cache rebuild, load resolvables) - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables)); YCPValue ret = SourceLoadImpl(pkgprogress); @@ -458,7 +458,7 @@ stages.push_back(_("Load Data")); // 3 steps per repository (download, cache rebuild, load resolvables) - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables)); } YCPValue ret = SourceStartManagerImpl(enable, pkgprogress); Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Save.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Save.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Save.cc Tue Jan 6 12:43:53 2009 @@ -142,7 +142,7 @@ prog_total.sendTo(pkgprogress.Receiver()); // start the process - pkgprogress.Start(_("Saving Repositories..."), stages, HelpTexts::save_help); + pkgprogress.Start(_("Saving Repositories..."), stages, _(HelpTexts::save_help)); // remove deleted repos (the old configurations) at first for (RepoCont::iterator it = repos.begin(); Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Set.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Set.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Source_Set.cc Tue Jan 6 12:43:53 2009 @@ -80,7 +80,7 @@ prog_total.sendTo(pkgprogress.Receiver()); zypp::CombinedProgressData load_subprogress(prog_total, 100); - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables)); success = LoadResolvablesFrom(repo->repoInfo(), load_subprogress); } Modified: branches/SuSE-Code-11-Branch/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pkg-bindi… ============================================================================== --- branches/SuSE-Code-11-Branch/pkg-bindings/src/Target_Load.cc (original) +++ branches/SuSE-Code-11-Branch/pkg-bindings/src/Target_Load.cc Tue Jan 6 12:43:53 2009 @@ -59,7 +59,7 @@ stages.push_back(_("Read Installed Packages")); PkgProgress pkgprogress(_callbackHandler); - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_target); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_target)); try { @@ -175,7 +175,7 @@ PkgProgress pkgprogress(_callbackHandler); - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_target); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_target)); try { -- 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] r54392 - in /trunk/pkg-bindings: package/yast2-pkg-bindings.changes src/Source_Create.cc src/Source_Download.cc src/Source_Load.cc src/Source_Save.cc src/Source_Set.cc src/Target_Load.cc
by lslezak＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: lslezak Date: Tue Jan 6 12:43:32 2009 New Revision: 54392 URL: http://svn.opensuse.org/viewcvs/yast?rev=54392&view=rev Log: - Translate the help texts displayed when loading/saving the package manager (bnc#446054) Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source_Create.cc trunk/pkg-bindings/src/Source_Download.cc trunk/pkg-bindings/src/Source_Load.cc trunk/pkg-bindings/src/Source_Save.cc trunk/pkg-bindings/src/Source_Set.cc trunk/pkg-bindings/src/Target_Load.cc 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 Tue Jan 6 12:43:32 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 6 12:30:01 CET 2009 - lslezak(a)suse.cz + +- Translate the help texts displayed when loading/saving the + package manager (bnc#446054) + +------------------------------------------------------------------- Mon Dec 22 16:49:36 CET 2008 - lslezak(a)suse.cz - call the refresh callbacks only when there is something to Modified: trunk/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Create.c… ============================================================================== --- trunk/pkg-bindings/src/Source_Create.cc (original) +++ trunk/pkg-bindings/src/Source_Create.cc Tue Jan 6 12:43:32 2009 @@ -620,7 +620,7 @@ stages.push_back(_("Load Data")); } - pkgprogress.Start(_("Adding the Repository..."), stages, HelpTexts::create_help); + pkgprogress.Start(_("Adding the Repository..."), stages, _(HelpTexts::create_help)); zypp::ProgressData prg(100); prg.sendTo(pkgprogress.Receiver()); Modified: trunk/pkg-bindings/src/Source_Download.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Download… ============================================================================== --- trunk/pkg-bindings/src/Source_Download.cc (original) +++ trunk/pkg-bindings/src/Source_Download.cc Tue Jan 6 12:43:32 2009 @@ -408,7 +408,7 @@ prog_total.sendTo(pkgprogress.Receiver()); // 3 steps per repository (download, cache rebuild, load resolvables) - pkgprogress.Start(_("Refreshing Repository..."), stages, HelpTexts::refresh_help); + pkgprogress.Start(_("Refreshing Repository..."), stages, _(HelpTexts::refresh_help)); try { Modified: trunk/pkg-bindings/src/Source_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Load.cc (original) +++ trunk/pkg-bindings/src/Source_Load.cc Tue Jan 6 12:43:32 2009 @@ -170,7 +170,7 @@ PkgProgress pkgprogress(_callbackHandler); // 3 steps per repository (download, cache rebuild, load resolvables) - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables)); YCPValue ret = SourceLoadImpl(pkgprogress); @@ -468,7 +468,7 @@ stages.push_back(_("Load Data")); // 3 steps per repository (download, cache rebuild, load resolvables) - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables)); } YCPValue ret = SourceStartManagerImpl(enable, pkgprogress); Modified: trunk/pkg-bindings/src/Source_Save.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Save.cc?… ============================================================================== --- trunk/pkg-bindings/src/Source_Save.cc (original) +++ trunk/pkg-bindings/src/Source_Save.cc Tue Jan 6 12:43:32 2009 @@ -142,7 +142,7 @@ prog_total.sendTo(pkgprogress.Receiver()); // start the process - pkgprogress.Start(_("Saving Repositories..."), stages, HelpTexts::save_help); + pkgprogress.Start(_("Saving Repositories..."), stages, _(HelpTexts::save_help)); // remove deleted repos (the old configurations) at first for (RepoCont::iterator it = repos.begin(); Modified: trunk/pkg-bindings/src/Source_Set.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source_Set.cc?r… ============================================================================== --- trunk/pkg-bindings/src/Source_Set.cc (original) +++ trunk/pkg-bindings/src/Source_Set.cc Tue Jan 6 12:43:32 2009 @@ -80,7 +80,7 @@ prog_total.sendTo(pkgprogress.Receiver()); zypp::CombinedProgressData load_subprogress(prog_total, 100); - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_resolvables); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_resolvables)); success = LoadResolvablesFrom(repo->repoInfo(), load_subprogress); } Modified: trunk/pkg-bindings/src/Target_Load.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Target_Load.cc?… ============================================================================== --- trunk/pkg-bindings/src/Target_Load.cc (original) +++ trunk/pkg-bindings/src/Target_Load.cc Tue Jan 6 12:43:32 2009 @@ -59,7 +59,7 @@ stages.push_back(_("Read Installed Packages")); PkgProgress pkgprogress(_callbackHandler); - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_target); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_target)); try { @@ -175,7 +175,7 @@ PkgProgress pkgprogress(_callbackHandler); - pkgprogress.Start(_("Loading the Package Manager..."), stages, HelpTexts::load_target); + pkgprogress.Start(_("Loading the Package Manager..."), stages, _(HelpTexts::load_target)); try { -- 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] r54391 - in /branches/SuSE-Code-11-Branch/ncurses-pkg/src: NCPkgTable.cc NCPkgTable.h
by kmachalkova＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: kmachalkova Date: Tue Jan 6 12:37:18 2009 New Revision: 54391 URL: http://svn.opensuse.org/viewcvs/yast?rev=54391&view=rev Log: Fixed crash after pressing some keys handled by parent class - PkgTable items did not contain correct references to YTableItems (I wonder how it might have worked so far :)) (#462961) Modified: branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.cc branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.h Modified: branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses-p… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.cc (original) +++ branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.cc Tue Jan 6 12:37:18 2009 @@ -43,38 +43,15 @@ // NCPkgTableTag::NCPkgTableTag( ZyppObj objPtr, ZyppSel selPtr, ZyppStatus stat ) - : NCTableCol( NCstring( " " ), SEPARATOR ) + : YTableCell( " " ) , status ( stat ) , dataPointer( objPtr ) , selPointer( selPtr ) { - -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgTableTag::DrawAt -// METHOD TYPE : virtual DrawAt -// -// DESCRIPTION : -// -void NCPkgTableTag::DrawAt( NCursesWindow & w, const wrect at, - NCTableStyle & tableStyle, - NCTableLine::STATE linestate, - unsigned colidx ) const -{ - NCTableCol::DrawAt( w, at, tableStyle, linestate, colidx ); - - string statusStr = statusToStr( status ); - w.addch( at.Pos.L, at.Pos.C, statusStr.c_str()[0] ); - w.addch( at.Pos.L, at.Pos.C +1, statusStr.c_str()[1] ); - w.addch( at.Pos.L, at.Pos.C +2, statusStr.c_str()[2] ); - w.addch( at.Pos.L, at.Pos.C +3, statusStr.c_str()[3] ); + setLabel( statusToString(stat) ); } - -string NCPkgTableTag::statusToStr( ZyppStatus stat ) const +string NCPkgTableTag::statusToString( ZyppStatus stat ) const { // convert ZyppStatus to string switch ( stat ) @@ -156,16 +133,18 @@ ZyppObj objPtr, ZyppSel slbPtr ) { - vector<NCTableCol*> Items( elements.size()+1, 0 ); + YTableItem *tabItem = new YTableItem(); // fill first column (containing the status information and the package pointers) - Items[0] = new NCPkgTableTag( objPtr, slbPtr, stat ); + tabItem->addCell( new NCPkgTableTag( objPtr, slbPtr, stat )); + for ( unsigned i = 1; i < elements.size()+1; ++i ) { - // NCTableCol has NCstring argument to enforce 'utf8' encoding - Items[i] = new NCTableCol( elements[i-1] ); + tabItem->addCell( elements[i-1] ); } - myPad()->Append( Items ); + + addItem(tabItem); + yuiMilestone() << "adding line" << endl; // don't call DrawPad(); for every line - is called once after the loop @@ -392,7 +371,9 @@ } // get first column (the column containing the status info) - NCPkgTableTag * cc = static_cast<NCPkgTableTag *>( cl->GetCol( 0 ) ); + YTableItem *it = dynamic_cast<YTableItem*> (cl->origItem() ); + YTableCell *tcell = it->cell(0); + NCPkgTableTag * cc = static_cast<NCPkgTableTag*>( tcell ); // get the object pointer ZyppSel slbPtr = getSelPointer( index ); ZyppObj objPtr = getDataPointer( index ); @@ -422,7 +403,9 @@ // set new status (if status has changed) if ( getStatus(index) != newstatus ) { + int index = getCurrentItem(); cc->setStatus( newstatus ); + cellChanged( index, 0, cc->statusToString (newstatus) ); } } } @@ -875,7 +858,9 @@ return 0; // get first column (the column containing the status info) - NCPkgTableTag * cc = static_cast<NCPkgTableTag *>( cl->GetCol( 0 ) ); + YTableItem *it = dynamic_cast<YTableItem*> (cl->origItem() ); + YTableCell *tcell = it->cell(0); + NCPkgTableTag * cc = static_cast<NCPkgTableTag *>( tcell ); return cc; } Modified: branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ncurses-p… ============================================================================== --- branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.h (original) +++ branches/SuSE-Code-11-Branch/ncurses-pkg/src/NCPkgTable.h Tue Jan 6 12:37:18 2009 @@ -41,7 +41,7 @@ * not installed, to be deleted and so on). * **/ -class NCPkgTableTag : public NCTableCol { +class NCPkgTableTag : public YTableCell { private: @@ -49,9 +49,6 @@ ZyppObj dataPointer; // cannot get at it from dataPointer ZyppSel selPointer; - - // returns the corresponding string value to given package status - string statusToStr( ZyppStatus stat ) const; public: @@ -59,15 +56,13 @@ ZyppSel selPtr, ZyppStatus stat = S_NoInst ); - virtual ~NCPkgTableTag() {} - - virtual void DrawAt( NCursesWindow & w, const wrect at, - NCTableStyle & tableStyle, - NCTableLine::STATE linestate, - unsigned colidx ) const; + ~NCPkgTableTag() {} - void setStatus( ZyppStatus stat ) { status = stat; } + void setStatus( ZyppStatus stat ) { status = stat; } ZyppStatus getStatus() const { return status; } + // returns the corresponding string value to given package status + string statusToString( ZyppStatus stat ) const; + ZyppObj getDataPointer() const { return dataPointer; } ZyppSel getSelPointer() const { return selPointer; } }; -- 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] r54390 - in /trunk/yast2: library/types/src/String.ycp library/types/testsuite/tests/String.out library/types/testsuite/tests/String.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: jsrain Date: Tue Jan 6 12:17:57 2009 New Revision: 54390 URL: http://svn.opensuse.org/viewcvs/yast?rev=54390&view=rev Log: added String::RemoveShortcut to allow using widget labels in help texts to ensure translations are in sync (bnc #307220) Modified: trunk/yast2/library/types/src/String.ycp trunk/yast2/library/types/testsuite/tests/String.out trunk/yast2/library/types/testsuite/tests/String.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/String.y… ============================================================================== --- trunk/yast2/library/types/src/String.ycp (original) +++ trunk/yast2/library/types/src/String.ycp Tue Jan 6 12:17:57 2009 @@ -1242,5 +1242,18 @@ return ret; } +/** + * Remove a shortcut from a label, so that it can be inserted into help + * to avoid risk of different translation of the label + * @param label string a label possibly including a shortcut + * @return string the label without the shortcut mark + */ +global string RemoveShortcut (string label) { + string ret = label; + if (regexpmatch (label, "^(.*[^&])?(&&)*&[[:alnum:]].*$")) + ret = regexpsub (label, "^((.*[^&])?(&&)*)&([[:alnum:]].*)$", "\\1\\4"); + return ret; +} + /* EOF */ } Modified: trunk/yast2/library/types/testsuite/tests/String.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/String.out (original) +++ trunk/yast2/library/types/testsuite/tests/String.out Tue Jan 6 12:17:57 2009 @@ -110,3 +110,16 @@ Dump Strings::EscapeTags Return text & another Return 2 > 1 +Dump Strings::RemoveShortcut +Return Hello +Return Hello +Return He&&llo +Return He&&llo +Return He&&&&llo +Return He&&&&llo +Return Hello +Return &&Hello +Return &&Hello +Return &&&&Hello +Return &&&&Hello +Return &&Hello Modified: trunk/yast2/library/types/testsuite/tests/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/testsuite/te… ============================================================================== --- trunk/yast2/library/types/testsuite/tests/String.ycp (original) +++ trunk/yast2/library/types/testsuite/tests/String.ycp Tue Jan 6 12:17:57 2009 @@ -148,4 +148,18 @@ DUMP("Strings::EscapeTags"); TEST(``(String::EscapeTags("text & another")), [], nil); TEST(``(String::EscapeTags("2 > 1")), [], nil); + +DUMP("Strings::RemoveShortcut"); +TEST(``(String::RemoveShortcut("Hello")), [], nil); +TEST(``(String::RemoveShortcut("He&llo")), [], nil); +TEST(``(String::RemoveShortcut("He&&llo")), [], nil); +TEST(``(String::RemoveShortcut("He&&&llo")), [], nil); +TEST(``(String::RemoveShortcut("He&&&&llo")), [], nil); +TEST(``(String::RemoveShortcut("He&&&&&llo")), [], nil); +TEST(``(String::RemoveShortcut("&Hello")), [], nil); +TEST(``(String::RemoveShortcut("&&Hello")), [], nil); +TEST(``(String::RemoveShortcut("&&&Hello")), [], nil); +TEST(``(String::RemoveShortcut("&&&&Hello")), [], nil); +TEST(``(String::RemoveShortcut("&&&&&Hello")), [], nil); +TEST(``(String::RemoveShortcut("&&He&llo")), [], nil); } 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 Tue Jan 6 12:17:57 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 6 12:12:09 CET 2009 - jsrain(a)suse.cz + +- added String::RemoveShortcut to allow using widget labels in help + texts to ensure translations are in sync (bnc #307220) + +------------------------------------------------------------------- Tue Dec 30 14:37:45 CET 2008 - lslezak(a)suse.cz - use "Installed Size" label in the summary table during package -- 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] r54389 - in /trunk/ncurses-pkg/src: NCPkgTable.cc NCPkgTable.h
by kmachalkova＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: kmachalkova Date: Tue Jan 6 11:09:35 2009 New Revision: 54389 URL: http://svn.opensuse.org/viewcvs/yast?rev=54389&view=rev Log: Fixed crash after pressing some keys handled by parent class - PkgTable items did not contain correct references to YTableItems (I wonder how it might have worked so far :)) (#462961) Modified: trunk/ncurses-pkg/src/NCPkgTable.cc trunk/ncurses-pkg/src/NCPkgTable.h Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Tue Jan 6 11:09:35 2009 @@ -43,38 +43,15 @@ // NCPkgTableTag::NCPkgTableTag( ZyppObj objPtr, ZyppSel selPtr, ZyppStatus stat ) - : NCTableCol( NCstring( " " ), SEPARATOR ) + : YTableCell( " " ) , status ( stat ) , dataPointer( objPtr ) , selPointer( selPtr ) { - -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCPkgTableTag::DrawAt -// METHOD TYPE : virtual DrawAt -// -// DESCRIPTION : -// -void NCPkgTableTag::DrawAt( NCursesWindow & w, const wrect at, - NCTableStyle & tableStyle, - NCTableLine::STATE linestate, - unsigned colidx ) const -{ - NCTableCol::DrawAt( w, at, tableStyle, linestate, colidx ); - - string statusStr = statusToStr( status ); - w.addch( at.Pos.L, at.Pos.C, statusStr.c_str()[0] ); - w.addch( at.Pos.L, at.Pos.C +1, statusStr.c_str()[1] ); - w.addch( at.Pos.L, at.Pos.C +2, statusStr.c_str()[2] ); - w.addch( at.Pos.L, at.Pos.C +3, statusStr.c_str()[3] ); + setLabel( statusToString(stat) ); } - -string NCPkgTableTag::statusToStr( ZyppStatus stat ) const +string NCPkgTableTag::statusToString( ZyppStatus stat ) const { // convert ZyppStatus to string switch ( stat ) @@ -156,16 +133,18 @@ ZyppObj objPtr, ZyppSel slbPtr ) { - vector<NCTableCol*> Items( elements.size()+1, 0 ); + YTableItem *tabItem = new YTableItem(); // fill first column (containing the status information and the package pointers) - Items[0] = new NCPkgTableTag( objPtr, slbPtr, stat ); + tabItem->addCell( new NCPkgTableTag( objPtr, slbPtr, stat )); + for ( unsigned i = 1; i < elements.size()+1; ++i ) { - // NCTableCol has NCstring argument to enforce 'utf8' encoding - Items[i] = new NCTableCol( elements[i-1] ); + tabItem->addCell( elements[i-1] ); } - myPad()->Append( Items ); + + addItem(tabItem); + yuiMilestone() << "adding line" << endl; // don't call DrawPad(); for every line - is called once after the loop @@ -392,7 +371,9 @@ } // get first column (the column containing the status info) - NCPkgTableTag * cc = static_cast<NCPkgTableTag *>( cl->GetCol( 0 ) ); + YTableItem *it = dynamic_cast<YTableItem*> (cl->origItem() ); + YTableCell *tcell = it->cell(0); + NCPkgTableTag * cc = static_cast<NCPkgTableTag*>( tcell ); // get the object pointer ZyppSel slbPtr = getSelPointer( index ); ZyppObj objPtr = getDataPointer( index ); @@ -422,7 +403,9 @@ // set new status (if status has changed) if ( getStatus(index) != newstatus ) { + int index = getCurrentItem(); cc->setStatus( newstatus ); + cellChanged( index, 0, cc->statusToString (newstatus) ); } } } @@ -875,7 +858,9 @@ return 0; // get first column (the column containing the status info) - NCPkgTableTag * cc = static_cast<NCPkgTableTag *>( cl->GetCol( 0 ) ); + YTableItem *it = dynamic_cast<YTableItem*> (cl->origItem() ); + YTableCell *tcell = it->cell(0); + NCPkgTableTag * cc = static_cast<NCPkgTableTag *>( tcell ); return cc; } Modified: trunk/ncurses-pkg/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.h?rev… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.h (original) +++ trunk/ncurses-pkg/src/NCPkgTable.h Tue Jan 6 11:09:35 2009 @@ -41,7 +41,7 @@ * not installed, to be deleted and so on). * **/ -class NCPkgTableTag : public NCTableCol { +class NCPkgTableTag : public YTableCell { private: @@ -49,9 +49,6 @@ ZyppObj dataPointer; // cannot get at it from dataPointer ZyppSel selPointer; - - // returns the corresponding string value to given package status - string statusToStr( ZyppStatus stat ) const; public: @@ -59,15 +56,13 @@ ZyppSel selPtr, ZyppStatus stat = S_NoInst ); - virtual ~NCPkgTableTag() {} - - virtual void DrawAt( NCursesWindow & w, const wrect at, - NCTableStyle & tableStyle, - NCTableLine::STATE linestate, - unsigned colidx ) const; + ~NCPkgTableTag() {} - void setStatus( ZyppStatus stat ) { status = stat; } + void setStatus( ZyppStatus stat ) { status = stat; } ZyppStatus getStatus() const { return status; } + // returns the corresponding string value to given package status + string statusToString( ZyppStatus stat ) const; + ZyppObj getDataPointer() const { return dataPointer; } ZyppSel getSelPointer() const { return selPointer; } }; -- 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] r54388 - /trunk/mail/package/yast2-mail.changes
by varkoly＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: varkoly Date: Tue Jan 6 09:48:45 2009 New Revision: 54388 URL: http://svn.opensuse.org/viewcvs/yast?rev=54388&view=rev Log: new build Modified: trunk/mail/package/yast2-mail.changes Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Tue Jan 6 09:48:45 2009 @@ -1,16 +1,9 @@ ------------------------------------------------------------------- -Tue Jan 6 09:09:44 CET 2009 - varkoly(a)suse.de +Tue Jan 6 09:47:46 CET 2009 - varkoly(a)suse.de +- make progress bar by WriteDialog visable - bnc#463589 - YaST2 Mail Server & amavisd - -------------------------------------------------------------------- -Mon Jan 5 13:23:15 CET 2009 - varkoly(a)suse.de - - the myhostname in /etc/amavisd.conf must be set to FQHN - -------------------------------------------------------------------- -Sun Jan 4 10:08:56 CET 2009 - varkoly(a)suse.de - - bnc#463430 - Mail to a shared folder can couse infinit loop ------------------------------------------------------------------- -- 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] r54387 - in /trunk/mail/src: MailServer.ycp mail-server_complex.ycp mail-server_dialogs.ycp
by varkoly＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: varkoly Date: Tue Jan 6 09:47:34 2009 New Revision: 54387 URL: http://svn.opensuse.org/viewcvs/yast?rev=54387&view=rev Log: make the progress wizard by WriteDiealog visable clean up code Modified: trunk/mail/src/MailServer.ycp trunk/mail/src/mail-server_complex.ycp trunk/mail/src/mail-server_dialogs.ycp Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=5438… ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Tue Jan 6 09:47:34 2009 @@ -582,7 +582,7 @@ else { return false; - } + } } Service::Enable("amavis"); Service::Enable("clamd"); Modified: trunk/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp… ============================================================================== --- trunk/mail/src/mail-server_complex.ycp (original) +++ trunk/mail/src/mail-server_complex.ycp Tue Jan 6 09:47:34 2009 @@ -127,6 +127,8 @@ */ symbol WriteDialog() { + Wizard::CreateDialog (); + Wizard::SetDesktopIcon("mail"); Wizard::RestoreHelp(HELPS["write"]:""); boolean ret = MailServer::Write(); return ret ? `next : `abort; Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp… ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Tue Jan 6 09:47:34 2009 @@ -658,7 +658,7 @@ term MailPreventionDialog(string CID, string CIDRBL) { - y2milestone("--Start MailTransportsDialog ---"); + y2milestone("--Start MailPreventionDialog ---"); list<term> AccessItems= []; list<term> RBLItems = []; string BasicProtection = (string)MailServer::MailPrevention["BasicProtection"]:""; @@ -671,8 +671,7 @@ boolean BasicProtectionMedium = false; boolean BasicProtectionHard = true; -y2milestone("---- MailPrevention %1",MailServer::MailPrevention); -y2milestone("---- VSCount %1",VSCount); + y2milestone("---- VSCount %1",VSCount); if(BasicProtection == "off"){ BasicProtectionOff = true; @@ -701,9 +700,9 @@ SpamL = `Left(`CheckBox (`id(`SpamLearning), `opt(`notify), _("Configure Spam Learning Extension"), SpamLearning)); } term content = `VBox ( - `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), `VSpacing (1), - `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), 1,50,VSCount)), + `Left(`IntField (`id(`VSCount), `opt(`notify), _("Count of Virsus Scanner Process"), 1,50,VSCount)), `VSpacing (1), SpamL, `VSpacing (1), @@ -1349,6 +1348,10 @@ ret = event["ID"]:nil; EventType = event["EventType"]:nil; +y2milestone("event %1",event); +y2milestone("event %1",ret); +y2milestone("FocusedContent %1",FocusedContent); + if(ret == `cancel || ret == `abort ) { if(ReallyAbort()) break; else continue; @@ -1655,9 +1658,6 @@ focus_changed = true; FocusedContent ="MailLocalDomains"; } -y2milestone("event %1",event); -y2milestone("event %1",ret); -y2milestone("FocusedContent %1",FocusedContent); if(ret != `cancel && ret != `abort && ret != `next ) { Wizard::SetContents(title, content ,helptext, false, true); Wizard::SetDesktopIcon("mail"); -- 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] r54386 - /trunk/mail/package/yast2-mail.changes
by varkoly＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: varkoly Date: Tue Jan 6 09:11:02 2009 New Revision: 54386 URL: http://svn.opensuse.org/viewcvs/yast?rev=54386&view=rev Log: new build Modified: trunk/mail/package/yast2-mail.changes Modified: trunk/mail/package/yast2-mail.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/package/yast2-mail.changes?… ============================================================================== --- trunk/mail/package/yast2-mail.changes (original) +++ trunk/mail/package/yast2-mail.changes Tue Jan 6 09:11:02 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 6 09:09:44 CET 2009 - varkoly(a)suse.de + +- bnc#463589 - YaST2 Mail Server & amavisd + +------------------------------------------------------------------- Mon Jan 5 13:23:15 CET 2009 - varkoly(a)suse.de - the myhostname in /etc/amavisd.conf must be set to FQHN -- 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] r54385 - /trunk/mail/src/YaPI/MailServer.pm
by varkoly＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: varkoly Date: Tue Jan 6 09:08:27 2009 New Revision: 54385 URL: http://svn.opensuse.org/viewcvs/yast?rev=54385&view=rev Log: set the default value of MailboxSizeLimit to 0 to avoid gui error Modified: trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Tue Jan 6 09:08:27 2009 @@ -1827,7 +1827,7 @@ my %MailLocalDelivery = ( 'Changed' => YaST::YCP::Boolean(0), 'Type' => '', - 'MailboxSizeLimit'=> '', + 'MailboxSizeLimit'=> 0, 'FallBackMailbox' => '', 'SpoolDirectory' => '', 'QuotaLimit' => 90, -- 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] r54384 - /trunk/mail/src/YaPI/MailServer.pm
by varkoly＠svn.opensuse.org 06 Jan '09

06 Jan '09

Author: varkoly Date: Tue Jan 6 08:53:55 2009 New Revision: 54384 URL: http://svn.opensuse.org/viewcvs/yast?rev=54384&view=rev Log: add MX and NS records to the zone entry, for better co-operation with yast2-dns-server Modified: trunk/mail/src/YaPI/MailServer.pm Modified: trunk/mail/src/YaPI/MailServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/YaPI/MailServer.pm?rev=… ============================================================================== --- trunk/mail/src/YaPI/MailServer.pm (original) +++ trunk/mail/src/YaPI/MailServer.pm Tue Jan 6 08:53:55 2009 @@ -1374,36 +1374,37 @@ description => "activating the virus scanner failed: $err"); } # This is only for systems updated from SLES10 - my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtps', 'command' => 'smtpd' }); - if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} ) - { - my $opts = $smtps->[0]->{options}; - if ( defined $opts->{'content_filter'} ) - { - delete $opts->{'content_filter'}; - SCR->Execute('.mail.postfix.mastercf.modifyService', - { 'service' => 'smtps', - 'command' => 'smtpd', - 'maxproc' => '-', - 'options' => $opts } ); - } - } - my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', - { 'service' => 'smtp', 'command' => 'smtpd' }); - if( ref($smtp) eq 'ARRAY' && defined $smtp->[0]->{options} ) - { - my $opts = $smtp->[0]->{options}; - if ( defined $opts->{'content_filter'} ) - { - delete $opts->{'content_filter'}; - SCR->Execute('.mail.postfix.mastercf.modifyService', - { 'service' => 'smtp', - 'command' => 'smtpd', - 'maxproc' => '-', - 'options' => $opts } ); - } - } + my $smtps = SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'smtps', 'command' => 'smtpd' }); + if( ref($smtps) eq 'ARRAY' && defined $smtps->[0]->{options} ) + { + my $opts = $smtps->[0]->{options}; + if ( defined $opts->{'content_filter'} ) + { + delete $opts->{'content_filter'}; + SCR->Execute('.mail.postfix.mastercf.modifyService', + { 'service' => 'smtps', + 'command' => 'smtpd', + 'maxproc' => '-', + 'options' => $opts } ); + } + } + my $smtp = SCR->Execute('.mail.postfix.mastercf.findService', + { 'service' => 'smtp', 'command' => 'smtpd' }); + if( ref($smtp) eq 'ARRAY' && defined $smtp->[0]->{options} ) + { + my $opts = $smtp->[0]->{options}; + if ( defined $opts->{'content_filter'} ) + { + delete $opts->{'content_filter'}; + SCR->Execute('.mail.postfix.mastercf.modifyService', + { 'service' => 'smtp', + 'command' => 'smtpd', + 'maxproc' => '-', + 'options' => $opts } ); + } + } + # End This is only for systems updated from SLES10 if( SCR->Execute('.mail.postfix.mastercf.findService', { 'service' => 'localhost:10025', 'command' => 'smtpd' })) { @@ -1416,7 +1417,6 @@ SCR->Execute('.mail.postfix.mastercf.deleteService', { 'service' => 'amavis', 'command' => 'lmtp' }); } - # End This is only for systems updated from SLES10 # create smtpd pocess for getting back the emails SCR->Execute('.mail.postfix.mastercf.addService', { 'service' => 'amavis', @@ -2365,25 +2365,27 @@ } else { - # This is a new domain, we create it. - # We create all the DNS attributes. `hostname -f` is the NS entry. - my $serial = POSIX::strftime("%Y%m%d%H%M",localtime); - my $host = `hostname -f`; chomp $host; - my $tmp = { 'Objectclass' => [ 'dNSZone','suseMailDomain' ], - 'zoneName' => $name, - 'suseMailDomainType' => $type, - 'suseMailDomainMasquerading' => $masquerading, + # This is a new domain, we create it. + # We create all the DNS attributes. `hostname -f` is the NS and MX entry. + my $serial = POSIX::strftime("%Y%m%d%H%M",localtime); + my $host = `hostname -f`; chomp $host; + my $tmp = { 'Objectclass' => [ 'dNSZone','suseMailDomain' ], + 'zoneName' => $name, + 'suseMailDomainType' => $type, + 'suseMailDomainMasquerading' => $masquerading, 'relativeDomainName' => '@', 'dNSClass' => 'IN', 'dNSTTL' => '86400', + 'nSRecord' => $host.'.', + 'mXRecord' => '40 '.$host.'.', 'sOARecord' => $host.'. root.'.$host.'. '.$serial.' 10800 3600 302400 43200' - }; - if(! SCR->Write('.ldap.add',{ "dn" => $DN } ,$tmp)){ - my $ldapERR = SCR->Read(".ldap.error"); - return $self->SetError(summary => "LDAP add failed", - code => "SCR_WRITE_FAILED", - description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); - } + }; + if(! SCR->Write('.ldap.add',{ "dn" => $DN } ,$tmp)){ + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_WRITE_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0