* bump, bug #122157

(Portage version: 2.1_pre4-r1)

2 files changed, 136 insertions, 0 deletions

diff --git a/x11-themes/lipstik/files/digest-lipstik-2.2 b/x11-themes/lipstik/files/digest-lipstik-2.2
new file mode 100644
index 000000000000..c6a4d3d317ba
--- /dev/null
+++ b/x11-themes/lipstik/files/digest-lipstik-2.2
@@ -0,0 +1,3 @@
+MD5 a4c8d994ef08f450491e9ee9840f3323 18223-lipstik-2.2.tar.bz2 431377
+RMD160 4b03c0a1e5ae3957fe4087f6563b21918de443ea 18223-lipstik-2.2.tar.bz2 431377
+SHA256 f914c3a412ac8058c974b8fd446ab7c09375bf85b316b6f2037501cc288e7236 18223-lipstik-2.2.tar.bz2 431377
diff --git a/x11-themes/lipstik/files/lipstik-2.2-lower_case.patch b/x11-themes/lipstik/files/lipstik-2.2-lower_case.patch
new file mode 100644
index 000000000000..d6c399dac13c
--- /dev/null
+++ b/x11-themes/lipstik/files/lipstik-2.2-lower_case.patch
@@ -0,0 +1,133 @@
+--- style/config/lipstikconf.cpp	2006-02-08 20:35:42.000000000 +0300
++++ style/config/lipstikconf.cpp	2006-02-12 18:34:37.139292536 +0300
+@@ -80,6 +80,7 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+ 	animateProgressBar = new QCheckBox(i18n("Animate progress bars"), generalGrp);
+ 	flatHeaders = new QCheckBox(i18n("Flatten column headers"), generalGrp);
+ 	tickCheckMark = new QCheckBox(i18n("Use a tick for checkmarks"), generalGrp);
++	lowerCaseText = new QCheckBox(i18n("Use lowercased text"), generalGrp);
+ 
+ 	tabLayout->addWidget(generalGrp,0,0,0);
+ 
+@@ -351,6 +352,9 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+  	origTickCheckMark = s.readBoolEntry("/lipstikstyle/Settings/tickCheckMark", true);
+ 	tickCheckMark->setChecked(origTickCheckMark);
+ 
++	origLowerCaseText = s.readBoolEntry("/lipstikstyle/Settings/lowerCaseText", false);
++	lowerCaseText->setChecked(origLowerCaseText);
++
+ 	origDrawTriangularExpander = s.readBoolEntry("/lipstikstyle/Settings/drawTriangularExpander", false);
+ 	drawTriangularExpander->setChecked(origDrawTriangularExpander);
+ 
+@@ -415,6 +419,7 @@ LipstikStyleConfig::LipstikStyleConfig(Q
+ 	connect(focusHighlightColor, SIGNAL( pressed() ), SLOT( updateChanged() ) );
+ 	connect(customCheckMarkColor, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 	connect(checkMarkColor, SIGNAL( pressed() ), SLOT( updateChanged() ) );
++	connect(lowerCaseText, SIGNAL( toggled(bool) ), SLOT( updateChanged() ) );
+ 
+ 	//Menu Stripe 
+ 	if ( menuLeftSideBar->isChecked() ) {
+@@ -502,6 +507,7 @@ void LipstikStyleConfig::save()
+ 	s.writeEntry("/lipstikstyle/Settings/focusHighlightColor", QColor(focusHighlightColor->color()).name());
+ 	s.writeEntry("/lipstikstyle/Settings/customCheckMarkColor", customCheckMarkColor->isChecked());
+ 	s.writeEntry("/lipstikstyle/Settings/checkMarkColor", QColor(checkMarkColor->color()).name());
++	s.writeEntry("/lipstikstyle/Settings/lowerCaseText", lowerCaseText->isChecked());
+ }
+ 
+ void LipstikStyleConfig::defaults()
+@@ -540,6 +546,7 @@ void LipstikStyleConfig::defaults()
+ 	focusHighlightColor->setColor("/Qt/KWinPalette/activeBackground");
+ 	customCheckMarkColor->setChecked(false);
+ 	checkMarkColor->setColor("/Qt/KWinPalette/activeBackground");
++	lowerCaseText->setChecked(false);
+ 	//updateChanged would be done by setChecked already
+ }
+ 
+@@ -629,6 +636,7 @@ void LipstikStyleConfig::updateChanged()
+ 	    (checkMarkColor->color() == origCheckMarkColor) &&
+ 	    (scrollBarStyle->currentText() == origScrollBarStyle) &&
+ 	    (scrollBarWidth->currentText() == origScrollBarWidth) &&
++	    (lowerCaseText->isChecked() == origLowerCaseText) &&
+ 	    (sliderStyle->currentText() == origSliderStyle)
+ 	)
+ 	    emit changed(false);
+--- style/config/lipstikconf.h	2006-02-08 12:18:05.000000000 +0300
++++ style/config/lipstikconf.h	2006-02-12 18:32:12.646258816 +0300
+@@ -85,6 +85,7 @@ protected:
+ 	QCheckBox* 	 kickerHighlight;
+ 	QCheckBox* 	 drawTabHighlight;
+ 	QCheckBox* 	 flatStripe;
++	QCheckBox* 	 lowerCaseText;
+ 	QCheckBox* 	 compressedMenus;
+ 	QCheckBox* 	 drawToolBarSeparator;
+ 	QCheckBox* 	 drawToolBarGradient;
+@@ -121,6 +122,7 @@ protected:
+ 	bool       origKickerHighlight;
+ 	bool       origDrawTabHighlight;
+     	bool       origFlatStripe;
++    	bool       origLowerCaseText;
+     	bool       origCompressedMenus;
+ 	bool       origDrawToolBarSeparator;
+ 	bool       origDrawToolBarGradient;
+--- style/lipstik.cpp	2006-02-08 20:35:16.000000000 +0300
++++ style/lipstik.cpp	2006-02-12 18:32:12.648258512 +0300
+@@ -196,6 +196,8 @@ LipstikStyle::LipstikStyle() : KStyle( A
+     _menuSpacing = settings.readNumEntry("/menuSpacing", 5);
+     _toolBarSpacing = settings.readNumEntry("/toolBarSpacing", 0);
+ 
++    _lowerCaseText = settings.readBoolEntry("/lowerCaseText", false);
++
+     _drawStatusBarFrame = settings.readBoolEntry("/drawStatusBarFrame", false);
+     _scrollBarStyle = settings.readEntry("/scrollBarStyle", "WindowsStyleScrollBar");
+     _scrollBarWidth = settings.readEntry("/scrollBarWidth", "Small");
+@@ -2738,7 +2740,8 @@ void LipstikStyle::drawControl(ControlEl
+ 
+             // Make the label indicate if the button is a default button or not
+             drawItem( p, QRect(x, y, w, h), AlignCenter|ShowPrefix, button->colorGroup(),
+-                        button->isEnabled(), button->pixmap(), button->text(), -1,
++                        button->isEnabled(), button->pixmap(),
++			_lowerCaseText ? button->text().lower() : button->text(), -1,
+                         &button->colorGroup().buttonText() );
+ 
+ 
+@@ -2791,7 +2794,7 @@ void LipstikStyle::drawControl(ControlEl
+                             		_sharperMenuGradient?_contrast+30:_contrast+3, Draw_Top|Draw_Bottom|Is_Horizontal);
+ 		    }
+     		    p->setPen(cg.highlightedText() );
+-        	    p->drawText(r, text_flags, mi->text());
++        	    p->drawText(r, text_flags, _lowerCaseText ? mi->text().lower() : mi->text());
+             	} else {
+             	    if (down) {
+                 	drawPrimitive(PE_ButtonTool, p, r, cg, flags|Style_Down, opt);
+@@ -2799,11 +2802,11 @@ void LipstikStyle::drawControl(ControlEl
+                 	drawPrimitive(PE_ButtonTool, p, r, cg, flags, opt);
+             	    }
+     		    p->setPen(cg.buttonText() );
+-        	    p->drawText(r, text_flags, mi->text());
++        	    p->drawText(r, text_flags, _lowerCaseText ? mi->text().lower() : mi->text());
+                 }
+ 	    } else {
+     		    p->setPen(cg.buttonText() );
+-        	    p->drawText(r, text_flags, mi->text());
++        	    p->drawText(r, text_flags, _lowerCaseText ? mi->text().lower() : mi->text());
+ 	    }
+             break;
+         }
+@@ -3003,7 +3006,7 @@ void LipstikStyle::drawControl(ControlEl
+             }
+             else {
+                 // The menu item doesn't draw it's own label
+-                QString s = mi->text();
++                QString s = _lowerCaseText ? mi->text().lower() : mi->text();
+                 // Does the menu item have a text label?
+                 if ( !s.isNull() ) {
+                     int t = s.find( '\t' );
+--- style/lipstik.h	2006-02-08 12:13:21.000000000 +0300
++++ style/lipstik.h	2006-02-12 18:32:12.649258360 +0300
+@@ -294,6 +294,7 @@ private:
+     bool _customOverHighlightColor;
+     bool _customFocusHighlightColor;
+     bool _customCheckMarkColor;
++    bool _lowerCaseText;
+ 
+     bool _drawStatusBarFrame;
+     bool _paintGroove;