Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

plasma: remove redundant plasma-desktop shell config

Browse source 
the default Plasma::Theme font is already set to QApplication::font() by
Plasma::Theme itself, it has configuration option for it too which is to
read the font setting from the application "General" config group. for
reference:
kdelibs/plasma/theme.cpp

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-29 11:27:27 +03:00
parent 4b91610fc7
commit c17805df29
4 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plasma/shells/plasma-desktop/CMakeLists.txt
View file

@ -23,8 +23,6 @@ set(plasma_SRCS
klistconfirmationdialog.cpp klistconfirmationdialog.cpp
) )
kde4_add_kcfg_files(plasma_SRCS data/plasma-shell-desktop.kcfgc)
set(plasmaapp_dbusXML dbus/org.kde.plasma.App.xml) set(plasmaapp_dbusXML dbus/org.kde.plasma.App.xml)
qt4_add_dbus_adaptor(plasma_SRCS ${plasmaapp_dbusXML} plasmaapp.h PlasmaApp) qt4_add_dbus_adaptor(plasma_SRCS ${plasmaapp_dbusXML} plasmaapp.h PlasmaApp)

14
plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfg
View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile />
<include>QApplication</include>
<group name="General">
<entry key="desktopFont" type="Font">
<label>The font to use on the desktop</label>
<default code="true">qApp->font()</default>
</entry>
</group>
</kcfg>

4
plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc
View file

@ -1,4 +0,0 @@
File=plasma-shell-desktop.kcfg
ClassName=AppSettings
Singleton=true
Mutators=true

5
plasma/shells/plasma-desktop/plasmaapp.cpp
View file

@ -46,7 +46,6 @@
#include <Plasma/AbstractToolBox> #include <Plasma/AbstractToolBox>
#include <Plasma/Containment> #include <Plasma/Containment>
#include <Plasma/Dialog> #include <Plasma/Dialog>
#include <Plasma/Theme>
#include <Plasma/Wallpaper> #include <Plasma/Wallpaper>
#include <Plasma/WindowEffects> #include <Plasma/WindowEffects>
#include <Plasma/Package> #include <Plasma/Package>
@ -61,7 +60,6 @@
#include "interactiveconsole.h" #include "interactiveconsole.h"
#include "panelshadows.h" #include "panelshadows.h"
#include "panelview.h" #include "panelview.h"
#include "plasma-shell-desktop.h"
#include "toolbutton.h" #include "toolbutton.h"
#include "klistconfirmationdialog.h" #include "klistconfirmationdialog.h"
@ -200,9 +198,6 @@ void PlasmaApp::setupDesktop()
m_XdndVersionAtom = (Atom)xdndversion; m_XdndVersionAtom = (Atom)xdndversion;
#endif #endif
// intialize the default theme and set the font
Plasma::Theme *theme = Plasma::Theme::defaultTheme();
theme->setFont(AppSettings::desktopFont());
m_panelShadows = new PanelShadows(); m_panelShadows = new PanelShadows();
// this line initializes the corona. // this line initializes the corona.