Author: lmontel
Date: Thu Feb 15 12:04:22 2007
New Revision: 121342
Modified:
packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-sidetop.patch
packages/cooker/kdebase/current/SPECS/kdebase.spec
Log:
Fix patch
Modified: packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-sidetop.patch
==============================================================================
--- packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-sidetop.patch
(original)
+++ packages/cooker/kdebase/current/SOURCES/kdebase-3.5.6-sidetop.patch Thu Feb
15 12:04:22 2007
@@ -1,5 +1,5 @@
---- kdebase-3.5.6/kicker/libkicker/kickerSettings.kcfg-- 2007-02-15
09:27:50.000000000 +0100
-+++ kdebase-3.5.6/kicker/libkicker/kickerSettings.kcfg 2007-02-15
09:31:35.000000000 +0100
+--- kdebase-3.5.6/kicker/libkicker/kickerSettings.kcfg.kicker_side_top
2006-10-07 16:23:10.000000000 +0200
++++ kdebase-3.5.6/kicker/libkicker/kickerSettings.kcfg 2007-02-15
09:42:35.000000000 +0100
@@ -255,6 +255,22 @@
<default>true</default>
</entry>
@@ -23,8 +23,8 @@
<entry name="SidePixmapName" key="SideName" type="String" >
<label>The name of the file to use as the side image in the K
Menu</label>
<default>kside.png</default>
---- kdebase-3.5.6/kicker/kicker/ui/k_mnu.cpp-- 2007-02-15 09:23:56.000000000
+0100
-+++ kdebase-3.5.6/kicker/kicker/ui/k_mnu.cpp 2007-02-15 09:41:11.000000000
+0100
+--- kdebase-3.5.6/kicker/kicker/ui/k_mnu.cpp.kicker_side_top 2006-10-01
19:31:52.000000000 +0200
++++ kdebase-3.5.6/kicker/kicker/ui/k_mnu.cpp 2007-02-15 11:28:39.000000000
+0100
@@ -110,9 +110,9 @@
{
return false;
@@ -49,7 +49,7 @@
sidePixmap.convertFromImage(image);
image.load(locate("data", "kicker/pics/" + sideTileName));
-@@ -134,7 +134,8 @@
+@@ -134,25 +134,50 @@
return false;
}
@@ -58,9 +58,22 @@
+ KickerLib::colorize(image);
sideTilePixmap.convertFromImage(image);
++ if(!useTop)
++ {
if (sidePixmap.width() != sideTilePixmap.width())
-@@ -144,15 +145,28 @@
+ {
+ kdDebug(1210) << "Pixmaps have to be the same size" << endl;
+ return false;
}
++ }
++ else
++ {
++ if (sidePixmap.height() != sideTilePixmap.height())
++ {
++ kdDebug(1210) << "Pixmaps have to be the same size" << endl;
++ return false;
++ }
++ }
// pretile the pixmap to a height of at least 100 pixels
- if (sideTilePixmap.height() < 100)
@@ -90,7 +103,7 @@
return true;
}
-@@ -444,22 +458,34 @@
+@@ -444,22 +469,34 @@
void PanelKMenu::setMinimumSize(const QSize & s)
{
@@ -129,7 +142,7 @@
}
#include <iostream>
-@@ -482,8 +508,10 @@
+@@ -482,8 +519,10 @@
QRect PanelKMenu::sideImageRect()
{
@@ -142,7 +155,7 @@
}
void PanelKMenu::resizeEvent(QResizeEvent * e)
-@@ -493,7 +521,11 @@
+@@ -493,7 +532,11 @@
PanelServiceMenu::resizeEvent(e);
@@ -155,7 +168,7 @@
width() - sidePixmap.width(), height()
), this ) );
}
-@@ -519,6 +551,7 @@
+@@ -519,6 +562,7 @@
return;
}
@@ -163,7 +176,7 @@
QPainter p(this);
p.setClipRegion(e->region());
-@@ -528,19 +561,29 @@
+@@ -528,19 +572,29 @@
QStyleOption( frameWidth(), 0 ) );
QRect r = sideImageRect();
Modified: packages/cooker/kdebase/current/SPECS/kdebase.spec
==============================================================================
--- packages/cooker/kdebase/current/SPECS/kdebase.spec (original)
+++ packages/cooker/kdebase/current/SPECS/kdebase.spec Thu Feb 15 12:04:22 2007
@@ -41,7 +41,7 @@
Name: kdebase
Summary: K Desktop Environment - Core files
Version: 3.5.6
-Release: %mkrel 10
+Release: %mkrel 11
Epoch: 1
Group: Graphical desktop/KDE
License: GPL
