October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41532 - in /trunk/pos-installation/src/clients: inst_slepos_data_migration.ycp inst_slepos_server_selection.ycp
by bruclik＠svn.opensuse.org 24 Oct '07

24 Oct '07

Author: bruclik Date: Wed Oct 24 03:00:16 2007 New Revision: 41532 URL: http://svn.opensuse.org/viewcvs/yast?rev=41532&view=rev Log: - added help text made by Nayden Modified: trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp trunk/pos-installation/src/clients/inst_slepos_server_selection.ycp Modified: trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/ins… ============================================================================== --- trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp (original) +++ trunk/pos-installation/src/clients/inst_slepos_data_migration.ycp Wed Oct 24 03:00:16 2007 @@ -11,8 +11,7 @@ string migration_type = ""; string slepos_migration_post_script = ""; - // FIXME - textdomain "SLEPOS"; + textdomain "slepos-installation"; import "FileUtils"; import "Wizard"; @@ -261,7 +260,13 @@ `Left (`Label (_("Note: Migration can take very long time according to the current size of your data."))) ), // TRANSLATORS: Dialog help - _("Some help - FIXME Text1!!!!"), + _("The default choice is Skip Migration in case no files for migration were found. + The files and directories to be migrated are listed in the table. + You can find detailed choices in the Migration Details pop-up menu. Here you can choose + to make a complete Backup of your system (tar.bz2). + By pressing Next you start the migration and possible backup processes (if you have chosen + to backup your system in the Migration Details menu). + The whole procedure may take a long time depending on the size of your data."), Label::BackButton(), Label::NextButton() ); @@ -484,7 +489,13 @@ `VStretch () ), // TRANSLATORS: Dialog help - _("Some help - FIXME Text2!!!!"), + _("In case you have chosen to Backup your data you will see the backup + progress in this window. + After the Backup is finished you will see the progress of the migration + with the following information : + Total files: Number of processed files. + Total size: Size of migrated data. + When the whole migration process is ready you will see a Done message."), Label::BackButton(), Label::NextButton() ); @@ -952,7 +963,7 @@ `Label (_("Running post-migration script...")) ), // TRANSLATORS: Dialog help - _("Some help - FIXME Text3!!!!"), + _("The last migration step - a cleaning script is triggered."), Label::BackButton(), Label::NextButton() ); @@ -1011,4 +1022,4 @@ Wizard::CloseDialog(); return (symbol) ret; -} \ No newline at end of file +} Modified: trunk/pos-installation/src/clients/inst_slepos_server_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/pos-installation/src/clients/ins… ============================================================================== --- trunk/pos-installation/src/clients/inst_slepos_server_selection.ycp (original) +++ trunk/pos-installation/src/clients/inst_slepos_server_selection.ycp Wed Oct 24 03:00:16 2007 @@ -2,8 +2,7 @@ */ { - // FIXME - textdomain "SLEPOS"; + textdomain "slepos-installation"; import "Wizard"; import "Label"; @@ -25,19 +24,19 @@ // TRANSLATORS: A name of pattern, used as RadioButton label "label" : _("Admin Server Installation"), "name" : "SLEPOS_Server_Admin", - "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-powertweak.png", + "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-host.png", ], $[ // TRANSLATORS: A name of pattern, used as RadioButton label "label" : _("Branch Server Installation"), "name" : "SLEPOS_Server_Branch", - "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-iscsi-server.png", + "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-network.png", ], $[ // TRANSLATORS: A name of pattern, used as RadioButton label "label" : _("Image Server Installation"), "name" : "SLEPOS_Image_Server", - "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-instserver.png", + "icon" : "/usr/share/icons/hicolor/32x32/apps/yast-source.png", ], ]; @@ -287,7 +286,13 @@ term_patterns ), // TRANSLATORS: Dialog help - _("Some help - FIXME!!!!"), + _("Please choose what type of server you would like to install and + press Next. + In case you would like to make a detailed choice or install more services + on one server please choose Detailed Selection. + The installation will automatically start upon pressing Next. + When the installation is complete the Migration Assistant window will + open and guide you through the migration process."), Label::BackButton(), Label::NextButton() ); -- 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] r41531 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/ygdkmngloader.c
by rpmcruz＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: rpmcruz Date: Tue Oct 23 23:30:02 2007 New Revision: 41531 URL: http://svn.opensuse.org/viewcvs/yast?rev=41531&view=rev Log: * src/YGPackageSelector.cc (class YGPatchSelector): Use the more sophisticated logic taken from YQPkgPatchList::fillList to determine what patches are available (#336124) Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/ygdkmngloader.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41531&r1=41530… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 23 23:30:02 2007 @@ -1,3 +1,9 @@ +2007-10-23 JP Rosevear <jpr(a)novell.com> + + * src/YGPackageSelector.cc (class YGPatchSelector): Use the more + sophisticated logic taken from YQPkgPatchList::fillList to + determine what patches are available (#336124) + 2007-10-22 Boyd Timothy <btimothy(a)novell.com> * src/YGPackageSelector.cc: Removed the space before the question mark Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Tue Oct 23 23:30:02 2007 @@ -492,23 +492,26 @@ /* authors() should be the proper way to get authors, but it seems to be rarely used, instead packagers list them on the description. */ string description (object->description()); +std::cerr << "description: " << description << std::endl; string::size_type pos = description.find ("Authors:"); if (pos != string::npos) { pos = description.find_first_not_of ( '-', pos + sizeof ("Authors:") + 1); +std::cerr << "copy string from " << pos << std::endl; authors = string (description, pos, string::npos); authors = YGUtils::escape_markup (authors, true); +std::cerr << "authors: " << authors << std::endl; } } string text; if (!packager.empty()) - text = _("Packaged by:") + (" <blockquote>" + packager) + + text = _("Packaged by:") + ("<blockquote>" + packager) + "</blockquote>"; if (!authors.empty()) { if (!packager.empty()) text += " "; - text += _("Developed by:") + (" <blockquote>" + authors) + + text += _("Developed by:") + ("<blockquote>" + authors) + "</blockquote>"; } set_text (m_authors_text, text); @@ -904,9 +907,59 @@ it != zyppPool().byKindEnd <zypp::Patch>(); it++) { ZyppSelectable selectable = *it; ZyppPatch patch = tryCastToZyppPatch (selectable->theObj()); + if (!patch) + continue; + bool displayPatch = false; + + // These rules are taken from YQPkgPatchList::fillList() in the RelevantPatches case + if (selectable->hasInstalledObj()) { // installed? + if (selectable->installedPoolItem().status().isIncomplete()) { // patch broken? + // The patch is broken: It had been installed, but the user somehow + // downgraded individual packages belonging to the patch to older versions. + displayPatch = true; + + y2warning( "Installed patch is broken: %s - %s", + patch->name().c_str(), + patch->summary().c_str() ); + } + } else { // not installed + if (selectable->hasCandidateObj() && selectable->candidatePoolItem().status().isSatisfied()) { + // This is a pretty exotic case, but still it might happen: + // + // The patch itelf is not installed, but it is satisfied because the + // user updated all the packages belonging to the patch to the versions + // the patch requires. All that is missing now is to get the patch meta + // data onto the system. So let's display the patch to give the user + // a chance to install it (if he so chooses). + + displayPatch = true; + + y2milestone( "Patch satisfied, but not installed yet: %s - %s", + patch->name().c_str(), + patch->summary().c_str() ); + } + } + + if (selectable->hasCandidateObj()) { // candidate available? + // The most common case: There is a candidate patch, i.e. one that could be + // installed, but either no version of that patch is installed or there is a + // newer one to which the patch could be updated. + + if (selectable->candidatePoolItem().status().isNeeded()) { // patch really needed? + // Patches are needed if any of the packages that belong to the patch + // are installed on the system. + + displayPatch = true; + } else { + // None of the packages that belong to the patch is installed on the system. + + y2debug( "Patch not needed: %s - %s", + patch->name().c_str(), + patch->summary().c_str() ); + } + } - if (patch && !selectable->hasInstalledObj() && - selectable->hasCandidateObj() /*don't show installed ones*/) { + if (displayPatch) { // select them all selectable->set_status (zypp::ui::S_Install); Modified: trunk/gtk/src/ygdkmngloader.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygdkmngloader.c?rev=4153… ============================================================================== --- trunk/gtk/src/ygdkmngloader.c (original) +++ trunk/gtk/src/ygdkmngloader.c Tue Oct 23 23:30:02 2007 @@ -308,7 +308,8 @@ static gboolean ygdk_mng_pixbuf_is_static_image (GdkPixbufAnimation *anim) { - return FALSE; + YGdkMngPixbuf *mng_anim = YGDK_MNG_PIXBUF (anim); + return g_list_length (mng_anim->frames) == 1; } static GdkPixbuf *ygdk_mng_pixbuf_get_static_image (GdkPixbufAnimation *anim) -- 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] r41530 - /tags/branch-SLE-10-SP1-2_13_9/firstboot/
by jsrain＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: jsrain Date: Tue Oct 23 16:07:28 2007 New Revision: 41530 URL: http://svn.opensuse.org/viewcvs/yast?rev=41530&view=rev Log: Created tag branch-SLE-10-SP1-2_13_9 for firstboot Added: tags/branch-SLE-10-SP1-2_13_9/firstboot/ - copied from r41529, branches/SuSE-SLE-10-SP1-Branch/firstboot/ -- 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] r41529 - in /trunk/firstboot: VERSION package/yast2-firstboot.changes src/firstboot.ycp
by jsrain＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: jsrain Date: Tue Oct 23 16:07:20 2007 New Revision: 41529 URL: http://svn.opensuse.org/viewcvs/yast?rev=41529&view=rev Log: initialize package callbacks, since some of the modules run in the firstboot workflow expect them being initialized (#335979) Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=41529&r1=4… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Tue Oct 23 16:07:20 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Tue Oct 23 16:07:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 23 15:53:31 CEST 2007 - jsrain(a)suse.cz + +- initialize package callbacks, since some of the modules run + in the firstboot workflow expect them being initialized (#335979) +- 2.16.1 + +------------------------------------------------------------------- Fri Oct 19 12:02:36 CEST 2007 - jsuchome(a)suse.cz - added support for keyboard and restaring network (#F302520) Modified: trunk/firstboot/src/firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot.ycp?rev=… ============================================================================== --- trunk/firstboot/src/firstboot.ycp (original) +++ trunk/firstboot/src/firstboot.ycp Tue Oct 23 16:07:20 2007 @@ -13,6 +13,7 @@ import "Report"; import "Firstboot"; import "Misc"; + import "PackageCallbacksInit"; Wizard::OpenNextBackStepsDialog(); @@ -27,6 +28,9 @@ Report::LogErrors(true); Report::LogWarnings(true); + // initialize package callbacks, since some of the modules run in the + // firstboot workflow expect them to be initialized (bug #335979) + PackageCallbacksInit::InitPackageCallbacks (); symbol ret = ProductControl::Run(); y2milestone("ProductControl::Run() returned: %1", ret); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41528 - in /branches/SuSE-SLE-10-SP1-Branch/firstboot: VERSION package/yast2-firstboot.changes src/firstboot.ycp
by jsrain＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: jsrain Date: Tue Oct 23 16:06:54 2007 New Revision: 41528 URL: http://svn.opensuse.org/viewcvs/yast?rev=41528&view=rev Log: initialize package callbacks, since some of the modules run in the firstboot workflow expect them being initialized (#335979) Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/VERSION Tue Oct 23 16:06:54 2007 @@ -1 +1 @@ -2.13.8 +2.13.9 Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/package/yast2-firstboot.changes Tue Oct 23 16:06:54 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 23 15:53:31 CEST 2007 - jsrain(a)suse.cz + +- initialize package callbacks, since some of the modules run + in the firstboot workflow expect them being initialized (#335979) +- 2.13.9 + +------------------------------------------------------------------- Thu Aug 23 14:57:53 CEST 2007 - jsuchome(a)suse.cz - added support for keyboard and restaring network (#F302520) Modified: branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/firstb… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/firstboot/src/firstboot.ycp Tue Oct 23 16:06:54 2007 @@ -13,6 +13,7 @@ import "Report"; import "Firstboot"; import "Misc"; + import "PackageCallbacksInit"; Wizard::OpenNextBackStepsDialog(); @@ -27,6 +28,9 @@ Report::LogErrors(true); Report::LogWarnings(true); + // initialize package callbacks, since some of the modules run in the + // firstboot workflow expect them to be initialized (bug #335979) + PackageCallbacksInit::InitPackageCallbacks (); symbol ret = ProductControl::Run(); y2milestone("ProductControl::Run() returned: %1", ret); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41527 - /tags/stable-2_16_0/ncurses/
by kmachalkova＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: kmachalkova Date: Tue Oct 23 15:42:33 2007 New Revision: 41527 URL: http://svn.opensuse.org/viewcvs/yast?rev=41527&view=rev Log: Created tag stable-2_16_0 for ncurses Added: tags/stable-2_16_0/ncurses/ - copied from r41526, trunk/ncurses/ -- 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] r41526 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: kmachalkova Date: Tue Oct 23 15:36:31 2007 New Revision: 41526 URL: http://svn.opensuse.org/viewcvs/yast?rev=41526&view=rev Log: version 2.16.0 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=41526&r1=415… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue Oct 23 15:36:31 2007 @@ -1 +1 @@ -2.15.27 +2.16.0 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue Oct 23 15:36:31 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 23 15:18:39 CEST 2007 - kmachalkova(a)suse.cz + +- Added missing includes to compile with gcc 4.3 +- Removed sources of gcc 4.3 operator priority warnings + +------------------------------------------------------------------- Fri Sep 7 17:15:00 CEST 2007 - kmachalkova(a)suse.cz - Display install notify message only if package is marked for -- 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] r41525 - in /branches/tmp/sh/mod-ui/ncurses: src/ testsuite/
by kmachalkova＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: kmachalkova Date: Tue Oct 23 15:16:34 2007 New Revision: 41525 URL: http://svn.opensuse.org/viewcvs/yast?rev=41525&view=rev Log: Merged GCC 4.3 related changes (missing includes, operator priority) from trunk into mod-ui branch Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCR… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h Tue Oct 23 15:16:34 2007 @@ -142,7 +142,7 @@ if ( sline == unset || scol == unset || eline == unset || ecol == unset ) return false; - if ( eline == sline && ecol <= scol + if ( ( eline == sline && ecol <= scol ) || eline < sline ) return false; return true; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc Tue Oct 23 15:16:34 2007 @@ -20,6 +20,8 @@ #include "NCTablePad.h" #include "NCPopupMenu.h" +#include <limits.h> + #if 0 #undef DBG_CLASS #define DBG_CLASS "_NCTablePad_" Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc Tue Oct 23 15:16:34 2007 @@ -19,6 +19,8 @@ #include "Y2Log.h" #include "NCTextPad.h" +#include <limits.h> + /////////////////////////////////////////////////////////////////// // // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCs… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc Tue Oct 23 15:16:34 2007 @@ -19,6 +19,7 @@ #include <ycp/YCPString.h> #include <errno.h> +#include <iconv.h> #include "Y2Log.h" #include "NCstring.h" Modified: branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCs… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h Tue Oct 23 15:16:34 2007 @@ -75,13 +75,13 @@ inline static chtype getChar ( chtype a ) { return a & char_mask; } inline static chtype getNonChar ( chtype a ) { return a & ~char_mask; } - inline static void setStyle ( chtype & a, chtype ch ) { a = a & ~style_mask | ch & style_mask; } - inline static void setColor ( chtype & a, chtype ch ) { if ( colors() ) a = a & ~color_mask | ch & color_mask; } - inline static void setChar ( chtype & a, chtype ch ) { a = a & ~char_mask | ch & char_mask; } + inline static void setStyle ( chtype & a, chtype ch ) { a = (a & ~style_mask) | (ch & style_mask); } + inline static void setColor ( chtype & a, chtype ch ) { if ( colors() ) a = (a & ~color_mask) | (ch & color_mask); } + inline static void setChar ( chtype & a, chtype ch ) { a = (a & ~char_mask) | (ch & char_mask); } - inline static void addStyle ( chtype & a, chtype ch ) { a = a | ch & style_mask; } + inline static void addStyle ( chtype & a, chtype ch ) { a = a | (ch & style_mask); } inline static void delStyle ( chtype & a, chtype ch ) { a = a & ~(ch & style_mask); } - inline static void toggleStyle( chtype & a, chtype ch ) { setStyle( a, a & ~ch | (a ^ ch) & ch ); } + inline static void toggleStyle( chtype & a, chtype ch ) { setStyle( a, (a & ~ch) | ((a ^ ch) & ch )); } inline static void addAlt ( chtype & a ) { a |= A_ALTCHARSET; } inline static void delAlt ( chtype & a ) { a &= ~A_ALTCHARSET; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCt… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc Tue Oct 23 15:16:34 2007 @@ -21,6 +21,7 @@ #include "stringutil.h" #include <wchar.h> // wcwidth +#include <langinfo.h> /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Tue Oct 23 15:16:34 2007 @@ -21,6 +21,7 @@ #include <string> #include <sys/time.h> #include <unistd.h> +#include <langinfo.h> #include "Y2Log.h" #include <YEvent.h> Modified: branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/testsui… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc Tue Oct 23 15:16:34 2007 @@ -19,6 +19,7 @@ #include <ycp/YCPString.h> #include <errno.h> +#include <iconv.h> #include "Y2Log.h" #include "NCstring_test.h" Modified: branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/testsui… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc Tue Oct 23 15:16:34 2007 @@ -18,6 +18,8 @@ #include <stdio.h> #include <errno.h> +#include <langinfo.h> +#include <libintl.h> #include <ycp/y2log.h> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41524 - in /trunk/ncurses/src: NCRichText.h NCstyle.h
by kmachalkova＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: kmachalkova Date: Tue Oct 23 15:06:36 2007 New Revision: 41524 URL: http://svn.opensuse.org/viewcvs/yast?rev=41524&view=rev Log: Fixed some operator priority Modified: trunk/ncurses/src/NCRichText.h trunk/ncurses/src/NCstyle.h Modified: trunk/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.h?rev=415… ============================================================================== --- trunk/ncurses/src/NCRichText.h (original) +++ trunk/ncurses/src/NCRichText.h Tue Oct 23 15:06:36 2007 @@ -142,7 +142,7 @@ if ( sline == unset || scol == unset || eline == unset || ecol == unset ) return false; - if ( eline == sline && ecol <= scol + if ( ( eline == sline && ecol <= scol ) || eline < sline ) return false; return true; Modified: trunk/ncurses/src/NCstyle.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCstyle.h?rev=41524&… ============================================================================== --- trunk/ncurses/src/NCstyle.h (original) +++ trunk/ncurses/src/NCstyle.h Tue Oct 23 15:06:36 2007 @@ -75,13 +75,13 @@ inline static chtype getChar ( chtype a ) { return a & char_mask; } inline static chtype getNonChar ( chtype a ) { return a & ~char_mask; } - inline static void setStyle ( chtype & a, chtype ch ) { a = a & ~style_mask | ch & style_mask; } - inline static void setColor ( chtype & a, chtype ch ) { if ( colors() ) a = a & ~color_mask | ch & color_mask; } - inline static void setChar ( chtype & a, chtype ch ) { a = a & ~char_mask | ch & char_mask; } + inline static void setStyle ( chtype & a, chtype ch ) { a = (a & ~style_mask) | (ch & style_mask); } + inline static void setColor ( chtype & a, chtype ch ) { if ( colors() ) a = (a & ~color_mask) | (ch & color_mask); } + inline static void setChar ( chtype & a, chtype ch ) { a = (a & ~char_mask) | (ch & char_mask); } - inline static void addStyle ( chtype & a, chtype ch ) { a = a | ch & style_mask; } + inline static void addStyle ( chtype & a, chtype ch ) { a = a | (ch & style_mask); } inline static void delStyle ( chtype & a, chtype ch ) { a = a & ~(ch & style_mask); } - inline static void toggleStyle( chtype & a, chtype ch ) { setStyle( a, a & ~ch | (a ^ ch) & ch ); } + inline static void toggleStyle( chtype & a, chtype ch ) { setStyle( a, (a & ~ch) | ((a ^ ch) & ch )); } inline static void addAlt ( chtype & a ) { a |= A_ALTCHARSET; } inline static void delAlt ( chtype & a ) { a &= ~A_ALTCHARSET; } -- 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] r41523 - in /trunk/ncurses: src/NCTablePad.cc src/NCTextPad.cc src/NCstring.cc src/NCtext.cc src/YNCursesUI.cc testsuite/NCstring_test.cc testsuite/utf8test.cc
by kmachalkova＠svn.opensuse.org 23 Oct '07

