December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-server
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package xorg-x11-server checked in at Mon Dec 18 17:55:03 CET 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-12-15 16:49:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2006-12-18 17:08:58.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 18 17:08:00 CET 2006 - schwab(a)suse.de + +- Fix off-by-one in pci multi-domain support [#229278]. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.69jKAL/_old 2006-12-18 17:54:55.000000000 +0100 +++ /var/tmp/diff_new_pack.69jKAL/_new 2006-12-18 17:54:55.000000000 +0100 @@ -17,7 +17,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 31 +Release: 32 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -444,6 +444,8 @@ %endif %changelog -n xorg-x11-server +* Mon Dec 18 2006 - schwab(a)suse.de +- Fix off-by-one in pci multi-domain support [#229278]. * Wed Dec 13 2006 - sndirsch(a)suse.de - libdrm.diff: * no longer fail when some driver tries to load "drm" module ++++++ p_pci-off-by-one.diff ++++++ --- /var/tmp/diff_new_pack.69jKAL/_old 2006-12-18 17:54:56.000000000 +0100 +++ /var/tmp/diff_new_pack.69jKAL/_new 2006-12-18 17:54:56.000000000 +0100 @@ -1,11 +1,89 @@ ---- hw/xfree86/os-support/bus/linuxPci.c.orig 2006-11-20 22:04:35.000000000 +0100 -+++ hw/xfree86/os-support/bus/linuxPci.c 2006-11-20 22:06:08.000000000 +0100 -@@ -547,7 +547,7 @@ - pPCI = xf86GetPciHostConfigFromTag(Tag); - - if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum))) -- return result; -+ return result + 1; +--- hw/xfree86/os-support/bus/linuxPci.c ++++ hw/xfree86/os-support/bus/linuxPci.c +@@ -550,15 +550,15 @@ + return result; if (!pPCI || pPCI->fakeDevice) - return 1; /* Domain 0 is reserved */ +- return 1; /* Domain 0 is reserved */ ++ return 0; + + if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0) +- return 0; ++ return -1; + + if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0) +- return 0; ++ return -1; + +- return result + 1; /* Domain 0 is reserved */ ++ return result; + } + + static pointer +@@ -628,7 +628,7 @@ + return NULL; + } + +-#define MAX_DOMAINS 257 ++#define MAX_DOMAINS 256 + static pointer DomainMmappedIO[MAX_DOMAINS]; + + static int +@@ -649,11 +649,10 @@ + domain = xf86GetPciDomain(Tag); + bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag)); + +- /* Domain 0 is reserved -- see xf86GetPciDomain() */ +- if ((domain <= 0) || (domain >= MAX_DOMAINS)) ++ if ((domain < 0) || (domain >= MAX_DOMAINS)) + FatalError("linuxOpenLegacy(): domain out of range\n"); + +- sprintf(path, PREFIX, domain - 1, bus, name); ++ sprintf(path, PREFIX, domain, bus, name); + fd = open(path, O_RDWR); + if (fd >= 0) { + xfree(path); +@@ -685,7 +684,6 @@ + xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag, + ADDRESS Base, unsigned long Size) + { +- int domain = xf86GetPciDomain(Tag); + int fd; + pointer addr; + +@@ -733,7 +731,7 @@ + int domain = xf86GetPciDomain(Tag); + int fd; + +- if ((domain <= 0) || (domain >= MAX_DOMAINS)) ++ if ((domain < 0) || (domain >= MAX_DOMAINS)) + FatalError("xf86MapDomainIO(): domain out of range\n"); + + if (DomainMmappedIO[domain]) +@@ -847,7 +845,7 @@ + RANGE_TYPE(ResExcIoBlock, domain)); + pRes = xf86AddResToList(pRes, &range, -1); + +- if (domain <= 0) ++ if (domain < 0) + break; + } + } +@@ -881,7 +879,7 @@ + RANGE_TYPE(ResExcIoBlock, domain)); + pRes = xf86AddResToList(pRes, &range, -1); + +- if (domain <= 0) ++ if (domain < 0) + break; + } + } +@@ -933,7 +931,7 @@ + RANGE_TYPE(ResExcIoBlock, domain)); + pRes = xf86AddResToList(pRes, &range, -1); + +- if (domain <= 0) ++ if (domain < 0) + break; + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package xorg-x11-server checked in at Mon Dec 18 15:48:24 CET 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-12-02 22:39:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2006-12-15 16:49:47.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Dec 13 18:26:05 CET 2006 - sndirsch(a)suse.de + +- libdrm.diff: + * no longer fail when some driver tries to load "drm" module + +------------------------------------------------------------------- +Tue Dec 12 05:37:31 CET 2006 - sndirsch(a)suse.de + +- xorg-server-1.1.99.901-GetDrawableAttributes.patch: + * hopefully fixes AIGLX issues (X.Org Bug #8991) + +------------------------------------------------------------------- +Fri Dec 8 20:56:59 CET 2006 - sndirsch(a)suse.de + +- another 64bit warning fix + +------------------------------------------------------------------- New: ---- libdrm.diff xorg-server-1.1.99.901-GetDrawableAttributes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.sVJF6k/_old 2006-12-18 15:47:23.000000000 +0100 +++ /var/tmp/diff_new_pack.sVJF6k/_new 2006-12-18 15:47:23.000000000 +0100 @@ -17,7 +17,7 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 30 +Release: 31 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -67,6 +67,8 @@ Patch32: acpi_events.diff Patch33: p_pci-off-by-one.diff Patch34: Mesa-6.5.2.diff +Patch35: xorg-server-1.1.99.901-GetDrawableAttributes.patch +Patch36: libdrm.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -136,6 +138,8 @@ %patch32 -p1 %patch33 -p0 %patch34 -p0 +%patch35 -p1 +%patch36 -p0 %build autoreconf -fi @@ -440,6 +444,14 @@ %endif %changelog -n xorg-x11-server +* Wed Dec 13 2006 - sndirsch(a)suse.de +- libdrm.diff: + * no longer fail when some driver tries to load "drm" module +* Tue Dec 12 2006 - sndirsch(a)suse.de +- xorg-server-1.1.99.901-GetDrawableAttributes.patch: + * hopefully fixes AIGLX issues (X.Org Bug #8991) +* Fri Dec 08 2006 - sndirsch(a)suse.de +- another 64bit warning fix * Sat Dec 02 2006 - sndirsch(a)suse.de - X.Org 7.2RC3 release * Add a -showDefaultModulePath option. ++++++ 64bit.diff ++++++ --- /var/tmp/diff_new_pack.sVJF6k/_old 2006-12-18 15:47:23.000000000 +0100 +++ /var/tmp/diff_new_pack.sVJF6k/_new 2006-12-18 15:47:23.000000000 +0100 @@ -11,3 +11,13 @@ for (i = 0; i < size; i++) ErrorF("%d: %s\n", i, strings[i]); free(strings); +--- hw/xfree86/dri/drimodule.c.orig 2006-12-08 20:54:05.218730315 +0100 ++++ hw/xfree86/dri/drimodule.c 2006-12-08 20:54:46.246132159 +0100 +@@ -88,6 +88,6 @@ + drmSetServerInfo(&DRIDRMServerInfo); + + /* Need a non-NULL return value to indicate success */ +- return 1; ++ return (pointer) 1; + } + ++++++ libdrm.diff ++++++ --- hw/xfree86/common/xf86Helper.c.orig 2006-12-13 16:21:35.000000000 +0100 +++ hw/xfree86/common/xf86Helper.c 2006-12-13 18:23:53.000000000 +0100 @@ -2386,22 +2386,29 @@ _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) { pointer ret; int errmaj = 0, errmin = 0; ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL, &errmaj, &errmin); if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); + + /* "drm" module has been merged into "dri" module, but some drivers + are still trying to load it explictely and fail if it doesn't exist :-( */ + if (!ret && !strcmp(name,"drm")) { + ret = (pointer) -1; + } + return ret; } /* * xf86LoadOneModule loads a single module. */ _X_EXPORT pointer xf86LoadOneModule(char *name, pointer opt) { int errmaj, errmin; char *Name; ++++++ xorg-server-1.1.99.901-GetDrawableAttributes.patch ++++++ --- xorg-server-9999/GL/glx/indirect_table.c.orig 2006-10-12 16:02:06.000000000 +0800 +++ xorg-server-9999/GL/glx/indirect_table.c 2006-10-12 16:15:35.000000000 +0800 @@ -1232,7 +1232,7 @@ const struct __glXDispatchInfo Render_di /*****************************************************************/ /* tree depth = 13 */ -static const int_fast16_t VendorPriv_dispatch_tree[155] = { +static const int_fast16_t VendorPriv_dispatch_tree[159] = { /* [0] -> opcode range [0, 131072], node depth 1 */ 2, 5, @@ -1480,11 +1480,16 @@ static const int_fast16_t VendorPriv_dis /* [152] -> opcode range [65536, 65552], node depth 13 */ 1, LEAF(88), + 156, EMPTY_LEAF, + /* [156] -> opcode range [65544, 65552], node depth 13 */ + 1, + LEAF(96), + EMPTY_LEAF, }; -static const void *VendorPriv_function_table[96][2] = { +static const void *VendorPriv_function_table[99][2] = { /* [ 0] = 0 */ {NULL, NULL}, /* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT}, /* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT}, @@ -1581,6 +1586,9 @@ static const void *VendorPriv_function_t /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX}, /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX}, /* [ 95] = 65543 */ {NULL, NULL}, + /* [ 96] = 65544 */ {NULL, NULL}, + /* [ 97] = 65545 */ {NULL, NULL}, + /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX}, }; const struct __glXDispatchInfo VendorPriv_dispatch_info = { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-country
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package yast2-country checked in at Mon Dec 18 14:02:00 CET 2006. -------- --- yast2-country/yast2-country.changes 2006-12-13 10:45:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2006-12-18 09:23:27.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 15 11:09:10 CET 2006 - jsuchome(a)suse.cz + +- added support for Marathi language +- 2.15.4 + +------------------------------------------------------------------- Old: ---- yast2-country-2.15.3.tar.bz2 New: ---- yast2-country-2.15.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.roHdBO/_old 2006-12-18 14:01:52.000000000 +0100 +++ /var/tmp/diff_new_pack.roHdBO/_new 2006-12-18 14:01:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.15.3) +# spec file for package yast2-country (Version 2.15.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-country -Version: 2.15.3 +Version: 2.15.4 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.15.3.tar.bz2 +Source0: yast2-country-2.15.4.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings @@ -64,7 +64,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.15.3 +%setup -n yast2-country-2.15.4 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,9 @@ %{prefix}/share/applications/YaST2/timezone.desktop %changelog -n yast2-country +* Fri Dec 15 2006 - jsuchome(a)suse.cz +- added support for Marathi language +- 2.15.4 * Wed Dec 13 2006 - jsuchome(a)suse.cz - added missing time zone for Belarus (#228042) - 2.15.3 ++++++ yast2-country-2.15.3.tar.bz2 -> yast2-country-2.15.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.3/VERSION new/yast2-country-2.15.4/VERSION --- old/yast2-country-2.15.3/VERSION 2006-12-13 10:22:41.000000000 +0100 +++ new/yast2-country-2.15.4/VERSION 2006-12-15 11:09:27.000000000 +0100 @@ -1 +1 @@ -2.15.3 +2.15.4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.3/language/data/language_mr_IN.ycp new/yast2-country-2.15.4/language/data/language_mr_IN.ycp --- old/yast2-country-2.15.3/language/data/language_mr_IN.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-country-2.15.4/language/data/language_mr_IN.ycp 2006-12-15 09:40:10.000000000 +0100 @@ -0,0 +1,43 @@ +/** + * This file contains the description of the language needed by yast2-country + * module. + * + * Translation of the 'language name' to actual YaST language be must applied + * each time this file is invoked. + * + * If you want to add new language to YaST using a file of this type provided + * by some module different from yast2-country (e.g. in some Add-On Product), + * consider using special textdomain, so it is possible to provide also + * translations of the 'language name' string to all installed languages. + * + * Author: Jiří Suchomel <jsuchome(a)suse.cz> + * $Id: language_pa_IN.ycp 32769 2006-09-08 09:29:15Z jsuchome $ + */ +{ + textdomain "languages_db"; + + return + $[ + // 1. information for language selection: + // Format is + // <LANG-Code> : [ + // <Language-to-display-UTF8-coded>, + // <Language-to-display-ASCII-coded-if-needed>, + // <LANG modifier used when UTF-8 enconding is selected> + // <LANG modifier used when no UTF-8 enconding is selected> + // <translated Language-to-display-UTF8-coded> ] + // + "mr_IN" : [ + "मराठी", + "Marathi", + ".UTF-8", + "", + // language name + _("Marathi") + ], + // 2. what time zone propose for this language + "timezone" : "Asia/Calcutta", + // 3. which keyboard layout propose for this language + "keyboard" : "english-us", + ]; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.3/timezone/data/timezone_raw.ycp new/yast2-country-2.15.4/timezone/data/timezone_raw.ycp --- old/yast2-country-2.15.3/timezone/data/timezone_raw.ycp 2006-12-13 10:21:49.000000000 +0100 +++ new/yast2-country-2.15.4/timezone/data/timezone_raw.ycp 2006-12-13 10:45:45.000000000 +0100 @@ -3,7 +3,7 @@ * Authors: Thomas Roelz <tom(a)suse.de> * Summary: The untranslated timezone database. * - * $Id: timezone_raw.ycp 31665 2006-06-26 14:24:27Z jsuchome $ + * $Id: timezone_raw.ycp 34932 2006-12-13 09:45:39Z jsuchome $ * * ***************************************************************** * In case of changes please keep the following files in sync: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lvm2
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package lvm2 checked in at Mon Dec 18 14:01:39 CET 2006. -------- --- lvm2/lvm2.changes 2006-12-06 10:08:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/lvm2/lvm2.changes 2006-12-18 14:00:11.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Dec 18 10:39:49 CET 2006 - fehr(a)suse.de + +- update to new version 2.02.17 + Add missing pvremove error message when device doesn't exist. + When lvconvert allocates a mirror log, respect parallel area constraints. + Use loop to iterate through the now-ordered policy list in _allocate(). + Check for failure to allocate just the mirror log. + Introduce calc_area_multiple(). + Support mirror log allocation when there is only one PV: area_count now 0. + Fix detection of smallest area in _alloc_parallel_area() for cling policy. + Add manpage entry for clvmd -T + Fix gulm operation of clvmd, including a hang when doing lvchange -aey + Fix hang in clvmd if a pre-command failed. + +------------------------------------------------------------------- Old: ---- LVM2.2.02.16.tar.bz2 New: ---- LVM2.2.02.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.0iNi2n/_old 2006-12-18 14:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.0iNi2n/_new 2006-12-18 14:01:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lvm2 (Version 2.02.16) +# spec file for package lvm2 (Version 2.02.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ PreReq: %fillup_prereq %insserv_prereq %endif Autoreqprov: on -Version: 2.02.16 +Version: 2.02.17 Release: 1 Summary: LVM2 Tools Source: LVM2.%{version}.tar.bz2 @@ -176,6 +176,18 @@ %{_mandir}/man8/vgsplit.8.gz %changelog -n lvm2 +* Mon Dec 18 2006 - fehr(a)suse.de +- update to new version 2.02.17 + Add missing pvremove error message when device doesn't exist. + When lvconvert allocates a mirror log, respect parallel area constraints. + Use loop to iterate through the now-ordered policy list in _allocate(). + Check for failure to allocate just the mirror log. + Introduce calc_area_multiple(). + Support mirror log allocation when there is only one PV: area_count now 0. + Fix detection of smallest area in _alloc_parallel_area() for cling policy. + Add manpage entry for clvmd -T + Fix gulm operation of clvmd, including a hang when doing lvchange -aey + Fix hang in clvmd if a pre-command failed. * Wed Dec 06 2006 - fehr(a)suse.de - update to new version 2.02.16 Fix VG clustered read locks to use PR not CR. ++++++ LVM2.2.02.16.tar.bz2 -> LVM2.2.02.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/VERSION new/LVM2.2.02.17/VERSION --- old/LVM2.2.02.16/VERSION 2006-12-02 00:22:12.000000000 +0100 +++ new/LVM2.2.02.17/VERSION 2006-12-14 21:06:12.000000000 +0100 @@ -1 +1 @@ -2.02.16 (2006-12-01) +2.02.17 (2006-12-14) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/WHATS_NEW new/LVM2.2.02.17/WHATS_NEW --- old/LVM2.2.02.16/WHATS_NEW 2006-12-02 00:15:59.000000000 +0100 +++ new/LVM2.2.02.17/WHATS_NEW 2006-12-14 21:05:08.000000000 +0100 @@ -1,3 +1,16 @@ +Version 2.02.17 - 14th December 2006 +==================================== + Add missing pvremove error message when device doesn't exist. + When lvconvert allocates a mirror log, respect parallel area constraints. + Use loop to iterate through the now-ordered policy list in _allocate(). + Check for failure to allocate just the mirror log. + Introduce calc_area_multiple(). + Support mirror log allocation when there is only one PV: area_count now 0. + Fix detection of smallest area in _alloc_parallel_area() for cling policy. + Add manpage entry for clvmd -T + Fix gulm operation of clvmd, including a hang when doing lvchange -aey + Fix hang in clvmd if a pre-command failed. + Version 2.02.16 - 1st December 2006 =================================== Fix VG clustered read locks to use PR not CR. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/daemons/clvmd/clvmd-command.c new/LVM2.2.02.17/daemons/clvmd/clvmd-command.c --- old/LVM2.2.02.16/daemons/clvmd/clvmd-command.c 2006-12-02 00:10:25.000000000 +0100 +++ new/LVM2.2.02.17/daemons/clvmd/clvmd-command.c 2006-12-11 15:00:26.000000000 +0100 @@ -194,7 +194,7 @@ /* Read locks need to be PR; other modes get passed through */ if ((lock_cmd & LCK_TYPE_MASK) == LCK_READ) { lock_cmd &= ~LCK_TYPE_MASK; - lock_cmd |= LKM_PRMODE; + lock_cmd |= LCK_PREAD; } status = sync_lock(lockname, (int)lock_cmd, (lock_flags & LCK_NONBLOCK) ? LKF_NOQUEUE : 0, &lkid); if (status) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/daemons/clvmd/clvmd-gulm.c new/LVM2.2.02.17/daemons/clvmd/clvmd-gulm.c --- old/LVM2.2.02.16/daemons/clvmd/clvmd-gulm.c 2006-10-09 16:11:57.000000000 +0200 +++ new/LVM2.2.02.17/daemons/clvmd/clvmd-gulm.c 2006-12-11 15:00:26.000000000 +0100 @@ -730,7 +730,7 @@ pthread_mutex_lock(&lwait.mutex); /* This needs to be converted from DLM/LVM2 value for GULM */ - if (flags == LCK_NONBLOCK) flags = lg_lock_flag_Try; + if (flags & LKF_NOQUEUE) flags = lg_lock_flag_Try; dm_hash_insert(lock_hash, resource, &lwait); DEBUGLOG("lock_resource '%s', flags=%d, mode=%d\n", resource, flags, mode); @@ -828,6 +828,7 @@ } break; + case LCK_PREAD: case LCK_READ: status = _lock_resource(lock1, lg_lock_state_Shared, flags, lockid); if (status) @@ -864,6 +865,7 @@ /* The held lock mode is in the lock id */ assert(lockid == LCK_EXCL || lockid == LCK_READ || + lockid == LCK_PREAD || lockid == LCK_WRITE); status = _unlock_resource(lock1, lockid); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/daemons/clvmd/clvmd-gulm.h new/LVM2.2.02.17/daemons/clvmd/clvmd-gulm.h --- old/LVM2.2.02.16/daemons/clvmd/clvmd-gulm.h 2005-01-13 14:24:02.000000000 +0100 +++ new/LVM2.2.02.17/daemons/clvmd/clvmd-gulm.h 2006-12-11 15:00:26.000000000 +0100 @@ -1,5 +1,6 @@ - +/* DLM constant that clvmd uses as a generic NONBLOCK lock flag */ +#define LKF_NOQUEUE 1 extern int get_next_node_csid(void **context, char *csid); extern void add_down_node(char *csid); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/daemons/clvmd/clvmd.c new/LVM2.2.02.17/daemons/clvmd/clvmd.c --- old/LVM2.2.02.16/daemons/clvmd/clvmd.c 2006-12-02 00:10:25.000000000 +0100 +++ new/LVM2.2.02.17/daemons/clvmd/clvmd.c 2006-12-11 14:48:41.000000000 +0100 @@ -1426,6 +1426,8 @@ DEBUGLOG("Writing status %d down pipe %d\n", status, pipe_fd); /* Tell the parent process we have finished this bit */ write(pipe_fd, &status, sizeof(int)); + if (status) + continue; /* Wait for another PRE command */ /* We may need to wait for the condition variable before running the post command */ pthread_mutex_lock(&client->bits.localsock.mutex); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/lib/locking/locking.h new/LVM2.2.02.17/lib/locking/locking.h --- old/LVM2.2.02.16/lib/locking/locking.h 2006-05-16 18:48:30.000000000 +0200 +++ new/LVM2.2.02.17/lib/locking/locking.h 2006-12-11 15:00:26.000000000 +0100 @@ -50,7 +50,7 @@ #define LCK_NULL 0x00000000 /* LCK$_NLMODE */ #define LCK_READ 0x00000001 /* LCK$_CRMODE */ /* LCK$_CWMODE */ - /* LCK$_PRMODE */ +#define LCK_PREAD 0x00000003 /* LCK$_PRMODE */ #define LCK_WRITE 0x00000004 /* LCK$_PWMODE */ #define LCK_EXCL 0x00000005 /* LCK$_EXMODE */ #define LCK_UNLOCK 0x00000006 /* This is ours */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/lib/metadata/lv_manip.c new/LVM2.2.02.17/lib/metadata/lv_manip.c --- old/LVM2.2.02.16/lib/metadata/lv_manip.c 2006-10-30 17:10:55.000000000 +0100 +++ new/LVM2.2.02.17/lib/metadata/lv_manip.c 2006-12-13 04:39:58.000000000 +0100 @@ -415,6 +415,15 @@ struct list alloced_areas[0]; /* Lists of areas in each stripe */ }; +static uint32_t calc_area_multiple(const struct segment_type *segtype, + const uint32_t area_count) +{ + if (!segtype_is_striped(segtype) || !area_count) + return 1; + + return area_count; +} + /* * Preparation for a specific allocation attempt */ @@ -476,7 +485,7 @@ ah->area_count = area_count; ah->log_count = log_count; ah->alloc = alloc; - ah->area_multiple = segtype_is_striped(segtype) ? ah->area_count : 1; + ah->area_multiple = calc_area_multiple(segtype, area_count); for (s = 0; s < ah->area_count; s++) list_init(&ah->alloced_areas[s]); @@ -553,7 +562,7 @@ if (mirrored_pv) extra_areas = 1; - area_multiple = segtype_is_striped(segtype) ? area_count : 1; + area_multiple = calc_area_multiple(segtype, area_count); /* log_lv gets set up elsehere */ if (!(seg = alloc_lv_segment(lv->vg->cmd->mem, segtype, lv, @@ -628,17 +637,17 @@ struct pv_area **areas, uint32_t *ix, struct pv_area *log_area) { - uint32_t area_len, smallest, remaining; + uint32_t area_len, remaining; uint32_t s; struct alloced_area *aa; remaining = needed - *ix; area_len = remaining / ah->area_multiple; - smallest = areas[ah->area_count - 1]->count; - - if (area_len > smallest) - area_len = smallest; + /* Reduce area_len to the smallest of the areas */ + for (s = 0; s < ah->area_count; s++) + if (area_len > areas[s]->count) + area_len = areas[s]->count; if (!(aa = dm_pool_alloc(ah->mem, sizeof(*aa) * (ah->area_count + (log_area ? 1 : 0))))) { @@ -707,7 +716,7 @@ if (max_seg_len && *max_seg_len > remaining_seg_len) *max_seg_len = remaining_seg_len; - area_multiple = segtype_is_striped(seg->segtype) ? seg->area_count : 1; + area_multiple = calc_area_multiple(seg->segtype, seg->area_count); area_len = remaining_seg_len / area_multiple ? : 1; for (s = first_area; @@ -1066,6 +1075,7 @@ int r = 0; struct list *pvms; uint32_t areas_size; + alloc_policy_t alloc; if (allocated >= new_extents && !ah->log_count) { log_error("_allocate called with no work to do!"); @@ -1111,50 +1121,18 @@ return 0; } - old_allocated = allocated; - if (!_find_parallel_space(ah, ALLOC_CONTIGUOUS, pvms, areas, - areas_size, can_split, - prev_lvseg, &allocated, new_extents)) { - stack; - goto out; - } - - if ((allocated == new_extents) || (ah->alloc == ALLOC_CONTIGUOUS) || - (!can_split && (allocated != old_allocated))) - goto finished; - - old_allocated = allocated; - if (!_find_parallel_space(ah, ALLOC_CLING, pvms, areas, - areas_size, can_split, - prev_lvseg, &allocated, new_extents)) { - stack; - goto out; - } - - if ((allocated == new_extents) || (ah->alloc == ALLOC_CLING) || - (!can_split && (allocated != old_allocated))) - goto finished; - - old_allocated = allocated; - if (!_find_parallel_space(ah, ALLOC_NORMAL, pvms, areas, - areas_size, can_split, - prev_lvseg, &allocated, new_extents)) { - stack; - goto out; - } - - if ((allocated == new_extents) || (ah->alloc == ALLOC_NORMAL) || - (!can_split && (allocated != old_allocated))) - goto finished; - - if (!_find_parallel_space(ah, ALLOC_ANYWHERE, pvms, areas, - areas_size, can_split, - prev_lvseg, &allocated, new_extents)) { - stack; - goto out; + /* Attempt each defined allocation policy in turn */ + for (alloc = ALLOC_CONTIGUOUS; alloc < ALLOC_INHERIT; alloc++) { + old_allocated = allocated; + if (!_find_parallel_space(ah, alloc, pvms, areas, + areas_size, can_split, + prev_lvseg, &allocated, new_extents)) + goto_out; + if ((allocated == new_extents) || (ah->alloc == alloc) || + (!can_split && (allocated != old_allocated))) + break; } - finished: if (allocated != new_extents) { log_error("Insufficient suitable %sallocatable extents " "for logical volume %s: %u more required", @@ -1165,6 +1143,13 @@ goto out; } + if (ah->log_count && !ah->log_area.len) { + log_error("Insufficient extents for log allocation " + "for logical volume %s.", + lv ? lv->name : ""); + goto out; + } + r = 1; out: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/lib/metadata/metadata.h new/LVM2.2.02.17/lib/metadata/metadata.h --- old/LVM2.2.02.16/lib/metadata/metadata.h 2006-11-03 22:07:14.000000000 +0100 +++ new/LVM2.2.02.17/lib/metadata/metadata.h 2006-12-13 04:39:58.000000000 +0100 @@ -78,17 +78,18 @@ #define FMT_RESIZE_PV 0x00000080U /* Supports pvresize? */ #define FMT_UNLIMITED_STRIPESIZE 0x00000100U /* Unlimited stripe size? */ +/* Ordered list - see lv_manip.c */ typedef enum { - ALLOC_INVALID = 0, - ALLOC_INHERIT, + ALLOC_INVALID, ALLOC_CONTIGUOUS, ALLOC_CLING, ALLOC_NORMAL, - ALLOC_ANYWHERE + ALLOC_ANYWHERE, + ALLOC_INHERIT } alloc_policy_t; typedef enum { - AREA_UNASSIGNED = 0, + AREA_UNASSIGNED, AREA_PV, AREA_LV } area_type_t; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/man/clvmd.8 new/LVM2.2.02.17/man/clvmd.8 --- old/LVM2.2.02.16/man/clvmd.8 2006-10-04 10:28:17.000000000 +0200 +++ new/LVM2.2.02.17/man/clvmd.8 2006-12-11 15:06:25.000000000 +0100 @@ -6,6 +6,7 @@ [\-d] [\-h] [\-R] [\-t <timeout>] +[\-T <start timeout>] [\-V] .SH DESCRIPTION clvmd is the daemon that distributes LVM metadata updates around a cluster. @@ -23,6 +24,23 @@ may need to increase this on systems with very large disk farms. The default is 30 seconds. .TP +.I \-T <start timeout> +Specifies the timeout for clvmd daemon startup. If the daemon does not report +that it has started up within this time then the parent command will exit with +status of 5. This does NOT mean that clvmd has not started! What it means is +that the startup of clvmd has been delayed for some reason; the most likely +cause of this is an inquorate cluster though it could be due to locking +latencies on a cluster with large numbers of logical volumes. If you get the +return code of 5 it is usually not necessary to restart clvmd - it will start +as soon as that blockage has cleared. This flag is to allow startup scripts +to exit in a timely fashion even if the cluster is stalled for some reason. + +The default is 0 (no timeout) and the value is in seconds. Don't set this too +small or you will experience spurious errors. 10 or 20 seconds might be +sensible. + +This timeout will be ignored if you start clvmd with the -d switch. +.TP .I \-R Tells all the running clvmd in the cluster to reload their device cache and re-read the lvm configuration file. This command should be run whenever the diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/tools/lvconvert.c new/LVM2.2.02.17/tools/lvconvert.c --- old/LVM2.2.02.16/tools/lvconvert.c 2006-11-03 00:33:20.000000000 +0100 +++ new/LVM2.2.02.17/tools/lvconvert.c 2006-12-13 04:39:58.000000000 +0100 @@ -281,15 +281,8 @@ if (lp->mirrors == existing_mirrors) { if (!seg->log_lv && !arg_count(cmd, corelog_ARG)) { /* No disk log present, add one. */ - /* FIXME: Why doesn't this work? Without - it, we will probably put the log on the - same device as a mirror leg. - if (!(parallel_areas = build_parallel_areas_from_lv(cmd, lv))) { - stack; - return 0; - } - */ - parallel_areas = NULL; + if (!(parallel_areas = build_parallel_areas_from_lv(cmd, lv))) + return_0; if (!lv_mirror_percent(cmd, lv, 0, &sync_percent, NULL)) { log_error("Unable to determine mirror sync status."); return 0; @@ -297,7 +290,7 @@ segtype = get_segtype_from_string(cmd, "striped"); - if (!(ah = allocate_extents(lv->vg, NULL, segtype, 1, + if (!(ah = allocate_extents(lv->vg, NULL, segtype, 0, 0, 1, 0, NULL, 0, 0, lp->pvh, lp->alloc, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/LVM2.2.02.16/tools/pvremove.c new/LVM2.2.02.17/tools/pvremove.c --- old/LVM2.2.02.16/tools/pvremove.c 2006-11-17 03:45:51.000000000 +0100 +++ new/LVM2.2.02.17/tools/pvremove.c 2006-12-13 19:40:23.000000000 +0100 @@ -38,8 +38,8 @@ if (!(pv = pv_read(cmd, name, NULL, NULL, 1))) { if (arg_count(cmd, force_ARG)) return 1; - else - return 0; + log_error("Physical Volume %s not found", name); + return 0; } /* orphan ? */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xgl-hardware-list
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package xgl-hardware-list checked in at Mon Dec 18 14:01:21 CET 2006. -------- --- xgl-hardware-list/xgl-hardware-list.changes 2006-11-30 15:45:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/xgl-hardware-list/xgl-hardware-list.changes 2006-12-18 08:00:11.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 18 07:57:57 CET 2006 - sndirsch(a)suse.de + +- added remaining radeon supported cards with status unknown + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl-hardware-list.spec ++++++ --- /var/tmp/diff_new_pack.EUx0zG/_old 2006-12-18 14:01:14.000000000 +0100 +++ /var/tmp/diff_new_pack.EUx0zG/_new 2006-12-18 14:01:14.000000000 +0100 @@ -16,7 +16,7 @@ Group: System/X11/Servers/XF86_4 Autoreqprov: on Version: 060526 -Release: 33 +Release: 36 Conflicts: compiz < cvs_060519 BuildArchitectures: noarch Summary: Xgl hardware compatibility list @@ -52,6 +52,8 @@ /etc/X11/xgl-intel-setup.sh %changelog -n xgl-hardware-list +* Mon Dec 18 2006 - sndirsch(a)suse.de +- added remaining radeon supported cards with status unknown * Thu Nov 30 2006 - sndirsch(a)suse.de - added another ATI card usable with radeon driver (ssommer) * U 1002:4e50 # MOBILITY RADEON 9600/9700 (M10/M11 4E50) ++++++ xgl-hardware-list ++++++ --- xgl-hardware-list/xgl-hardware-list 2006-11-30 15:44:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/xgl-hardware-list/xgl-hardware-list 2006-12-18 07:56:59.000000000 +0100 @@ -277,10 +277,124 @@ # Non-Xgl-compatible ATI cards # Unrecognized ATI cards -U 1002:4c57 # Radeon LW -U 1002:4e50 # MOBILITY RADEON 9600/9700 (M10/M11 4E50) -U 1002:5b60 # RADEON X300/X550 (RV370 5B60) - +U 1002:3152 # ATI Technologies Inc:MOBILITY RADEON X300 +U 1002:3154 # ATI Technologies Inc:FireGL M24 GL 3154 (PCIE) +U 1002:3e50 # ATI Technologies Inc:Radeon X600 (RV380) 3E50 (PCIE) +U 1002:3e54 # ATI Technologies Inc:FireGL V3200 (RV380) 3E54 (PCIE) +U 1002:4136 # ATI Technologies Inc:RS100 4136 +U 1002:4137 # ATI Technologies Inc:RS100 4137 +U 1002:4144 # ATI Technologies Inc:R300 AD +U 1002:4145 # ATI Technologies Inc:E300 AE +U 1002:4146 # ATI Technologies Inc:R300 AF +U 1002:4147 # ATI Technologies Inc:R300 AG +U 1002:4148 # ATI Technologies Inc:R350 AH +U 1002:4149 # ATI Technologies Inc:R350 AI +U 1002:414a # ATI Technologies Inc:R350 AJ +U 1002:414b # ATI Technologies Inc:R350 AK +U 1002:4150 # ATI Technologies Inc:RV350 AP +U 1002:4151 # ATI Technologies Inc:RV350 AQ +U 1002:4152 # ATI Technologies Inc:RV350 AR +U 1002:4153 # ATI Technologies Inc:RV350 AS +U 1002:4154 # ATI Technologies Inc:RV350 AT +U 1002:4155 # ATI Technologies Inc:Radeon 9650 +U 1002:4156 # ATI Technologies Inc:RV350 AV +U 1002:4237 # ATI Technologies Inc:RS250 4237 +U 1002:4242 # ATI Technologies Inc:R200 BB +U 1002:4243 # ATI Technologies Inc:R200 BC +U 1002:4336 # ATI Technologies Inc:RS100 4336 +U 1002:4337 # ATI Technologies Inc:RS200 4337 +U 1002:4437 # ATI Technologies Inc:RS250 4437 +U 1002:4967 # ATI Technologies Inc:RV250 Ig +U 1002:4a48 # ATI Technologies Inc:R420 JH +U 1002:4a49 # ATI Technologies Inc:R420 JI +U 1002:4a4a # ATI Technologies Inc:R420 JJ +U 1002:4a4b # ATI Technologies Inc:R420 JK +U 1002:4a4c # ATI Technologies Inc:R420 JL +U 1002:4a4d # ATI Technologies Inc:R420 JM +U 1002:4a4e # ATI Technologies Inc:R420 JN +U 1002:4a4f # ATI Technologies Inc:Radeon X800 SE (R420) (AGP) +U 1002:4a50 # ATI Technologies Inc:R420 JP +U 1002:4a54 # ATI Technologies Inc:ATI Radeon AIW X800 VE (R420) JT (AGP) +U 1002:4b49 # ATI Technologies Inc:Radeon X850 XT (R480) (AGP) +U 1002:4b4a # ATI Technologies Inc:Radeon X850 SE (R480) (AGP) +U 1002:4b4b # ATI Technologies Inc:Radeon X850 PRO (R480) (AGP) +U 1002:4b4c # ATI Technologies Inc:Radeon X850 XT PE (R480) (AGP) +U 1002:4c57 # ATI Technologies Inc:Radeon LW +U 1002:4c58 # ATI Technologies Inc:Radeon LX +U 1002:4c59 # ATI Technologies Inc:Radeon LY +U 1002:4c5a # ATI Technologies Inc:Radeon LZ +U 1002:4c64 # ATI Technologies Inc:RV250 Ld +U 1002:4c66 # ATI Technologies Inc:RV250 Lf +U 1002:4c67 # ATI Technologies Inc:RV250 Lg +U 1002:4e45 # ATI Technologies Inc:R300 NE +U 1002:4e46 # ATI Technologies Inc:R300 NF +U 1002:4e48 # ATI Technologies Inc:R350 NH +U 1002:4e49 # ATI Technologies Inc:R350 NI +U 1002:4e4a # ATI Technologies Inc:R360 NJ +U 1002:4e4b # ATI Technologies Inc:R350 NK +U 1002:4e50 # ATI Technologies Inc:RV350 NP +U 1002:4e51 # ATI Technologies Inc:RV350 NQ +U 1002:4e52 # ATI Technologies Inc:RV350 NR +U 1002:4e53 # ATI Technologies Inc:RV350 NS +U 1002:4e54 # ATI Technologies Inc:FireGL Mobility T2 +U 1002:4e56 # ATI Technologies Inc:RV350 NV +U 1002:5144 # ATI Technologies Inc:Radeon QD +U 1002:5145 # ATI Technologies Inc:Radeon QE +U 1002:5146 # ATI Technologies Inc:Radeon QF +U 1002:5147 # ATI Technologies Inc:Radeon QG +U 1002:5148 # ATI Technologies Inc:fgl8x00 +U 1002:514c # ATI Technologies Inc:R200 QL +U 1002:514d # ATI Technologies Inc:Radeon 9100 QM +U 1002:5158 # ATI Technologies Inc:RV200 QX +U 1002:515a # ATI Technologies Inc:Radeon QZ +U 1002:5460 # ATI Technologies Inc:Radeon Mobility M300 (M22) 5460 (PCIE) +U 1002:5462 # ATI Technologies Inc:MOBILITY RADEON X600SE +U 1002:5464 # ATI Technologies Inc:FireGL M22 GL 5464 (PCIE) +U 1002:5548 # ATI Technologies Inc:Radeon X800 (R423) UH (PCIE) +U 1002:5549 # ATI Technologies Inc:Radeon X800PRO (R423) UI (PCIE) +U 1002:554a # ATI Technologies Inc:Radeon X800LE (R423) UJ (PCIE) +U 1002:554b # ATI Technologies Inc:Radeon X800SE (R423) UK (PCIE) +U 1002:554c # ATI Technologies Inc:Radeon X800 XTP (R430) (PCIE) +U 1002:554d # ATI Technologies Inc:Radeon X800 XL (R430) (PCIE) +U 1002:554e # ATI Technologies Inc:Radeon X800 SE (R430) (PCIE) +U 1002:554f # ATI Technologies Inc:Radeon X800 (R430) (PCIE) +U 1002:5550 # ATI Technologies Inc:FireGL V7100 (R423) (PCIE) +U 1002:5551 # ATI Technologies Inc:FireGL V7200 (R423) UQ (PCIE) +U 1002:5552 # ATI Technologies Inc:FireGL V5100 (R423) UR (PCIE) +U 1002:5554 # ATI Technologies Inc:FireGL V7100 (R423) UT (PCIE) +U 1002:564a # ATI Technologies Inc:Mobility FireGL V5000 564A (M26) (PCIE) +U 1002:564b # ATI Technologies Inc:Mobility FireGL V5000 564B (M26) (PCIE) +U 1002:564f # ATI Technologies Inc:ATI Radeon 7000 IGP (A4+) 4237 +U 1002:5652 # ATI Technologies Inc:Mobility Radeon X700 5652 (M26) (PCIE) +U 1002:5834 # ATI Technologies Inc:RS300 5834 +U 1002:5835 # ATI Technologies Inc:RS300 5835 +U 1002:5962 # ATI Technologies Inc:RV280 5962 +U 1002:5964 # ATI Technologies Inc:RV280 5964 +U 1002:5965 # ATI Technologies Inc:FireMV 2200 (PCI) +U 1002:5b60 # ATI Technologies Inc:Radeon X300 (RV370) 5B60 (PCIE) +U 1002:5b62 # ATI Technologies Inc:Radeon X600 (RV370) 5B62 (PCIE) +U 1002:5b63 # ATI Technologies Inc:RADEON X550 +U 1002:5b65 # ATI Technologies Inc:FireGL D1100 (RV370) 5B65 (PCIE) +U 1002:5c61 # ATI Technologies Inc:RV280 5c61 +U 1002:5c63 # ATI Technologies Inc:RV280 5c63 +U 1002:5d48 # ATI Technologies Inc:Mobility Radeon X800 XT (M28) (PCIE) +U 1002:5d49 # ATI Technologies Inc:Mobility FireGL V5100 (M28) (PCIE) +U 1002:5d4a # ATI Technologies Inc:Mobility Radeon X800 (M28) (PCIE) +U 1002:5d4c # ATI Technologies Inc:Radeon X850 5D4C (PCIE) +U 1002:5d4d # ATI Technologies Inc:Radeon X850 XT PE (R480) (PCIE) +U 1002:5d4e # ATI Technologies Inc:Radeon X850 SE (R480) (PCIE) +U 1002:5d4f # ATI Technologies Inc:Radeon X850 PRO (R480) (PCIE) +U 1002:5d50 # ATI Technologies Inc:Radeon FireGL (R480) GL 5D50 (PCIE) +U 1002:5d52 # ATI Technologies Inc:Radeon X850 XT (R480) (PCIE) +U 1002:5d57 # ATI Technologies Inc:Radeon X800XT (R423) 5D57 (PCIE) +U 1002:5e48 # ATI Technologies Inc:FireGL V5000 (RV410) (PCIE) +U 1002:5e4a # ATI Technologies Inc:Radeon X700 XT (RV410) (PCIE) +U 1002:5e4b # ATI Technologies Inc:Radeon X700 PRO (RV410) (PCIE) +U 1002:5e4c # ATI Technologies Inc:Radeon X700 SE (RV410) 5E4C (PCIE) +U 1002:5e4d # ATI Technologies Inc:Radeon X700 (RV410) (PCIE) +U 1002:5e4f # ATI Technologies Inc:Radeon X700 SE (RV410) 5E4F (PCIE) +U 1002:7834 # ATI Technologies Inc:Radeon 9100 PRO IGP 7834 +U 1002:7835 # ATI Technologies Inc:Radeon Mobility 9200 IGP 7835 ## ## ATI cards ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-kde
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package qtcurve-kde checked in at Mon Dec 18 14:00:48 CET 2006. -------- --- KDE/qtcurve-kde/qtcurve-kde.changes 2006-11-30 16:17:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-kde/qtcurve-kde.changes 2006-12-18 11:24:50.000000000 +0100 @@ -1,0 +2,20 @@ +Mon Dec 18 11:23:44 CET 2006 - stbinner(a)suse.de + +- update to 0.46.2: + * Remove rgb2Hls() and hls2Rgb() unless using old style shading. + * Don't mouse-over disabled tabs! + * Fix look of flat style tabs. + + update to 0.46.1: + * Fix location of arrows on secondary scrollbar buttons. + * New shading routine - works *much* better with dark colour schemes. + + update to 0.46: + * Allow negative highlight factors. + * Allow usage of light borders on menuitems and progressbars, as well + as a custom colour setting. + * Dont fill in slider grooves of disabled sliders. + * Dont allow OO.o menubar shading if this would require swapping text + colours - cant do this in OO.o. + +------------------------------------------------------------------- Old: ---- QtCurve-KDE3-0.45.2.tar.gz New: ---- QtCurve-KDE3-0.46.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde.spec ++++++ --- /var/tmp/diff_new_pack.NO1JXg/_old 2006-12-18 14:00:39.000000000 +0100 +++ /var/tmp/diff_new_pack.NO1JXg/_new 2006-12-18 14:00:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde (Version 0.45.2) +# spec file for package qtcurve-kde (Version 0.46.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ License: GNU General Public License (GPL) Group: System/GUI/GNOME Summary: QtCurve style for Gtk2+ -Version: 0.45.2 -Release: 9 +Version: 0.46.2 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE3-%{version}.tar.gz Patch: fix-opensuseupdater-systemtray-transparency.diff @@ -70,6 +70,21 @@ /opt/kde3/share/apps/qtcurve %changelog -n qtcurve-kde +* Mon Dec 18 2006 - stbinner(a)suse.de +- update to 0.46.2: + * Remove rgb2Hls() and hls2Rgb() unless using old style shading. + * Don't mouse-over disabled tabs! + * Fix look of flat style tabs. + update to 0.46.1: + * Fix location of arrows on secondary scrollbar buttons. + * New shading routine - works *much* better with dark colour schemes. + update to 0.46: + * Allow negative highlight factors. + * Allow usage of light borders on menuitems and progressbars, as well + as a custom colour setting. + * Dont fill in slider grooves of disabled sliders. + * Dont allow OO.o menubar shading if this would require swapping text + colours - cant do this in OO.o. * Thu Nov 30 2006 - stbinner(a)suse.de - fix transparency of opensuseupdater in system tray (#223472) * Mon Nov 06 2006 - stbinner(a)suse.de ++++++ QtCurve-KDE3-0.45.2.tar.gz -> QtCurve-KDE3-0.46.2.tar.gz ++++++ ++++ 1805 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/ChangeLog new/QtCurve-KDE3-0.46.2/ChangeLog --- old/QtCurve-KDE3-0.45.2/ChangeLog 2006-11-05 20:27:33.000000000 +0100 +++ new/QtCurve-KDE3-0.46.2/ChangeLog 2006-12-16 16:18:01.000000000 +0100 @@ -1,3 +1,31 @@ +0.46.2 +------ +1. Remove rgb2Hls() and hls2Rgb() unless using old style shading. +2. Don't mouse-over disabled tabs! +3. Fix look of flat style tabs. + +0.46.1 +------ +1. Fix location of arrows on secondary scrollbar buttons. +2. New shading routine - works *much* better with dark colour + schemes. This is enabled for all colours be default, to + enable only for dark colours (i.e. where red, green, + and blue < 96), then configure with --enable-old-shading + +0.46 +---- +1. Allow negative highlight factors. +2. Allow usage of light borders on menuitems and progressbars, + as well as a custom colour setting. Patch by Frederic Van Assche +3. Dont fill in slider grooves of disabled sliders. Patch by Frederic Van Assche +4. Dont allow OO.o menubar shading if this would require swapping + text colours - cant do this in OO.o. + +0.45.3 +------ +1. Correctly place check and radio buttons. +2. Improve drawing of very small progress. + 0.45.2 ------ 1. Make kaffeine's sidebar buttons consistent when coloured. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/config.h.in new/QtCurve-KDE3-0.46.2/config.h.in --- old/QtCurve-KDE3-0.45.2/config.h.in 2006-11-05 18:45:18.000000000 +0100 +++ new/QtCurve-KDE3-0.46.2/config.h.in 2006-12-16 16:19:04.000000000 +0100 @@ -117,6 +117,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Use new shading only for dark colours */ +#undef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK + /* The size of `char *', as computed by sizeof. */ #undef SIZEOF_CHAR_P diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/configure.in new/QtCurve-KDE3-0.46.2/configure.in --- old/QtCurve-KDE3-0.45.2/configure.in 2006-11-05 18:44:51.000000000 +0100 +++ new/QtCurve-KDE3-0.46.2/configure.in 2006-12-16 16:18:21.000000000 +0100 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.45.2) dnl searches for some needed programs +AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.46.2) dnl searches for some needed programs KDE_SET_PREFIX @@ -70,6 +70,14 @@ AC_CHECK_BOOL AC_PREFIX_DEFAULT([`kde-config --prefix`]) +AC_ARG_ENABLE(old-shading, + AS_HELP_STRING([--enable-old-shading], + [Use pre 0.46.1 style shading for colours red>=96 && green>=96 && blue>=96]), + [USE_OLD_SHADE="$enableval"], [USE_OLD_SHADE="no"]) +if test "$USE_OLD_SHADE" = "yes"; then + AC_DEFINE(QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK, 1, [Use new shading only for dark colours]) +fi + # KDECONFIG comes from KDE's configure stuff... KDE_VERSION=`$KDECONFIG --version | grep KDE | awk -F: '{print $2}' | awk -F' ' '{print $1}' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` KDE_CREATE_SUBDIRSLIST diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/configure.in.in new/QtCurve-KDE3-0.46.2/configure.in.in --- old/QtCurve-KDE3-0.45.2/configure.in.in 2006-11-05 20:27:33.000000000 +0100 +++ new/QtCurve-KDE3-0.46.2/configure.in.in 2006-12-16 16:18:01.000000000 +0100 @@ -1,9 +1,17 @@ #MIN_CONFIG -AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.45.2) +AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.46.2) CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST" AC_CHECK_FUNCS(setenv unsetenv) AC_CHECK_BOOL AC_PREFIX_DEFAULT([`kde-config --prefix`]) +AC_ARG_ENABLE(old-shading, + AS_HELP_STRING([--enable-old-shading], + [Use pre 0.46.1 style shading for colours red>=96 && green>=96 && blue>=96]), + [USE_OLD_SHADE="$enableval"], [USE_OLD_SHADE="no"]) +if test "$USE_OLD_SHADE" = "yes"; then + AC_DEFINE(QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK, 1, [Use new shading only for dark colours]) +fi + # KDECONFIG comes from KDE's configure stuff... KDE_VERSION=`$KDECONFIG --version | grep KDE | awk -F: '{print $2}' | awk -F' ' '{print $1}' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/common.h new/QtCurve-KDE3-0.46.2/kde/common.h --- old/QtCurve-KDE3-0.45.2/kde/common.h 2006-10-23 21:35:36.000000000 +0200 +++ new/QtCurve-KDE3-0.46.2/kde/common.h 2006-12-16 16:18:01.000000000 +0100 @@ -75,6 +75,7 @@ #define SHADE_2_HIGHLIGHT NUM_STD_SHADES+2 /* 3d effect - i.e. buttons, etc */ +#ifdef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK #define QTC_SHADES \ static const double shades[11][NUM_STD_SHADES]=\ { \ @@ -90,6 +91,23 @@ { 1.19, 1.07, 0.91, 0.789, 0.846, 0.40 }, \ { 1.21, 1.07, 0.91, 0.790, 0.848, 0.35 } \ }; +#else +#define QTC_SHADES \ + static const double shades[11][NUM_STD_SHADES]=\ + { \ + { 1.07, 1.03, 0.91, 0.780, 0.834, 0.82 }, \ + { 1.08, 1.03, 0.91, 0.781, 0.835, 0.80 }, \ + { 1.09, 1.03, 0.91, 0.782, 0.836, 0.78 }, \ + { 1.10, 1.04, 0.91, 0.783, 0.837, 0.76 }, \ + { 1.11, 1.04, 0.91, 0.784, 0.838, 0.74 }, \ + { 1.12, 1.05, 0.91, 0.785, 0.840, 0.72 }, \ + { 1.13, 1.05, 0.91, 0.786, 0.842, 0.70 }, \ + { 1.14, 1.06, 0.91, 0.787, 0.844, 0.68 }, /* default */ \ + { 1.16, 1.06, 0.91, 0.788, 0.846, 0.53 }, \ + { 1.18, 1.07, 0.91, 0.789, 0.848, 0.48 }, \ + { 1.20, 1.07, 0.91, 0.790, 0.850, 0.43 } \ + }; +#endif #define QTC_SHADE(c, s) \ (c>10 || c<0 || s>=NUM_STD_SHADES || s<0 ? 1.0 : shades[c][s]) @@ -113,15 +131,23 @@ #define SHADE_MENU_LIGHT 1.02 #define SHADE_MENU_DARK 0.96 +/* #define SHADE_TAB_LIGHT 1.0 #define SHADE_TAB_DARK 1.0 +*/ #define SHADE_TAB_SEL_LIGHT 1.1 #define SHADE_TAB_SEL_DARK 1.0 +/* #define SHADE_BOTTOM_TAB_LIGHT 1.0 #define SHADE_BOTTOM_TAB_DARK 1.0 +*/ #define SHADE_BOTTOM_TAB_SEL_LIGHT 1.0 +#ifdef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK #define SHADE_BOTTOM_TAB_SEL_DARK 0.9 +#else +#define SHADE_BOTTOM_TAB_SEL_DARK 0.96 +#endif #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.20) \ @@ -143,11 +169,15 @@ #define TOO_DARK(A) ((A).red<MENUBAR_DARK_LIMIT || (A).green<MENUBAR_DARK_LIMIT || (A).blue<MENUBAR_DARK_LIMIT) #endif -#define MENUBAR_SHADE_LIGHT_FACTOR 1.20 +/* #define MENUBAR_SHADE_LIGHT_FACTOR 1.20 */ #define DEFAULT_HIGHLIGHT_FACTOR 1.05 #define MAX_HIGHLIGHT_FACTOR 50 -#define MIN_HIGHLIGHT_FACTOR 0 +#define MIN_HIGHLIGHT_FACTOR -50 +#ifdef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK #define MENUBAR_DARK_FACTOR 0.95 +#else +#define MENUBAR_DARK_FACTOR 0.97 +#endif #define POPUPMENU_LIGHT_FACTOR 1.15 #define INACTIVE_HIGHLIGHT_FACTOR 1.15 @@ -163,7 +193,7 @@ #define NUM_SPLITTER_DASHES 21 -#define WIDGET_BUTTON(w) (WIDGET_STD_BUTTON==w || WIDGET_DEF_BUTTON==w || WIDGET_TOGGLE_BUTTON==w) +#define WIDGET_BUTTON(w) (WIDGET_STD_BUTTON==w || WIDGET_DEF_BUTTON==w || WIDGET_TOGGLE_BUTTON==w || WIDGET_CHECKBOX==w) #define COLORED_BORDER_SIZE 3 #define PROGRESS_CHUNK_WIDTH 10 #define PROGRESS_ANIMATION 100 @@ -191,6 +221,7 @@ WIDGET_CHECKBOX, WIDGET_TOGGLE_BUTTON, WIDGET_MENU_ITEM, + WIDGET_PROGRESSBAR, WIDGET_OTHER } EWidget; @@ -355,6 +386,7 @@ #define QTC_MIN(a, b) ((a) < (b) ? (a) : (b)) #define QTC_MAX(a, b) ((b) < (a) ? (a) : (b)) +#ifdef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK static void rgb2Hls(double *r, double *g, double *b) { double min, @@ -482,6 +514,7 @@ *s=b; } } +#endif static bool equal(double d1, double d2) { @@ -566,6 +599,8 @@ stripedProgress, animatedProgress, fillSlider, + lightMenuBorder, + lightProgressBorder, lightSliderBorder, lightSbSliderBorder, fixParentlessDialogs, @@ -578,6 +613,7 @@ menubarMouseOver, shadeMenubarOnlyWhenActive, inactiveHighlight, + useCustomLightBorderColor, thinnerMenuItems; EFocus focus; ETBarBorder toolbarBorders; @@ -602,6 +638,7 @@ shadeCheckRadio; EScrollbar scrollbarType; color customMenubarsColor, + customLightBorderColor, customSlidersColor, customSbSlidersColor, customLvHeaderColor, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfig.cpp new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfig.cpp --- old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfig.cpp 2006-10-23 21:35:36.000000000 +0200 +++ new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfig.cpp 2006-11-28 21:35:56.000000000 +0100 @@ -211,6 +211,8 @@ connect(appearance, SIGNAL(activated(int)), SLOT(updateChanged())); connect(vArrow, SIGNAL(toggled(bool)), SLOT(updateChanged())); connect(fillSlider, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(lightMenuBorder, SIGNAL(toggled(bool)), SLOT(updateChanged())); + connect(lightProgressBorder, SIGNAL(toggled(bool)), SLOT(updateChanged())); connect(lightSliderBorder, SIGNAL(toggled(bool)), SLOT(updateChanged())); connect(lightSbSliderBorder, SIGNAL(toggled(bool)), SLOT(updateChanged())); connect(stripedProgress, SIGNAL(toggled(bool)), SLOT(stripedProgressChanged())); @@ -239,6 +241,8 @@ connect(borderMenubarItems, SIGNAL(toggled(bool)), SLOT(borderMenubarItemsChanged())); connect(selectedTabAppearance, SIGNAL(activated(int)), SLOT(updateChanged())); connect(normalTabAppearance, SIGNAL(activated(int)), SLOT(updateChanged())); + connect(useCustomLightBorderColor, SIGNAL(toggled(bool)), SLOT(useCustomLightBorderColorChanged())); + connect(customLightBorderColor, SIGNAL(changed(const QColor &)), SLOT(updateChanged())); connect(customSlidersColor, SIGNAL(changed(const QColor &)), SLOT(updateChanged())); connect(customSbSlidersColor, SIGNAL(changed(const QColor &)), SLOT(updateChanged())); connect(customMenubarsColor, SIGNAL(changed(const QColor &)), SLOT(updateChanged())); @@ -302,6 +306,12 @@ updateChanged(); } +void QtCurveConfig::useCustomLightBorderColorChanged() +{ + customLightBorderColor->setEnabled(useCustomLightBorderColor->isChecked()); + updateChanged(); +} + void QtCurveConfig::shadeSbSlidersChanged() { customSbSlidersColor->setEnabled(SHADE_CUSTOM==shadeSbSliders->currentItem()); @@ -624,6 +634,8 @@ opts.roundMenubarItems=roundMenubarItems->isChecked(); opts.borderMenubarItems=borderMenubarItems->isChecked(); opts.fixParentlessDialogs=fixParentlessDialogs->isChecked(); + opts.lightMenuBorder=lightMenuBorder->isChecked(); + opts.lightProgressBorder=lightProgressBorder->isChecked(); opts.lightSliderBorder=lightSliderBorder->isChecked(); opts.lightSbSliderBorder=lightSbSliderBorder->isChecked(); opts.stripedProgress=stripedProgress->isChecked(); @@ -657,6 +669,8 @@ opts.toolbarSeparators=(ELine)toolbarSeparators->currentItem(); opts.splitters=(ELine)splitters->currentItem(); opts.highlightEdits=highlightEdits->isChecked(); + opts.useCustomLightBorderColor=useCustomLightBorderColor->isChecked(); + opts.customLightBorderColor=customLightBorderColor->color(); opts.customSlidersColor=customSlidersColor->color(); opts.customSbSlidersColor=customSbSlidersColor->color(); opts.customMenubarsColor=customMenubarsColor->color(); @@ -699,6 +713,8 @@ roundMenubarItems->setChecked(opts.roundMenubarItems); borderMenubarItems->setChecked(opts.borderMenubarItems); fixParentlessDialogs->setChecked(opts.fixParentlessDialogs); + lightMenuBorder->setChecked(opts.lightMenuBorder); + lightProgressBorder->setChecked(opts.lightProgressBorder); lightSliderBorder->setChecked(opts.lightSliderBorder); lightSbSliderBorder->setChecked(opts.lightSbSliderBorder); stripedProgress->setChecked(opts.stripedProgress); @@ -720,6 +736,8 @@ shadeMenubars->setCurrentItem(opts.shadeMenubars); shadeCheckRadio->setCurrentItem(opts.shadeCheckRadio); highlightFactor->setValue((int)(opts.highlightFactor*100)-100); + useCustomLightBorderColor->setChecked(opts.useCustomLightBorderColor); + customLightBorderColor->setColor(opts.customLightBorderColor); customSlidersColor->setColor(opts.customSlidersColor); customSbSlidersColor->setColor(opts.customSbSlidersColor); customMenubarsColor->setColor(opts.customMenubarsColor); @@ -729,6 +747,7 @@ customMenuSelTextColor->setColor(opts.customMenuSelTextColor); customMenuTextColor->setChecked(opts.customMenuTextColor); + customLightBorderColor->setEnabled(opts.useCustomLightBorderColor); customSlidersColor->setEnabled(SHADE_CUSTOM==opts.shadeSliders); customSbSlidersColor->setEnabled(SHADE_CUSTOM==opts.shadeSbSliders); customMenubarsColor->setEnabled(SHADE_CUSTOM==opts.shadeMenubars); @@ -770,6 +789,8 @@ roundMenubarItems->isChecked()!=currentStyle->opts.roundMenubarItems || borderMenubarItems->isChecked()!=currentStyle->opts.borderMenubarItems || fixParentlessDialogs->isChecked()!=currentStyle->opts.fixParentlessDialogs || + lightMenuBorder->isChecked()!=currentStyle->opts.lightMenuBorder || + lightProgressBorder->isChecked()!=currentStyle->opts.lightProgressBorder || lightSliderBorder->isChecked()!=currentStyle->opts.lightSliderBorder || lightSbSliderBorder->isChecked()!=currentStyle->opts.lightSbSliderBorder || stripedProgress->isChecked()!=currentStyle->opts.stripedProgress || @@ -804,6 +825,8 @@ selectedTabAppearance->currentItem()!=currentStyle->opts.selectedTabAppearance || normalTabAppearance->currentItem()!=currentStyle->opts.normalTabAppearance || customMenuTextColor->isChecked()!=currentStyle->opts.customMenuTextColor || + useCustomLightBorderColor->isChecked()!=currentStyle->opts.useCustomLightBorderColor || + customLightBorderColor->color()!=currentStyle->opts.customLightBorderColor || (HEADER_COLOR_CUSTOM==currentStyle->opts.lvHeaderColor && customLvHeaderColor->color()!=currentStyle->opts.customLvHeaderColor) || (SHADE_CUSTOM==currentStyle->opts.shadeSliders && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfig.h new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfig.h --- old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfig.h 2006-09-30 01:53:01.000000000 +0200 +++ new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfig.h 2006-11-28 21:35:56.000000000 +0100 @@ -73,6 +73,7 @@ void dbiChanged(); void lvChanged(); void shadeSlidersChanged(); + void useCustomLightBorderColorChanged(); void shadeSbSlidersChanged(); void shadeMenubarsChanged(); void shadeCheckRadioChanged(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfigbase.cpp new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfigbase.cpp --- old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfigbase.cpp 2006-10-29 00:17:50.000000000 +0200 +++ new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfigbase.cpp 2006-11-28 21:36:18.000000000 +0100 @@ -3,7 +3,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file './qtcurveconfigbase.ui' ** -** Created: Sat Oct 28 23:17:50 2006 +** Created: Tue Nov 28 20:36:16 2006 ** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $) ** ** WARNING! All changes made in this file will be lost! @@ -97,71 +97,85 @@ appearance = new QComboBox( FALSE, tab, "appearance" ); tabLayout->addMultiCellWidget( appearance, 0, 0, 2, 3 ); - spacer6 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); - tabLayout->addItem( spacer6, 12, 2 ); + spacer6 = new QSpacerItem( 2, 2, QSizePolicy::Minimum, QSizePolicy::Expanding ); + tabLayout->addItem( spacer6, 14, 3 ); - embolden = new QCheckBox( tab, "embolden" ); + coloredSidebarButtons = new QCheckBox( tab, "coloredSidebarButtons" ); - tabLayout->addWidget( embolden, 6, 2 ); + tabLayout->addWidget( coloredSidebarButtons, 12, 3 ); - animatedProgress = new QCheckBox( tab, "animatedProgress" ); + fixParentlessDialogs = new QCheckBox( tab, "fixParentlessDialogs" ); - tabLayout->addMultiCellWidget( animatedProgress, 5, 5, 1, 3 ); + tabLayout->addMultiCellWidget( fixParentlessDialogs, 13, 13, 0, 2 ); - stripedProgress = new QCheckBox( tab, "stripedProgress" ); + highlightFactor = new KIntNumInput( tab, "highlightFactor" ); - tabLayout->addMultiCellWidget( stripedProgress, 4, 4, 0, 3 ); + tabLayout->addWidget( highlightFactor, 9, 3 ); - defaultIndicator = new QComboBox( FALSE, tab, "defaultIndicator" ); - defaultIndicator->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, defaultIndicator->sizePolicy().hasHeightForWidth() ) ); + highlightEdits = new QCheckBox( tab, "highlightEdits" ); - tabLayout->addWidget( defaultIndicator, 6, 3 ); - spacer13_3_2 = new QSpacerItem( 20, 20, QSizePolicy::Fixed, QSizePolicy::Minimum ); - tabLayout->addItem( spacer13_3_2, 5, 0 ); + tabLayout->addMultiCellWidget( highlightEdits, 10, 10, 0, 2 ); - textLabel1_3 = new QLabel( tab, "textLabel1_3" ); + drawDockWindowTitles = new QCheckBox( tab, "drawDockWindowTitles" ); - tabLayout->addMultiCellWidget( textLabel1_3, 6, 6, 0, 1 ); + tabLayout->addMultiCellWidget( drawDockWindowTitles, 12, 12, 0, 2 ); - textLabel1_8 = new QLabel( tab, "textLabel1_8" ); + inactiveHighlight = new QCheckBox( tab, "inactiveHighlight" ); - tabLayout->addMultiCellWidget( textLabel1_8, 7, 7, 0, 1 ); + tabLayout->addWidget( inactiveHighlight, 10, 3 ); - highlightFactor = new KIntNumInput( tab, "highlightFactor" ); + defaultIndicator = new QComboBox( FALSE, tab, "defaultIndicator" ); + defaultIndicator->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, defaultIndicator->sizePolicy().hasHeightForWidth() ) ); + + tabLayout->addWidget( defaultIndicator, 8, 3 ); - tabLayout->addWidget( highlightFactor, 7, 3 ); + embolden = new QCheckBox( tab, "embolden" ); + + tabLayout->addWidget( embolden, 8, 2 ); + spacer13_3_2 = new QSpacerItem( 20, 20, QSizePolicy::Fixed, QSizePolicy::Minimum ); + tabLayout->addItem( spacer13_3_2, 7, 0 ); coloredMouseOver = new QCheckBox( tab, "coloredMouseOver" ); - tabLayout->addMultiCellWidget( coloredMouseOver, 9, 9, 0, 2 ); + tabLayout->addMultiCellWidget( coloredMouseOver, 11, 11, 0, 2 ); - inactiveHighlight = new QCheckBox( tab, "inactiveHighlight" ); + stripedProgress = new QCheckBox( tab, "stripedProgress" ); - tabLayout->addWidget( inactiveHighlight, 8, 3 ); + tabLayout->addMultiCellWidget( stripedProgress, 6, 6, 0, 3 ); - highlightEdits = new QCheckBox( tab, "highlightEdits" ); + lightProgressBorder = new QCheckBox( tab, "lightProgressBorder" ); - tabLayout->addMultiCellWidget( highlightEdits, 8, 8, 0, 2 ); + tabLayout->addMultiCellWidget( lightProgressBorder, 5, 5, 0, 2 ); - coloredSidebarButtons = new QCheckBox( tab, "coloredSidebarButtons" ); + vArrow = new QCheckBox( tab, "vArrow" ); - tabLayout->addWidget( coloredSidebarButtons, 10, 3 ); + tabLayout->addWidget( vArrow, 13, 3 ); - drawDockWindowTitles = new QCheckBox( tab, "drawDockWindowTitles" ); + animatedProgress = new QCheckBox( tab, "animatedProgress" ); + + tabLayout->addMultiCellWidget( animatedProgress, 7, 7, 1, 3 ); + + textLabel1_3 = new QLabel( tab, "textLabel1_3" ); - tabLayout->addMultiCellWidget( drawDockWindowTitles, 10, 10, 0, 2 ); + tabLayout->addMultiCellWidget( textLabel1_3, 8, 8, 0, 1 ); drawStatusBarFrames = new QCheckBox( tab, "drawStatusBarFrames" ); - tabLayout->addWidget( drawStatusBarFrames, 9, 3 ); + tabLayout->addWidget( drawStatusBarFrames, 11, 3 ); - fixParentlessDialogs = new QCheckBox( tab, "fixParentlessDialogs" ); + textLabel1_8 = new QLabel( tab, "textLabel1_8" ); - tabLayout->addMultiCellWidget( fixParentlessDialogs, 11, 11, 0, 2 ); + tabLayout->addMultiCellWidget( textLabel1_8, 9, 9, 0, 1 ); - vArrow = new QCheckBox( tab, "vArrow" ); + customLightBorderColor = new KColorButton( tab, "customLightBorderColor" ); + customLightBorderColor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, customLightBorderColor->sizePolicy().hasHeightForWidth() ) ); - tabLayout->addWidget( vArrow, 11, 3 ); + tabLayout->addWidget( customLightBorderColor, 4, 2 ); + + useCustomLightBorderColor = new QCheckBox( tab, "useCustomLightBorderColor" ); + useCustomLightBorderColor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, useCustomLightBorderColor->sizePolicy().hasHeightForWidth() ) ); + + tabLayout->addMultiCellWidget( useCustomLightBorderColor, 4, 4, 0, 1 ); optionsTab->insertTab( tab, QString::fromLatin1("") ); TabPage = new QWidget( optionsTab, "TabPage" ); @@ -248,7 +262,7 @@ handles = new QComboBox( FALSE, tab_2, "handles" ); tabLayout_2->addWidget( handles, 1, 1 ); - spacer5 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer5 = new QSpacerItem( 20, 2, QSizePolicy::Minimum, QSizePolicy::Expanding ); tabLayout_2->addItem( spacer5, 4, 0 ); groupBox2 = new QGroupBox( tab_2, "groupBox2" ); @@ -323,46 +337,50 @@ groupBox2_2Layout->addMultiCellWidget( menubarMouseOver, 5, 5, 0, 5 ); - borderMenubarItems = new QCheckBox( groupBox2_2, "borderMenubarItems" ); + thinnerMenuItems = new QCheckBox( groupBox2_2, "thinnerMenuItems" ); - groupBox2_2Layout->addMultiCellWidget( borderMenubarItems, 8, 8, 1, 2 ); + groupBox2_2Layout->addMultiCellWidget( thinnerMenuItems, 6, 6, 0, 3 ); - textLabel1_10 = new QLabel( groupBox2_2, "textLabel1_10" ); + customMenuNormTextColor = new KColorButton( groupBox2_2, "customMenuNormTextColor" ); - groupBox2_2Layout->addWidget( textLabel1_10, 7, 0 ); + groupBox2_2Layout->addWidget( customMenuNormTextColor, 3, 5 ); - borderMenuItems = new QCheckBox( groupBox2_2, "borderMenuItems" ); + customMenuTextColor = new QCheckBox( groupBox2_2, "customMenuTextColor" ); + customMenuTextColor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, customMenuTextColor->sizePolicy().hasHeightForWidth() ) ); - groupBox2_2Layout->addMultiCellWidget( borderMenuItems, 7, 7, 1, 2 ); + groupBox2_2Layout->addMultiCellWidget( customMenuTextColor, 3, 3, 0, 4 ); - roundMenuItems = new QCheckBox( groupBox2_2, "roundMenuItems" ); + textLabel1_10_2 = new QLabel( groupBox2_2, "textLabel1_10_2" ); - groupBox2_2Layout->addMultiCellWidget( roundMenuItems, 7, 7, 3, 5 ); + groupBox2_2Layout->addWidget( textLabel1_10_2, 9, 0 ); - roundMenubarItems = new QCheckBox( groupBox2_2, "roundMenubarItems" ); + menubarRoundTopOnly = new QCheckBox( groupBox2_2, "menubarRoundTopOnly" ); - groupBox2_2Layout->addWidget( roundMenubarItems, 8, 3 ); + groupBox2_2Layout->addMultiCellWidget( menubarRoundTopOnly, 9, 9, 4, 5 ); - menubarRoundTopOnly = new QCheckBox( groupBox2_2, "menubarRoundTopOnly" ); + textLabel1_10 = new QLabel( groupBox2_2, "textLabel1_10" ); - groupBox2_2Layout->addMultiCellWidget( menubarRoundTopOnly, 8, 8, 4, 5 ); + groupBox2_2Layout->addWidget( textLabel1_10, 8, 0 ); - textLabel1_10_2 = new QLabel( groupBox2_2, "textLabel1_10_2" ); + borderMenubarItems = new QCheckBox( groupBox2_2, "borderMenubarItems" ); - groupBox2_2Layout->addWidget( textLabel1_10_2, 8, 0 ); + groupBox2_2Layout->addMultiCellWidget( borderMenubarItems, 9, 9, 1, 2 ); - thinnerMenuItems = new QCheckBox( groupBox2_2, "thinnerMenuItems" ); + roundMenubarItems = new QCheckBox( groupBox2_2, "roundMenubarItems" ); - groupBox2_2Layout->addMultiCellWidget( thinnerMenuItems, 6, 6, 0, 3 ); + groupBox2_2Layout->addWidget( roundMenubarItems, 9, 3 ); - customMenuNormTextColor = new KColorButton( groupBox2_2, "customMenuNormTextColor" ); + borderMenuItems = new QCheckBox( groupBox2_2, "borderMenuItems" ); - groupBox2_2Layout->addWidget( customMenuNormTextColor, 3, 5 ); + groupBox2_2Layout->addMultiCellWidget( borderMenuItems, 8, 8, 1, 2 ); - customMenuTextColor = new QCheckBox( groupBox2_2, "customMenuTextColor" ); - customMenuTextColor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)0, 0, 0, customMenuTextColor->sizePolicy().hasHeightForWidth() ) ); + roundMenuItems = new QCheckBox( groupBox2_2, "roundMenuItems" ); - groupBox2_2Layout->addMultiCellWidget( customMenuTextColor, 3, 3, 0, 4 ); + groupBox2_2Layout->addMultiCellWidget( roundMenuItems, 8, 8, 3, 5 ); + + lightMenuBorder = new QCheckBox( groupBox2_2, "lightMenuBorder" ); + + groupBox2_2Layout->addWidget( lightMenuBorder, 7, 0 ); tabLayout_2->addMultiCellWidget( groupBox2_2, 2, 2, 0, 1 ); optionsTab->insertTab( tab_2, QString::fromLatin1("") ); @@ -487,7 +505,7 @@ QtCurveConfigBaseLayout->addMultiCellWidget( optionsTab, 2, 3, 1, 1 ); languageChange(); - resize( QSize(666, 537).expandedTo(minimumSizeHint()) ); + resize( QSize(750, 564).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // tab order @@ -496,7 +514,10 @@ setTabOrder( appearance, focus ); setTabOrder( focus, splitters ); setTabOrder( splitters, round ); - setTabOrder( round, stripedProgress ); + setTabOrder( round, useCustomLightBorderColor ); + setTabOrder( useCustomLightBorderColor, customLightBorderColor ); + setTabOrder( customLightBorderColor, lightProgressBorder ); + setTabOrder( lightProgressBorder, stripedProgress ); setTabOrder( stripedProgress, animatedProgress ); setTabOrder( animatedProgress, embolden ); setTabOrder( embolden, defaultIndicator ); @@ -530,7 +551,8 @@ setTabOrder( customMenuSelTextColor, lighterPopupMenuBgnd ); setTabOrder( lighterPopupMenuBgnd, menubarMouseOver ); setTabOrder( menubarMouseOver, thinnerMenuItems ); - setTabOrder( thinnerMenuItems, borderMenuItems ); + setTabOrder( thinnerMenuItems, lightMenuBorder ); + setTabOrder( lightMenuBorder, borderMenuItems ); setTabOrder( borderMenuItems, roundMenuItems ); setTabOrder( roundMenuItems, borderMenubarItems ); setTabOrder( borderMenubarItems, roundMenubarItems ); @@ -574,28 +596,31 @@ textLabel1_9->setText( tr2i18n( "Roundedness" ) ); textLabel1_7->setText( tr2i18n( "General appearance:" ) ); QWhatsThis::add( appearance, tr2i18n( "The setting here affects the general appearance - and will be applied to buttons, scrollbars, sliders, combo boxes, and spin buttons." ) ); - embolden->setText( tr2i18n( "Bold text, and" ) ); - animatedProgress->setText( tr2i18n( "Animated progress bars" ) ); - stripedProgress->setText( tr2i18n( "Striped progress bars" ) ); - textLabel1_3->setText( tr2i18n( "Default button:" ) ); - textLabel1_8->setText( tr2i18n( "Highlight factor:" ) ); - QWhatsThis::add( textLabel1_8, tr2i18n( "This controls the % that widgets will be highlighted by when the mouse hovers over them" ) ); - highlightFactor->setSuffix( tr2i18n( "%" ) ); - coloredMouseOver->setText( tr2i18n( "Use color when mouse-over" ) ); - inactiveHighlight->setText( tr2i18n( "Standard highlight for inactive windows" ) ); - highlightEdits->setText( tr2i18n( "Highlight selected text fields" ) ); - QWhatsThis::add( highlightEdits, tr2i18n( "Enabling this will cause a border to be drawn around the currently active text field." ) ); coloredSidebarButtons->setText( tr2i18n( "Use colored side bar buttons" ) ); - drawDockWindowTitles->setText( tr2i18n( "Display dock window titles" ) ); - QWhatsThis::add( drawDockWindowTitles, tr2i18n( "Some applications, such as Qt Designer, and Krita, make use of 'dock windows' These have a handle strip along the top - enabling this option will draw the name of the window in the handle strip." ) ); - drawStatusBarFrames->setText( tr2i18n( "Draw statusbar frames" ) ); fixParentlessDialogs->setText( tr2i18n( "'Fix' parentless dialogs" ) ); QWhatsThis::add( fixParentlessDialogs, tr2i18n( "<h2>Warning: Experimental!</h1>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs that have no 'parent'. This causes the dialog to recieve an entry in the taskbar, and allows the dialog to be minimised independantly of the main application window.\n" "\n" "If you enable this option, QtCurve will try to 'fix' this by assigning the dialogs a parent.\n" "\n" "Note: This may brake some applications, as it wiill alter the behaviour of dialogs in a way the application has not intended. Therefore, please use with care." ) ); + highlightFactor->setSuffix( tr2i18n( "%" ) ); + highlightEdits->setText( tr2i18n( "Highlight selected text fields" ) ); + QWhatsThis::add( highlightEdits, tr2i18n( "Enabling this will cause a border to be drawn around the currently active text field." ) ); + drawDockWindowTitles->setText( tr2i18n( "Display dock window titles" ) ); + QWhatsThis::add( drawDockWindowTitles, tr2i18n( "Some applications, such as Qt Designer, and Krita, make use of 'dock windows' These have a handle strip along the top - enabling this option will draw the name of the window in the handle strip." ) ); + inactiveHighlight->setText( tr2i18n( "Standard highlight for inactive windows" ) ); + embolden->setText( tr2i18n( "Bold text, and" ) ); + coloredMouseOver->setText( tr2i18n( "Use color when mouse-over" ) ); + stripedProgress->setText( tr2i18n( "Striped progress bars" ) ); + lightProgressBorder->setText( tr2i18n( "Draw light borders on progress bars" ) ); vArrow->setText( tr2i18n( "'V' style arrows" ) ); + animatedProgress->setText( tr2i18n( "Animated progress bars" ) ); + textLabel1_3->setText( tr2i18n( "Default button:" ) ); + drawStatusBarFrames->setText( tr2i18n( "Draw statusbar frames" ) ); + textLabel1_8->setText( tr2i18n( "Highlight factor:" ) ); + QWhatsThis::add( textLabel1_8, tr2i18n( "This controls the % that widgets will be highlighted by when the mouse hovers over them" ) ); + customLightBorderColor->setText( QString::null ); + useCustomLightBorderColor->setText( tr2i18n( "Custom light border color:" ) ); optionsTab->changeTab( tab, tr2i18n( "General" ) ); textLabel1_4_2_3_2_2_2->setText( tr2i18n( "Coloration:" ) ); customCheckRadioColor->setText( QString::null ); @@ -632,16 +657,17 @@ customMenuSelTextColor->setText( QString::null ); lighterPopupMenuBgnd->setText( tr2i18n( "Lighter popup-menu background" ) ); menubarMouseOver->setText( tr2i18n( "Enable mouse-over for menubar items" ) ); - borderMenubarItems->setText( tr2i18n( "Bordered" ) ); - textLabel1_10->setText( tr2i18n( "Menu items:" ) ); - borderMenuItems->setText( tr2i18n( "Borderd" ) ); - roundMenuItems->setText( tr2i18n( "Rounded" ) ); - roundMenubarItems->setText( tr2i18n( "Rounded" ) ); - menubarRoundTopOnly->setText( tr2i18n( "Round top only" ) ); - textLabel1_10_2->setText( tr2i18n( "Menubar items:" ) ); thinnerMenuItems->setText( tr2i18n( "Thinner menu items" ) ); customMenuNormTextColor->setText( QString::null ); customMenuTextColor->setText( tr2i18n( "Custom text colors (normal/selected):" ) ); + textLabel1_10_2->setText( tr2i18n( "Menubar items:" ) ); + menubarRoundTopOnly->setText( tr2i18n( "Round top only" ) ); + textLabel1_10->setText( tr2i18n( "Menu items:" ) ); + borderMenubarItems->setText( tr2i18n( "Bordered" ) ); + roundMenubarItems->setText( tr2i18n( "Rounded" ) ); + borderMenuItems->setText( tr2i18n( "Bordered" ) ); + roundMenuItems->setText( tr2i18n( "Rounded" ) ); + lightMenuBorder->setText( tr2i18n( "Draw light borders on menu items" ) ); optionsTab->changeTab( tab_2, tr2i18n( "Menus && Toolbars" ) ); groupBox3->setTitle( tr2i18n( "General Sliders" ) ); textLabel1_4_2_3_2_2->setText( tr2i18n( "Coloration:" ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfigbase.ui new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfigbase.ui --- old/QtCurve-KDE3-0.45.2/kde/config/qtcurveconfigbase.ui 2006-10-24 21:37:51.000000000 +0200 +++ new/QtCurve-KDE3-0.46.2/kde/config/qtcurveconfigbase.ui 2006-11-28 21:35:56.000000000 +0100 @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>666</width> - <height>537</height> + <width>750</width> + <height>564</height> </rect> </property> <property name="caption"> @@ -177,7 +177,7 @@ <string>The setting here affects the general appearance - and will be applied to buttons, scrollbars, sliders, combo boxes, and spin buttons.</string> </property> </widget> - <spacer row="12" column="2"> + <spacer row="14" column="3"> <property name="name"> <cstring>spacer6</cstring> </property> @@ -189,36 +189,73 @@ </property> <property name="sizeHint"> <size> - <width>20</width> - <height>20</height> + <width>2</width> + <height>2</height> </size> </property> </spacer> - <widget class="QCheckBox" row="6" column="2"> + <widget class="QCheckBox" row="12" column="3"> <property name="name"> - <cstring>embolden</cstring> + <cstring>coloredSidebarButtons</cstring> </property> <property name="text"> - <string>Bold text, and</string> + <string>Use colored side bar buttons</string> </property> </widget> - <widget class="QCheckBox" row="5" column="1" rowspan="1" colspan="3"> + <widget class="QCheckBox" row="13" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>animatedProgress</cstring> + <cstring>fixParentlessDialogs</cstring> </property> <property name="text"> - <string>Animated progress bars</string> + <string>'Fix' parentless dialogs</string> + </property> + <property name="whatsThis" stdset="0"> + <string><h2>Warning: Experimental!</h1>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs that have no 'parent'. This causes the dialog to recieve an entry in the taskbar, and allows the dialog to be minimised independantly of the main application window. + +If you enable this option, QtCurve will try to 'fix' this by assigning the dialogs a parent. + +Note: This may brake some applications, as it wiill alter the behaviour of dialogs in a way the application has not intended. Therefore, please use with care.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="4"> + <widget class="KIntNumInput" row="9" column="3"> <property name="name"> - <cstring>stripedProgress</cstring> + <cstring>highlightFactor</cstring> + </property> + <property name="suffix"> + <string>%</string> + </property> + </widget> + <widget class="QCheckBox" row="10" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>highlightEdits</cstring> </property> <property name="text"> - <string>Striped progress bars</string> + <string>Highlight selected text fields</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Enabling this will cause a border to be drawn around the currently active text field.</string> </property> </widget> - <widget class="QComboBox" row="6" column="3"> + <widget class="QCheckBox" row="12" column="0" rowspan="1" colspan="3"> + <property name="name"> + <cstring>drawDockWindowTitles</cstring> + </property> + <property name="text"> + <string>Display dock window titles</string> + </property> + <property name="whatsThis" stdset="0"> + <string>Some applications, such as Qt Designer, and Krita, make use of 'dock windows' These have a handle strip along the top - enabling this option will draw the name of the window in the handle strip.</string> + </property> + </widget> + <widget class="QCheckBox" row="10" column="3"> + <property name="name"> + <cstring>inactiveHighlight</cstring> + </property> + <property name="text"> + <string>Standard highlight for inactive windows</string> + </property> + </widget> + <widget class="QComboBox" row="8" column="3"> <property name="name"> <cstring>defaultIndicator</cstring> </property> @@ -231,7 +268,15 @@ </sizepolicy> </property> </widget> - <spacer row="5" column="0"> + <widget class="QCheckBox" row="8" column="2"> + <property name="name"> + <cstring>embolden</cstring> + </property> + <property name="text"> + <string>Bold text, and</string> + </property> + </widget> + <spacer row="7" column="0"> <property name="name"> <cstring>spacer13_3_2</cstring> </property> @@ -248,108 +293,103 @@ </size> </property> </spacer> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2"> + <widget class="QCheckBox" row="11" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>textLabel1_3</cstring> + <cstring>coloredMouseOver</cstring> </property> <property name="text"> - <string>Default button:</string> + <string>Use color when mouse-over</string> </property> </widget> - <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2"> + <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>textLabel1_8</cstring> + <cstring>stripedProgress</cstring> </property> <property name="text"> - <string>Highlight factor:</string> - </property> - <property name="whatsThis" stdset="0"> - <string>This controls the % that widgets will be highlighted by when the mouse hovers over them</string> + <string>Striped progress bars</string> </property> </widget> - <widget class="KIntNumInput" row="7" column="3"> + <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>highlightFactor</cstring> + <cstring>lightProgressBorder</cstring> </property> - <property name="suffix"> - <string>%</string> + <property name="text"> + <string>Draw light borders on progress bars</string> </property> </widget> - <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="3"> + <widget class="QCheckBox" row="13" column="3"> <property name="name"> - <cstring>coloredMouseOver</cstring> + <cstring>vArrow</cstring> </property> <property name="text"> - <string>Use color when mouse-over</string> + <string>'V' style arrows</string> </property> </widget> - <widget class="QCheckBox" row="8" column="3"> + <widget class="QCheckBox" row="7" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>inactiveHighlight</cstring> + <cstring>animatedProgress</cstring> </property> <property name="text"> - <string>Standard highlight for inactive windows</string> + <string>Animated progress bars</string> </property> </widget> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="3"> + <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>highlightEdits</cstring> + <cstring>textLabel1_3</cstring> </property> <property name="text"> - <string>Highlight selected text fields</string> - </property> - <property name="whatsThis" stdset="0"> - <string>Enabling this will cause a border to be drawn around the currently active text field.</string> + <string>Default button:</string> </property> </widget> - <widget class="QCheckBox" row="10" column="3"> + <widget class="QCheckBox" row="11" column="3"> <property name="name"> - <cstring>coloredSidebarButtons</cstring> + <cstring>drawStatusBarFrames</cstring> </property> <property name="text"> - <string>Use colored side bar buttons</string> + <string>Draw statusbar frames</string> </property> </widget> - <widget class="QCheckBox" row="10" column="0" rowspan="1" colspan="3"> + <widget class="QLabel" row="9" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>drawDockWindowTitles</cstring> + <cstring>textLabel1_8</cstring> </property> <property name="text"> - <string>Display dock window titles</string> + <string>Highlight factor:</string> </property> <property name="whatsThis" stdset="0"> - <string>Some applications, such as Qt Designer, and Krita, make use of 'dock windows' These have a handle strip along the top - enabling this option will draw the name of the window in the handle strip.</string> + <string>This controls the % that widgets will be highlighted by when the mouse hovers over them</string> </property> </widget> - <widget class="QCheckBox" row="9" column="3"> + <widget class="KColorButton" row="4" column="2"> <property name="name"> - <cstring>drawStatusBarFrames</cstring> - </property> - <property name="text"> - <string>Draw statusbar frames</string> + <cstring>customLightBorderColor</cstring> </property> - </widget> - <widget class="QCheckBox" row="11" column="0" rowspan="1" colspan="3"> - <property name="name"> - <cstring>fixParentlessDialogs</cstring> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>'Fix' parentless dialogs</string> - </property> - <property name="whatsThis" stdset="0"> - <string><h2>Warning: Experimental!</h1>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs that have no 'parent'. This causes the dialog to recieve an entry in the taskbar, and allows the dialog to be minimised independantly of the main application window. - -If you enable this option, QtCurve will try to 'fix' this by assigning the dialogs a parent. - -Note: This may brake some applications, as it wiill alter the behaviour of dialogs in a way the application has not intended. Therefore, please use with care.</string> + <string></string> </property> </widget> - <widget class="QCheckBox" row="11" column="3"> + <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>vArrow</cstring> + <cstring>useCustomLightBorderColor</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>'V' style arrows</string> + <string>Custom light border color:</string> </property> </widget> </grid> @@ -612,7 +652,7 @@ <property name="sizeHint"> <size> <width>20</width> - <height>20</height> + <height>2</height> </size> </property> </spacer> @@ -754,92 +794,100 @@ <string>Enable mouse-over for menubar items</string> </property> </widget> - <widget class="QCheckBox" row="8" column="1" rowspan="1" colspan="2"> + <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>borderMenubarItems</cstring> + <cstring>thinnerMenuItems</cstring> </property> <property name="text"> - <string>Bordered</string> + <string>Thinner menu items</string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="KColorButton" row="3" column="5"> <property name="name"> - <cstring>textLabel1_10</cstring> + <cstring>customMenuNormTextColor</cstring> </property> <property name="text"> - <string>Menu items:</string> + <string></string> </property> </widget> - <widget class="QCheckBox" row="7" column="1" rowspan="1" colspan="2"> + <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="5"> <property name="name"> - <cstring>borderMenuItems</cstring> + <cstring>customMenuTextColor</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>3</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> <property name="text"> - <string>Borderd</string> + <string>Custom text colors (normal/selected):</string> </property> </widget> - <widget class="QCheckBox" row="7" column="3" rowspan="1" colspan="3"> + <widget class="QLabel" row="9" column="0"> <property name="name"> - <cstring>roundMenuItems</cstring> + <cstring>textLabel1_10_2</cstring> </property> <property name="text"> - <string>Rounded</string> + <string>Menubar items:</string> </property> </widget> - <widget class="QCheckBox" row="8" column="3"> + <widget class="QCheckBox" row="9" column="4" rowspan="1" colspan="2"> <property name="name"> - <cstring>roundMenubarItems</cstring> + <cstring>menubarRoundTopOnly</cstring> </property> <property name="text"> - <string>Rounded</string> + <string>Round top only</string> </property> </widget> - <widget class="QCheckBox" row="8" column="4" rowspan="1" colspan="2"> + <widget class="QLabel" row="8" column="0"> <property name="name"> - <cstring>menubarRoundTopOnly</cstring> + <cstring>textLabel1_10</cstring> </property> <property name="text"> - <string>Round top only</string> + <string>Menu items:</string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="QCheckBox" row="9" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>textLabel1_10_2</cstring> + <cstring>borderMenubarItems</cstring> </property> <property name="text"> - <string>Menubar items:</string> + <string>Bordered</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="4"> + <widget class="QCheckBox" row="9" column="3"> <property name="name"> - <cstring>thinnerMenuItems</cstring> + <cstring>roundMenubarItems</cstring> </property> <property name="text"> - <string>Thinner menu items</string> + <string>Rounded</string> </property> </widget> - <widget class="KColorButton" row="3" column="5"> + <widget class="QCheckBox" row="8" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>customMenuNormTextColor</cstring> + <cstring>borderMenuItems</cstring> </property> <property name="text"> - <string></string> + <string>Bordered</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="5"> + <widget class="QCheckBox" row="8" column="3" rowspan="1" colspan="3"> <property name="name"> - <cstring>customMenuTextColor</cstring> + <cstring>roundMenuItems</cstring> </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="text"> + <string>Rounded</string> + </property> + </widget> + <widget class="QCheckBox" row="7" column="0"> + <property name="name"> + <cstring>lightMenuBorder</cstring> </property> <property name="text"> - <string>Custom text colors (normal/selected):</string> + <string>Draw light borders on menu items</string> </property> </widget> </grid> @@ -1141,6 +1189,9 @@ <tabstop>focus</tabstop> <tabstop>splitters</tabstop> <tabstop>round</tabstop> + <tabstop>useCustomLightBorderColor</tabstop> + <tabstop>customLightBorderColor</tabstop> + <tabstop>lightProgressBorder</tabstop> <tabstop>stripedProgress</tabstop> <tabstop>animatedProgress</tabstop> <tabstop>embolden</tabstop> @@ -1175,6 +1226,7 @@ <tabstop>lighterPopupMenuBgnd</tabstop> <tabstop>menubarMouseOver</tabstop> <tabstop>thinnerMenuItems</tabstop> + <tabstop>lightMenuBorder</tabstop> <tabstop>borderMenuItems</tabstop> <tabstop>roundMenuItems</tabstop> <tabstop>borderMenubarItems</tabstop> @@ -1208,5 +1260,6 @@ <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> + <includehint>kcolorbutton.h</includehint> </includehints> </UI> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/config_file.c new/QtCurve-KDE3-0.46.2/kde/config_file.c --- old/QtCurve-KDE3-0.45.2/kde/config_file.c 2006-10-27 22:09:24.000000000 +0200 +++ new/QtCurve-KDE3-0.46.2/kde/config_file.c 2006-11-28 21:35:56.000000000 +0100 @@ -250,7 +250,7 @@ if(!home) { - struct passwd *p=getpwuid(geteuid()); + struct passwd *p=getpwuid(getuid()); if(p) home=p->pw_dir; @@ -602,6 +602,8 @@ QTC_CFG_READ_BOOL(drawDockWindowTitles) QTC_CFG_READ_BOOL(coloredSidebarButtons) #endif + QTC_CFG_READ_BOOL(lightMenuBorder) + QTC_CFG_READ_BOOL(lightProgressBorder) QTC_CFG_READ_BOOL(lightSliderBorder) QTC_CFG_READ_BOOL(lightSbSliderBorder) QTC_CFG_READ_BOOL(stripedProgress) @@ -642,6 +644,8 @@ QTC_CFG_READ_BOOL(inactiveHighlight) QTC_CFG_READ_BOOL(shadeMenubarOnlyWhenActive) QTC_CFG_READ_BOOL(thinnerMenuItems) + QTC_CFG_READ_BOOL(useCustomLightBorderColor) + QTC_CFG_READ_COLOR(customLightBorderColor) QTC_CFG_READ_COLOR(customSlidersColor) QTC_CFG_READ_COLOR(customSbSlidersColor) QTC_CFG_READ_COLOR(customMenubarsColor) @@ -733,6 +737,8 @@ opts->embolden=false; opts->menubarRoundTopOnly=true; opts->fillSlider=true; + opts->lightMenuBorder=false; + opts->lightProgressBorder=false; opts->lightSliderBorder=false; opts->lightSbSliderBorder=false; opts->focus=FOCUS_COLORED; @@ -770,9 +776,11 @@ opts->shadeMenubarOnlyWhenActive=false; opts->thinnerMenuItems=false; opts->scrollbarType=SCROLLBAR_WINDOWS; + opts->useCustomLightBorderColor=false; #ifdef __cplusplus opts->customMenubarsColor.setRgb(0, 0, 0); opts->customSlidersColor.setRgb(0, 0, 0); + opts->customLightBorderColor.setRgb(0, 0, 0); opts->customSbSlidersColor.setRgb(0, 0, 0); opts->customLvHeaderColor.setRgb(0, 0, 0); opts->customMenuNormTextColor.setRgb(0, 0, 0); @@ -782,6 +790,7 @@ opts->coloredSidebarButtons=true; #else opts->customMenubarsColor.red=opts->customMenubarsColor.green=opts->customMenubarsColor.blue=0; + opts->customLightBorderColor.red=opts->customLightBorderColor.green=opts->customLightBorderColor.blue=0; opts->customSlidersColor.red=opts->customSlidersColor.green=opts->customSlidersColor.blue=0; opts->customSbSlidersColor.red=opts->customSlidersColor.green=opts->customSlidersColor.blue=0; opts->customLvHeaderColor.red=opts->customLvHeaderColor.green=opts->customLvHeaderColor.blue=0; @@ -1021,6 +1030,8 @@ CFG_WRITE_ENTRY(fixParentlessDialogs); CFG_WRITE_ENTRY(drawDockWindowTitles); CFG_WRITE_ENTRY(coloredSidebarButtons); + CFG_WRITE_ENTRY(lightMenuBorder); + CFG_WRITE_ENTRY(lightProgressBorder); CFG_WRITE_ENTRY(lightSliderBorder); CFG_WRITE_ENTRY(lightSbSliderBorder); CFG_WRITE_ENTRY(stripedProgress); @@ -1061,6 +1072,8 @@ CFG_WRITE_ENTRY(inactiveHighlight); CFG_WRITE_ENTRY(shadeMenubarOnlyWhenActive); CFG_WRITE_ENTRY(thinnerMenuItems); + CFG_WRITE_ENTRY(useCustomLightBorderColor); + CFG_WRITE_ENTRY(customLightBorderColor); CFG_WRITE_ENTRY(customSlidersColor); CFG_WRITE_ENTRY(customSbSlidersColor); CFG_WRITE_ENTRY(customMenubarsColor); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-KDE3-0.45.2/kde/qtcurve.cpp new/QtCurve-KDE3-0.46.2/kde/qtcurve.cpp --- old/QtCurve-KDE3-0.45.2/kde/qtcurve.cpp 2006-11-05 20:27:33.000000000 +0100 +++ new/QtCurve-KDE3-0.46.2/kde/qtcurve.cpp 2006-12-16 16:18:01.000000000 +0100 @@ -187,26 +187,45 @@ *b=a; else { - double red(a.red()/256.0), - green(a.green()/256.0), - blue(a.blue()/256.0); - - rgb2Hls(&red, &green, &blue); - - green *=k; - if(green > 1.0) - green=1.0; - else if(green < 0.0) - green=0.0; - - blue *=k; - if(blue > 1.0) - blue=1.0; - else if(blue < 0.0) - blue=0.0; +#ifdef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK + if(a.red()<96 && a.green()<96 && a.blue()<96) + { +#endif + int v=(int)(255.0*(k-1.0)); + + /*if(a.red()+v>255) + v-=(a.red()+v)-255; + if(a.green()+v>255) + v-=(a.green()+v)-255; + if(a.blue()+v>255) + v-=(a.blue()+v)-255;*/ + b->setRgb(limit(a.red()+v), limit(a.green()+v), limit(a.blue()+v)); +#ifdef QTC_USE_ADDITIVE_SHADE_ONLY_FOR_DARK + } + else + { + double red(a.red()/256.0), + green(a.green()/256.0), + blue(a.blue()/256.0); + + rgb2Hls(&red, &green, &blue); + + green *=k; + if(green > 1.0) + green=1.0; + else if(green < 0.0) + green=0.0; + + blue *=k; + if(blue > 1.0) + blue=1.0; + else if(blue < 0.0) + blue=0.0; - hls2Rgb(&red, &green, &blue); - b->setRgb(limit(red*256), limit(green*256), limit(blue*256)); + hls2Rgb(&red, &green, &blue); + b->setRgb(limit(red*256), limit(green*256), limit(blue*256)); + } +#endif } } @@ -396,6 +415,12 @@ readConfig(NULL, &opts, &opts); itsPixmapCache.setAutoDelete(true); + if ((SHADE_CUSTOM==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars) && + "soffice.bin"==QString(qApp->argv()[0]) && TOO_DARK(SHADE_CUSTOM==opts.shadeMenubars + ? opts.customMenubarsColor + : itsMenuitemCols[ORIGINAL_SHADE])) + opts.shadeMenubars=SHADE_DARKEN; + shadeColors(qApp->palette().active().highlight(), itsMenuitemCols); shadeColors(qApp->palette().active().background(), itsBackgroundCols); shadeColors(qApp->palette().active().button(), itsButtonCols); @@ -1358,7 +1383,9 @@ sunken(flags &(QStyle::Style_Down | QStyle::Style_On | QStyle::Style_Sunken)), doFill(true), lightBorder((opts.lightSliderBorder && WIDGET_SLIDER==w) || - (opts.lightSbSliderBorder && WIDGET_SB_SLIDER==w)), + (opts.lightSbSliderBorder && WIDGET_SB_SLIDER==w) || + (opts.lightMenuBorder && WIDGET_MENU_ITEM==w) || + (opts.lightProgressBorder && WIDGET_PROGRESSBAR==w)), colouredMouseOver(doBorder && opts.coloredMouseOver && flags&QStyle::Style_MouseOver && !IS_SLIDER(w) && @@ -1412,19 +1439,24 @@ br.addCoords(1, 1,-1,-1); } - // fill - if(doFill) - drawBevelGradient(fill, !sunken, p, br, flags&Style_Horizontal, getWidgetShade(w, true, - sunken), getWidgetShade(w, false, sunken), sunken, opts.appearance, w); - if(lightBorder) { - p->setPen(cols[0]); + if(opts.useCustomLightBorderColor && (flags&Style_Enabled || WIDGET_MENU_ITEM==w) && + (cols==itsSliderCols || WIDGET_SB_SLIDER!=w)) + p->setPen(opts.customLightBorderColor); + else + p->setPen(cols[0]); br=r; br.addCoords(1,1,-1,-1); p->drawRect(br); + br.addCoords(1,1,-1,-1); } + // fill + if(doFill) + drawBevelGradient(fill, !sunken, p, br, flags&Style_Horizontal, getWidgetShade(w, true, + sunken), getWidgetShade(w, false, sunken), sunken, opts.appearance, w); + if(doBorder) drawBorder(bgnd, p, r, cg, flags, round, cols, doCorners); @@ -2375,7 +2407,8 @@ case PE_ScrollBarAddLine: case PE_ScrollBarSubLine: { - QRect br(r); + QRect br(r), + ar(r); bool down((flags &(QStyle::Style_Down|QStyle::Style_On|QStyle::Style_Sunken))); const QColor *use(buttonColors(cg)); @@ -2388,6 +2421,9 @@ PE_ArrowDown==pe ? ROUNDED_BOTTOM : PE_ArrowUp==pe ? ROUNDED_TOP : ROUNDED_NONE; + if(flags&Style_Down) + ar.addCoords(1, 1, 1, 1); + switch(opts.scrollbarType) { default: @@ -2399,11 +2435,13 @@ { round=ROUNDED_NONE; br.addCoords(0, 0, 1, 0); + ar.addCoords(1, 0, 1, 0); } else if(PE_ArrowUp==pe && r.y()>3) { round=ROUNDED_NONE; br.addCoords(0, 0, 0, 1); + ar.addCoords(0, 1, 0, 1); } break; case SCROLLBAR_NEXT: @@ -2411,11 +2449,13 @@ { round=ROUNDED_NONE; br.addCoords(-1, 0, 0, 0); + ar.addCoords(-1, 0, 0, -1); } else if(PE_ArrowDown==pe) { round=ROUNDED_NONE; br.addCoords(0, -1, 0, 0); + ar.addCoords(0, -1, 0, -1); } break; } @@ -2425,11 +2465,6 @@ : Style_Default)), round, getFill(flags, use), use); - QRect ar(r); - - if(flags&Style_Down) - ar.addCoords(1, 1, 1, 1); - drawPrimitive(pe, p, ar, cg, flags); break; } @@ -2734,7 +2769,7 @@ ? 0==qstrcmp("KTabCtl", widget->parent()->className()) : false), active(flags & Style_Selected), - itsHover(itsHoverTab && data.tab()==itsHoverTab && + itsHover(itsHoverTab && itsHoverTab->isEnabled() && data.tab()==itsHoverTab && !(flags&Style_Selected) && tb->currentTab()!=tabIndex); const QColor &fill(getTabFill(flags&Style_Selected, itsHover, itsBackgroundCols)); @@ -2850,7 +2885,7 @@ else { tr.addCoords(0, 2, 0,-1); - fr.addCoords(1, 4,-1,-2); + fr.addCoords(1, 4, -1,-2); drawBevelGradient(fill, true, p, fr, true, SHADE_TAB_SEL_LIGHT, SHADE_TAB_SEL_DARK, false, @@ -2875,13 +2910,14 @@ if(cornerWidget) p->drawPoint(tr.left(), tr.bottom()+1); - if(IS_FLAT(opts.appearance) || firstTab) + if(/*IS_FLAT(opts.appearance) ||*/ firstTab) { - if(!firstTab) - p->setPen(itsBackgroundCols[2]); + //if(!firstTab) + // p->setPen(itsBackgroundCols[2]); p->drawLine(tr.left()+1, tr.bottom()-1, tr.left()+1, tr.top()+2); } + p->setPen(itsBackgroundCols[0]); /* The following (firsTab ? :) helps out withs tora's tabs */ p->drawLine(tr.left()+(firstTab && !reverse ? 1 : -1), tr.bottom()+1, @@ -3818,6 +3854,7 @@ wrect.height()-border2-dbw2); break; } +#if 0 case SR_CheckBoxIndicator: { int h(pixelMetric(PM_IndicatorHeight)); @@ -3834,6 +3871,7 @@ pixelMetric(PM_ExclusiveIndicatorWidth), h); break; } +#endif case SR_ProgressBarGroove: rect=QRect(widget->rect()); break; @@ -4769,9 +4807,12 @@ if(r.width()<1) return; + int minWidth(ROUND_FULL==opts.round ? 3 : ROUND_SLIGHT==opts.round ? 2 : 1); + bool drawFull(r.width()>minWidth), + drawStripe(r.width()>(minWidth*1.5)); QRegion outer(r); - if(r.width()>4) + if(drawStripe) { int animShift=-PROGRESS_CHUNK_WIDTH; @@ -4799,38 +4840,45 @@ switch(opts.appearance) { default: - { - flags|=QStyle::Style_Raised|Style_Horizontal; + if(drawFull) + { + flags|=QStyle::Style_Raised|Style_Horizontal; - drawLightBevel(cg.background(), p, r, cg, flags, round, itsMenuitemCols[ORIGINAL_SHADE], - itsMenuitemCols, true, true, WIDGET_MENU_ITEM); + drawLightBevel(cg.background(), p, r, cg, flags, round, itsMenuitemCols[ORIGINAL_SHADE], + itsMenuitemCols, true, true, WIDGET_PROGRESSBAR); - if(r.width()>4 && opts.stripedProgress) + if(drawStripe && opts.stripedProgress) + { + p->setClipRegion(outer); + drawLightBevel(cg.background(), p, r, cg, flags, round, itsMenuitemCols[1], + itsMenuitemCols, true, true, WIDGET_PROGRESSBAR); + p->setClipping(false); + } + } + else { - p->setClipRegion(outer); - drawLightBevel(cg.background(), p, r, cg, flags, round, itsMenuitemCols[1], - itsMenuitemCols, true, true, WIDGET_MENU_ITEM); - p->setClipping(false); + //p->fillRect(r, itsMenuitemCols[ORIGINAL_SHADE]); + p->setPen(itsMenuitemCols[5]); + p->setBrush(itsMenuitemCols[ORIGINAL_SHADE]); + p->drawRect(r); } - - if(QTC_ROUNDED && ROUNDED_ALL!=round) + if(r.width()>2 && QTC_ROUNDED && ROUNDED_ALL!=round) { p->setPen(midColor(cg.background(), itsMenuitemCols[5])); - if(!(round&CORNER_TL)) + if(!(round&CORNER_TL) || !drawFull) p->drawPoint(r.x(), r.y()); - if(!(round&CORNER_BL)) + if(!(round&CORNER_BL) || !drawFull) p->drawPoint(r.x(), r.y()+r.height()-1); - if(!(round&CORNER_TR)) + if(!(round&CORNER_TR) || !drawFull) p->drawPoint(r.x()+r.width()-1, r.y()); - if(!(round&CORNER_BR)) + if(!(round&CORNER_BR) || !drawFull) p->drawPoint(r.x()+r.width()-1, r.y()+r.height()-1); } break; - } case APPEARANCE_FLAT: case APPEARANCE_RAISED: p->fillRect(r, cg.highlight()); - if(r.width()>4 && opts.stripedProgress) + if(r.width()>minWidth && opts.stripedProgress) { p->setClipRegion(outer); p->fillRect(r, itsMenuitemCols[1]); @@ -5129,7 +5177,7 @@ #ifdef QTC_SLIDER_SHADING itsActive && #endif - sliderWidget->maxValue()!=sliderWidget->minValue()) + sliderWidget->maxValue()!=sliderWidget->minValue() && flags&Style_Enabled) { QRect used(rest); int pos((int)(((double)(horiz ? groove.width() : groove.height()) / ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qtcurve-gtk2
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Mon Dec 18 14:00:32 CET 2006. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-11-29 16:54:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-12-18 11:18:57.000000000 +0100 @@ -1,0 +2,21 @@ +Mon Dec 18 11:16:56 CET 2006 - stbinner(a)suse.de + +- update to 0.46.2: + * Remove rgb2Hls() and hls2Rgb() unless using old style shading. + * Use fileno() to obtain file descriptor of FILE * stream. + * Fix look of slider grooves for 'flat' appearance. + * Fix appearance of checkboxes for 'bevelled' appearance. + + update to 0.46.1: + * Fix location of arrows on secondary scrollbar buttons. + * New shading routine - works *much* better with dark colour schemes + + update to 0.46: + * Allow negative highlight factors. + * Allow usage of light borders on menuitems and progressbars, as well + as a custom colour setting. + * Dont fill in slider grooves of disabled sliders. + * Use encrypted.png for gtk-dialog-authentication if password.png is + not found. + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.45.3.tar.gz fix-cached-gc-crash.diff fix_braces_and_switch_compiler_warnings.diff safe-userchrome.diff x86_64_shaped_cluebat.diff New: ---- QtCurve-Gtk2-0.46.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.svLPO6/_old 2006-12-18 14:00:21.000000000 +0100 +++ /var/tmp/diff_new_pack.svLPO6/_new 2006-12-18 14:00:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.45.3) +# spec file for package qtcurve-gtk2 (Version 0.46.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,16 +16,12 @@ License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: QtCurve style for KDE -Version: 0.45.3 -Release: 16 +Version: 0.46.2 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz Patch: fix-return-value.diff -Patch1: fix-cached-gc-crash.diff Patch2: fixme.diff -Patch3: fix_braces_and_switch_compiler_warnings.diff -Patch4: x86_64_shaped_cluebat.diff -Patch5: safe-userchrome.diff %if %suse_version > 1010 Recommends: qtcurve-kde %endif @@ -42,11 +38,7 @@ %prep %setup -q -n QtCurve-Gtk2-%{version} %patch -%patch1 %patch2 -%patch3 -%patch4 -%patch5 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -78,6 +70,22 @@ /opt/gnome/share/themes/QtCurve %changelog -n qtcurve-gtk2 +* Mon Dec 18 2006 - stbinner(a)suse.de +- update to 0.46.2: + * Remove rgb2Hls() and hls2Rgb() unless using old style shading. + * Use fileno() to obtain file descriptor of FILE * stream. + * Fix look of slider grooves for 'flat' appearance. + * Fix appearance of checkboxes for 'bevelled' appearance. + update to 0.46.1: + * Fix location of arrows on secondary scrollbar buttons. + * New shading routine - works *much* better with dark colour schemes + update to 0.46: + * Allow negative highlight factors. + * Allow usage of light borders on menuitems and progressbars, as well + as a custom colour setting. + * Dont fill in slider grooves of disabled sliders. + * Use encrypted.png for gtk-dialog-authentication if password.png is + not found. * Wed Nov 29 2006 - wstephenson(a)suse.de - Fix mozilla crash when loading user defined Chrome on x86_64. * Mon Nov 27 2006 - wstephenson(a)suse.de ++++++ QtCurve-Gtk2-0.45.3.tar.gz -> QtCurve-Gtk2-0.46.2.tar.gz ++++++ ++++ 2811 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit 3ddiag
by root＠suse.de 18 Dec '06

18 Dec '06

Hello community, here is the log from the commit of package 3ddiag checked in at Mon Dec 18 13:59:01 CET 2006. -------- --- 3ddiag/3ddiag.changes 2006-11-23 04:31:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/3ddiag/3ddiag.changes 2006-12-18 00:31:45.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 18 00:30:53 CET 2006 - sndirsch(a)suse.de + +- 3Ddiag.dri: + * udpated supported radeon/fglrx/tdfx devices + +------------------------------------------------------------------- Old: ---- 3Ddiag-0.738.tar.gz New: ---- 3Ddiag-0.740.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 3ddiag.spec ++++++ --- /var/tmp/diff_new_pack.dXLqrq/_old 2006-12-18 13:58:52.000000000 +0100 +++ /var/tmp/diff_new_pack.dXLqrq/_new 2006-12-18 13:58:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package 3ddiag (Version 0.738) +# spec file for package 3ddiag (Version 0.740) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ License: GNU General Public License (GPL) Group: System/Base Autoreqprov: on -Version: 0.738 -Release: 27 +Version: 0.740 +Release: 1 Summary: A Tool to Verify the 3D Configuration Source: 3Ddiag-%{version}.tar.gz Source5: switch2nv @@ -70,6 +70,9 @@ /usr/bin/switch2nvidia %changelog -n 3ddiag +* Mon Dec 18 2006 - sndirsch(a)suse.de +- 3Ddiag.dri: + * udpated supported radeon/fglrx/tdfx devices * Thu Nov 23 2006 - sndirsch(a)suse.de - switch2nv: * check for nvidia driver also in new X.Org 7 module path ++++++ 3Ddiag-0.738.tar.gz -> 3Ddiag-0.740.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/3Ddiag/3Ddiag.dri new/3Ddiag/3Ddiag.dri --- old/3Ddiag/3Ddiag.dri 2006-04-19 23:17:29.000000000 +0200 +++ new/3Ddiag/3Ddiag.dri 2006-12-18 00:26:41.000000000 +0100 @@ -83,8 +83,28 @@ board="ATI Rage 128 ($device)" driver="ati" ;; + 1002@3150 | \ + 1002@3152 | \ + 1002@3154 | \ + 1002@3e50 | \ + 1002@3e54 | \ 1002@4136 | \ 1002@4137 | \ + 1002@4144 | \ + 1002@4145 | \ + 1002@4146 | \ + 1002@4147 | \ + 1002@4148 | \ + 1002@4149 | \ + 1002@414a | \ + 1002@414b | \ + 1002@4150 | \ + 1002@4151 | \ + 1002@4152 | \ + 1002@4153 | \ + 1002@4154 | \ + 1002@4155 | \ + 1002@4156 | \ 1002@4237 | \ 1002@4242 | \ 1002@4243 | \ @@ -93,6 +113,20 @@ 1002@4437 | \ 1002@4966 | \ 1002@4967 | \ + 1002@4a48 | \ + 1002@4a49 | \ + 1002@4a4a | \ + 1002@4a4b | \ + 1002@4a4c | \ + 1002@4a4d | \ + 1002@4a4e | \ + 1002@4a4f | \ + 1002@4a50 | \ + 1002@4a54 | \ + 1002@4b49 | \ + 1002@4b4a | \ + 1002@4b4b | \ + 1002@4b4c | \ 1002@4c57 | \ 1002@4c58 | \ 1002@4c59 | \ @@ -100,6 +134,20 @@ 1002@4c64 | \ 1002@4c66 | \ 1002@4c67 | \ + 1002@4e44 | \ + 1002@4e45 | \ + 1002@4e46 | \ + 1002@4e47 | \ + 1002@4e48 | \ + 1002@4e49 | \ + 1002@4e4a | \ + 1002@4e4b | \ + 1002@4e50 | \ + 1002@4e51 | \ + 1002@4e52 | \ + 1002@4e53 | \ + 1002@4e54 | \ + 1002@4e56 | \ 1002@5144 | \ 1002@5145 | \ 1002@5146 | \ @@ -111,6 +159,26 @@ 1002@5158 | \ 1002@5159 | \ 1002@515a | \ + 1002@5460 | \ + 1002@5462 | \ + 1002@5464 | \ + 1002@5548 | \ + 1002@5549 | \ + 1002@554a | \ + 1002@554b | \ + 1002@554c | \ + 1002@554d | \ + 1002@554e | \ + 1002@554f | \ + 1002@5550 | \ + 1002@5551 | \ + 1002@5552 | \ + 1002@5554 | \ + 1002@564a | \ + 1002@564b | \ + 1002@564f | \ + 1002@5652 | \ + 1002@5653 | \ 1002@5834 | \ 1002@5835 | \ 1002@5960 | \ @@ -118,14 +186,36 @@ 1002@5962 | \ 1002@5964 | \ 1002@5965 | \ + 1002@5b60 | \ + 1002@5b62 | \ + 1002@5b63 | \ + 1002@5b64 | \ + 1002@5b65 | \ 1002@5c61 | \ 1002@5c63 | \ + 1002@5d48 | \ + 1002@5d49 | \ + 1002@5d4a | \ + 1002@5d4c | \ + 1002@5d4d | \ + 1002@5d4e | \ + 1002@5d4f | \ + 1002@5d50 | \ + 1002@5d52 | \ + 1002@5d57 | \ + 1002@5e48 | \ + 1002@5e4a | \ + 1002@5e4b | \ + 1002@5e4c | \ + 1002@5e4d | \ + 1002@5e4f | \ 1002@7834 | \ 1002@7835) board="ATI Radeon ($device)" driver="radeon" ;; 1002@3150 | \ + 1002@3151 | \ 1002@3152 | \ 1002@3154 | \ 1002@3e50 | \ @@ -141,9 +231,6 @@ 1002@4153 | \ 1002@4154 | \ 1002@4155 | \ - 1002@4242 | \ - 1002@4966 | \ - 1002@4967 | \ 1002@4a48 | \ 1002@4a49 | \ 1002@4a4a | \ @@ -159,9 +246,6 @@ 1002@4b4a | \ 1002@4b4b | \ 1002@4b4c | \ - 1002@4c64 | \ - 1002@4c66 | \ - 1002@4c67 | \ 1002@4e44 | \ 1002@4e45 | \ 1002@4e46 | \ @@ -175,9 +259,6 @@ 1002@4e52 | \ 1002@4e54 | \ 1002@4e56 | \ - 1002@5148 | \ - 1002@514c | \ - 1002@514d | \ 1002@5460 | \ 1002@5461 | \ 1002@5462 | \ @@ -186,23 +267,22 @@ 1002@5549 | \ 1002@554a | \ 1002@554b | \ + 1002@554c | \ 1002@554d | \ 1002@554e | \ 1002@554f | \ 1002@5550 | \ 1002@5551 | \ + 1002@5554 | \ + 1002@5555 | \ 1002@564a | \ 1002@564b | \ + 1002@564f | \ 1002@5652 | \ 1002@5653 | \ - 1002@5834 | \ - 1002@5835 | \ + 1002@5657 | \ 1002@5954 | \ 1002@5955 | \ - 1002@5960 | \ - 1002@5961 | \ - 1002@5962 | \ - 1002@5964 | \ 1002@5974 | \ 1002@5975 | \ 1002@5a41 | \ @@ -213,17 +293,19 @@ 1002@5b62 | \ 1002@5b63 | \ 1002@5b64 | \ - 1002@5c61 | \ - 1002@5c63 | \ + 1002@5b65 | \ + 1002@5b66 | \ 1002@5d48 | \ 1002@5d49 | \ 1002@5d4a | \ + 1002@5d4c | \ 1002@5d4d | \ 1002@5d4f | \ + 1002@5d50 | \ + 1002@5d51 | \ 1002@5d52 | \ 1002@5d57 | \ 1002@5e48 | \ - 1002@5e49 | \ 1002@5e4a | \ 1002@5e4b | \ 1002@5e4c | \ @@ -232,27 +314,61 @@ 1002@7100 | \ 1002@7101 | \ 1002@7102 | \ + 1002@7103 | \ + 1002@7104 | \ + 1002@7105 | \ + 1002@7106 | \ 1002@7108 | \ 1002@7109 | \ 1002@710a | \ 1002@710b | \ 1002@710c | \ + 1002@710e | \ + 1002@710f | \ 1002@7140 | \ 1002@7142 | \ + 1002@7143 | \ + 1002@7144 | \ 1002@7145 | \ 1002@7146 | \ + 1002@7147 | \ 1002@7149 | \ 1002@714a | \ 1002@714b | \ 1002@714c | \ + 1002@714d | \ 1002@714e | \ + 1002@7152 | \ 1002@715e | \ + 1002@715f | \ + 1002@7180 | \ + 1002@7181 | \ + 1002@7183 | \ + 1002@7186 | \ + 1002@7187 | \ + 1002@718a | \ + 1002@718b | \ + 1002@718c | \ + 1002@718d | \ + 1002@718f | \ + 1002@7196 | \ 1002@71c0 | \ + 1002@71c1 | \ 1002@71c2 | \ + 1002@71c3 | \ + 1002@71c4 | \ 1002@71c5 | \ 1002@71c6 | \ + 1002@71c7 | \ + 1002@71cd | \ 1002@71ce | \ + 1002@71d2 | \ + 1002@71d4 | \ + 1002@71d5 | \ + 1002@71d6 | \ + 1002@71da | \ 1002@71de | \ + 1002@7200 | \ 1002@7240 | \ 1002@7243 | \ 1002@7244 | \ @@ -267,7 +383,12 @@ 1002@724d | \ 1002@724e | \ 1002@724f | \ - 1002@7834) + 1002@7280 | \ + 1002@7284 | \ + 1002@7291 | \ + 1002@7293 | \ + 1002@7941 | \ + 1002@7942) board="ATI RV350/R300/R350 ($device)" driver="fglrx" depth="24" @@ -289,12 +410,6 @@ board="Intel i810/i815/i830/i845/855/865/915/945 ($device)" driver="i810" ;; - 121a@0003 | \ - 121a@0005 | \ - 121a@0009) - board="3Dfx Banshee/Voodoo-3/Voodoo-5 ($device)" - driver="tdfx" - ;; 1039@0300 | \ 1039@5300 | \ 1039@6300) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/3Ddiag/version new/3Ddiag/version --- old/3Ddiag/version 2006-08-30 18:09:22.000000000 +0200 +++ new/3Ddiag/version 2006-12-18 00:30:30.000000000 +0100 @@ -1 +1 @@ -738 +740 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit unrar
by root＠suse.de 17 Dec '06

17 Dec '06

Hello community, here is the log from the commit of package unrar checked in at Mon Dec 18 00:25:29 CET 2006. -------- --- unrar/unrar.changes 2006-12-15 20:20:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/unrar/unrar.changes 2006-12-17 13:57:46.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Dec 17 13:57:40 CET 2006 - schwab(a)suse.de + +- Fix last change. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unrar.spec ++++++ --- /var/tmp/diff_new_pack.X38uky/_old 2006-12-18 00:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.X38uky/_new 2006-12-18 00:24:20.000000000 +0100 @@ -13,7 +13,7 @@ Name: unrar BuildRequires: gcc-c++ Version: 3.60.8 -Release: 24 +Release: 25 Autoreqprov: on Group: Productivity/Archiving/Compression License: Freely Redistributable Software (FSR), Other License(s), see package @@ -58,6 +58,8 @@ %{_bindir}/* %changelog -n unrar +* Sun Dec 17 2006 - schwab(a)suse.de +- Fix last change. * Fri Dec 15 2006 - lmichnovic(a)suse.cz - corrected and readded reverted *strcmp.patch * Fri Dec 15 2006 - mmarek(a)suse.cz ++++++ unrarsrc-3.6.8-strcmp.patch ++++++ --- /var/tmp/diff_new_pack.X38uky/_old 2006-12-18 00:24:20.000000000 +0100 +++ /var/tmp/diff_new_pack.X38uky/_new 2006-12-18 00:24:20.000000000 +0100 @@ -5,22 +5,50 @@ #include "rar.hpp" CommandData::CommandData() -@@ -911,15 +912,15 @@ +@@ -884,7 +885,7 @@ + { + #ifndef SFX_MODULE + #ifdef DISABLEAUTODETECT +- if (Help[I]==MCHelpSwV) ++ if (strcmp(Help[I],MCHelpSwV) == 0) + continue; + #endif + #ifndef _WIN_32 +@@ -894,7 +895,7 @@ + }; + bool Found=false; + for (int J=0;J<sizeof(Win32Only)/sizeof(Win32Only[0]);J++) +- if (Help[I]==Win32Only[J]) ++ if (strcmp(Help[I],Win32Only[J]) == 0) + { + Found=true; + break; +@@ -903,23 +904,23 @@ + continue; + #endif + #if !defined(_UNIX) && !defined(_WIN_32) +- if (Help[I]==MCHelpSwOW) ++ if (strcmp(Help[I],MCHelpSwOW) == 0) + continue; + #endif + #ifndef SAVE_LINKS +- if (Help[I]==MCHelpSwOL) ++ if (strcmp(Help[I],MCHelpSwOL) == 0) continue; #endif #ifndef _WIN_32 - if (Help[I]==MCHelpSwRI) -+ if (0 == strncmp(Help[I], "MCHelpSwRI", 10)) ++ if (strcmp(Help[I],MCHelpSwRI) == 0) continue; #endif #ifndef PACK_SMP - if (Help[I]==MCHelpSwMT) -+ if (0 == strncmp(Help[I], "MCHelpSwMT", 10)) ++ if (strcmp(Help[I],MCHelpSwMT) == 0) continue; #endif #ifndef _BEOS - if (Help[I]==MCHelpSwEE) -+ if (0 == strncmp(Help[I], "MCHelpSwEE", 10)) ++ if (strcmp(Help[I],MCHelpSwEE) == 0) { #if defined(_EMX) && !defined(_DJGPP) if (_osmode != OS2_MODE) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smart
by root＠suse.de 17 Dec '06

17 Dec '06

Hello community, here is the log from the commit of package smart checked in at Mon Dec 18 00:24:05 CET 2006. -------- --- smart/smart.changes 2006-12-11 20:03:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/smart/smart.changes 2006-12-17 13:40:44.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 17 13:41:49 CET 2006 - cthiel(a)suse.de + +- update smart-trunk.patch to r844, to pull in the latests translations and + fixes from upstream + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smart.spec ++++++ --- /var/tmp/diff_new_pack.AFzECY/_old 2006-12-18 00:14:01.000000000 +0100 +++ /var/tmp/diff_new_pack.AFzECY/_new 2006-12-18 00:14:01.000000000 +0100 @@ -20,7 +20,7 @@ %endif Summary: Smart Package Manager Version: 0.49.1 -Release: 2 +Release: 7 Source: smart-0.50rc1.tar.bz2 Source1: distro.py Source2: %{name}.desktop @@ -191,6 +191,9 @@ /opt/kde3/share/apps/konqueror %changelog -n smart +* Sun Dec 17 2006 - cthiel(a)suse.de +- update smart-trunk.patch to r844, to pull in the latests translations and + fixes from upstream * Mon Dec 11 2006 - cthiel(a)suse.de - updated smart-trunk.patch to r839 * Mon Dec 04 2006 - cthiel(a)suse.de ++++++ smart-trunk.patch ++++++ ++++ 1628 lines (skipped) ++++ between smart/smart-trunk.patch ++++ and /mounts/work_src_done/STABLE/smart/smart-trunk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0