yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CVS_SILENT

Browse source 
Corrected typos.

svn path=/trunk/kdebase/kwin/; revision=379392
This commit is contained in:
Andrew Coles 2005-01-17 12:50:27 +00:00
parent 2fde6b6cf3
commit 9a9d4a590e
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwinoptions/windows.cpp
View file

@ -1177,15 +1177,15 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, QW
resetKompmgr_ = FALSE; resetKompmgr_ = FALSE;
QVBoxLayout *lay = new QVBoxLayout (this); QVBoxLayout *lay = new QVBoxLayout (this);
if (!kompmgrAvailable()){ if (!kompmgrAvailable()){
KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems as if alpha channel support is not available!</b><br><br>" KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
"Please make sure, you have " "Please make sure you have "
"<a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a>" "<a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a>,"
" and installed the kompmgr that came with kwin<br>" " and installed the kompmgr that came with kwin.<br>"
"Also make sure you have the following entries in your XConfig (e.g. /etc/XF86Config):<br><br>" "Also, make sure you have the following entries in your XConfig (e.g. /etc/XF86Config):<br><br>"
"<i>Section \"Extensions\"<br>" "<i>Section \"Extensions\"<br>"
"Option \"Composite\" \"Enable\"<br>" "Option \"Composite\" \"Enable\"<br>"
"EndSection</i><br><br>" "EndSection</i><br><br>"
"And if your GPU provides hardware accelerated Xrender support (mainly nVidia cards):<br><br>" "And if your GPU provides hardware-accelerated Xrender support (mainly nVidia cards):<br><br>"
"<i>Option \"RenderAccel\" \"true\"</i><br>" "<i>Option \"RenderAccel\" \"true\"</i><br>"
"In <i>Section \"Device\"</i></qt>"), this); "In <i>Section \"Device\"</i></qt>"), this);
lay->addWidget(label); lay->addWidget(label);

16
workspace.cpp
View file

@ -2324,7 +2324,7 @@ void Workspace::startKompmgr()
{ {
{ {
options->useTranslucency = FALSE; options->useTranslucency = FALSE;
KMessageBox::information(desktop_widget, i18n("<qt>The Composite Manager could not be started.<br>Make sure you've got \"kompmgr\" in a $PATH directory</qt>"),0, "UseTranslucency"); KMessageBox::information(desktop_widget, i18n("<qt>The Composite Manager could not be started.<br>Make sure you have \"kompmgr\" in a $PATH directory.</qt>"),0, "UseTranslucency");
} }
} }
else else
@ -2356,7 +2356,7 @@ void Workspace::restartKompmgr()
if (!allowKompmgrRestart) // uh-ohh if (!allowKompmgrRestart) // uh-ohh
{ {
options->useTranslucency = FALSE; options->useTranslucency = FALSE;
KMessageBox::information(desktop_widget, i18n("The Composite Manager crashed twice within a minute and is therefore disabled for this session"), i18n("Composite Manager Failure")); KMessageBox::information(desktop_widget, i18n("The Composite Manager crashed twice within a minute and is therefore disabled for this session."), i18n("Composite Manager Failure"));
return; return;
} }
if (!kompmgr) if (!kompmgr)
@ -2372,7 +2372,7 @@ void Workspace::restartKompmgr()
if (!kompmgr->start(KProcess::NotifyOnExit, KProcess::Stderr)) if (!kompmgr->start(KProcess::NotifyOnExit, KProcess::Stderr))
{ {
options->useTranslucency = FALSE; options->useTranslucency = FALSE;
KMessageBox::information(desktop_widget, i18n("<qt>The Composite Manager could not be started.<br>Make sure you've got \"kompmgr\" in a $PATH directory</qt>")); KMessageBox::information(desktop_widget, i18n("<qt>The Composite Manager could not be started.<br>Make sure you have \"kompmgr\" in a $PATH directory.</qt>"));
} }
else else
{ {
@ -2385,18 +2385,18 @@ void Workspace::handleKompmgrOutput( KProcess *proc, char *buffer, int buflen)
{ {
if (QString(buffer).contains("Started",false)); // don't do anything, just pass to the connection release if (QString(buffer).contains("Started",false)); // don't do anything, just pass to the connection release
else if (QString(buffer).contains("Can't open display",false)) else if (QString(buffer).contains("Can't open display",false))
KMessageBox::sorry(desktop_widget, i18n("<qt><b>kompmgr failed to open the display</b><br>There's probably an invalid display entry in your ~/.xcompmgrrc</qt>")); KMessageBox::sorry(desktop_widget, i18n("<qt><b>kompmgr failed to open the display</b><br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"));
else if (QString(buffer).contains("No render extension",false)) else if (QString(buffer).contains("No render extension",false))
KMessageBox::sorry(desktop_widget, i18n("<qt><b>kompmgr misses the Xrender extension</b><br>You're either using an outdated or a crippled version of XOrg.<br>Get XOrg &ge; 6.8 from www.freedesktop.org<br></qt>")); KMessageBox::sorry(desktop_widget, i18n("<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either an outdated or a crippled version of XOrg.<br>Get XOrg &ge; 6.8 from www.freedesktop.org.<br></qt>"));
else if (QString(buffer).contains("No composite extension",false)) else if (QString(buffer).contains("No composite extension",false))
KMessageBox::sorry(desktop_widget, i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 to have translucency/shadows work<br>Additionally you need to add a new section to your X config file:<br>" KMessageBox::sorry(desktop_widget, i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.<br>Additionally, you need to add a new section to your X config file:<br>"
"<i>Section \"Extensions\"<br>" "<i>Section \"Extensions\"<br>"
"Option \"Composite\" \"Enable\"<br>" "Option \"Composite\" \"Enable\"<br>"
"EndSection</i></qt>")); "EndSection</i></qt>"));
else if (QString(buffer).contains("No damage extension",false)) else if (QString(buffer).contains("No damage extension",false))
KMessageBox::sorry(desktop_widget, i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 to have translucency/shadows work</qt>")); KMessageBox::sorry(desktop_widget, i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"));
else if (QString(buffer).contains("No XFixes extension",false)) else if (QString(buffer).contains("No XFixes extension",false))
KMessageBox::sorry(desktop_widget, i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 to have translucency/shadows work</qt>")); KMessageBox::sorry(desktop_widget, i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work.</qt>"));
else return; //skip others else return; //skip others
// kompmgr startup failed or succeeded, release connection // kompmgr startup failed or succeeded, release connection
kompmgr->closeStderr(); kompmgr->closeStderr();