Sophie

Sophie

distrib > Mandriva > 2009.1 > x86_64 > media > contrib-updates-src > by-pkgid > 36e35a7a1cedf0f7f039dc3bd76bfb00 > files > 19

kdebase3-3.5.10-23.8mdv2009.1.src.rpm

--- kdebase-3.5.4/kcontrol/style/kcmstyle.h	2006-08-28 16:09:51.000000000 -0300
+++ k/kcontrol/style/kcmstyle.h	2006-08-28 16:08:58.000000000 -0300
@@ -126,11 +126,13 @@
 	QFrame* containerFrame;
 	QGridLayout* containerLayout;
 	QComboBox* comboTooltipEffect;
+	QComboBox* comboRubberbandEffect;
 	QComboBox* comboComboEffect;
 	QComboBox* comboMenuEffect;
 	QComboBox* comboMenuHandle;
 
 	QLabel* lblTooltipEffect;
+	QLabel* lblRubberbandEffect;
 	QLabel* lblComboEffect;
 	QLabel* lblMenuEffect;
 	QLabel* lblMenuHandle;
--- kdebase-3.5.4/kcontrol/style/kcmstyle.cpp	2006-08-28 16:09:51.000000000 -0300
+++ k/kcontrol/style/kcmstyle.cpp	2006-08-28 16:08:58.000000000 -0300
@@ -229,6 +229,14 @@
 	containerLayout->addWidget( lblTooltipEffect, 1, 0 );
 	containerLayout->addWidget( comboTooltipEffect, 1, 1 );
 
+	comboRubberbandEffect = new QComboBox( FALSE, containerFrame );
+	comboRubberbandEffect->insertItem( i18n("Disable") );
+	comboRubberbandEffect->insertItem( i18n("Make translucent") );
+	lblRubberbandEffect = new QLabel( i18n("&Rubberband effect:"), containerFrame );
+	lblRubberbandEffect->setBuddy( comboRubberbandEffect );
+	containerLayout->addWidget( lblRubberbandEffect, 2, 0 );
+	containerLayout->addWidget( comboRubberbandEffect, 2, 1 );
+
 	comboMenuEffect = new QComboBox( FALSE, containerFrame );
 	comboMenuEffect->insertItem( i18n("Disable") );
 	comboMenuEffect->insertItem( i18n("Animate") );
@@ -236,8 +244,8 @@
 	comboMenuEffect->insertItem( i18n("Make Translucent") );
 	lblMenuEffect = new QLabel( i18n("&Menu effect:"), containerFrame );
 	lblMenuEffect->setBuddy( comboMenuEffect );
-	containerLayout->addWidget( lblMenuEffect, 2, 0 );
-	containerLayout->addWidget( comboMenuEffect, 2, 1 );
+	containerLayout->addWidget( lblMenuEffect, 3, 0 );
+	containerLayout->addWidget( comboMenuEffect, 3, 1 );
 
 	comboMenuHandle = new QComboBox( FALSE, containerFrame );
 	comboMenuHandle->insertItem( i18n("Disable") );
@@ -245,11 +253,11 @@
 //	comboMenuHandle->insertItem( i18n("Enable") );
 	lblMenuHandle = new QLabel( i18n("Me&nu tear-off handles:"), containerFrame );
 	lblMenuHandle->setBuddy( comboMenuHandle );
-	containerLayout->addWidget( lblMenuHandle, 3, 0 );
-	containerLayout->addWidget( comboMenuHandle, 3, 1 );
+	containerLayout->addWidget( lblMenuHandle, 4, 0 );
+	containerLayout->addWidget( comboMenuHandle, 4, 1 );
 
 	cbMenuShadow = new QCheckBox( i18n("Menu &drop shadow"), containerFrame );
-	containerLayout->addWidget( cbMenuShadow, 4, 0 );
+	containerLayout->addWidget( cbMenuShadow, 5, 0 );
 
 	// Push the [label combo] to the left.
 	comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
@@ -359,12 +367,14 @@
 	connect( cbEnableEffects,     SIGNAL(toggled(bool)),    this, SLOT(setEffectsDirty()));
 	connect( cbEnableEffects,     SIGNAL(toggled(bool)),    this, SLOT(setStyleDirty()));
 	connect( comboTooltipEffect,  SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
+	connect( comboRubberbandEffect, SIGNAL(activated(int)),   this, SLOT(setStyleDirty()));
 	connect( comboComboEffect,    SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
 	connect( comboMenuEffect,     SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
 	connect( comboMenuHandle,     SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
 	connect( comboMenuEffectType, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
 	connect( slOpacity,           SIGNAL(valueChanged(int)),this, SLOT(setStyleDirty()));
 	connect( cbMenuShadow,        SIGNAL(toggled(bool)),    this, SLOT(setStyleDirty()));
+
 	// Page3
 	connect( cbHoverButtons,        SIGNAL(toggled(bool)),    this, SLOT(setToolbarsDirty()));
 	connect( cbTransparentToolbars, SIGNAL(toggled(bool)),    this, SLOT(setToolbarsDirty()));
@@ -556,6 +566,8 @@
 	item = comboTooltipEffect->currentItem();
 	config.writeEntry( "EffectAnimateTooltip", item == 1);
 	config.writeEntry( "EffectFadeTooltip", item == 2 );
+	item = comboRubberbandEffect->currentItem();
+	config.writeEntry("SemiTransparentRubberband", item == 1);
 	item = comboMenuHandle->currentItem();
 	config.writeEntry( "InsertTearOffHandle", item );
 	item = comboMenuEffect->currentItem();
@@ -876,6 +888,8 @@
 
 	cbEnableEffects->setChecked( config.readBoolEntry( "EffectsEnabled", false) );
 
+	comboRubberbandEffect->setCurrentItem( config.readBoolEntry( "SemiTransparentRubberband", true) );
+
 	if ( config.readBoolEntry( "EffectAnimateCombo", false) )
 		comboComboEffect->setCurrentItem( 1 );
 	else
@@ -897,9 +911,7 @@
 
 	comboMenuHandle->setCurrentItem(config.readNumEntry("InsertTearOffHandle", 0));
 
-	// KStyle Menu transparency and drop-shadow options...
-	QSettings settings;
-	QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
+	QString effectEngine = config.readEntry( "MenuTransparencyEngine", "Disabled" );
 
 #ifdef HAVE_XRENDER
 	if (effectEngine == "XRender") {
@@ -926,10 +938,10 @@
 	else
 		menuPreview->setPreviewMode( MenuPreview::Blend );
 
-	slOpacity->setValue( (int)(100 * settings.readDoubleEntry("/KStyle/Settings/MenuOpacity", 0.90)) );
+	slOpacity->setValue( (int)(100 * config.readDoubleNumEntry("MenuOpacity", 0.90)) );
 
 	// Menu Drop-shadows...
-	cbMenuShadow->setChecked( settings.readBoolEntry("/KStyle/Settings/MenuDropShadow", false) );
+	cbMenuShadow->setChecked( config.readBoolEntry("MenuDropShadow", false) );
 
 	if (cbEnableEffects->isChecked()) {
 		containerFrame->setEnabled( true );
@@ -1027,6 +1039,8 @@
 	QWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
 							"<p><b>Animate: </b>Do some animation.</p>\n"
 							"<b>Fade: </b>Fade in tooltips using alpha-blending.") );
+	QWhatsThis::add( comboRubberbandEffect, i18n( "<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
+							"<b>Make Translucent: </b>Draw a translucent rubberband.") );
 	QWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n"
 							"<p><b>Animate: </b>Do some animation.</p>\n"
 							"<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n"