23 Oct '07

Author: kmachalkova Date: Tue Oct 23 14:57:42 2007 New Revision: 41523 URL: http://svn.opensuse.org/viewcvs/yast?rev=41523&view=rev Log: Added missing includes to fix compilation with GCC 4.3 Modified: trunk/ncurses/src/NCTablePad.cc trunk/ncurses/src/NCTextPad.cc trunk/ncurses/src/NCstring.cc trunk/ncurses/src/NCtext.cc trunk/ncurses/src/YNCursesUI.cc trunk/ncurses/testsuite/NCstring_test.cc trunk/ncurses/testsuite/utf8test.cc Modified: trunk/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTablePad.cc?rev=41… ============================================================================== --- trunk/ncurses/src/NCTablePad.cc (original) +++ trunk/ncurses/src/NCTablePad.cc Tue Oct 23 14:57:42 2007 @@ -20,6 +20,8 @@ #include "NCTablePad.h" #include "NCPopupMenu.h" +#include <limits.h> + #if 0 #undef DBG_CLASS #define DBG_CLASS "_NCTablePad_" Modified: trunk/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.cc?rev=415… ============================================================================== --- trunk/ncurses/src/NCTextPad.cc (original) +++ trunk/ncurses/src/NCTextPad.cc Tue Oct 23 14:57:42 2007 @@ -19,6 +19,8 @@ #include "Y2Log.h" #include "NCTextPad.h" +#include <limits.h> + /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses/src/NCstring.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCstring.cc?rev=4152… ============================================================================== --- trunk/ncurses/src/NCstring.cc (original) +++ trunk/ncurses/src/NCstring.cc Tue Oct 23 14:57:42 2007 @@ -19,6 +19,7 @@ #include <ycp/YCPString.h> #include <errno.h> +#include <iconv.h> #include "Y2Log.h" #include "NCstring.h" Modified: trunk/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCtext.cc?rev=41523&… ============================================================================== --- trunk/ncurses/src/NCtext.cc (original) +++ trunk/ncurses/src/NCtext.cc Tue Oct 23 14:57:42 2007 @@ -21,6 +21,7 @@ #include "stringutil.h" #include <wchar.h> // wcwidth +#include <langinfo.h> /////////////////////////////////////////////////////////////////// Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=41… ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Tue Oct 23 14:57:42 2007 @@ -21,6 +21,7 @@ #include <string> #include <sys/time.h> #include <unistd.h> +#include <langinfo.h> #include "Y2Log.h" #include <YEvent.h> Modified: trunk/ncurses/testsuite/NCstring_test.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/testsuite/NCstring_test.… ============================================================================== --- trunk/ncurses/testsuite/NCstring_test.cc (original) +++ trunk/ncurses/testsuite/NCstring_test.cc Tue Oct 23 14:57:42 2007 @@ -19,6 +19,7 @@ #include <ycp/YCPString.h> #include <errno.h> +#include <iconv.h> #include "Y2Log.h" #include "NCstring_test.h" Modified: trunk/ncurses/testsuite/utf8test.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/testsuite/utf8test.cc?re… ============================================================================== --- trunk/ncurses/testsuite/utf8test.cc (original) +++ trunk/ncurses/testsuite/utf8test.cc Tue Oct 23 14:57:42 2007 @@ -18,6 +18,8 @@ #include <stdio.h> #include <errno.h> +#include <langinfo.h> +#include <libintl.h> #include <ycp/y2log.h> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0