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

Compile/link

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=476069
This commit is contained in:
Laurent Montel 2005-10-31 12:57:20 +00:00
parent 71b041d1ec
commit 1a9537c873
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tabbox.cpp
View file

@ -927,8 +927,8 @@ void Workspace::CDEWalkThroughWindows( bool forward )
Client* nc = c; Client* nc = c;
bool options_traverse_all; bool options_traverse_all;
{ {
KConfigGroupSaver saver( KGlobal::config(), "TabBox" ); KConfigGroup saver( KGlobal::config(), "TabBox" );
options_traverse_all = KGlobal::config()->readNumEntry("TraverseAll", false ); options_traverse_all = saver.readNumEntry("TraverseAll", false );
} }
if ( !forward ) if ( !forward )

20
workspace.cpp
View file

@ -316,8 +316,8 @@ void Workspace::init()
initial_desktop = client_info.currentDesktop(); initial_desktop = client_info.currentDesktop();
else else
{ {
KConfigGroupSaver saver( kapp->sessionConfig(), "Session" ); KConfigGroup saver( kapp->sessionConfig(), "Session" );
initial_desktop = kapp->sessionConfig()->readNumEntry( "desktop", 1 ); initial_desktop = saver.readNumEntry( "desktop", 1 );
} }
if( !setCurrentDesktop( initial_desktop )) if( !setCurrentDesktop( initial_desktop ))
setCurrentDesktop( 1 ); setCurrentDesktop( 1 );
@ -907,9 +907,9 @@ void Workspace::loadDesktopSettings()
groupname = "Desktops"; groupname = "Desktops";
else else
groupname.sprintf("Desktops-screen-%d", screen_number); groupname.sprintf("Desktops-screen-%d", screen_number);
KConfigGroupSaver saver(c,groupname); KConfigGroup saver(c,groupname);
int n = c->readNumEntry("Number", 4); int n = saver.readNumEntry("Number", 4);
number_of_desktops = n; number_of_desktops = n;
delete workarea; delete workarea;
workarea = new QRect[ n + 1 ]; workarea = new QRect[ n + 1 ];
@ -919,7 +919,7 @@ void Workspace::loadDesktopSettings()
desktop_focus_chain.resize( n ); desktop_focus_chain.resize( n );
for(int i = 1; i <= n; i++) for(int i = 1; i <= n; i++)
{ {
QString s = c->readEntry(QString("Name_%1").arg(i), QString s = saver.readEntry(QString("Name_%1").arg(i),
i18n("Desktop %1").arg(i)); i18n("Desktop %1").arg(i));
rootInfo->setDesktopName( i, s.toUtf8().data() ); rootInfo->setDesktopName( i, s.toUtf8().data() );
desktop_focus_chain[i-1] = i; desktop_focus_chain[i-1] = i;
@ -934,9 +934,9 @@ void Workspace::saveDesktopSettings()
groupname = "Desktops"; groupname = "Desktops";
else else
groupname.sprintf("Desktops-screen-%d", screen_number); groupname.sprintf("Desktops-screen-%d", screen_number);
KConfigGroupSaver saver(c,groupname); KConfigGroup saver(c,groupname);
c->writeEntry("Number", number_of_desktops ); saver.writeEntry("Number", number_of_desktops );
for(int i = 1; i <= number_of_desktops; i++) for(int i = 1; i <= number_of_desktops; i++)
{ {
QString s = desktopName( i ); QString s = desktopName( i );
@ -949,13 +949,13 @@ void Workspace::saveDesktopSettings()
if (s != defaultvalue) if (s != defaultvalue)
{ {
c->writeEntry( QString("Name_%1").arg(i), s ); saver.writeEntry( QString("Name_%1").arg(i), s );
} }
else else
{ {
QString currentvalue = c->readEntry(QString("Name_%1").arg(i)); QString currentvalue = saver.readEntry(QString("Name_%1").arg(i));
if (currentvalue != defaultvalue) if (currentvalue != defaultvalue)
c->writeEntry( QString("Name_%1").arg(i), "" ); saver.writeEntry( QString("Name_%1").arg(i), "" );
} }
} }
} }