[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/utils/kpager
From: Pino Toscano <pino () kde ! org>
Date: 2015-11-19 21:28:35
Message-ID: E1ZzWkt-00006n-Dt () scm ! kde ! org
[Download RAW message or body]
SVN commit 1444716 by pino:
use enums in settings
make use of Enum types for some of the Settings keys; this way, it is
possible to get rid of all the manual casts, and have actually just
one set of enums (generated in the Settings class) used all around
M +8 -9 desktop.cpp
M +3 -4 desktop.h
M +21 -22 kpager.cpp
M +3 -3 kpager.h
M +21 -9 kpager.kcfg
M +2 -0 settings.kcfgc
--- trunk/extragear/utils/kpager/desktop.cpp #1444715:1444716
@@ -47,7 +47,6 @@
#include "config.h"
#include "windowdrag.h"
#include <QX11Info>
-#include <settings.h>
Desktop::Desktop(int desk, QCache<WId, QPixmap> &winPixCache, QWidget *parent): \
QWidget(parent), m_windowPixmapsCache(winPixCache) {
@@ -61,7 +60,7 @@
setAcceptDrops(true);
setAttribute(Qt::WA_NoSystemBackground, true);
- m_transparentMode = \
static_cast<WindowTransparentMode>(Settings::windowTransparentMode()); + \
m_transparentMode = Settings::windowTransparentMode(); resize(67, 50);
}
@@ -116,7 +115,7 @@
{
KWindowSystem::forceActiveWindow(info->win());
- // if ( static_cast<WindowDrawMode>( KPagerConfigDialog::m_windowDrawMode ) == \
Pixmap ) + // if (Settings::windowDrawMode() == Settings::Pixmap)
// m_windowPixmapsCache.remove(info->win());
}
}
@@ -241,11 +240,11 @@
void Desktop::paintWindow(QPainter &p, const KWindowInfo *info, bool onDesktop) \
const {
- switch (static_cast<WindowDrawMode>(Settings::windowDrawMode()) )
+ switch (Settings::windowDrawMode())
{
- case (Plain) : paintWindowPlain (p, info, onDesktop);break;
- case (Icon) : paintWindowIcon (p, info, onDesktop);break;
- case (Pixmap) : paintWindowPixmap(p, info, onDesktop);break;
+ case (Settings::Plain) : paintWindowPlain (p, info, onDesktop);break;
+ case (Settings::Icon) : paintWindowIcon (p, info, onDesktop);break;
+ case (Settings::Pixmap) : paintWindowPixmap(p, info, onDesktop);break;
}
}
@@ -498,8 +497,8 @@
else brush=palette().brush( QPalette::Button );
if (onDesktop
- && (m_transparentMode == AllWindows
- || (m_transparentMode==MaximizedWindows && (info->state() & NET::Max))
+ && (m_transparentMode == Settings::AllWindows
+ || (m_transparentMode==Settings::MaximizedWindows && (info->state() & \
NET::Max)) )
)
{
--- trunk/extragear/utils/kpager/desktop.h #1444715:1444716
@@ -30,6 +30,8 @@
#include <QPixmap>
#include <QCache>
+#include <settings.h>
+
class KSharedPixmap;
class QPainter;
@@ -50,9 +52,6 @@
// int widthForHeight(int height) const;
// int heightForWidth(int width) const;
- enum WindowDrawMode { Plain=0, Icon=1, Pixmap=2 };
- enum WindowTransparentMode { NoWindows=0, MaximizedWindows=1, AllWindows=2};
-
virtual int deskX() const { return 0; }
virtual int deskY() const { return 0; }
virtual int deskWidth() const { return width(); }
@@ -99,7 +98,7 @@
QPixmap *m_bgSmallPixmap;
static QPixmap *m_bgCommonSmallPixmap;
static bool m_isCommon;
- WindowTransparentMode m_transparentMode;
+ Settings::EnumWindowTransparentMode m_transparentMode;
QPixmap paintNewWindow(const KWindowInfo *info) const;
--- trunk/extragear/utils/kpager/kpager.cpp #1444715:1444716
@@ -58,7 +58,6 @@
#include <kicon.h>
#include "kpageradaptor.h"
-#include <settings.h>
#include <QtDBus/QtDBus>
static int intFromItem(KConfigSkeletonItem *item)
@@ -224,7 +223,7 @@
m_desktops.append(dsk);
}
- m_layoutType = static_cast<enum KPager::LayoutTypes>(Settings::layoutType());
+ m_layoutType = Settings::layoutType();
connect( KWindowSystem::self(), SIGNAL( activeWindowChanged(WId)),
SLOT(slotActiveWindowChanged(WId)));
@@ -260,9 +259,9 @@
const QString KPager::lWidth() const
{
switch (m_layoutType) {
- case (Classical) : return "layoutClassicalWidth";break;
- case (Horizontal) : return "layoutHorizontalWidth";break;
- case (Vertical) : return "layoutVerticalWidth";break;
+ case (Settings::Classical) : return "layoutClassicalWidth";break;
+ case (Settings::Horizontal) : return "layoutHorizontalWidth";break;
+ case (Settings::Vertical) : return "layoutVerticalWidth";break;
};
return "Width";
}
@@ -270,9 +269,9 @@
const QString KPager::lHeight() const
{
switch (m_layoutType) {
- case (Classical) : return "layoutClassicalHeight";break;
- case (Horizontal) : return "layoutHorizontalHeight";break;
- case (Vertical) : return "layoutVerticalHeight";break;
+ case (Settings::Classical) : return "layoutClassicalHeight";break;
+ case (Settings::Horizontal) : return "layoutHorizontalHeight";break;
+ case (Settings::Vertical) : return "layoutVerticalHeight";break;
};
return "Height";
}
@@ -297,9 +296,9 @@
ndesks++;
switch (m_layoutType)
{
- case (Classical) : i= ndesks / halfdesks; j = ndesks % halfdesks; \
break;
- case (Horizontal) : j++; break;
- case (Vertical) : i++; break;
+ case (Settings::Classical) : i= ndesks / halfdesks; j = ndesks % \
halfdesks; break; + case (Settings::Horizontal) : j++; break;
+ case (Settings::Vertical) : i++; break;
};
}
@@ -308,9 +307,9 @@
switch (m_layoutType)
{
- case (Classical) : resize(w*(ndesks/2+(ndesks%2)),h*2);break;
- case (Horizontal) : resize(w*ndesks,h);break;
- case (Vertical) : resize(w, h*ndesks);break;
+ case (Settings::Classical) : resize(w*(ndesks/2+(ndesks%2)),h*2);break;
+ case (Settings::Horizontal) : resize(w*ndesks,h);break;
+ case (Settings::Vertical) : resize(w, h*ndesks);break;
};
}
@@ -387,7 +386,7 @@
void KPager::slotSettingsChanged()
{
- m_layoutType = static_cast<enum KPager::LayoutTypes>(Settings::layoutType());
+ m_layoutType = Settings::layoutType();
int nWd = parentWidget() ? parentWidget()->width() : width();
int nHg = parentWidget() ? parentWidget()->width() : width();
@@ -533,9 +532,9 @@
i=j=m_desktops.count();
switch (m_layoutType)
{
- case (Classical) : i%=2;j/=2; break;
- case (Horizontal) : i=0; break;
- case (Vertical) : j=0; break;
+ case (Settings::Classical) : i%=2;j/=2; break;
+ case (Settings::Horizontal) : i=0; break;
+ case (Settings::Vertical) : j=0; break;
}
for (int d=m_desktops.count()+1;d<=nDesktops; d++)
@@ -564,7 +563,7 @@
if (m_grabWinTimer->isActive()) m_grabWinTimer->stop();
- if ( static_cast<Desktop::WindowDrawMode>(Settings::windowDrawMode()) == \
Desktop::Pixmap ) + if (Settings::windowDrawMode() == Settings::Pixmap)
m_grabWinTimer->start(1000);
}
@@ -685,9 +684,9 @@
int hDsk=size.height();
switch (m_layoutType)
{
- case (Classical) : w=wDsk*(n/2+(n%2)); h=hDsk*2;break;
- case (Horizontal) : w=wDsk*n; h=hDsk;break;
- case (Vertical) : w=wDsk; h=hDsk*n;break;
+ case (Settings::Classical) : w=wDsk*(n/2+(n%2)); h=hDsk*2;break;
+ case (Settings::Horizontal) : w=wDsk*n; h=hDsk;break;
+ case (Settings::Vertical) : w=wDsk; h=hDsk*n;break;
};
return QSize(w,h);
}
--- trunk/extragear/utils/kpager/kpager.h #1444715:1444716
@@ -31,6 +31,8 @@
#include <kmainwindow.h>
#include <kwindowinfo.h>
+#include <settings.h>
+
class KPager;
class QMenu;
class KActionCollection;
@@ -87,8 +89,6 @@
QSize sizeHint() const;
- enum LayoutTypes { Classical=0, Horizontal, Vertical };
-
public Q_SLOTS:
void configureDialog();
void slotSettingsChanged();
@@ -128,7 +128,7 @@
const QString lWidth() const;
const QString lHeight() const;
- LayoutTypes m_layoutType;
+ Settings::EnumLayoutType m_layoutType;
KMenu *m_mnu;
#ifdef HAVE_FIXED_KMENU_TITLE
--- trunk/extragear/utils/kpager/kpager.kcfg #1444715:1444716
@@ -9,9 +9,13 @@
<entry key="Font" type="Font">
<default code="true">QFont(KGlobalSettings::generalFont().family(), 10, \
QFont::Bold)</default> </entry>
- <entry key="layoutType" type="UInt">
- <default>1</default>
- <max>2</max>
+ <entry key="layoutType" type="Enum">
+ <default>Horizontal</default>
+ <choices>
+ <choice name="Classical" />
+ <choice name="Horizontal" />
+ <choice name="Vertical" />
+ </choices>
</entry>
<entry key="showBackground" type="Bool">
<default>true</default>
@@ -28,13 +32,21 @@
<entry key="windowDragging" type="Bool">
<default>true</default>
</entry>
- <entry key="windowDrawMode" type="UInt">
- <default>1</default>
- <max>2</max>
+ <entry key="windowDrawMode" type="Enum">
+ <default>Icon</default>
+ <choices>
+ <choice name="Plain" />
+ <choice name="Icon" />
+ <choice name="Pixmap" />
+ </choices>
</entry>
- <entry key="windowTransparentMode" type="UInt">
- <default>2</default>
- <max>2</max>
+ <entry key="windowTransparentMode" type="Enum">
+ <default>AllWindows</default>
+ <choices>
+ <choice name="NoWindows" />
+ <choice name="MaximizedWindows" />
+ <choice name="AllWindows" />
+ </choices>
</entry>
<entry key="xPos" type="Int">
<default>-1</default>
--- trunk/extragear/utils/kpager/settings.kcfgc #1444715:1444716
@@ -2,3 +2,5 @@
File=kpager.kcfg
Mutators=true
Singleton=true
+GlobalEnums=true
+UseEnumTypes=true
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic