* Remove Ubuntu specific code

* Change default launch feedback to KDE3.5.10 style


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176186 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 8e999fffbf
commit 0c5e3c36fa

@ -22,7 +22,7 @@
<!-- blinking = c.readBoolEntry( "Blinking", false ); -->
</entry>
<entry key="Bouncing" type="Bool">
<default>true</default>
<default>false</default>
<label></label>
<whatsthis></whatsthis>
<!-- startupid.cpp:60 -->
@ -31,7 +31,7 @@
</group>
<group name="FeedbackStyle">
<entry key="BusyCursor" type="Bool">
<default>true</default>
<default>false</default>
<label></label>
<whatsthis></whatsthis>
</entry>

@ -179,14 +179,14 @@ bool XKBExtension::setLayoutInternal(const TQString& model,
p.start(KProcess::Block);
// reload ubuntu hotkey-setup keycode -> keysym maps
// reload system-wide hotkey-setup keycode -> keysym maps
KProcess pXmodmap;
pXmodmap << "/usr/bin/xmodmap" << "/usr/share/apps/kxkb/ubuntu.xmodmap";
pXmodmap << "xmodmap" << "/opt/trinity/share/apps/kxkb/system.xmodmap";
pXmodmap.start(KProcess::Block);
KProcess pXmodmapHome;
pXmodmapHome << "/usr/bin/xmodmap" << TQDir::home().path() + "/.Xmodmap";
pXmodmapHome.start(KProcess::Block);
pXmodmapHome << "xmodmap" << TQDir::home().path() + "/.Xmodmap";
pXmodmapHome.start(KProcess::Block);
return p.normalExit() && (p.exitStatus() == 0);
}

Loading…
Cancel
Save