[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdebase/kcontrol/kicker
From: Aaron J. Seigo <aseigo () kde ! org>
Date: 2005-10-31 20:57:57
Message-ID: 1130792277.672594.29084.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 476203 by aseigo:
set a default for position based on the X-KDE-PanelExt-Positions setting
in the .desktop file
BUG:115399
M +48 -10 extensionInfo.cpp
--- branches/KDE/3.5/kdebase/kcontrol/kicker/extensionInfo.cpp #476202:476203
@@ -39,6 +39,7 @@
{
setDefaults();
+ kdDebug() << "loading defaults for " << _desktopFile << endl;
if (_desktopFile.isNull())
{
_name = i18n("Main Panel");
@@ -65,17 +66,54 @@
_customSizeMax = df.readNumEntry("X-KDE-PanelExt-CustomSizeMax", \
_customSizeMax);
_customSize = df.readNumEntry("X-KDE-PanelExt-CustomSizeDefault", \
_customSize); }
- QStringList allowedPos=QStringList::split(",",df.readEntry("X-KDE-PanelExt-Positions","Left,Top,Right,Bottom").upper());
- for (int i=0;i<4;i++) _allowedPosition[i]=false;
- kdDebug()<<"BEFORE X-KDE-PanelExt-Positions parsing"<<endl;
- for (unsigned int i=0;i<allowedPos.count();i++) {
- kdDebug()<<allowedPos[i]<<endl;
- if (allowedPos[i]=="LEFT") _allowedPosition[KPanelExtension::Left]=true;
- if (allowedPos[i]=="RIGHT") _allowedPosition[KPanelExtension::Right]=true;
- if (allowedPos[i]=="TOP") _allowedPosition[KPanelExtension::Top]=true;
- if (allowedPos[i]=="BOTTOM") _allowedPosition[KPanelExtension::Bottom]=true;
- }
+ for (int i = 0; i < 4; i++)
+ {
+ _allowedPosition[i]=false;
+ }
+
+ kdDebug()<<"BEFORE X-KDE-PanelExt-Positions parsing"<<endl;
+ QStringList allowedPos;
+ allowedPos << "BOTTOM" << "TOP" << "LEFT" << "RIGHT" << "BOTTOM";
+ allowedPos= df.readListEntry("X-KDE-PanelExt-Positions", allowedPos);
+
+ for (unsigned int i=0;i<allowedPos.count();i++)
+ {
+ QString pos = allowedPos[i].upper();
+ kdDebug() << pos << endl;
+ if (pos == "LEFT")
+ {
+ if (i == 0)
+ {
+ _position = KPanelExtension::Left;
+ }
+ _allowedPosition[KPanelExtension::Left] = true;
+ }
+ else if (pos == "RIGHT")
+ {
+ if (i == 0)
+ {
+ _position = KPanelExtension::Right;
+ }
+ _allowedPosition[KPanelExtension::Right]=true;
+ }
+ else if (pos =="TOP")
+ {
+ if (i == 0)
+ {
+ _position = KPanelExtension::Top;
+ }
+ _allowedPosition[KPanelExtension::Top]=true;
+ }
+ else if (pos == "BOTTOM")
+ {
+ if (i == 0)
+ {
+ _position = KPanelExtension::Bottom;
+ }
+ _allowedPosition[KPanelExtension::Bottom]=true;
+ }
+ }
}
// sanitize
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic