June 2007 - openSUSE Commits - openSUSE Mailing Lists

commit java-1_4_2-gcj-compat
by root＠Hilbert.suse.de 25 Jun '07

25 Jun '07

Hello community, here is the log from the commit of package java-1_4_2-gcj-compat checked in at Mon Jun 25 13:42:31 CEST 2007. -------- --- java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2007-06-21 12:31:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2007-06-25 12:59:29.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 25 12:59:13 CEST 2007 - adrian(a)suse.de + +- make requires to libgcj version dependend and use libgcj42 now + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_4_2-gcj-compat.spec ++++++ --- /var/tmp/diff_new_pack.f17977/_old 2007-06-25 13:41:53.000000000 +0200 +++ /var/tmp/diff_new_pack.f17977/_new 2007-06-25 13:41:53.000000000 +0200 @@ -27,7 +27,7 @@ %define _jvmjardir %{_libdir}/jvm-exports %endif Version: 1.4.2.0 -Release: 124 +Release: 125 %define section free %define gccsuffix %{nil} %define origin gcj%{gccsuffix} @@ -60,9 +60,8 @@ # now the gcj related stuff is only done via triggerin #Requires: gcc%{gccsuffix}-java >= %{gccver} #PreReq: libgcj%{gccsuffix} >= %{gccver} -#Requires: libgcj%{gccsuffix} >= %{gccver} +Requires: libgcj%{gccsuffix} >= %{gccver} PreReq: gcc-gij -Requires: libgcj %if %{?!suse_version:1}0 %if %{?!mandriva_release:1}0 PreReq: chkconfig which @@ -340,6 +339,8 @@ #%ghost %{_jvmdir}/%{cname}-%{version}/include/jni.h %changelog +* Mon Jun 25 2007 - adrian(a)suse.de +- make requires to libgcj version dependend and use libgcj42 now * Thu Jun 21 2007 - lrupp(a)suse.de - use gccver 4.2 * Wed May 30 2007 - dbornkessel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-kde4
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package qtcurve-kde4 checked in at Sun Jun 24 23:56:11 CEST 2007. -------- --- KDE/qtcurve-kde4/qtcurve-kde4.changes 2007-06-11 13:36:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2007-06-24 16:59:55.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 24 16:59:48 CEST 2007 - stbinner(a)suse.de + +- update to 0.52.2: several style drawing fixes, see ChangeLog + +------------------------------------------------------------------- Old: ---- QtCurve-KDE4-0.51.tar.gz New: ---- QtCurve-KDE4-0.52.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde4.spec ++++++ --- /var/tmp/diff_new_pack.vL7108/_old 2007-06-24 23:55:58.000000000 +0200 +++ /var/tmp/diff_new_pack.vL7108/_new 2007-06-24 23:55:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde4 (Version 0.51) +# spec file for package qtcurve-kde4 (Version 0.52.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: QtCurve style for KDE 4 -Version: 0.51 +Version: 0.52.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE4-%{version}.tar.gz @@ -60,6 +60,8 @@ %_kde_share_dir/apps/kstyle/themes/qtcurve.themerc %changelog +* Sun Jun 24 2007 - stbinner(a)suse.de +- update to 0.52.2: several style drawing fixes, see ChangeLog * Mon Jun 11 2007 - stbinner(a)suse.de - update to 0.51: - Changed shading to use HSL colour space. This can be altered ++++++ QtCurve-KDE4-0.51.tar.gz -> QtCurve-KDE4-0.52.2.tar.gz ++++++ ++++ 1776 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 qtcurve-kde
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package qtcurve-kde checked in at Sun Jun 24 23:55:51 CEST 2007. -------- --- KDE/qtcurve-kde/qtcurve-kde.changes 2007-06-11 17:20:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-kde/qtcurve-kde.changes 2007-06-24 16:58:36.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 24 16:58:20 CEST 2007 - stbinner(a)suse.de + +- update to 0.52.2: several style drawing fixes, see ChangeLog + +------------------------------------------------------------------- Old: ---- QtCurve-KDE3-0.51.tar.gz New: ---- QtCurve-KDE3-0.52.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-kde.spec ++++++ --- /var/tmp/diff_new_pack.LB5343/_old 2007-06-24 23:55:15.000000000 +0200 +++ /var/tmp/diff_new_pack.LB5343/_new 2007-06-24 23:55:15.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-kde (Version 0.51) +# spec file for package qtcurve-kde (Version 0.52.2) # # Copyright (c) 2007 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/KDE Summary: QtCurve style for KDE -Version: 0.51 -Release: 2 +Version: 0.52.2 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-KDE3-%{version}.tar.gz Patch: fix-opensuseupdater-systemtray-transparency.diff @@ -70,6 +70,8 @@ /opt/kde3/share/apps/QtCurve %changelog +* Sun Jun 24 2007 - stbinner(a)suse.de +- update to 0.52.2: several style drawing fixes, see ChangeLog * Mon Jun 11 2007 - stbinner(a)suse.de - fix build * Mon Jun 11 2007 - stbinner(a)suse.de ++++++ QtCurve-KDE3-0.51.tar.gz -> QtCurve-KDE3-0.52.2.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/ChangeLog new/QtCurve-KDE3-0.52.2/ChangeLog --- old/QtCurve-KDE3-0.51/ChangeLog 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/ChangeLog 2007-06-21 10:42:00.000000000 +0200 @@ -1,3 +1,33 @@ +0.52.2 +------ +1. Fix crash when slider colour == button. + +0.52.1 +------ +1. Draw emphasis around menus when not lightening. +2. Use button colours to border entry fields. +3. Dont allow scrollbars to be recoloured. +4. Fix amarok menus! + +0.52 +---- + 1. Use 'dull glass' as the default gradient - previous default is now + called 'Clean'. + 2. Darken slider mouse over colour if slider is not shaded. + 3. Use thinner slider mouse over sections if slider is not shaded. + 4. Improve look of small V arrows. + 5. Even duller dull glass, but much more useable. + 6. Fix setting of check/radio colour. + 7. Only highlight editable combo arrow when mouse over arrow, not over + edit field - more Gtk like. + 8. Added one config file option (no gui): + gtkScrollViews set to 'true' to have the scrollbars drawn outside + of scrollviews. (However, doesn't look very good) + 9. Lighten combo list frame. +10. Dont round MDI buttons. +11. Fix opera's MDI buttons within menubars. +12. Always assume PE_ButtonBevel is enabled - used for QtConfig's colour buttons. + 0.51 ---- 1. Changed shading to use HSL colour space. This can be altered by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/configure new/QtCurve-KDE3-0.52.2/configure --- old/QtCurve-KDE3-0.51/configure 2007-06-07 00:18:07.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/configure 2007-06-21 10:43:14.000000000 +0200 @@ -2568,7 +2568,7 @@ # Define the identity of the package. PACKAGE=QtCurve-KDE3 - VERSION=0.51 + VERSION=0.52.2 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/configure.in new/QtCurve-KDE3-0.52.2/configure.in --- old/QtCurve-KDE3-0.51/configure.in 2007-06-07 00:17:57.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/configure.in 2007-06-21 10:43:05.000000000 +0200 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.51) dnl searches for some needed programs +AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.52.2) dnl searches for some needed programs KDE_SET_PREFIX diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/configure.in.in new/QtCurve-KDE3-0.52.2/configure.in.in --- old/QtCurve-KDE3-0.51/configure.in.in 2007-06-01 00:25:15.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/configure.in.in 2007-06-21 10:42:20.000000000 +0200 @@ -1,5 +1,5 @@ #MIN_CONFIG -AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.51) +AM_INIT_AUTOMAKE(QtCurve-KDE3, 0.52.2) CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST" AC_CHECK_FUNCS(setenv unsetenv) AC_CHECK_BOOL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/common.h new/QtCurve-KDE3-0.52.2/kde/common.h --- old/QtCurve-KDE3-0.51/kde/common.h 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/common.h 2007-06-18 22:26:12.000000000 +0200 @@ -50,6 +50,14 @@ #define QTC_HIGHLIGHT_SCROLVIEWS */ +/* + Control shading used for glass variants. + 0 => As used in 0.51.1 + + 1 => As used in 0.51 + 2 => As used in <0.51 +*/ +#define QTC_GLASS_SHADING 0 + typedef enum { SHADING_SIMPLE=0, @@ -58,7 +66,7 @@ } EShading; #ifndef QTC_CONFIG_DIALOG -static EShading shading=SHADING_SIMPLE; /* 0=>hsv/hsl, 1=>simple (i.e. 0.46.1->0.50 style) */ +static EShading shading=SHADING_HSL; #endif #ifdef __cplusplus @@ -87,6 +95,11 @@ #define QTC_MIN_BTN_SIZE 8 #define QTC_LV_SIZE 7 +#define LARGE_ARR_WIDTH 7 +#define LARGE_ARR_HEIGHT 4 +#define SMALL_ARR_WIDTH 5 +#define SMALL_ARR_HEIGHT 3 + #define NUM_STD_SHADES 6 #define NUM_EXTRA_SHADES 3 @@ -158,44 +171,50 @@ #define SHADE_BEVEL_MENU_ITEM_LIGHT (QTC_SIMPLE_SHADING ? 1.07 : 1.09) #define SHADE_BEVEL_MENU_ITEM_DARK (QTC_SIMPLE_SHADING ? 0.85 : 0.83) -#define SHADE_SLIDER_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.1 /*: 1.12)*/ -#define SHADE_SLIDER_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.8 /*: 0.72)*/ +#define SHADE_SLIDER_LIGHT 1.1 +#define SHADE_SLIDER_DARK 0.8 + +#define SHADE_SBAR_LIGHT 1.02 +#define SHADE_SBAR_DARK 0.95 + +#define SHADE_MENU_LIGHT 1.02 +#define SHADE_MENU_DARK 0.96 + +#define SHADE_TAB_SEL_LIGHT 1.1 +#define SHADE_TAB_SEL_DARK 1.0 -#define SHADE_SBAR_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.02 /*: 1.04)*/ -#define SHADE_SBAR_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.95 /*: 0.92)*/ +#define SHADE_BOTTOM_TAB_SEL_LIGHT 1.0 +#define SHADE_BOTTOM_TAB_SEL_DARK 0.96 + +#if !defined QTC_GLASS_SHADING || QTC_GLASS_SHADING==0 + + #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 0.99 : 0.98) \ + : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.55)) + #define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 0.94 : 0.92) \ + : 0.92) + #define SHADE_GLASS_BOT_A(A) (APPEARANCE_DULL_GLASS==A ? 1.02 : 0.99) + #define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.10 : 1.16) + +#elif QTC_GLASS_SHADING==1 + + #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 1.0 : 1.0) \ + : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) + #define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A ? 0.96 : 0.96) + #define SHADE_GLASS_BOT_A(A) 0.99 + #define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) + +#else -#define SHADE_MENU_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.02 /*: 1.03)*/ -#define SHADE_MENU_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.96 /*: 0.94)*/ + #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.05) \ + : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) + #define SHADE_GLASS_TOP_B(A, W) 0.96 + #define SHADE_GLASS_BOT_A(A) 0.99 + #define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) -#define SHADE_TAB_SEL_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.1 /*: 1.12)*/ -#define SHADE_TAB_SEL_DARK 1.0 - -#define SHADE_BOTTOM_TAB_SEL_LIGHT 1.0 -#define SHADE_BOTTOM_TAB_SEL_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.96 /*: 0.95)*/ - -#if 0 /* Duller on top & button */ -#define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? 0.98 : 0.98) \ - : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) -#define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A ? 0.97 : 0.96) -#define SHADE_GLASS_BOT_A(A) (APPEARANCE_DULL_GLASS==A ? 1.00 : 0.99) -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.10 : 1.16) -#endif -#if 1 /* Duller on top */ -#define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? /*(QTC_SIMPLE_SHADING ?*/ 0.98 /*: 0.99)*/ : /*(QTC_SIMPLE_SHADING ?*/ 0.98 /*: 0.99)*/) \ - : (WIDGET_DEF_BUTTON==W ? /*(QTC_SIMPLE_SHADING ?*/ 1.08 /*: 1.1)*/ : /*(QTC_SIMPLE_SHADING ?*/ 1.7 /*: 1.77)*/)) -#define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A ? 0.97 : 0.96) -#define SHADE_GLASS_BOT_A(A) 0.99 -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? /*(QTC_SIMPLE_SHADING ?*/ 1.08 /*: 1.09)*/ : /*(QTC_SIMPLE_SHADING ?*/ 1.16 /*: 1.17)*/) -#endif -#if 0 /* < 0.51 */ -#define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.05) \ - : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) -#define SHADE_GLASS_TOP_B(A, W) 0.96 -#define SHADE_GLASS_BOT_A(A) 0.99 -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) #endif #define IS_GLASS(A) (APPEARANCE_DULL_GLASS==A || APPEARANCE_SHINY_GLASS==A) @@ -215,17 +234,17 @@ #define MAX_HIGHLIGHT_FACTOR 50 #define MIN_HIGHLIGHT_FACTOR -50 #define MENUBAR_DARK_FACTOR 0.97 -#define POPUPMENU_LIGHT_FACTOR /*(QTC_SIMPLE_SHADING ?*/ 1.15 /*: 1.2)*/ +#define POPUPMENU_LIGHT_FACTOR 1.15 /*#define INACTIVE_HIGHLIGHT_FACTOR 1.15*/ #define USE_SHADED_MENU_BAR_COLORS (SHADE_CUSTOM==opts.shadeMenubars || SHADE_BLEND_SELECTED==opts.shadeMenubars) #define MENUBAR_GLASS_SELECTED_DARK_FACTOR 0.9 #define GLASS_BORDER 0.4 #define BEVEL_BORDER(w) (WIDGET_LISTVIEW_HEADER==w ? 6 : 4) -#define SHADE_BEVEL_TOP /*(QTC_SIMPLE_SHADING ?*/ 1.07 /*: 1.09)*/ -#define SHADE_BEVEL_MID_TOP /*(QTC_SIMPLE_SHADING ?*/ 1.03 /*: 1.04)*/ +#define SHADE_BEVEL_TOP 1.07 +#define SHADE_BEVEL_MID_TOP 1.03 #define SHADE_BEVEL_MID_BOT 0.975 -#define SHADE_BEVEL_BOT(w) (WIDGET_LISTVIEW_HEADER==(w) ? /*(QTC_SIMPLE_SHADING ?*/ 0.88 /*: 0.86)*/ : /*(QTC_SIMPLE_SHADING ?*/ 0.90 /*: 0.88)*/) +#define SHADE_BEVEL_BOT(w) (WIDGET_LISTVIEW_HEADER==(w) ? 0.88 : 0.90) #define NUM_SPLITTER_DASHES 21 @@ -248,12 +267,16 @@ #define QTC_NORM_TAB_APP (APPEARANCE_BEVELLED==opts.tabAppearance ? APPEARANCE_GRADIENT : opts.tabAppearance) #define QTC_SEL_TAB_APP (APPEARANCE_INVERTED==opts.tabAppearance ? APPEARANCE_FLAT : (QTC_NORM_TAB_APP)) -#define QTC_SLIDER_MO_SHADE 0 /*(SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 0 : 2)*/ +#define QTC_SLIDER_MO_SHADE (SHADE_SELECTED==opts.shadeSliders ? 1 : (SHADE_BLEND_SELECTED==opts.shadeSliders ? 0 : ORIGINAL_SHADE)) #define QTC_SLIDER_MO_BORDER (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 2 : 1) #define QTC_SLIDER_MO_LEN (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 4 : 3) -#define QTC_SB_SLIDER_MO_LEN(A) ((A)>31 ? 6 : 4) +#define QTC_SB_SLIDER_MO_LEN(A) ((A)<22 && ROUND_FULL!=opts.round \ + ? 2 \ + : ((A)<32 || (SHADE_SELECTED!=opts.shadeSliders && SHADE_BLEND_SELECTED!=opts.shadeSliders) \ + ? 4 \ + : 6)) -#define QTC_CR_MO_FILL 2 +#define QTC_CR_MO_FILL (SHADE_BLEND_SELECTED==opts.shadeCheckRadio || SHADE_SELECTED==opts.shadeCheckRadio ? 1 : 2) #define QTC_MO_DEF_BTN 2 #define QTC_MO_PLASTIK_DARK(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 3 : 2) /*? 2 : 1) */ #define QTC_MO_PLASTIK_LIGHT(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 4 : 1) /*? 2 : 0) */ @@ -805,6 +828,8 @@ gradientPbGroove, #ifdef __cplusplus stdSidebarButtons, + gtkScrollViews, + gtkComboMenus, #endif borderMenuitems, colorMenubarMouseOver, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Clean.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Clean.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Clean.qtcurve 1970-01-01 01:00:00.000000000 +0100 +++ new/QtCurve-KDE3-0.52.2/kde/config/Clean.qtcurve 2007-06-18 22:08:21.000000000 +0200 @@ -0,0 +1,47 @@ +[Settings] +animatedProgress=true +appearance=bevelled +borderMenuitems=true +coloredMouseOver=plastik +customCheckRadioColor=#000000 +customMenuNormTextColor=#000000 +customMenuSelTextColor=#000000 +customMenuTextColor=false +customMenubarsColor=#000000 +customSlidersColor=#000000 +darkerBorders=false +defBtnIndicator=colored +drawStatusBarFrames=false +embolden=false +fillSlider=true +gradientPbGroove=true +handles=dots +highlightFactor=5 +highlightTab=true +lighterPopupMenuBgnd=true +lvAppearance=bevelled +lvLines=false +menubarAppearance=gradient +menubarMouseOver=true +menuitemAppearance=bevelled +progressAppearance=bevelled +round=full +roundMbTopOnly=true +scrollbarType=kde +shadeCheckRadio=none +shadeMenubarOnlyWhenActive=true +shadeMenubars=darken +shadeSliders=selected +shadowButtons=false +sliderAppearance=gradient +sliderThumbs=dots +splitters=dots +stdFocus=true +stdSidebarButtons=false +stripedProgress=true +tabAppearance=gradient +thinnerMenuItems=false +toolbarAppearance=gradient +toolbarBorders=none +toolbarSeparators=dots +vArrows=false diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Clear.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Clear.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Clear.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Clear.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=false handles=dashes highlightFactor=5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Curve.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Curve.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Curve.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Curve.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=false -fixParentlessDialogs=true gradientPbGroove=false handles=sunken highlightFactor=8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Dull_Glass.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Dull_Glass.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Dull_Glass.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Dull_Glass.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=dots highlightFactor=5 @@ -31,7 +30,7 @@ scrollbarType=kde shadeCheckRadio=none shadeMenubarOnlyWhenActive=true -shadeMenubars=selected +shadeMenubars=darken shadeSliders=selected shadowButtons=true sliderAppearance=dullglass @@ -46,4 +45,3 @@ toolbarBorders=none toolbarSeparators=dots vArrows=false - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Glass.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Glass.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Glass.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Glass.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -1,6 +1,6 @@ [Settings] animatedProgress=true -appearance=shinyglass +appearance=dullglass borderMenuitems=true coloredMouseOver=plastik customCheckRadioColor=#000000 @@ -9,12 +9,11 @@ customMenuTextColor=false customMenubarsColor=#000000 customSlidersColor=#000000 -darkerBorders=true +darkerBorders=false defBtnIndicator=colored drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=dots highlightFactor=5 @@ -37,7 +36,7 @@ sliderAppearance=dullglass sliderThumbs=dots splitters=dots -stdFocus=false +stdFocus=true stdSidebarButtons=false stripedProgress=true tabAppearance=gradient diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Human.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Human.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Human.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Human.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=dots highlightFactor=7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Inverted.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Inverted.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Inverted.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Inverted.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=dots highlightFactor=5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Makefile.am new/QtCurve-KDE3-0.52.2/kde/config/Makefile.am --- old/QtCurve-KDE3-0.51/kde/config/Makefile.am 2007-06-07 00:17:33.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Makefile.am 2007-06-18 22:26:12.000000000 +0200 @@ -7,7 +7,7 @@ kstyle_qtcurve_config_la_METASOURCES = AUTO stylercdir = $(kde_datadir)/QtCurve -stylerc_DATA = Clear.qtcurve Dull_Glass.qtcurve Shiny_Glass.qtcurve Inverted.qtcurve Plain.qtcurve Glass.qtcurve Human.qtcurve Plastic.qtcurve Murrine.qtcurve Curve.qtcurve +stylerc_DATA = Clear.qtcurve Dull_Glass.qtcurve Shiny_Glass.qtcurve Inverted.qtcurve Plain.qtcurve Glass.qtcurve Human.qtcurve Plastic.qtcurve Murrine.qtcurve Curve.qtcurve Clean.qtcurve EXTRA_DIST = $(stylerc_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Makefile.in new/QtCurve-KDE3-0.52.2/kde/config/Makefile.in --- old/QtCurve-KDE3-0.51/kde/config/Makefile.in 2007-06-07 00:18:10.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Makefile.in 2007-06-21 10:43:17.000000000 +0200 @@ -349,7 +349,7 @@ kstyle_qtcurve_config_la_SOURCES= qtcurveconfig.cpp qtcurveconfigbase.cpp #>- kstyle_qtcurve_config_la_METASOURCES = AUTO stylercdir = $(kde_datadir)/QtCurve -stylerc_DATA = Clear.qtcurve Dull_Glass.qtcurve Shiny_Glass.qtcurve Inverted.qtcurve Plain.qtcurve Glass.qtcurve Human.qtcurve Plastic.qtcurve Murrine.qtcurve Curve.qtcurve +stylerc_DATA = Clear.qtcurve Dull_Glass.qtcurve Shiny_Glass.qtcurve Inverted.qtcurve Plain.qtcurve Glass.qtcurve Human.qtcurve Plastic.qtcurve Murrine.qtcurve Curve.qtcurve Clean.qtcurve EXTRA_DIST = $(stylerc_DATA) #>- all: all-am #>+ 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Murrine.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Murrine.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Murrine.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Murrine.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -2,7 +2,7 @@ animatedProgress=true appearance=dullglass borderMenuitems=true -coloredMouseOver=plastik +coloredMouseOver=colored customCheckRadioColor=#000000 customMenuNormTextColor=#000000 customMenuSelTextColor=#000000 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=false handles=sunken highlightFactor=5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Plain.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Plain.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Plain.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Plain.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=true fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=sunken highlightFactor=5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Plastic.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Plastic.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Plastic.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Plastic.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,10 +14,9 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=dots -highlightFactor=-4 +highlightFactor=-2 highlightTab=true lighterPopupMenuBgnd=true lvAppearance=gradient diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/qtcurveconfigbase.cpp new/QtCurve-KDE3-0.52.2/kde/config/qtcurveconfigbase.cpp --- old/QtCurve-KDE3-0.51/kde/config/qtcurveconfigbase.cpp 2007-06-07 21:54:13.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/qtcurveconfigbase.cpp 2007-06-21 10:37:43.000000000 +0200 @@ -3,7 +3,7 @@ /**************************************************************************** ** Form implementation generated from reading ui file './qtcurveconfigbase.ui' ** -** Created: Thu Jun 7 20:54:12 2007 +** Created: Thu Jun 21 09:37:43 2007 ** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.7 edited Aug 31 2005 $) ** ** WARNING! All changes made in this file will be lost! diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config/Shiny_Glass.qtcurve new/QtCurve-KDE3-0.52.2/kde/config/Shiny_Glass.qtcurve --- old/QtCurve-KDE3-0.51/kde/config/Shiny_Glass.qtcurve 2007-06-07 21:49:28.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config/Shiny_Glass.qtcurve 2007-06-18 22:26:12.000000000 +0200 @@ -14,7 +14,6 @@ drawStatusBarFrames=false embolden=false fillSlider=true -fixParentlessDialogs=false gradientPbGroove=true handles=dots highlightFactor=5 @@ -31,7 +30,7 @@ scrollbarType=kde shadeCheckRadio=none shadeMenubarOnlyWhenActive=true -shadeMenubars=selected +shadeMenubars=darken shadeSliders=selected shadowButtons=true sliderAppearance=shinyglass diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/config_file.c new/QtCurve-KDE3-0.52.2/kde/config_file.c --- old/QtCurve-KDE3-0.51/kde/config_file.c 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/config_file.c 2007-06-18 22:26:12.000000000 +0200 @@ -639,9 +639,11 @@ QTC_CFG_READ_BOOL(gradientPbGroove) QTC_CFG_READ_BOOL(darkerBorders) QTC_CFG_READ_BOOL(vArrows) + QTC_CFG_READ_BOOL(colorMenubarMouseOver) #ifdef __cplusplus QTC_CFG_READ_BOOL(stdSidebarButtons) - QTC_CFG_READ_BOOL(colorMenubarMouseOver) + QTC_CFG_READ_BOOL(gtkScrollViews); + QTC_CFG_READ_BOOL(gtkComboMenus); #endif #ifndef QTC_COMMON_ONLY_COVERTERS @@ -651,8 +653,8 @@ #ifndef __cplusplus releaseConfig(cfg); #endif - if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) - opts->shadeCheckRadio=SHADE_SELECTED; + if(SHADE_SELECTED==opts->shadeCheckRadio) + opts->shadeCheckRadio=SHADE_BLEND_SELECTED; checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); checkColor(&opts->shadeSliders, &opts->customSlidersColor); @@ -721,14 +723,14 @@ opts->stripedProgress=true; opts->highlightTab=true; opts->embolden=false; - opts->appearance=APPEARANCE_BEVELLED; /* APPEARANCE_DULL_GLASS; */ + opts->appearance=APPEARANCE_DULL_GLASS; opts->lvAppearance=APPEARANCE_BEVELLED; opts->tabAppearance=APPEARANCE_GRADIENT; - opts->sliderAppearance=APPEARANCE_GRADIENT; /* APPEARANCE_DULL_GLASS; */ + opts->sliderAppearance=APPEARANCE_DULL_GLASS; opts->menubarAppearance=APPEARANCE_GRADIENT; - opts->menuitemAppearance=APPEARANCE_BEVELLED; /* APPEARANCE_DULL_GLASS; */ + opts->menuitemAppearance=APPEARANCE_DULL_GLASS; opts->toolbarAppearance=APPEARANCE_GRADIENT; - opts->progressAppearance=APPEARANCE_BEVELLED; /* APPEARANCE_DULL_GLASS; */ + opts->progressAppearance=APPEARANCE_DULL_GLASS; opts->defBtnIndicator=IND_COLORED; opts->sliderThumbs=LINE_DOTS; opts->handles=LINE_DOTS; @@ -745,7 +747,7 @@ opts->shadeMenubarOnlyWhenActive=true; opts->thinnerMenuItems=false; opts->scrollbarType=SCROLLBAR_KDE; - opts->shadowButtons=false; /* true; */ + opts->shadowButtons=true; #ifndef QTC_PLAIN_FOCUS_ONLY opts->stdFocus=true; #endif @@ -760,6 +762,8 @@ opts->colorMenubarMouseOver=false; #ifdef __cplusplus opts->stdSidebarButtons=false; + opts->gtkScrollViews=false; + opts->gtkComboMenus=false; opts->customMenubarsColor.setRgb(0, 0, 0); opts->customSlidersColor.setRgb(0, 0, 0); opts->customMenuNormTextColor.setRgb(0, 0, 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/qtcurve.cpp new/QtCurve-KDE3-0.52.2/kde/qtcurve.cpp --- old/QtCurve-KDE3-0.51/kde/qtcurve.cpp 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/qtcurve.cpp 2007-06-21 10:40:34.000000000 +0200 @@ -94,6 +94,7 @@ #include <qvbox.h> #include <qtimer.h> #include <qdatetimeedit.h> +#include <qobjectlist.h> #include <math.h> #include <stdlib.h> #include <unistd.h> @@ -651,6 +652,8 @@ itsThemedApp=APP_KDIALOGD; else if ("tora"==appName) itsThemedApp=APP_TORA; + else if ("opera"==appName) + itsThemedApp=APP_OPERA; else if ("korn"==appName) { itsThemedApp=APP_KORN; @@ -785,6 +788,7 @@ itsCheckRadioCol=QApplication::palette().active().text(); break; case SHADE_SELECTED: + case SHADE_BLEND_SELECTED: itsCheckRadioCol=QApplication::palette().active().highlight(); break; case SHADE_CUSTOM: @@ -801,6 +805,42 @@ { bool enableFilter(!equal(opts.highlightFactor, 1.0) || opts.coloredMouseOver); + if(widget->parentWidget() && ::qt_cast<QScrollView *>(widget) && ::qt_cast<QComboBox *>(widget->parentWidget())) + { + QPalette pal(widget->palette()); +#if 0 + QPalette orig(pal); +#endif + QColorGroup act(pal.active()); + +#if 0 + if(opts.gtkComboMenus) + act.setColor(QColorGroup::Base, opts.lighterPopupMenuBgnd ? itsLighterPopupMenuBgndCol : itsBackgroundCols[ORIGINAL_SHADE]); + act.setColor(QColorGroup::Background, opts.gtkComboMenus + ? opts.lighterPopupMenuBgnd ? itsLighterPopupMenuBgndCol : itsBackgroundCols[ORIGINAL_SHADE] + : QApplication::palette().active().base()); +#endif + act.setColor(QColorGroup::Foreground, itsBackgroundCols[QT_STD_BORDER]); + + pal.setActive(act); + widget->setPalette(pal); +#if 0 + //((QScrollView *)widget)->setMargin(1); + + const QObjectList *children(widget->children()); + + if(children) + { + QObjectList::Iterator it(children->begin()), + end(children->end()); + + for(; it!=end; ++it) + if(::qt_cast<QWidget *>(*it)) + ((QWidget *)(*it))->setPalette(orig); + } +#endif + } + if (APP_MACTOR==itsThemedApp && itsMactorPal && !widget->inherits("QTipLabel")) widget->setPalette(*itsMactorPal); @@ -831,8 +871,8 @@ } else if (::qt_cast<QToolButton *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) - widget->setBackgroundMode(QWidget::PaletteBackground); + if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) + widget->setBackgroundMode(PaletteBackground); if(enableFilter) { widget->installEventFilter(this); @@ -844,47 +884,49 @@ else if (::qt_cast<QButton *>(widget) || widget->inherits("QToolBarExtensionWidget")) { /*if(onToolBar(widget)) - widget->setBackgroundMode(QWidget::NoBackground); - else*/ if(QWidget::NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) - widget->setBackgroundMode(QWidget::PaletteBackground); + widget->setBackgroundMode(NoBackground); + else*/ if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) + widget->setBackgroundMode(PaletteBackground); if(enableFilter) widget->installEventFilter(this); } else if (::qt_cast<QComboBox *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) - widget->setBackgroundMode(QWidget::PaletteBackground); + if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) + widget->setBackgroundMode(PaletteBackground); widget->installEventFilter(this); + if(enableFilter) + widget->setMouseTracking(true); + if(((QComboBox *)widget)->listBox()) ((QComboBox *)widget)->listBox()->installEventFilter(this); } else if(::qt_cast<QMenuBar *>(widget) || ::qt_cast<QToolBar *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) - widget->setBackgroundMode(QWidget::PaletteBackground); + if(NoBackground!=widget->backgroundMode()) + widget->setBackgroundMode(PaletteBackground); if(SHADE_NONE!=opts.shadeMenubars) widget->installEventFilter(this); } else if(::qt_cast<QPopupMenu *>(widget)) - widget->setBackgroundMode(QWidget::NoBackground); // QWidget::PaletteBackground); + widget->setBackgroundMode(NoBackground); // PaletteBackground); else if (widget->inherits("KToolBarSeparator") || (widget->inherits("KListViewSearchLineWidget") && widget->parent() && ::qt_cast<QToolBar *>(widget->parent()))) { widget->setName(kdeToolbarWidget); - widget->setBackgroundMode(QWidget::NoBackground); + widget->setBackgroundMode(NoBackground); widget->installEventFilter(this); } else if (::qt_cast<QScrollBar *>(widget)) { if(enableFilter) { - if(enableFilter) - widget->setMouseTracking(true); + widget->setMouseTracking(true); widget->installEventFilter(this); } - //widget->setBackgroundMode(QWidget::NoBackground); + //widget->setBackgroundMode(NoBackground); } else if (::qt_cast<QSlider *>(widget)) { @@ -893,7 +935,7 @@ if(widget->parent() && ::qt_cast<QToolBar *>(widget->parent())) { widget->setName(kdeToolbarWidget); - widget->setBackgroundMode(QWidget::NoBackground); // We paint whole background. + widget->setBackgroundMode(NoBackground); // We paint whole background. } // This bit stolen form polyester... @@ -919,9 +961,15 @@ onToolBar(widget)) { widget->installEventFilter(this); - widget->setBackgroundMode(QWidget::NoBackground); // We paint whole background. + widget->setBackgroundMode(NoBackground); // We paint whole background. } } + + if (widget->parentWidget() && ::qt_cast<QMenuBar *>(widget->parentWidget()) && !qstrcmp(widget->className(), "QFrame")) + { + widget->installEventFilter(this); + widget->setBackgroundMode(NoBackground); // We paint whole background. + } else if (Qt::X11ParentRelative!=widget->backgroundMode() && (::qt_cast<QLabel *>(widget) || ::qt_cast<QHBox *>(widget) || ::qt_cast<QVBox *>(widget)) && @@ -931,7 +979,7 @@ { widget->setName(kdeToolbarWidget); widget->installEventFilter(this); - widget->setBackgroundMode(QWidget::NoBackground); // We paint the whole background. + widget->setBackgroundMode(NoBackground); // We paint the whole background. } else if(opts.animatedProgress && ::qt_cast<QProgressBar*>(widget)) { @@ -1009,14 +1057,14 @@ } else if (::qt_cast<QButton *>(widget) || widget->inherits("QToolBarExtensionWidget")) { - if(QWidget::NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) - widget->setBackgroundMode(QWidget::PaletteButton); + if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) + widget->setBackgroundMode(PaletteButton); widget->removeEventFilter(this); } else if (::qt_cast<QToolButton *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) - widget->setBackgroundMode(QWidget::PaletteButton); + if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) + widget->setBackgroundMode(PaletteButton); widget->removeEventFilter(this); #if KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 widget->setMouseTracking(false); @@ -1024,21 +1072,22 @@ } else if (::qt_cast<QComboBox *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) - widget->setBackgroundMode(QWidget::PaletteButton); + if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) + widget->setBackgroundMode(PaletteButton); widget->removeEventFilter(this); + widget->setMouseTracking(false); if(((QComboBox *)widget)->listBox()) ((QComboBox *)widget)->listBox()->removeEventFilter(this); } else if (::qt_cast<QToolBar *>(widget) || ::qt_cast<QPopupMenu *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) - widget->setBackgroundMode(QWidget::PaletteBackground); + if(NoBackground!=widget->backgroundMode()) + widget->setBackgroundMode(PaletteBackground); } else if (::qt_cast<QMenuBar *>(widget)) { - if(QWidget::NoBackground!=widget->backgroundMode()) - widget->setBackgroundMode(QWidget::PaletteBackground); + if(NoBackground!=widget->backgroundMode()) + widget->setBackgroundMode(PaletteBackground); if(SHADE_NONE!=opts.shadeMenubars) widget->removeEventFilter(this); } @@ -1051,7 +1100,7 @@ { widget->setMouseTracking(false); widget->removeEventFilter(this); - widget->setBackgroundMode(QWidget::PaletteButton); + widget->setBackgroundMode(PaletteButton); } else if (::qt_cast<QSlider *>(widget)) { @@ -1077,6 +1126,11 @@ widget->removeEventFilter(this); widget->setBackgroundMode(PaletteBackground); } + if (widget->parentWidget() && ::qt_cast<QMenuBar *>(widget->parentWidget()) && !qstrcmp(widget->className(), "QFrame")) + { + widget->removeEventFilter(this); + widget->setBackgroundMode(PaletteBackground); // We paint whole background. + } else if(widget->inherits("KTabCtl"))// || ::qt_cast<QFrame*>(widget)) widget->removeEventFilter(this); else if(opts.fixParentlessDialogs && ::qt_cast<QDialog *>(widget)) @@ -1218,6 +1272,45 @@ } } + // Fix mdi buttons in menubars... + if(::qt_cast<QWidget*>(object) && ((QWidget *)object)->parentWidget() && + ::qt_cast<QMenuBar*>(((QWidget *)object)->parentWidget())) + { + bool drawMenubar=false; + + switch(event->type()) + { + case QEvent::Paint: + drawMenubar=true; + break; + case QEvent::WindowActivate: + itsActive=true; + drawMenubar=opts.shadeMenubarOnlyWhenActive && SHADE_NONE!=opts.shadeMenubars; + break; + case QEvent::WindowDeactivate: + itsActive=false; + drawMenubar=opts.shadeMenubarOnlyWhenActive && SHADE_NONE!=opts.shadeMenubars; + default: + break; + } + + if(drawMenubar) + { + + QWidget *widget(static_cast<QWidget*>(object)), + *parent(static_cast<QWidget*>(object->parent())); + QRect r(widget->rect()); + QPainter p(widget); + int y_offset(widget->y()+parent->y()); + + r.setY(r.y()-y_offset); + r.setHeight(parent->rect().height()); + + drawMenuOrToolBarBackground(&p, r, parent->colorGroup(), true, true); + return true; + } + } + // Taken from plastik... // focus highlight if (::qt_cast<QLineEdit*>(object) || ::qt_cast<QTextEdit*>(object)/* || ::qt_cast<QDateTimeEditBase*>(object)*/) @@ -1389,6 +1482,7 @@ #endif ::qt_cast<QHeader *>(itsHoverWidget) || ::qt_cast<QSpinWidget *>(itsHoverWidget) || + ::qt_cast<QComboBox *>(itsHoverWidget) || ::qt_cast<QTabBar *>(itsHoverWidget))) itsIsSpecialHover=true; @@ -1841,7 +1935,7 @@ void QtCurveStyle::drawEntryField(QPainter *p, const QRect &rx, const QColorGroup &cg, SFlags flags, bool highlight, int round, EWidget w) const { - const QColor *use(highlight ? itsMenuitemCols : itsBackgroundCols); + const QColor *use(highlight ? itsMenuitemCols : buttonColors(cg)); bool isSpin(WIDGET_SPIN==w), doEtch(!itsFormMode && ROUND_FULL==opts.round); @@ -1906,16 +2000,16 @@ switch(pe) { case QStyle::PE_ArrowUp: - a.setPoints(opts.vArrows ? 6 : 3, 2,0, 0,-2, -2,0, -1,1, 0,0, 1,1); + a.setPoints(opts.vArrows ? 7 : 3, 2,0, 0,-2, -2,0, -2,1, -1,0, 1,0, 2,1); break; case QStyle::PE_ArrowDown: - a.setPoints(opts.vArrows ? 6 : 3, 2,0, 0,2, -2,0, -1,-1, 0,0, 1,-1); + a.setPoints(opts.vArrows ? 7 : 3, 2,0, 0,2, -2,0, -2,-1, -1,0, 1,0, 2,-1); break; case QStyle::PE_ArrowRight: - a.setPoints(opts.vArrows ? 6 : 3, 0,-2, 2,0, 0,2, -1,1, 0,0, -1,-1); + a.setPoints(opts.vArrows ? 7 : 3, 0,-2, 2,0, 0,2, -1,2, 0,1, 0,-1, -1,-2); break; case QStyle::PE_ArrowLeft: - a.setPoints(opts.vArrows ? 6 : 3, 0,-2, -2,0, 0,2, 1,1, 0,0, 1,-1); + a.setPoints(opts.vArrows ? 7 : 3, 0,-2, -2,0, 0,2, 1,2, 0,1, 0,-1, 1,-2); break; default: return; @@ -2098,38 +2192,44 @@ case PE_HeaderArrow: drawArrow(p, r, cg, flags, flags&Style_Up ? PE_ArrowUp : PE_ArrowDown); break; - case PE_ButtonCommand: case PE_ButtonBevel: + flags|=Style_Enabled; + case PE_ButtonCommand: case PE_ButtonTool: case PE_ButtonDropDown: { const QColor *use(buttonColors(cg)); bool glassMod(PE_ButtonTool==pe && IS_GLASS(opts.appearance) && - IS_GLASS(opts.toolbarAppearance)); + IS_GLASS(opts.toolbarAppearance)), + mdi(!(flags&QTC_CHECK_BUTTON) && (!(flags&QTC_STD_TOOLBUTTON)||flags&QTC_NO_ETCH_BUTTON) && + PE_ButtonTool==pe && r.width()<=16 && r.height()<=16), + operaMdi(PE_ButtonTool==pe && APP_OPERA==itsThemedApp && r.width()==16 && r.height()==16); // If its not sunken, its raised-don't want flat buttons. if(!(flags&Style_Sunken)) flags|=Style_Raised; - if(PE_ButtonTool==pe) + if(PE_ButtonTool==pe && flags&QTC_VERTICAL_TB_BUTTON) { - if(flags&QTC_VERTICAL_TB_BUTTON) - { - flags-=QTC_VERTICAL_TB_BUTTON; - if(flags&Style_Horizontal) - flags-=Style_Horizontal; - } + flags-=QTC_VERTICAL_TB_BUTTON; + if(flags&Style_Horizontal) + flags-=Style_Horizontal; } // Dont AA' MDI windows' control buttons... - itsFormMode=itsFormMode || (!(flags&QTC_CHECK_BUTTON) && !(flags&QTC_STD_TOOLBUTTON) && - PE_ButtonTool==pe && r.width()<16 && r.height()<16); + itsFormMode=itsFormMode || mdi || operaMdi; + + if(mdi || operaMdi) + flags|=Style_Horizontal; + drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal, #if KDE_VERSION >= 0x30200 - APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe - ? ROUNDED_NONE : + (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) || #endif - ROUNDED_ALL, getFill(flags, use), use, true, true, + operaMdi || mdi + ? ROUNDED_NONE + : ROUNDED_ALL, + getFill(flags, use), use, true, true, flags&QTC_NO_ETCH_BUTTON ? WIDGET_NO_ETCH_BTN : WIDGET_STD_BUTTON); if(IND_COLORED==opts.defBtnIndicator && (flags&Style_ButtonDefault)) @@ -2501,14 +2601,14 @@ QCommonStyle::drawPrimitive(pe, p, r, cg, flags, data); break; case PE_PanelTabWidget: - { - const QColor *use(backgroundColors(cg)); + { + const QColor *use(backgroundColors(cg)); - drawBorder(cg.background(), p, r, cg, - (SFlags)(flags|Style_Horizontal|Style_Enabled), - ROUNDED_ALL, use, WIDGET_OTHER, true, BORDER_RAISED, false); - } + drawBorder(cg.background(), p, r, cg, + (SFlags)(flags|Style_Horizontal|Style_Enabled), + ROUNDED_ALL, use, WIDGET_OTHER, true, BORDER_RAISED, false); break; + } case PE_PanelPopup: { const QColor *use(backgroundColors(cg)); @@ -2516,8 +2616,20 @@ p->setPen(use[5]); p->setBrush(NoBrush); p->drawRect(r); - p->setPen(opts.lighterPopupMenuBgnd ? itsLighterPopupMenuBgndCol : cg.background()); - p->drawRect(QRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2)); + if(opts.lighterPopupMenuBgnd) + { + p->setPen(/*opts.lighterPopupMenuBgnd ? */itsLighterPopupMenuBgndCol/* : cg.background()*/); + p->drawRect(QRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2)); + } + else + { + p->setPen(use[0]); + p->drawLine(r.x()+1, r.y()+1, r.x()+r.width()-2, r.y()+1); + p->drawLine(r.x()+1, r.y()+1, r.x()+1, r.y()+r.height()-2); + p->setPen(use[QT_FRAME_DARK_SHADOW]); + p->drawLine(r.x()+1, r.y()+r.height()-2, r.x()+r.width()-2, r.y()+r.height()-2); + p->drawLine(r.x()+r.width()-2, r.y()+1, r.x()+r.width()-2, r.y()+r.height()-2); + } break; } case PE_TabBarBase: @@ -2608,7 +2720,7 @@ QRect br(r), ar(r); bool down((flags &(Style_Down|Style_On|Style_Sunken))); - const QColor *use(buttonColors(cg)); + const QColor *use(itsButtonCols); // buttonColors(cg)); pe=flags&Style_Horizontal ? PE_ScrollBarAddLine==pe ? PE_ArrowRight : PE_ArrowLeft @@ -2670,6 +2782,39 @@ drawSbSliderHandle(p, r, cg, flags); break; case PE_FocusRect: +#if 0 + // Menu item style selection... + if(opts.gtkComboMenus) + { + QWidget *widget(dynamic_cast<QWidget*>(p->device())); + + if(widget && 0==qstrcmp(widget->className(), "QViewportWidget") && + widget->parentWidget() && ::qt_cast<QListBox *>(widget->parentWidget()) && + widget->parentWidget()->parentWidget() && ::qt_cast<QComboBox *>(widget->parentWidget()->parentWidget())) + { + struct QtCurveListBoxItem : public QListBoxItem + { + void paintContents(QPainter *p) + { + paint(p); + } + }; + + QListBox *box=(QListBox *)widget->parentWidget(); + QtCurveListBoxItem *item=(QtCurveListBoxItem *)(box->item(box->currentItem())); + + if(item) + { + //p->fillRect(r, Qt::black); + drawMenuItem(p, r, cg, false, ROUNDED_ALL, + opts.lighterPopupMenuBgnd ? itsLighterPopupMenuBgndCol + : itsBackgroundCols[ORIGINAL_SHADE], itsMenuitemCols); + item->paintContents(p); + break; + } + } + } +#endif #ifndef QTC_PLAIN_FOCUS_ONLY if(opts.stdFocus) { @@ -3879,6 +4024,11 @@ if(controls&SC_ToolButton) { + if(onControlButtons || + (toolbutton->parentWidget() && toolbutton->parentWidget()->parentWidget() && + ::qt_cast<const QMenuBar *>(toolbutton->parentWidget()->parentWidget()))) + bflags|=QTC_NO_ETCH_BUTTON; + // If we're pressed, on, or raised... #if KDE_VERSION >= 0x30200 if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons) @@ -3988,6 +4138,9 @@ if(controls&SC_ComboBoxFrame && frame.isValid()) { + if(editable && HOVER_CB_ARROW!=itsHover && fillFlags&Style_MouseOver) + fillFlags-=Style_MouseOver; + if(opts.coloredMouseOver && fillFlags&Style_MouseOver && editable && !sunken) frame.addCoords(reverse ? 0 : 1, 0, reverse ? 1 : 0, 0); @@ -4193,7 +4346,7 @@ subline2.moveBy(0, -addline.height()); // Draw trough... - const QColor *trough(backgroundColors(cg)); + const QColor *trough(itsBackgroundCols); // backgroundColors(cg)); bool noButtons(SCROLLBAR_NONE==opts.scrollbarType); QRect s2(subpage), a2(addpage); @@ -4839,6 +4992,8 @@ { switch(stylehint) { + case SH_ScrollView_FrameOnlyAroundContents: + return opts.gtkScrollViews; case SH_EtchDisabledText: case SH_Slider_SnapToValue: case SH_PrintDialog_RightAlignButtons: @@ -5178,7 +5333,7 @@ SFlags flags) const { int min(MIN_SLIDER_SIZE(opts.sliderThumbs)); - const QColor *use(sliderColors(cg, flags)); + const QColor *use(sliderColors(/*cg, */flags)); QRect r(orig); // EShade shade(opts.shadeSliders); @@ -5219,7 +5374,7 @@ if(ROUND_FULL==opts.round) { - const QColor *use(sliderColors(cg, flags)); + const QColor *use(sliderColors(/*cg, */flags)); const QColor &fill(getFill(flags, use)); int x(r.x()), y(r.y()), @@ -5394,8 +5549,9 @@ if(r.width()<2 || r.height()<2) return; - if(!(flags&Style_MouseOver) && p->device()==itsHoverWidget) - flags|=Style_MouseOver; +// if(!(flags&Style_MouseOver) && p->device()==itsHoverWidget) +// flags|=Style_MouseOver; + flags&=~Style_MouseOver; // Dont mouse-over handles - we dont do this for KDE4... const QColor *border(borderColors(flags, itsBackgroundCols)); @@ -5452,12 +5608,12 @@ return itsButtonCols; } -const QColor * QtCurveStyle::sliderColors(const QColorGroup &cg, SFlags flags) const +const QColor * QtCurveStyle::sliderColors(/*const QColorGroup &cg, */ SFlags flags) const { return (flags&Style_Enabled) - ? SHADE_NONE!=opts.shadeSliders && cg.button()==itsButtonCols[ORIGINAL_SHADE] + ? SHADE_NONE!=opts.shadeSliders //&& cg.button()==itsButtonCols[ORIGINAL_SHADE] ? itsSliderCols - : buttonColors(cg) + : itsButtonCols // buttonColors(cg) : itsBackgroundCols; } @@ -5552,8 +5708,7 @@ pixelMetric(PM_IndicatorWidth)+4, itsHoverWidget->height()); itsHover=rect.contains(pos) ? HOVER_CHECK : HOVER_NONE; - return (HOVER_NONE!=itsHover && !rect.contains(itsOldPos)) || (HOVER_NONE==itsHover && - rect.contains(itsOldPos)); + return (HOVER_NONE!=itsHover && !rect.contains(itsOldPos)) || (HOVER_NONE==itsHover && rect.contains(itsOldPos)); } else { @@ -5686,7 +5841,33 @@ return redraw; } else - return itsOldPos==QPoint(-1, -1); + { + QComboBox *cb(::qt_cast<QComboBox *>(itsHoverWidget)); + + if(cb) + { + QRect arrow(cb->rect()); + + if(!cb->editable()) + itsHover=HOVER_CB_ARROW; + else + { + arrow=(querySubControlMetrics(CC_ComboBox, itsHoverWidget, + SC_ComboBoxArrow)); + + if(arrow.contains(pos)) + itsHover=HOVER_CB_ARROW; + else + itsHover=HOVER_NONE; + } + + return (HOVER_CB_ARROW==itsHover && !arrow.contains(itsOldPos)) || + (HOVER_CB_ARROW!=itsHover && arrow.contains(itsOldPos)); + } + else + return itsOldPos==QPoint(-1, -1); + + } } #if KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE3-0.51/kde/qtcurve.h new/QtCurve-KDE3-0.52.2/kde/qtcurve.h --- old/QtCurve-KDE3-0.51/kde/qtcurve.h 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-KDE3-0.52.2/kde/qtcurve.h 2007-06-20 23:10:07.000000000 +0200 @@ -94,6 +94,7 @@ APP_KDIALOGD, APP_TORA, APP_KONTACT, + APP_OPERA, APP_OTHER }; @@ -109,7 +110,8 @@ HOVER_HEADER, HOVER_KICKER, HOVER_SW_UP, - HOVER_SW_DOWN + HOVER_SW_DOWN, + HOVER_CB_ARROW }; QtCurveStyle(); @@ -182,7 +184,7 @@ void shadeColors(const QColor &base, QColor *vals) const; const QColor * buttonColors(const QColorGroup &cg) const; - const QColor * sliderColors(const QColorGroup &cg, SFlags flags) const; + const QColor * sliderColors(/*const QColorGroup &cg, */SFlags flags) const; const QColor * backgroundColors(const QColor &c) const; const QColor * backgroundColors(const QColorGroup &cg) const { return backgroundColors(cg.background()); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bluez-libs
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package bluez-libs checked in at Sun Jun 24 23:55:28 CEST 2007. -------- --- bluez-libs/bluez-libs.changes 2007-05-29 14:32:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-libs/bluez-libs.changes 2007-06-24 12:16:31.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jun 24 12:15:39 CEST 2007 - dgollub(a)suse.de + +- update to v3.12: + * Add missing HCI command text descriptions + * Add missing HCI commands structures. + * Add missing HCI event structures. + * Add common bachk() function. + +------------------------------------------------------------------- Old: ---- bluez-libs-3.11.tar.gz New: ---- bluez-libs-3.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-libs.spec ++++++ --- /var/tmp/diff_new_pack.TF5447/_old 2007-06-24 23:55:17.000000000 +0200 +++ /var/tmp/diff_new_pack.TF5447/_new 2007-06-24 23:55:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-libs (Version 3.11) +# spec file for package bluez-libs (Version 3.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: bluez-libs URL: http://bluez.sourceforge.net -Version: 3.11 -Release: 3 +Version: 3.12 +Release: 1 Summary: Bluetooth Libraries License: GNU General Public License (GPL) Group: Hardware/Mobile @@ -66,6 +66,12 @@ %doc AUTHORS COPYING INSTALL ChangeLog NEWS README %changelog +* Sun Jun 24 2007 - dgollub(a)suse.de +- update to v3.12: + * Add missing HCI command text descriptions + * Add missing HCI commands structures. + * Add missing HCI event structures. + * Add common bachk() function. * Tue May 29 2007 - dmueller(a)suse.de - add patch to fix compilation with C++ applications * Fri May 25 2007 - seife(a)suse.de ++++++ bluez-libs-3.11.tar.gz -> bluez-libs-3.12.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/ChangeLog new/bluez-libs-3.12/ChangeLog --- old/bluez-libs-3.11/ChangeLog 2007-05-24 12:35:15.000000000 +0200 +++ new/bluez-libs-3.12/ChangeLog 2007-06-24 00:55:57.000000000 +0200 @@ -1,3 +1,9 @@ +ver 3.12: + Add missing HCI command text descriptions + Add missing HCI commands structures. + Add missing HCI event structures. + Add common bachk() function. + ver 3.11: Fix URL data size handling. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/configure new/bluez-libs-3.12/configure --- old/bluez-libs-3.11/configure 2007-05-24 12:50:05.000000000 +0200 +++ new/bluez-libs-3.12/configure 2007-06-24 00:59:12.000000000 +0200 @@ -1775,7 +1775,7 @@ # Define the identity of the package. PACKAGE=bluez-libs - VERSION=3.11 + VERSION=3.12 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/configure.in new/bluez-libs-3.12/configure.in --- old/bluez-libs-3.11/configure.in 2007-05-24 12:35:15.000000000 +0200 +++ new/bluez-libs-3.12/configure.in 2007-06-24 00:55:57.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT() -AM_INIT_AUTOMAKE(bluez-libs, 3.11) +AM_INIT_AUTOMAKE(bluez-libs, 3.12) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/include/bluetooth.h new/bluez-libs-3.12/include/bluetooth.h --- old/bluez-libs-3.11/include/bluetooth.h 2007-01-28 21:16:41.000000000 +0100 +++ new/bluez-libs-3.12/include/bluetooth.h 2007-06-24 00:55:57.000000000 +0200 @@ -125,6 +125,7 @@ int ba2str(const bdaddr_t *ba, char *str); int str2ba(const char *str, bdaddr_t *ba); int ba2oui(const bdaddr_t *ba, char *oui); +int bachk(const char *str); int baprintf(const char *format, ...); int bafprintf(FILE *stream, const char *format, ...); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/include/hci.h new/bluez-libs-3.12/include/hci.h --- old/bluez-libs-3.11/include/hci.h 2007-05-09 08:40:39.000000000 +0200 +++ new/bluez-libs-3.12/include/hci.h 2007-06-24 00:55:57.000000000 +0200 @@ -249,8 +249,11 @@ #define LMP_EDR_3S_ESCO 0x80 #define LMP_EXT_INQ 0x01 +#define LMP_ERR_DAT_REP 0x20 +#define LMP_NFLUSH_PKTS 0x40 #define LMP_LSTO 0x01 +#define LMP_INQ_TX_PWR 0x02 #define LMP_EXT_FEAT 0x80 /* Link policies */ @@ -574,14 +577,14 @@ #define OCF_WRITE_DEFAULT_LINK_POLICY 0x000F -#define OCF_SNIFF_SUBRATE 0x0011 +#define OCF_SNIFF_SUBRATING 0x0011 typedef struct { uint16_t handle; uint16_t max_latency; uint16_t min_remote_timeout; uint16_t min_local_timeout; -} __attribute__ ((packed)) sniff_subrate_cp; -#define SNIFF_SUBRATE_CP_SIZE 8 +} __attribute__ ((packed)) sniff_subrating_cp; +#define SNIFF_SUBRATING_CP_SIZE 8 /* Host Controller and Baseband */ #define OGF_HOST_CTL 0x03 @@ -965,6 +968,57 @@ } __attribute__ ((packed)) write_ext_inquiry_response_rp; #define WRITE_EXT_INQUIRY_RESPONSE_RP_SIZE 1 +#define OCF_REFRESH_ENCRYPTION_KEY 0x0053 +typedef struct { + uint16_t handle; +} __attribute__ ((packed)) refresh_encryption_key_cp; +#define REFRESH_ENCRYPTION_KEY_CP_SIZE 2 +typedef struct { + uint8_t status; +} __attribute__ ((packed)) refresh_encryption_key_rp; +#define REFRESH_ENCRYPTION_KEY_RP_SIZE 1 + +#define OCF_READ_INQUIRY_TRANSMIT_POWER_LEVEL 0x0058 +typedef struct { + uint8_t status; + int8_t level; +} __attribute__ ((packed)) read_inquiry_transmit_power_level_rp; +#define READ_INQUIRY_TRANSMIT_POWER_LEVEL_RP_SIZE 2 + +#define OCF_WRITE_INQUIRY_TRANSMIT_POWER_LEVEL 0x0059 +typedef struct { + int8_t level; +} __attribute__ ((packed)) write_inquiry_transmit_power_level_cp; +#define WRITE_INQUIRY_TRANSMIT_POWER_LEVEL_CP_SIZE 1 +typedef struct { + uint8_t status; +} __attribute__ ((packed)) write_inquiry_transmit_power_level_rp; +#define WRITE_INQUIRY_TRANSMIT_POWER_LEVEL_RP_SIZE 1 + +#define OCF_READ_DEFAULT_ERROR_DATA_REPORTING 0x005A +typedef struct { + uint8_t status; + uint8_t reporting; +} __attribute__ ((packed)) read_default_error_data_reporting_rp; +#define READ_DEFAULT_ERROR_DATA_REPORTING_RP_SIZE 2 + +#define OCF_WRITE_DEFAULT_ERROR_DATA_REPORTING 0x005B +typedef struct { + uint8_t reporting; +} __attribute__ ((packed)) write_default_error_data_reporting_cp; +#define WRITE_DEFAULT_ERROR_DATA_REPORTING_CP_SIZE 1 +typedef struct { + uint8_t status; +} __attribute__ ((packed)) write_default_error_data_reporting_rp; +#define WRITE_DEFAULT_ERROR_DATA_REPORTING_RP_SIZE 1 + +#define OCF_ENHANCED_FLUSH 0x005F +typedef struct { + uint16_t handle; + uint8_t type; +} __attribute__ ((packed)) enhanced_flush_cp; +#define ENHANCED_FLUSH_CP_SIZE 3 + /* Informational Parameters */ #define OGF_INFO_PARAM 0x04 @@ -1382,7 +1436,7 @@ } __attribute__ ((packed)) evt_sync_conn_changed; #define EVT_SYNC_CONN_CHANGED_SIZE 9 -#define EVT_SNIFF_SUBRATE 0x2E +#define EVT_SNIFF_SUBRATING 0x2E typedef struct { uint8_t status; uint16_t handle; @@ -1390,8 +1444,8 @@ uint16_t max_rx_latency; uint16_t min_remote_timeout; uint16_t min_local_timeout; -} __attribute__ ((packed)) evt_sniff_subrate; -#define EVT_SNIFF_SUBRATE_SIZE 11 +} __attribute__ ((packed)) evt_sniff_subrating; +#define EVT_SNIFF_SUBRATING_SIZE 11 #define EVT_EXTENDED_INQUIRY_RESULT 0x2F typedef struct { @@ -1405,12 +1459,32 @@ } __attribute__ ((packed)) extended_inquiry_info; #define EXTENDED_INQUIRY_INFO_SIZE 254 -#define EVT_LINK_SUPERVISION_TIMEOUT_CHANGE 0x38 +#define EVT_ENCRYPTION_KEY_REFRESH_COMPLETE 0x30 +typedef struct { + uint8_t status; + uint16_t handle; +} __attribute__ ((packed)) evt_encryption_key_refresh_complete; +#define EVT_ENCRYPTION_KEY_REFRESH_COMPLETE_SIZE 3 + +#define EVT_LINK_SUPERVISION_TIMEOUT_CHANGED 0x38 typedef struct { uint16_t handle; uint16_t timeout; -} __attribute__ ((packed)) evt_link_supervision_timeout_change; -#define EVT_LINK_SUPERVISION_TIMEOUT_SIZE 4 +} __attribute__ ((packed)) evt_link_supervision_timeout_changed; +#define EVT_LINK_SUPERVISION_TIMEOUT_CHANGED_SIZE 4 + +#define EVT_ENHANCED_FLUSH_COMPLETE 0x39 +typedef struct { + uint16_t handle; +} __attribute__ ((packed)) evt_enhanced_flush_complete; +#define EVT_ENHANCED_FLUSH_COMPLETE_SIZE 2 + +#define EVT_REMOTE_HOST_FEATURES_NOTIFY 0x3D +typedef struct { + bdaddr_t bdaddr; + uint8_t features[8]; +} __attribute__ ((packed)) evt_remote_host_features_notify; +#define EVT_REMOTE_HOST_FEATURES_NOTIFY_SIZE 14 #define EVT_TESTING 0xFE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/include/l2cap.h new/bluez-libs-3.12/include/l2cap.h --- old/bluez-libs-3.11/include/l2cap.h 2007-01-28 21:16:42.000000000 +0100 +++ new/bluez-libs-3.12/include/l2cap.h 2007-06-08 20:48:19.000000000 +0200 @@ -175,7 +175,6 @@ typedef struct { uint16_t type; - uint8_t data[0]; } __attribute__ ((packed)) l2cap_info_req; #define L2CAP_INFO_REQ_SIZE 2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/src/bluetooth.c new/bluez-libs-3.12/src/bluetooth.c --- old/bluez-libs-3.11/src/bluetooth.c 2007-01-28 21:16:42.000000000 +0100 +++ new/bluez-libs-3.12/src/bluetooth.c 2007-06-24 00:55:57.000000000 +0200 @@ -29,6 +29,7 @@ #include <stdio.h> #include <errno.h> +#include <ctype.h> #include <stdarg.h> #include <stdlib.h> #include <malloc.h> @@ -110,6 +111,40 @@ return sprintf(str, "%2.2X-%2.2X-%2.2X", b[0], b[1], b[2]); } +int bachk(const char *str) +{ + char tmp[18], *ptr = tmp; + + if (!str) + return -1; + + if (strlen(str) != 17) + return -1; + + memcpy(tmp, str, 18); + + while (*ptr) { + *ptr = toupper(*ptr); + if (*ptr < '0'|| (*ptr > '9' && *ptr < 'A') || *ptr > 'F') + return -1; + ptr++; + + *ptr = toupper(*ptr); + if (*ptr < '0'|| (*ptr > '9' && *ptr < 'A') || *ptr > 'F') + return -1; + ptr++; + + *ptr = toupper(*ptr); + if (*ptr == 0) + break; + if (*ptr != ':') + return -1; + ptr++; + } + + return 0; +} + int baprintf(const char *format, ...) { va_list ap; @@ -384,6 +419,18 @@ return "PARROT SA"; case 68: return "Socket Communications"; + case 69: + return "Atheros Communications, Inc."; + case 70: + return "MediaTek, Inc."; + case 71: + return "Bluegiga"; /* (tentative) */ + case 72: + return "Marvell Technology Group Ltd."; + case 73: + return "3DSP Corporation"; + case 74: + return "Accel Semiconductor Ltd."; case 65535: return "internal use"; default: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/src/hci.c new/bluez-libs-3.12/src/hci.c --- old/bluez-libs-3.11/src/hci.c 2007-02-18 04:34:48.000000000 +0100 +++ new/bluez-libs-3.12/src/hci.c 2007-06-24 00:55:57.000000000 +0200 @@ -447,9 +447,35 @@ { "Reserved", 135 }, { "Read Extended Inquiry Response", 136 }, { "Write Extended Inquiry Response", 137 }, - { "Unknown", 138 }, - { "Unknown", 139 }, - { "Sniff Subrate", 140 }, + { "Refresh Encryption Key", 138 }, + { "Reserved", 139 }, + { "Sniff Subrating", 140 }, + { "Unknown", 141 }, + { "Unknown", 142 }, + { "Unknown", 143 }, + { "Read Inquiry Transmit Power Level", 144 }, + { "Write Inquiry Transmit Power Level", 145 }, + { "Read Default Erroneous Data Reporting", 146 }, + { "Write Default Erroneous Data Reporting", 147 }, + { "Reserved", 148 }, + { "Reserved", 149 }, + { "Reserved", 150 }, + { "Unknown", 151 }, + { "Unknown", 152 }, + { "Unknown", 153 }, + { "Unknown", 154 }, + { "Unknown", 155 }, + { "Unknown", 156 }, + { "Enhanced Flush", 157 }, + { "Unknown", 158 }, + { "Reserved", 159 }, + { "Reserved", 160 }, + { "Unknown", 161 }, + { "Unknown", 162 }, + { "Reserved", 163 }, + { "Reserved", 164 }, + { "Reserved", 165 }, + { "Reserved", 166 }, { NULL } }; @@ -600,14 +626,14 @@ { "<no. 50>", 0x04 }, /* Bit 2 */ { "<no. 51>", 0x08 }, /* Bit 3 */ { "<no. 52>", 0x10 }, /* Bit 4 */ - { "<no. 53>", 0x20 }, /* Bit 5 */ - { "<no. 54>", 0x40 }, /* Bit 6 */ + { "<err. data report>", LMP_ERR_DAT_REP }, /* Bit 5 */ + { "<non-flush flag>", LMP_NFLUSH_PKTS }, /* Bit 6 */ { "<no. 55>", 0x80 }, /* Bit 7 */ { NULL } }, { /* Byte 7 */ { "<LSTO>", LMP_LSTO }, /* Bit 1 */ - { "<no. 57>", 0x02 }, /* Bit 1 */ + { "<inquiry TX power>", LMP_INQ_TX_PWR }, /* Bit 1 */ { "<no. 58>", 0x04 }, /* Bit 2 */ { "<no. 59>", 0x08 }, /* Bit 3 */ { "<no. 60>", 0x10 }, /* Bit 4 */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/src/Makefile.am new/bluez-libs-3.12/src/Makefile.am --- old/bluez-libs-3.11/src/Makefile.am 2007-05-24 12:35:15.000000000 +0200 +++ new/bluez-libs-3.12/src/Makefile.am 2007-06-24 00:55:57.000000000 +0200 @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libbluetooth.la libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c -libbluetooth_la_LDFLAGS = -version-info 8:1:6 +libbluetooth_la_LDFLAGS = -version-info 9:0:7 INCLUDES = -I$(top_builddir)/include diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/src/Makefile.in new/bluez-libs-3.12/src/Makefile.in --- old/bluez-libs-3.11/src/Makefile.in 2007-05-24 12:50:03.000000000 +0200 +++ new/bluez-libs-3.12/src/Makefile.in 2007-06-24 00:59:10.000000000 +0200 @@ -166,7 +166,7 @@ target_alias = @target_alias@ lib_LTLIBRARIES = libbluetooth.la libbluetooth_la_SOURCES = bluetooth.c hci.c sdp.c -libbluetooth_la_LDFLAGS = -version-info 8:1:6 +libbluetooth_la_LDFLAGS = -version-info 9:0:7 INCLUDES = -I$(top_builddir)/include MAINTAINERCLEANFILES = Makefile.in all: all-am diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-libs-3.11/src/sdp.c new/bluez-libs-3.12/src/sdp.c --- old/bluez-libs-3.11/src/sdp.c 2007-05-23 19:11:56.000000000 +0200 +++ new/bluez-libs-3.12/src/sdp.c 2007-06-16 13:53:41.000000000 +0200 @@ -922,7 +922,8 @@ return NULL; } d->dtd = *(uint8_t *) p; - sdp_pattern_add_uuid(rec, &d->val.uuid); + if (rec) + sdp_pattern_add_uuid(rec, &d->val.uuid); return d; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Sun Jun 24 23:55:06 CEST 2007. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-06-11 13:33:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-06-24 16:57:09.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 24 16:55:19 CEST 2007 - stbinner(a)suse.de + +- update to 0.52.1: several style drawing fixes, see ChangeLog + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.51.tar.gz New: ---- QtCurve-Gtk2-0.52.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.X32302/_old 2007-06-24 23:52:37.000000000 +0200 +++ /var/tmp/diff_new_pack.X32302/_new 2007-06-24 23:52:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.51) +# spec file for package qtcurve-gtk2 (Version 0.52.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/GUI/GNOME Summary: QtCurve style for Gtk2 -Version: 0.51 +Version: 0.52.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz @@ -74,6 +74,8 @@ %pref/share/themes/QtCurve %changelog +* Sun Jun 24 2007 - stbinner(a)suse.de +- update to 0.52.1: several style drawing fixes, see ChangeLog * Mon Jun 11 2007 - stbinner(a)suse.de - update to 0.51: - Changed shading to use HSL colour space. This can be altered ++++++ QtCurve-Gtk2-0.51.tar.gz -> QtCurve-Gtk2-0.52.1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/ChangeLog new/QtCurve-Gtk2-0.52.1/ChangeLog --- old/QtCurve-Gtk2-0.51/ChangeLog 2007-06-10 22:11:50.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/ChangeLog 2007-06-20 23:05:56.000000000 +0200 @@ -1,3 +1,25 @@ +0.52.1 +------ +1. Draw emphasis around menus when not lightening. +2. Use button colours to border entry fields. +3. Fix menu standard background. + +0.52 +---- + 1. Use 'dull glass' as the default gradient - previous default is now + called 'Clean'. + 2. Darken slider mouse over colour if slider is not shaded. + 3. Use thinner slider mouse over sections if slider is not shaded. + 4. Improve look of small V arrows. + 5. Even duller dull glass, but much more useable. + 6. Implement 'plastik' style mouse over for square sliders. + 7. Fix bottom/right scrollbar arrow position. + 8. Fix spinbutton arrow position. + 9. Fix SWT combo arrows. +10. Don't prelight SWT combos - they don't un-prelight when activated! +11. For non editable combos, draw both an up and a down arrow. +12. For editable combos - make menu more KDE list like. + 0.51 ---- 1. Changed shading to use HSL colour space. This can be altered by diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/configure new/QtCurve-Gtk2-0.52.1/configure --- old/QtCurve-Gtk2-0.51/configure 2007-06-01 00:24:47.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/configure 2007-06-20 23:13:29.000000000 +0200 @@ -1925,7 +1925,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.51 +VERSION=0.52.1 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/configure.in new/QtCurve-Gtk2-0.52.1/configure.in --- old/QtCurve-Gtk2-0.51/configure.in 2007-06-01 00:24:32.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/configure.in 2007-06-20 23:12:59.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.51 +VERSION=0.52.1 AC_SUBST(VERSION) AUTOMAKE_OPTIONS=no-dependencies AM_INIT_AUTOMAKE($PACKAGE, $VERSION) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/gtk2/common.h new/QtCurve-Gtk2-0.52.1/gtk2/common.h --- old/QtCurve-Gtk2-0.51/gtk2/common.h 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/gtk2/common.h 2007-06-18 22:26:12.000000000 +0200 @@ -50,6 +50,14 @@ #define QTC_HIGHLIGHT_SCROLVIEWS */ +/* + Control shading used for glass variants. + 0 => As used in 0.51.1 + + 1 => As used in 0.51 + 2 => As used in <0.51 +*/ +#define QTC_GLASS_SHADING 0 + typedef enum { SHADING_SIMPLE=0, @@ -58,7 +66,7 @@ } EShading; #ifndef QTC_CONFIG_DIALOG -static EShading shading=SHADING_SIMPLE; /* 0=>hsv/hsl, 1=>simple (i.e. 0.46.1->0.50 style) */ +static EShading shading=SHADING_HSL; #endif #ifdef __cplusplus @@ -87,6 +95,11 @@ #define QTC_MIN_BTN_SIZE 8 #define QTC_LV_SIZE 7 +#define LARGE_ARR_WIDTH 7 +#define LARGE_ARR_HEIGHT 4 +#define SMALL_ARR_WIDTH 5 +#define SMALL_ARR_HEIGHT 3 + #define NUM_STD_SHADES 6 #define NUM_EXTRA_SHADES 3 @@ -158,44 +171,50 @@ #define SHADE_BEVEL_MENU_ITEM_LIGHT (QTC_SIMPLE_SHADING ? 1.07 : 1.09) #define SHADE_BEVEL_MENU_ITEM_DARK (QTC_SIMPLE_SHADING ? 0.85 : 0.83) -#define SHADE_SLIDER_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.1 /*: 1.12)*/ -#define SHADE_SLIDER_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.8 /*: 0.72)*/ +#define SHADE_SLIDER_LIGHT 1.1 +#define SHADE_SLIDER_DARK 0.8 + +#define SHADE_SBAR_LIGHT 1.02 +#define SHADE_SBAR_DARK 0.95 + +#define SHADE_MENU_LIGHT 1.02 +#define SHADE_MENU_DARK 0.96 + +#define SHADE_TAB_SEL_LIGHT 1.1 +#define SHADE_TAB_SEL_DARK 1.0 -#define SHADE_SBAR_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.02 /*: 1.04)*/ -#define SHADE_SBAR_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.95 /*: 0.92)*/ +#define SHADE_BOTTOM_TAB_SEL_LIGHT 1.0 +#define SHADE_BOTTOM_TAB_SEL_DARK 0.96 + +#if !defined QTC_GLASS_SHADING || QTC_GLASS_SHADING==0 + + #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 0.99 : 0.98) \ + : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.55)) + #define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 0.94 : 0.92) \ + : 0.92) + #define SHADE_GLASS_BOT_A(A) (APPEARANCE_DULL_GLASS==A ? 1.02 : 0.99) + #define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.10 : 1.16) + +#elif QTC_GLASS_SHADING==1 + + #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 1.0 : 1.0) \ + : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) + #define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A ? 0.96 : 0.96) + #define SHADE_GLASS_BOT_A(A) 0.99 + #define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) + +#else -#define SHADE_MENU_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.02 /*: 1.03)*/ -#define SHADE_MENU_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.96 /*: 0.94)*/ + #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ + ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.05) \ + : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) + #define SHADE_GLASS_TOP_B(A, W) 0.96 + #define SHADE_GLASS_BOT_A(A) 0.99 + #define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) -#define SHADE_TAB_SEL_LIGHT /*(QTC_SIMPLE_SHADING ?*/ 1.1 /*: 1.12)*/ -#define SHADE_TAB_SEL_DARK 1.0 - -#define SHADE_BOTTOM_TAB_SEL_LIGHT 1.0 -#define SHADE_BOTTOM_TAB_SEL_DARK /*(QTC_SIMPLE_SHADING ?*/ 0.96 /*: 0.95)*/ - -#if 0 /* Duller on top & button */ -#define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? 0.98 : 0.98) \ - : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) -#define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A ? 0.97 : 0.96) -#define SHADE_GLASS_BOT_A(A) (APPEARANCE_DULL_GLASS==A ? 1.00 : 0.99) -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.10 : 1.16) -#endif -#if 1 /* Duller on top */ -#define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? /*(QTC_SIMPLE_SHADING ?*/ 0.98 /*: 0.99)*/ : /*(QTC_SIMPLE_SHADING ?*/ 0.98 /*: 0.99)*/) \ - : (WIDGET_DEF_BUTTON==W ? /*(QTC_SIMPLE_SHADING ?*/ 1.08 /*: 1.1)*/ : /*(QTC_SIMPLE_SHADING ?*/ 1.7 /*: 1.77)*/)) -#define SHADE_GLASS_TOP_B(A, W) (APPEARANCE_DULL_GLASS==A ? 0.97 : 0.96) -#define SHADE_GLASS_BOT_A(A) 0.99 -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? /*(QTC_SIMPLE_SHADING ?*/ 1.08 /*: 1.09)*/ : /*(QTC_SIMPLE_SHADING ?*/ 1.16 /*: 1.17)*/) -#endif -#if 0 /* < 0.51 */ -#define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.05) \ - : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) -#define SHADE_GLASS_TOP_B(A, W) 0.96 -#define SHADE_GLASS_BOT_A(A) 0.99 -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) #endif #define IS_GLASS(A) (APPEARANCE_DULL_GLASS==A || APPEARANCE_SHINY_GLASS==A) @@ -215,17 +234,17 @@ #define MAX_HIGHLIGHT_FACTOR 50 #define MIN_HIGHLIGHT_FACTOR -50 #define MENUBAR_DARK_FACTOR 0.97 -#define POPUPMENU_LIGHT_FACTOR /*(QTC_SIMPLE_SHADING ?*/ 1.15 /*: 1.2)*/ +#define POPUPMENU_LIGHT_FACTOR 1.15 /*#define INACTIVE_HIGHLIGHT_FACTOR 1.15*/ #define USE_SHADED_MENU_BAR_COLORS (SHADE_CUSTOM==opts.shadeMenubars || SHADE_BLEND_SELECTED==opts.shadeMenubars) #define MENUBAR_GLASS_SELECTED_DARK_FACTOR 0.9 #define GLASS_BORDER 0.4 #define BEVEL_BORDER(w) (WIDGET_LISTVIEW_HEADER==w ? 6 : 4) -#define SHADE_BEVEL_TOP /*(QTC_SIMPLE_SHADING ?*/ 1.07 /*: 1.09)*/ -#define SHADE_BEVEL_MID_TOP /*(QTC_SIMPLE_SHADING ?*/ 1.03 /*: 1.04)*/ +#define SHADE_BEVEL_TOP 1.07 +#define SHADE_BEVEL_MID_TOP 1.03 #define SHADE_BEVEL_MID_BOT 0.975 -#define SHADE_BEVEL_BOT(w) (WIDGET_LISTVIEW_HEADER==(w) ? /*(QTC_SIMPLE_SHADING ?*/ 0.88 /*: 0.86)*/ : /*(QTC_SIMPLE_SHADING ?*/ 0.90 /*: 0.88)*/) +#define SHADE_BEVEL_BOT(w) (WIDGET_LISTVIEW_HEADER==(w) ? 0.88 : 0.90) #define NUM_SPLITTER_DASHES 21 @@ -248,12 +267,16 @@ #define QTC_NORM_TAB_APP (APPEARANCE_BEVELLED==opts.tabAppearance ? APPEARANCE_GRADIENT : opts.tabAppearance) #define QTC_SEL_TAB_APP (APPEARANCE_INVERTED==opts.tabAppearance ? APPEARANCE_FLAT : (QTC_NORM_TAB_APP)) -#define QTC_SLIDER_MO_SHADE 0 /*(SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 0 : 2)*/ +#define QTC_SLIDER_MO_SHADE (SHADE_SELECTED==opts.shadeSliders ? 1 : (SHADE_BLEND_SELECTED==opts.shadeSliders ? 0 : ORIGINAL_SHADE)) #define QTC_SLIDER_MO_BORDER (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 2 : 1) #define QTC_SLIDER_MO_LEN (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 4 : 3) -#define QTC_SB_SLIDER_MO_LEN(A) ((A)>31 ? 6 : 4) +#define QTC_SB_SLIDER_MO_LEN(A) ((A)<22 && ROUND_FULL!=opts.round \ + ? 2 \ + : ((A)<32 || (SHADE_SELECTED!=opts.shadeSliders && SHADE_BLEND_SELECTED!=opts.shadeSliders) \ + ? 4 \ + : 6)) -#define QTC_CR_MO_FILL 2 +#define QTC_CR_MO_FILL (SHADE_BLEND_SELECTED==opts.shadeCheckRadio || SHADE_SELECTED==opts.shadeCheckRadio ? 1 : 2) #define QTC_MO_DEF_BTN 2 #define QTC_MO_PLASTIK_DARK(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 3 : 2) /*? 2 : 1) */ #define QTC_MO_PLASTIK_LIGHT(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 4 : 1) /*? 2 : 0) */ @@ -805,6 +828,8 @@ gradientPbGroove, #ifdef __cplusplus stdSidebarButtons, + gtkScrollViews, + gtkComboMenus, #endif borderMenuitems, colorMenubarMouseOver, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/gtk2/config_file.c new/QtCurve-Gtk2-0.52.1/gtk2/config_file.c --- old/QtCurve-Gtk2-0.51/gtk2/config_file.c 2007-06-10 22:12:03.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/gtk2/config_file.c 2007-06-18 22:26:12.000000000 +0200 @@ -639,9 +639,11 @@ QTC_CFG_READ_BOOL(gradientPbGroove) QTC_CFG_READ_BOOL(darkerBorders) QTC_CFG_READ_BOOL(vArrows) + QTC_CFG_READ_BOOL(colorMenubarMouseOver) #ifdef __cplusplus QTC_CFG_READ_BOOL(stdSidebarButtons) - QTC_CFG_READ_BOOL(colorMenubarMouseOver) + QTC_CFG_READ_BOOL(gtkScrollViews); + QTC_CFG_READ_BOOL(gtkComboMenus); #endif #ifndef QTC_COMMON_ONLY_COVERTERS @@ -651,8 +653,8 @@ #ifndef __cplusplus releaseConfig(cfg); #endif - if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) - opts->shadeCheckRadio=SHADE_SELECTED; + if(SHADE_SELECTED==opts->shadeCheckRadio) + opts->shadeCheckRadio=SHADE_BLEND_SELECTED; checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); checkColor(&opts->shadeSliders, &opts->customSlidersColor); @@ -721,14 +723,14 @@ opts->stripedProgress=true; opts->highlightTab=true; opts->embolden=false; - opts->appearance=APPEARANCE_BEVELLED; /* APPEARANCE_DULL_GLASS; */ + opts->appearance=APPEARANCE_DULL_GLASS; opts->lvAppearance=APPEARANCE_BEVELLED; opts->tabAppearance=APPEARANCE_GRADIENT; - opts->sliderAppearance=APPEARANCE_GRADIENT; /* APPEARANCE_DULL_GLASS; */ + opts->sliderAppearance=APPEARANCE_DULL_GLASS; opts->menubarAppearance=APPEARANCE_GRADIENT; - opts->menuitemAppearance=APPEARANCE_BEVELLED; /* APPEARANCE_DULL_GLASS; */ + opts->menuitemAppearance=APPEARANCE_DULL_GLASS; opts->toolbarAppearance=APPEARANCE_GRADIENT; - opts->progressAppearance=APPEARANCE_BEVELLED; /* APPEARANCE_DULL_GLASS; */ + opts->progressAppearance=APPEARANCE_DULL_GLASS; opts->defBtnIndicator=IND_COLORED; opts->sliderThumbs=LINE_DOTS; opts->handles=LINE_DOTS; @@ -745,7 +747,7 @@ opts->shadeMenubarOnlyWhenActive=true; opts->thinnerMenuItems=false; opts->scrollbarType=SCROLLBAR_KDE; - opts->shadowButtons=false; /* true; */ + opts->shadowButtons=true; #ifndef QTC_PLAIN_FOCUS_ONLY opts->stdFocus=true; #endif @@ -760,6 +762,8 @@ opts->colorMenubarMouseOver=false; #ifdef __cplusplus opts->stdSidebarButtons=false; + opts->gtkScrollViews=false; + opts->gtkComboMenus=false; opts->customMenubarsColor.setRgb(0, 0, 0); opts->customSlidersColor.setRgb(0, 0, 0); opts->customMenuNormTextColor.setRgb(0, 0, 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/gtk2/gtkrc-top new/QtCurve-Gtk2-0.52.1/gtk2/gtkrc-top --- old/QtCurve-Gtk2-0.51/gtk2/gtkrc-top 2007-05-01 00:05:07.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/gtk2/gtkrc-top 2007-06-16 21:43:45.000000000 +0200 @@ -27,6 +27,7 @@ GtkNotebook::tab-overlap = 2 GtkNotebook::tab-curvature = 4 GtkStatusbar::shadow-type = 0 + GtkComboBoxEntry::appears-as-list = 1 xthickness = 1 ythickness = 1 @@ -128,28 +129,28 @@ ythickness = 2 } -class "GtkWidget" style "qtcurve-default" -class "GtkNotebook" style "qtcurve-w2" +class "*GtkWidget" style "qtcurve-default" +class "*GtkNotebook" style "qtcurve-w2" class "*Button" style "qtcurve-h2" -class "GtkOptionMenu" style "qtcurve-h2" -class "GtkRange" style "qtcurve-w2b" -class "GtkMenu" style "qtcurve-w2" -class "GtkScrolledWindow" style "qtcurve-w2" +class "*GtkOptionMenu" style "qtcurve-h2" +class "*GtkRange" style "qtcurve-w2b" +class "*GtkMenu" style "qtcurve-w2" +class "*GtkScrolledWindow" style "qtcurve-w2" class "*MenuBar" style "qtcurve-menubar" class "*MenuItem" style "qtcurve-menuitem" widget_class "*MenuBar*MenuItem" style "qtcurve-menubaritem" -class "GtkFrame" style "qtcurve-w2" -class "GtkStatusbar" style "qtcurve-default" -class "GtkRadioButton" style "qtcurve-default" -class "GtkCheckButton" style "qtcurve-default" -class "GtkSpinButton" style "qtcurve-w2b" +class "*GtkFrame" style "qtcurve-w2" +class "*GtkStatusbar" style "qtcurve-default" +class "*GtkRadioButton" style "qtcurve-default" +class "*GtkCheckButton" style "qtcurve-default" +class "*GtkSpinButton" style "qtcurve-w2b" widget_class "*.GtkMenuItem.*" style "qtcurve-default" widget_class "*.GtkAccelMenuItem.*" style "qtcurve-default" widget_class "*.GtkRadioMenuItem.*" style "qtcurve-default" widget_class "*.GtkCheckMenuItem.*" style "qtcurve-default" widget_class "*.GtkImageMenuItem.*" style "qtcurve-default" widget_class "*.GtkSeparatorMenuItem.*" style "qtcurve-default" -class "GtkEntry" style "qtcurve-w2b" +class "*GtkEntry" style "qtcurve-w2b" widget_class "*.tooltips.*.GtkToggleButton" style "qtcurve-tasklist" widget_class "*Tree*GtkButton" style "qtcurve-default" widget_class "*List*GtkButton" style "qtcurve-default" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/gtk2/qtcurve.c new/QtCurve-Gtk2-0.52.1/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.51/gtk2/qtcurve.c 2007-06-10 22:11:50.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/gtk2/qtcurve.c 2007-06-20 23:05:56.000000000 +0200 @@ -51,10 +51,6 @@ #endif #define SLIDER_TROUGH_SIZE 5 -#define LARGE_ARR_WIDTH 7 -#define LARGE_ARR_HEIGHT 4 -#define SMALL_ARR_WIDTH 5 -#define SMALL_ARR_HEIGHT 3 static void gtkDrawBox(GtkStyle *style, GdkWindow *window, GtkStateType state, GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget, @@ -367,6 +363,7 @@ return isComboBoxEntry(widget) && widget->parent->parent && 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent->parent)), "SwtFixed"); } + static gboolean isOnComboEntry(GtkWidget *w, int level) { if(w) @@ -1988,11 +1985,11 @@ QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget) && GTK_APP_JAVA!=qtSettings.app, doEtch=ROUND_FULL==opts.round; - GdkGC **gcs=highlight ? qtcurveStyle->menuitem_gc : qtcurveStyle->background_gc, + GdkGC **gcs=highlight ? qtcurveStyle->menuitem_gc : qtcurveStyle->button_gc, *bgnd_gc=style->bg_gc[state], *gc=NULL, *midgc=NULL; - GdkColor *colors=highlight ? qtcurveStyle->menuitem : qtcurveStyle->background; + GdkColor *colors=highlight ? qtcurveStyle->menuitem : qtcurveStyle->button; if(doEtch) { @@ -2286,13 +2283,13 @@ } } -static void drawArrowPolygon(GdkWindow *window, GdkGC *gc, GdkRectangle *area, GdkPoint *points) +static void drawArrowPolygon(GdkWindow *window, GdkGC *gc, GdkRectangle *area, GdkPoint *points, int npoints) { if(area) gdk_gc_set_clip_rectangle(gc, area); - gdk_draw_polygon(window, gc, FALSE, points, opts.vArrows ? 6 : 3); - gdk_draw_polygon(window, gc, TRUE, points, opts.vArrows ? 6 : 3); + gdk_draw_polygon(window, gc, FALSE, points, npoints); + gdk_draw_polygon(window, gc, TRUE, points, npoints); if(area) gdk_gc_set_clip_rectangle(gc, NULL); @@ -2306,26 +2303,26 @@ { case GTK_ARROW_UP: { - GdkPoint a[]={{x+2,y}, {x,y-2}, {x-2,y}, {x-1,y+1}, {x,y}, {x+1,y+1}}; - drawArrowPolygon(window, gc, area, a); + GdkPoint a[]={{x+2,y}, {x,y-2}, {x-2,y}, {x-2,y+1}, {x-1,y}, {x+1,y}, {x+2,y+1}}; + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 7 : 3); break; } case GTK_ARROW_DOWN: { - GdkPoint a[]={{x+2,y}, {x,y+2}, {x-2,y}, {x-1,y-1}, {x,y}, {x+1,y-1}}; - drawArrowPolygon(window, gc, area, a); + GdkPoint a[]={{x+2,y}, {x,y+2}, {x-2,y}, {x-2,y-1}, {x-1,y}, {x+1,y}, {x+2,y-1}}; + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 7 : 3); break; } case GTK_ARROW_RIGHT: { - GdkPoint a[]={{x,y-2}, {x+2,y}, {x,y+2}, {x-1,y+1}, {x,y}, {x-1,y-1}}; - drawArrowPolygon(window, gc, area, a); + GdkPoint a[]={{x,y-2}, {x+2,y}, {x,y+2}, {x-1,y+2}, {x,y+1}, {x,y-1}, {x-1,y-2}}; + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 7 : 3); break; } case GTK_ARROW_LEFT: { - GdkPoint a[]={{x,y-2}, {x-2,y}, {x,y+2}, {x+1,y+1}, {x,y}, {x+1,y-1}}; - drawArrowPolygon(window, gc, area, a); + GdkPoint a[]={{x,y-2}, {x-2,y}, {x,y+2}, {x+1,y+2}, {x,y+1}, {x,y-1}, {x+1,y-2}}; + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 7 : 3); break; } default: @@ -2337,25 +2334,25 @@ case GTK_ARROW_UP: { GdkPoint a[]={{x+3,y+1}, {x,y-2}, {x-3,y+1}, {x-2, y+2}, {x,y}, {x+2,y+2}}; - drawArrowPolygon(window, gc, area, a); + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 6 : 3); break; } case GTK_ARROW_DOWN: { GdkPoint a[]={{x+3,y-1}, {x,y+2}, {x-3,y-1}, {x-2,y-2}, {x,y}, {x+2,y-2}}; - drawArrowPolygon(window, gc, area, a); + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 6 : 3); break; } case GTK_ARROW_RIGHT: { GdkPoint a[]={{x-1,y-3}, {x+2,y}, {x-1,y+3}, {x-2,y+2}, {x,y}, {x-2,y-2}}; - drawArrowPolygon(window, gc, area, a); + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 6 : 3); break; } case GTK_ARROW_LEFT: { GdkPoint a[]={{x+1,y-3}, {x-2,y}, {x+1,y+3}, {x+2,y+2}, {x,y}, {x+2,y-2}}; - drawArrowPolygon(window, gc, area, a); + drawArrowPolygon(window, gc, area, a, opts.vArrows ? 6 : 3); break; } default: @@ -2375,16 +2372,8 @@ if(DETAIL("arrow")) { if(!isOnComboEntry(widget, 0) && !isOnCombo(widget, 0)) - { - if(GTK_ARROW_DOWN==arrow_type || GTK_ARROW_UP==arrow_type) - drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, arrow_type, - x+(width>>1), - y+(LARGE_ARR_HEIGHT>>1), FALSE); - else - drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, arrow_type, - x+(width>>1), - y+(height>>1), FALSE); - } + drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, arrow_type, + x+(width>>1), y+(height>>1), FALSE); } else { @@ -2407,6 +2396,7 @@ */ sanitizeSize(window, &width, &height); +#if 0 if(isSpinButton) { /*if(GTK_ARROW_UP==arrow_type) @@ -2414,9 +2404,11 @@ else*/ if(GTK_ARROW_DOWN==arrow_type) y+=1; } - +#endif if(isSpinButton) { + if(GTK_ARROW_UP==arrow_type) + y++; a_height = SMALL_ARR_HEIGHT; a_width = SMALL_ARR_WIDTH; } @@ -2442,28 +2434,29 @@ } if(sbar) - { - EStepper s=getStepper(widget, x, y); - - if(QTC_STEPPER_B==s || QTC_STEPPER_C==s) - switch(opts.scrollbarType) - { - default: - case SCROLLBAR_KDE: - case SCROLLBAR_PLATINUM: - if(GTK_ARROW_LEFT==arrow_type) - x++; - else if(GTK_ARROW_UP==arrow_type) - y++; - break; - case SCROLLBAR_NEXT: - if(GTK_ARROW_RIGHT==arrow_type) - x--; - else if(GTK_ARROW_DOWN==arrow_type) - y--; - break; - } - } + switch(getStepper(widget, x, y)) + { + default: + case QTC_STEPPER_A: + break; + case QTC_STEPPER_B: + if(GTK_ARROW_RIGHT==arrow_type) + x-=2; + else + y-=2; + break; + case QTC_STEPPER_C: + if(GTK_ARROW_LEFT==arrow_type) + x++; + else + y++; + break; + case QTC_STEPPER_D: + if(GTK_ARROW_RIGHT==arrow_type) + x--; + else + y--; + } drawArrow(window, style->text_gc[QTC_IS_MENU_ITEM(widget) && GTK_STATE_PRELIGHT==state ? GTK_STATE_SELECTED : QTC_ARROW_STATE(state)], @@ -2687,7 +2680,13 @@ ? WIDGET_SB_BUTTON : WIDGET_OTHER; - if(GTK_APP_MOZILLA!=qtSettings.app) + /* For some reason SWT combo's dont un-prelight when activated! So dont pre-light at all! */ + if(GTK_APP_JAVA_SWT==qtSettings.app && WIDGET_STD_BUTTON==widgetType && GTK_STATE_PRELIGHT==state && isComboBoxButton(widget)) + { + state=GTK_STATE_NORMAL; + bgnd=getFill(state, btn_down); + } + else if(GTK_APP_MOZILLA!=qtSettings.app) { if(QTC_STEPPER_B==step) { @@ -2749,30 +2748,30 @@ } #ifdef QTC_INCREASE_SB_SLIDER - if(slider && widget && GTK_IS_RANGE (widget)) + if(slider && widget && GTK_IS_RANGE(widget)) { - GtkAdjustment *adj = GTK_RANGE (widget)->adjustment; + GtkAdjustment *adj = GTK_RANGE(widget)->adjustment; if(adj->value <= adj->lower && - (GTK_RANGE (widget)->has_stepper_a || GTK_RANGE (widget)->has_stepper_b)) + (GTK_RANGE(widget)->has_stepper_a || GTK_RANGE(widget)->has_stepper_b)) { - if (GTK_IS_VSCROLLBAR (widget)) + if (GTK_IS_VSCROLLBAR(widget)) { y--; height++; } - else if (GTK_IS_HSCROLLBAR (widget)) + else if (GTK_IS_HSCROLLBAR(widget)) { x--; width++; } } if(adj->value >= adj->upper - adj->page_size && - (GTK_RANGE (widget)->has_stepper_c || GTK_RANGE (widget)->has_stepper_d)) + (GTK_RANGE (widget)->has_stepper_c || GTK_RANGE(widget)->has_stepper_d)) { - if (GTK_IS_VSCROLLBAR (widget)) + if (GTK_IS_VSCROLLBAR(widget)) height++; - else if (GTK_IS_HSCROLLBAR (widget)) + else if (GTK_IS_HSCROLLBAR(widget)) width++; } } @@ -2913,7 +2912,6 @@ vwidth=width-(vx-x), darkLine=GTK_STATE_INSENSITIVE!=state ? QT_STD_BORDER : QT_DISABLED_BORDER; - if(rev) { vx=x+LARGE_ARR_WIDTH; @@ -2945,9 +2943,19 @@ vx++; y++; } - drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, GTK_ARROW_DOWN, - rev ? vx : vx+(vwidth>>1), - y+(height>>1), FALSE); + if(combo && !combo_entry) + { + drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, GTK_ARROW_UP, + rev ? vx : vx+(vwidth>>1), + y+(height>>1)-(LARGE_ARR_HEIGHT-1), FALSE); + drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, GTK_ARROW_DOWN, + rev ? vx : vx+(vwidth>>1), + y+(height>>1)+(LARGE_ARR_HEIGHT-1), FALSE); + } + else + drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], area, GTK_ARROW_DOWN, + rev ? vx : vx+(vwidth>>1), + y+(height>>1), FALSE); } } else if(detail && (0==strcmp(detail, "buttondefault") || @@ -3274,7 +3282,7 @@ } else if(widget && (menuitem || pbar)) { - GdkRegion *region=NULL; + GdkRegion *region=NULL; GtkMenuBar *mb=menuitem ? isMenubar(widget, 0) : NULL; gboolean active_mb=mb ? GTK_MENU_SHELL(mb)->active : FALSE, horizPbar=isHorizontalProgressbar(widget); @@ -3316,7 +3324,7 @@ stripeOffset+=(PROGRESS_CHUNK_WIDTH*2)) { GdkRectangle inner_rect={x+1, y+stripeOffset+animShift, width-2, - PROGRESS_CHUNK_WIDTH}; + PROGRESS_CHUNK_WIDTH}; constrainRect(&inner_rect, area); if(inner_rect.width>0 && inner_rect.height>0) @@ -3336,10 +3344,10 @@ ? &qtcurveStyle->menubar[ORIGINAL_SHADE] : NULL; int round=pbar ? progressbarRound(widget, rev) : mb - ? active_mb && opts.roundMbTopOnly + ? active_mb && opts.roundMbTopOnly ? ROUNDED_TOP : ROUNDED_ALL - : ROUNDED_ALL, + : ROUNDED_ALL, new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state; gboolean border=pbar || menuitem || mb, stdColors=!mb || SHADE_BLEND_SELECTED!=opts.shadeMenubars, @@ -3365,33 +3373,33 @@ TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); else if(stdColors) drawLightBevel(style, window, new_state, area, NULL, x, y, - width, height, &itemCols[ORIGINAL_SHADE], bgnd, - itemGcs, itemCols, - NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, - DF_LARGE_ARC|DF_DRAW_INSIDE|(horiz ? 0 : DF_VERT)| - (border&&stdColors ? DF_DO_BORDER : 0)| - (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); + width, height, &itemCols[ORIGINAL_SHADE], bgnd, + itemGcs, itemCols, + NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, + DF_LARGE_ARC|DF_DRAW_INSIDE|(horiz ? 0 : DF_VERT)| + (border&&stdColors ? DF_DO_BORDER : 0)| + (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); else { if(width>2 && height>2) drawBevelGradient(style, window, area, region, x+1, y+1, width-2, height-2, - &itemCols[ORIGINAL_SHADE], - getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE, opts.menuitemAppearance), - getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE, opts.menuitemAppearance), - TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); + &itemCols[ORIGINAL_SHADE], + getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE, opts.menuitemAppearance), + getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE, opts.menuitemAppearance), + TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); realDrawBorder(style, window, state, area, NULL, x, y, width, height, bgnd, - itemGcs, itemCols, round, BORDER_FLAT, - WIDGET_OTHER, DF_LARGE_ARC, 0); + itemGcs, itemCols, round, BORDER_FLAT, + WIDGET_OTHER, DF_LARGE_ARC, 0); } if(pbar && opts.stripedProgress) drawLightBevel(style, window, new_state, NULL, region, x, y, - width, height, &qtcurveStyle->menuitem[1], NULL, - qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, - NULL, round, WIDGET_PROGRESSBAR, BORDER_FLAT, - DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|(horiz ? 0 : DF_VERT)| - (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); + width, height, &qtcurveStyle->menuitem[1], NULL, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, + NULL, round, WIDGET_PROGRESSBAR, BORDER_FLAT, + DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|(horiz ? 0 : DF_VERT)| + (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); if(pbar && QTC_ROUNDED && ROUNDED_ALL!=round) { @@ -3424,13 +3432,32 @@ { if(opts.lighterPopupMenuBgnd) drawAreaModColor(style, window, area, NULL, &qtcurveStyle->background[ORIGINAL_SHADE], POPUPMENU_LIGHT_FACTOR, x, y, width, height); + else + { + if(area) + { + gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[QT_FRAME_DARK_SHADOW], area); + gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[0], area); + } + + gdk_draw_line(window, qtcurveStyle->background_gc[0], x+1, y+1, x+width-2, y+1); + gdk_draw_line(window, qtcurveStyle->background_gc[0], x+1, y+1, x+1, y+height-2); + gdk_draw_line(window, qtcurveStyle->background_gc[QT_FRAME_DARK_SHADOW], x+1, y+height-2, x+width-2, y+height-2); + gdk_draw_line(window, qtcurveStyle->background_gc[QT_FRAME_DARK_SHADOW], x+width-2, y+1, x+width-2, y+height-2); + + if(area) + { + gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[QT_FRAME_DARK_SHADOW], NULL); + gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[0], NULL); + } + } if(area) - gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[5], area); + gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[QT_STD_BORDER], area); - gdk_draw_rectangle(window, qtcurveStyle->background_gc[5], FALSE, x, y, width-1, height-1); + gdk_draw_rectangle(window, qtcurveStyle->background_gc[QT_STD_BORDER], FALSE, x, y, width-1, height-1); if(area) - gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[5], NULL); + gdk_gc_set_clip_rectangle(qtcurveStyle->background_gc[QT_STD_BORDER], NULL); } else if(detail &&(!strcmp(detail, "paned") || !strcmp(detail+1, "paned"))) { @@ -3483,13 +3510,38 @@ GTK_STATE_ACTIVE==state || (GTK_IS_BUTTON(widget) && GTK_BUTTON(widget)->depressed)); } +static int isComboList(GtkWidget *widget) +{ + return widget && widget->parent && widget->parent->name && GTK_IS_FRAME(widget) && GTK_IS_WINDOW(widget->parent) && + 0==strcmp(widget->parent->name, "gtk-combobox-popup-window"); +} + +#if 0 +static int isComboFrame(GtkWidget *widget) +{ + return !GTK_IS_COMBO_BOX_ENTRY(widget) && GTK_IS_FRAME(widget) && widget->parent && GTK_IS_COMBO_BOX(widget->parent); +} +#endif + static void gtkDrawShadow(GtkStyle *style, GdkWindow *window, GtkStateType state, GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget, const gchar *detail, gint x, gint y, gint width, gint height) { QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; - if(DETAIL("entry") || DETAIL("text")) + if(isComboList(widget)) + { + /* if appears-as-list is set, then make border more KDE like */ + gdk_draw_rectangle(window, qtcurveStyle->background_gc[QT_STD_BORDER], FALSE, x, y, width-1, height-1); + gdk_draw_rectangle(window, style->base_gc[state], FALSE, x+1, y+1, width-3, height-3); + } +#if 0 + else if(isComboFrame(widget)) + { + } + else +#endif + else if(DETAIL("entry") || DETAIL("text")) { gboolean combo=isComboBoxEntry(widget); @@ -4119,11 +4171,14 @@ y++; } - drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], NULL, GTK_ARROW_DOWN, - reverseLayout(widget) || (widget && reverseLayout(widget->parent)) + x=reverseLayout(widget) || (widget && reverseLayout(widget->parent)) ? x+1 - : x+(width>>1), - y+(height>>1), FALSE); + : x+(width>>1); + + drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], NULL, GTK_ARROW_UP, x, + y+(height>>1)-(LARGE_ARR_HEIGHT-1), FALSE); + drawArrow(window, style->text_gc[QTC_ARROW_STATE(state)], NULL, GTK_ARROW_DOWN, x, + y+(height>>1)+(LARGE_ARR_HEIGHT-1), FALSE); } static void gtkDrawBoxGap(GtkStyle *style, GdkWindow *window, GtkStateType state, @@ -4663,7 +4718,7 @@ if(scrollbar || ROUND_FULL!=opts.round) { - gtk_paint_box(style, window, state, shadow_type, area, widget, detail, x, y, width, height); + gtk_paint_box(style, window, state, shadow_type, area, widget, "slider", x, y, width, height); /* Orientation is always vertical with Mozilla, why? Anyway this hack should be OK - as we only draw dashes when slider is larger than 'min' pixels... */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.51/gtk2/qt_settings.c new/QtCurve-Gtk2-0.52.1/gtk2/qt_settings.c --- old/QtCurve-Gtk2-0.51/gtk2/qt_settings.c 2007-06-01 00:24:32.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.1/gtk2/qt_settings.c 2007-06-19 21:56:45.000000000 +0200 @@ -93,7 +93,8 @@ GTK_APP_VMPLAYER, GTK_APP_GIMP, GTK_APP_GIMP_PLUGIN, - GTK_APP_JAVA + GTK_APP_JAVA, + GTK_APP_JAVA_SWT /*GTK_APP_GAIM*/ } EGtkApp; @@ -1241,7 +1242,7 @@ /* Eclipse sets a application name, so if this is set then we're not a Swing java app */ if(GTK_APP_JAVA==qtSettings.app && g_get_application_name() && 0!=strcmp(g_get_application_name(), "<unknown>")) - qtSettings.app=GTK_APP_UNKNOWN; + qtSettings.app=GTK_APP_JAVA_SWT; if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gdb
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package gdb checked in at Sun Jun 24 23:52:27 CEST 2007. -------- --- gdb/gdb.changes 2007-06-21 12:38:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdb/gdb.changes 2007-06-24 18:54:11.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Jun 24 18:52:47 CEST 2007 - schwab(a)suse.de + +- Fix annotations for commands prompt. + +------------------------------------------------------------------- New: ---- async-command-editing.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdb.spec ++++++ --- /var/tmp/diff_new_pack.H29858/_old 2007-06-24 23:52:13.000000000 +0200 +++ /var/tmp/diff_new_pack.H29858/_new 2007-06-24 23:52:13.000000000 +0200 @@ -24,7 +24,7 @@ Autoreqprov: on PreReq: %{install_info_prereq} Version: 6.6.50.20070621 -Release: 1 +Release: 2 Summary: The GNU Debugger Source: gdb-%{version}-cvs.tar.bz2 Patch1: gdb-misc.patch @@ -39,6 +39,7 @@ Patch10: ppc-long-double.diff Patch11: elf-symtab-read.diff Patch12: find-pc-sect-line.diff +Patch13: async-command-editing.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -81,6 +82,9 @@ %patch10 %patch11 %patch12 +cd gdb +%patch13 +cd .. %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -136,6 +140,8 @@ %endif %changelog +* Sun Jun 24 2007 - schwab(a)suse.de +- Fix annotations for commands prompt. * Thu Jun 21 2007 - schwab(a)suse.de - Update to head of trunk. * Fri Jun 08 2007 - schwab(a)suse.de ++++++ async-command-editing.diff ++++++ >From nobody Sun Jun 24 18:21:49 2007 From: Daniel Jacobowitz <drow(a)false.org> Subject: Re: PATCH: PR tui/2173: Arrow keys no longer works in breakpoint command list To: Nick Roberts <nickrob(a)snap.net.nz>, gdb-patches(a)sourceware.org Date: Sun, 24 Jun 2007 11:47:00 -0400 Mail-Followup-To: Nick Roberts <nickrob(a)snap.net.nz>, gdb-patches(a)sourceware.org On Tue, Jun 05, 2007 at 09:27:00AM -0400, Daniel Jacobowitz wrote: > On Wed, Jun 06, 2007 at 12:55:55AM +1200, Nick Roberts wrote: > > > > This change breaks the behaviour of annotations with commands that span > > > > multiple lines, like if, while, etc: > > > > > > Sorry, I didn't even know we had special annotations for this (and the > > > testsuite must not cover it)... > > > > Here's a test for gdb.base/annota3.exp. I can do the same for > > gdb.base/annota1.exp and gdb.cp/annota3.exp, if needed. > > Thanks. This is OK once we fix the problem. I haven't gotten back to > you about that yet because I want to figure out what other issues were > solved by the original patch - there were several. But I've been on > vacation and I'm in a mad rush at home now, so it may be a bit longer. Nick, does this work for emacs? It fixes the testcase (which I updated to fail and not time out for broken GDBs). -- Daniel Jacobowitz CodeSourcery 2007-06-24 Daniel Jacobowitz <dan(a)codesourcery.com> * top.c (gdb_readline_wrapper_line): Call rl_callback_handler_remove. (struct gdb_readline_wrapper_cleanup): Remove prompt_orig. (gdb_readline_wrapper_cleanup): Do not reset the prompt. (gdb_readline_wrapper): Do not save the prompt. Pass our prompt to display_gdb_prompt. 2007-06-24 Nick Roberts <nickrob(a)snap.net.nz> Daniel Jacobowitz <dan(a)codesourcery.com> * gdb.base/annota3.exp: Test for if construct. Index: top.c =================================================================== RCS file: /cvs/src/src/gdb/top.c,v retrieving revision 1.120 diff -u -p -r1.120 top.c --- top.c 29 Mar 2007 18:55:01 -0000 1.120 +++ top.c 24 Jun 2007 15:42:02 -0000 @@ -751,12 +751,16 @@ gdb_readline_wrapper_line (char *line) /* Prevent operate-and-get-next from acting too early. */ saved_after_char_processing_hook = after_char_processing_hook; after_char_processing_hook = NULL; + + /* Prevent parts of the prompt from being redisplayed if annotations + are enabled, and readline's state getting out of sync. */ + if (async_command_editing_p) + rl_callback_handler_remove (); } struct gdb_readline_wrapper_cleanup { void (*handler_orig) (char *); - char *prompt_orig; int already_prompted_orig; }; @@ -766,7 +770,6 @@ gdb_readline_wrapper_cleanup (void *arg) struct gdb_readline_wrapper_cleanup *cleanup = arg; rl_already_prompted = cleanup->already_prompted_orig; - PROMPT (0) = cleanup->prompt_orig; gdb_assert (input_handler == gdb_readline_wrapper_line); input_handler = cleanup->handler_orig; @@ -790,14 +793,12 @@ gdb_readline_wrapper (char *prompt) cleanup->handler_orig = input_handler; input_handler = gdb_readline_wrapper_line; - cleanup->prompt_orig = get_prompt (); - PROMPT (0) = prompt; cleanup->already_prompted_orig = rl_already_prompted; back_to = make_cleanup (gdb_readline_wrapper_cleanup, cleanup); /* Display our prompt and prevent double prompt display. */ - display_gdb_prompt (NULL); + display_gdb_prompt (prompt); rl_already_prompted = 1; if (after_char_processing_hook) Index: testsuite/gdb.base/annota3.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota3.exp,v retrieving revision 1.12 diff -u -p -r1.12 annota3.exp --- testsuite/gdb.base/annota3.exp 9 Jan 2007 17:59:09 -0000 1.12 +++ testsuite/gdb.base/annota3.exp 24 Jun 2007 15:42:02 -0000 @@ -99,7 +99,29 @@ gdb_expect_list "annotation set at level "set annotate 3" } - +# +# if construct: +# +send_gdb "if 1\n" +gdb_expect { + -re "^if 1\r\n\r\n\032\032post-prompt\r\n\r\n\032\032pre-commands\r\n >\r\n\032\032commands\r\n$" { + pass "start if construct" + } + -re ".*\032\032commands\r\n" { + fail "start if construct" + } + timeout { fail "start if construct (timeout)" } +} +send_gdb "end\n" +gdb_expect { + -re "^end\r\n\r\n\032\032post-commands\r\n$gdb_prompt$" { + pass "end if construct" + } + -re ".*$gdb_prompt$" { + fail "end if construct" + } + timeout { fail "end if construct (timeout)" } +} # # info 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 bluez-utils
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package bluez-utils checked in at Sun Jun 24 23:52:04 CEST 2007. -------- --- bluez-utils/bluez-utils.changes 2007-05-25 12:17:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-utils/bluez-utils.changes 2007-06-24 12:18:44.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Jun 24 12:17:47 CEST 2007 - dgollub(a)suse.de + +- update to v3.12: + * Add support for limited discovery mode. + * Add support for setting of event mask. + * Add GetRemoteServiceIdentifiers method. + * Add skeleton for local D-Bus server. + * Add headset gain control methods. + * Fix various headset implementation issues. + * Fix various serial port service issues. + * Fix various input service issues. + * Let CUPS plugin discover printers in range. + * Improve the BCM2035 UART init routine. + * Ignore connection events for non-ACL links. + +------------------------------------------------------------------- Old: ---- bluez-utils-3.11.tar.gz New: ---- bluez-utils-3.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-utils.spec ++++++ --- /var/tmp/diff_new_pack.D28358/_old 2007-06-24 23:51:48.000000000 +0200 +++ /var/tmp/diff_new_pack.D28358/_new 2007-06-24 23:51:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-utils (Version 3.11) +# spec file for package bluez-utils (Version 3.12) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: bluez-utils BuildRequires: alsa-devel bluez-libs cups dbus-1-devel fuse-devel libusb openobex-devel pkgconfig resmgr xorg-x11-devel URL: http://bluez.sourceforge.net -Version: 3.11 +Version: 3.12 Release: 1 Summary: Bluetooth Daemons and Utilities License: GNU General Public License (GPL) @@ -279,6 +279,19 @@ %doc %{_defaultdocdir}/bluez-test %changelog +* Sun Jun 24 2007 - dgollub(a)suse.de +- update to v3.12: + * Add support for limited discovery mode. + * Add support for setting of event mask. + * Add GetRemoteServiceIdentifiers method. + * Add skeleton for local D-Bus server. + * Add headset gain control methods. + * Fix various headset implementation issues. + * Fix various serial port service issues. + * Fix various input service issues. + * Let CUPS plugin discover printers in range. + * Improve the BCM2035 UART init routine. + * Ignore connection events for non-ACL links. * Fri May 25 2007 - seife(a)suse.de - update to v3.11: * Update API documentation. ++++++ bluez-utils-3.11.tar.gz -> bluez-utils-3.12.tar.gz ++++++ ++++ 12846 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 kdegraphics4
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package kdegraphics4 checked in at Sun Jun 24 11:56:53 CEST 2007. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2007-06-08 09:33:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2007-06-23 10:22:25.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 10:22:22 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn678982 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.KE6805/_old 2007-06-24 11:56:36.000000000 +0200 +++ /var/tmp/diff_new_pack.KE6805/_new 2007-06-24 11:56:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 3.90.1.svn672301) +# spec file for package kdegraphics4 (Version 3.90.1.svn678982) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,11 +11,11 @@ Name: kdegraphics4 BuildRequires: OpenEXR-devel fribidi-devel imlib-config imlib-devel libexif libjasper libkde4-devel net-snmp-devel -BuildRequires: chmlib-devel djvulibre libgphoto2-devel sane +BuildRequires: chmlib-devel libexiv2-devel libgphoto2-devel sane %if %suse_version > 1020 -BuildRequires: texlive texlive-devel texlive-latex +BuildRequires: libdjvulibre-devel texlive texlive-devel texlive-latex %else -BuildRequires: te_ams te_kpath te_latex +BuildRequires: djvulibre te_ams te_kpath te_latex %endif %if %suse_version == 1020 BuildRequires: poppler-devel poppler-qt @@ -26,7 +26,7 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package URL: http://www.kde.org -Version: 3.90.1.svn672301 +Version: 3.90.1.svn678982 Release: 1 Source0: kdegraphics.tar.bz2 Source1: _upstream @@ -34,19 +34,17 @@ Requires: kdebase4-runtime Patch: desktop-files.diff Suggests: kde4-kcolorchooser -Suggests: kde4-kcoloredit Suggests: kde4-kfax Suggests: kde4-kio_kamera Suggests: kde4-kghostview -Suggests: kde4-kiconedit Suggests: kde4-kolourpaint Suggests: kde4-kruler Suggests: kde4-ksnapshot -Suggests: kde4-kuickshow -Suggests: kde4-ligature -Suggests: kde4-kpovmodeler Suggests: kde4-okular Suggests: libkscan4 +%if %suse_version > 1020 +Suggests: kde4-gwenview +%endif %description This package suggests the packages which are built from the kdegraphics @@ -70,17 +68,12 @@ cd build %makeinstall %suse_update_desktop_file kolourpaint Graphics RasterGraphics - %suse_update_desktop_file kiconedit Graphics RasterGraphics - %suse_update_desktop_file kuickshow Graphics Viewer %suse_update_desktop_file -r kruler Utility DesktopUtility %suse_update_desktop_file -r ksnapshot Utility DesktopUtility %suse_update_desktop_file -r kcolorchooser Utility DesktopUtility - %suse_update_desktop_file -r kcoloredit Utility DesktopUtility %suse_update_desktop_file -u kfax Office Viewer %suse_update_desktop_file kghostview Office Viewer - %suse_update_desktop_file -r ligature Office Viewer %suse_update_desktop_file -r okular Office Viewer - %suse_update_desktop_file kpovmodeler Graphics 3DGraphics %kde_post_install %post -p /sbin/ldconfig @@ -116,36 +109,6 @@ /usr/bin/kcolorchooser /usr/share/applications/kde4/kcolorchooser.desktop /usr/share/icons/hicolor/*/apps/kcolorchooser.* -%package -n kde4-kcoloredit -Group: Productivity/Graphics/Other -Summary: Color Palette Editor -Requires: kdebase4-runtime - -%description -n kde4-kcoloredit -This is a color palette editor for KDE. - - - -Authors: --------- - The KDE Team <kde(a)kde.org> - - -%post -n kde4-kcoloredit -%run_ldconfig - -%postun -n kde4-kcoloredit -%run_ldconfig - -%files -n kde4-kcoloredit -%defattr(-,root,root) -%doc COPYING COPYING-DOCS README -/usr/bin/kcoloredit -/usr/share/applications/kde4/kcoloredit.desktop - -%_kde_share_dir/apps/kcoloredit -%doc %lang(en) /usr/share/doc/HTML/en/kcoloredit -/usr/share/icons/hicolor/*/apps/kcoloredit.* %package -n kde4-kfax Group: Productivity/Graphics/Viewers Summary: Fax Viewer @@ -176,7 +139,7 @@ %_kde_share_dir/apps/kfax /usr/share/icons/hicolor/*/apps/kfax.* %package -n kde4-kio_kamera -Group: System/GUI/KDE +Group: Hardware/Camera Summary: KDE I/O-Slave for Cameras Requires: kdebase4-runtime @@ -251,36 +214,7 @@ %_kde_share_dir/services/kghostview_part.desktop %_kde_share_dir/apps/kconf_update/update-to-xt-names.pl -%package -n kde4-kiconedit -Group: Productivity/Graphics/Bitmap Editors -Summary: Icon Editor -Requires: kdebase4-runtime - -%description -n kde4-kiconedit -An icon editor for KDE - - - -Authors: --------- - The KDE Team <kde(a)kde.org> - - -%post -n kde4-kiconedit -%run_ldconfig - -%postun -n kde4-kiconedit -%run_ldconfig - -%files -n kde4-kiconedit -%defattr(-,root,root) -%doc COPYING COPYING-DOCS README -/usr/bin/kiconedit -/usr/share/applications/kde4/kiconedit.desktop - -%_kde_share_dir/apps/kiconedit -%doc %lang(en) /usr/share/doc/HTML/en/kiconedit -/usr/share/icons/hicolor/*/apps/kiconedit.* +# ----------------------------------------------------------------------------- %package -n kde4-kolourpaint Group: Productivity/Graphics/Bitmap Editors Summary: Paint Program @@ -370,110 +304,6 @@ /usr/share/dbus-1/interfaces/org.kde.ksnapshot.xml %doc %lang(en) /usr/share/doc/HTML/en/ksnapshot /usr/share/icons/hicolor/*/apps/ksnapshot.* -%package -n kde4-kuickshow -Group: Productivity/Graphics/Viewers -Summary: Image Viewer -Requires: kdebase4-runtime - -%description -n kde4-kuickshow -A fast and versatile image viewer - - - -Authors: --------- - The KDE Team <kde(a)kde.org> - - -%post -n kde4-kuickshow -%run_ldconfig - -%postun -n kde4-kuickshow -%run_ldconfig - -%files -n kde4-kuickshow -%defattr(-,root,root) -%doc COPYING COPYING-DOCS README -/usr/bin/kuickshow -/usr/share/applications/kde4/kuickshow.desktop -/usr/%_lib/libkdeinit4_kuickshow.so - -%_kde_share_dir/apps/kuickshow -%doc %lang(en) /usr/share/doc/HTML/en/kuickshow -/usr/share/icons/hicolor/*/apps/kuickshow.* -%package -n kde4-ligature -Group: Productivity/Other -Summary: Document Viewer -Requires: kdebase4-runtime - -%description -n kde4-ligature -Document viewing program; supports document in various formats - - - -Authors: --------- - The KDE Team <kde(a)kde.org> - - -%post -n kde4-ligature -%run_ldconfig - -%postun -n kde4-ligature -%run_ldconfig - -%files -n kde4-ligature -%defattr(-,root,root) -%doc COPYING COPYING-DOCS README -/usr/bin/ligature -/usr/%_lib/kde4/ligaturePlugin_DJVU.so -/usr/%_lib/kde4/ligaturePlugin_DVI.so -/usr/%_lib/kde4/ligaturePlugin_PS.so -/usr/%_lib/kde4/ligaturePlugin_TIFF.so -/usr/%_lib/kde4/ligaturepart.so -/usr/%_lib/libligaturePluginGUI.so.* -/usr/%_lib/libligaturecore.so.* -/usr/share/applications/kde4/ligature.desktop - -%_kde_share_dir/apps/ligature - -%_kde_share_dir/config.kcfg/ligature.kcfg -/usr/share/dbus-1/interfaces/org.kde.ligature.MultiPage.xml - -%_kde_share_dir/servicetypes/ligaturePluginGUI.desktop -/usr/share/icons/hicolor/*/apps/kdvi.* - -%_kde_share_dir/services/kvs_djvu_part.desktop - -%_kde_share_dir/services/kvs_dvi_part.desktop - -%_kde_share_dir/services/kvs_fax_part.desktop - -%_kde_share_dir/services/kvs_ps_part.desktop - -%_kde_share_dir/apps/kviewerpart -/usr/%_lib/libdjvu.so.* - -%_kde_share_dir/services/djvumultipage.desktop - -%_kde_share_dir/services/kdvimultipage.desktop - -%_kde_share_dir/services/kfaxmultipage.desktop - -%_kde_share_dir/services/psMultipage.desktop - -%_kde_share_dir/apps/ligaturepart - -%_kde_share_dir/apps/psMultipage.rc - -%_kde_share_dir/config.kcfg/djvumultipage.kcfg - -%_kde_share_dir/config.kcfg/kdvi.kcfg -/usr/share/icons/crystalsvg/*/apps/kviewshell.* - -%_kde_share_dir/apps/djvumultipage.rc - -%_kde_share_dir/apps/kdvi_part.rc %package -n libkscan4 Group: System/GUI/KDE Summary: KDE Scanner Library @@ -520,40 +350,6 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS README /usr/%_lib/libkscan.so -%package -n kde4-kpovmodeler -Group: Productivity/Graphics/3D Editors -Summary: Modeler for POV-Ray Scenes -Requires: kdebase4-runtime - -%description -n kde4-kpovmodeler -KPovmodeler is an 3D POV-Ray scene editor. - - - -Authors: --------- - The KDE Team <kde(a)kde.org> - - -%post -n kde4-kpovmodeler -%run_ldconfig - -%postun -n kde4-kpovmodeler -%run_ldconfig - -%files -n kde4-kpovmodeler -%defattr(-,root,root) -%doc COPYING COPYING-DOCS README -/usr/bin/kpovmodeler -/usr/%_lib/kde4/libkpovmodelerpart.so -/usr/%_lib/liblkpovmodeler.so.* -/usr/share/applications/kde4/kpovmodeler.desktop - -%_kde_share_dir/apps/kpovmodeler -/usr/share/dbus-1/interfaces/org.kde.kpovmodeler.xml -/usr/share/icons/crystalsvg/*/mimetypes/kpovmodeler_doc.* -/usr/share/icons/hicolor/*/apps/kpovmodeler.* -%doc %lang(en) /usr/share/doc/HTML/en/kpovmodeler %package -n kde4-okular Group: Productivity/Office/Other Summary: Document Viewer @@ -603,7 +399,7 @@ %package devel Group: Productivity/Graphics/Other Summary: kdegraphics base package: Build Environment -Requires: kdegraphics4 = %version kde4-okular = %version kde4-ligature = %version kde4-kpovmodeler = %version kde4-kghostview = %version +Requires: kdegraphics4 = %version kde4-okular = %version kde4-kghostview = %version %description devel This package suggests the packages which are built from the kdegraphics @@ -620,26 +416,52 @@ %defattr(-,root,root) /usr/include/okular /usr/%_lib/libokularcore.so -/usr/%_lib/libligaturecore.so -/usr/%_lib/libligaturePluginGUI.so -/usr/%_lib/libdjvu.so -/usr/%_lib/liblkpovmodeler.so /usr/%_lib/libkghostviewlib.so +%if %suse_version > 1020 +%package -n kde4-gwenview +Group: Productivity/Graphics/Viewers +Summary: Simple Image Viewer for KDE +Requires: kdebase4-runtime + +%description -n kde4-gwenview +Gwenview is a simple image viewer for KDE. It features a folder tree +window and a file list window, providing easy navigation of your file +hierarchy. + + + +Authors: +-------- + Aur�lien G�teau <aurelien.gateau(a)mail.dotcom.fr> + + +%post -n kde4-gwenview +%run_ldconfig + +%postun -n kde4-gwenview +%run_ldconfig + +%files -n kde4-gwenview +%defattr(-,root,root) +%doc COPYING COPYING-DOCS README +/usr/bin/gwenview +/usr/%_lib/kde4/gvpart.so +/usr/%_lib/libgwenviewlib.so +/usr/%_lib/libgwenviewlib.so.* +/usr/share/kde4/apps/gvpart +/usr/share/kde4/apps/gwenview +/usr/share/kde4/services/gvpart.desktop +%endif %files %defattr(-,root,root) %doc COPYING COPYING-DOCS README %doc %lang(en) /usr/share/doc/HTML/en/kgamma /usr/%_lib/kde4/gsthumbnail.so -/usr/%_lib/kde4/kfilewrite_jpeg.so -/usr/%_lib/strigi/strigiea_jpeg.so -/usr/%_lib/strigi/strigiea_ps.so /usr/%_lib/strigi/strigita_dvi.so /usr/%_lib/strigi/strigita_ico.so %_kde_share_dir/services/gsthumbnail.desktop - -%_kde_share_dir/services/kfilewrite_jpeg.desktop /usr/%_lib/kde4/kio_msits.so %_kde_share_dir/services/msits.protocol @@ -651,6 +473,8 @@ %_kde_share_dir/services/scanservice.desktop %changelog +* Sat Jun 23 2007 - stbinner(a)suse.de +- update to 3.90.1.svn678982 * Fri Jun 08 2007 - stbinner(a)suse.de - update to 3.90.1.svn670093 * Fri Jun 01 2007 - coolo(a)suse.de ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.KE6805/_old 2007-06-24 11:56:36.000000000 +0200 +++ /var/tmp/diff_new_pack.KE6805/_new 2007-06-24 11:56:36.000000000 +0200 @@ -1,13 +1,3 @@ ---- ./ligature/shell/ligature.desktop 2007/05/13 14:57:55 1.1 -+++ ./ligature/shell/ligature.desktop 2007/05/13 14:58:01 -@@ -11,7 +11,6 @@ - GenericName[x-test]=xxDocument Viewerxx - Terminal=false - Exec=ligature %U -caption "%c" --Icon=ligature - Type=Application - MimeType=application/x-dvi;application/x-gzdvi;application/x-bzdvi;application/x-djvu;image/vnd.djvu;image/fax-g3;image/tiff;application/pdf;application/postscript;application/x-gzpostscript;image/x-eps; - InitialPreference=7 --- ./kolourpaint/kolourpaint.desktop 2007/05/13 16:11:06 1.1 +++ ./kolourpaint/kolourpaint.desktop 2007/05/13 16:11:14 @@ -65,7 +65,6 @@ ++++++ kdegraphics.tar.bz2 ++++++ ++++ 329560 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 tsclient
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package tsclient checked in at Sun Jun 24 11:56:53 CEST 2007. -------- --- tsclient/tsclient.changes 2007-05-24 06:58:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/tsclient/tsclient.changes 2007-06-23 00:33:34.413955000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 23 00:33:17 CEST 2007 - maw(a)suse.de + +- Remove gr locale files. + +------------------------------------------------------------------- New: ---- abuild.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tsclient.spec ++++++ --- /var/tmp/diff_new_pack.Xl8101/_old 2007-06-24 11:56:48.000000000 +0200 +++ /var/tmp/diff_new_pack.Xl8101/_new 2007-06-24 11:56:48.000000000 +0200 @@ -16,17 +16,18 @@ %define prefix /usr License: GNU General Public License (GPL) -Group: System/GUI/GNOME +Group: Productivity/Networking/Remote Desktop Requires: rdesktop vnc Recommends: ICAClient Summary: Terminal Server Client is a frontend for rdesktop Version: 0.148 -Release: 67 +Release: 82 Source0: tsclient-%{version}.tar.bz2 Patch0: tsclient-0.132-mandir.dif Patch1: tsclient-0.148-vncviewer.dif Patch3: tsclient-0.140-fix_desktop_file.dif Patch4: tsclient-utf8-po.patch +Patch5: abuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,6 +50,7 @@ %patch1 %patch3 %patch4 +### %patch5 -p1 %build autoconf @@ -68,6 +70,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/locale/nl/LC_MESSAGES/ mv $RPM_BUILD_ROOT/usr/share/locale/nl_NL/LC_MESSAGES/* $RPM_BUILD_ROOT/usr/share/locale/nl/LC_MESSAGES/ rm -rf $RPM_BUILD_ROOT/usr/share/locale/nl_NL +rm -rf $RPM_BUILD_ROOT/usr/share/locale/gr gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.? DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime %suse_update_desktop_file %name Network RemoteAccess @@ -97,6 +100,8 @@ %doc %{prefix}/share/man/man1/* %changelog +* Sat Jun 23 2007 - maw(a)suse.de +- Remove gr locale files. * Thu May 24 2007 - stbinner(a)suse.de - remove X-SuSE-translate from .desktop patch * Thu Jan 11 2007 - mc(a)suse.de ++++++ abuild.patch ++++++ Index: tsclient-0.148/src/mrulist.c =================================================================== --- tsclient-0.148.orig/src/mrulist.c +++ tsclient-0.148/src/mrulist.c @@ -55,7 +55,7 @@ int mru_file_to_list (GSList** list) i = 0; // the first line is already in the buffer do { - if (buffer) { + if (strcmp (buffer, "") != 0) { if(buffer[strlen(buffer) - 1] == '\n') buffer[strlen(buffer) - 1] = '\0'; if(buffer[strlen(buffer) - 1] == '\r') buffer[strlen(buffer) - 1] = '\0'; buffer[MAX_SERVER_SIZE - 1] = '\0'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebase3
by root＠Hilbert.suse.de 24 Jun '07

24 Jun '07

Hello community, here is the log from the commit of package kdebase3 checked in at Sun Jun 24 11:56:40 CEST 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-06-21 18:21:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-06-24 05:44:54.000000000 +0200 @@ -77 +77 @@ -- only default shortcuts to switch to first 10 desktops (#141046) +- only default shortcuts to switch to first 10 desktops (#275705) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.KS1568/_old 2007-06-24 11:56:00.000000000 +0200 +++ /var/tmp/diff_new_pack.KS1568/_new 2007-06-24 11:56:00.000000000 +0200 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.7 -Release: 23 +Release: 24 %define kde_version 3.5.7 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -380,7 +380,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 308 +Release: 309 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1601,7 +1601,7 @@ * several bugfixes in all applications - update xinerama.patch: fix handling of SeparateScreenFocus option - update kickoff.diff from SVN -- only default shortcuts to switch to first 10 desktops (#141046) +- only default shortcuts to switch to first 10 desktops (#275705) * Tue May 15 2007 - dmueller(a)suse.de - drop python requirement - only install kdebase3-beagle when both kdebase3 and beagle ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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