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