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

activity associations are saved with kwin's session

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1181900
This commit is contained in:
Chani Armitage 2010-10-02 17:04:24 +00:00
parent 25d7b58620
commit ac91cd2195
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
manage.cpp
View file

@ -167,6 +167,7 @@ bool Client::manage( Window w, bool isMapped )
desk = session->desktop; desk = session->desktop;
if( session->onAllDesktops ) if( session->onAllDesktops )
desk = NET::OnAllDesktops; desk = NET::OnAllDesktops;
setOnActivities(session->activities);
} }
else else
{ {

2
sm.cpp
View file

@ -145,6 +145,7 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase )
// KConfig doesn't support long so we need to live with less precision on 64-bit systems // KConfig doesn't support long so we need to live with less precision on 64-bit systems
static_cast<int>( reinterpret_cast<long>( c->clientGroup() )) : 0; static_cast<int>( reinterpret_cast<long>( c->clientGroup() )) : 0;
cg.writeEntry( QString("clientGroup")+n, group ); cg.writeEntry( QString("clientGroup")+n, group );
cg.writeEntry( QString("activities")+n, c->activities() );
} }
} }
if( phase == SMSavePhase0 ) if( phase == SMSavePhase0 )
@ -217,6 +218,7 @@ void Workspace::loadSessionInfo()
info->stackingOrder = cg.readEntry( QString("stackingOrder")+n, -1 ); info->stackingOrder = cg.readEntry( QString("stackingOrder")+n, -1 );
info->clientGroup = cg.readEntry( QString("clientGroup")+n, 0 ); info->clientGroup = cg.readEntry( QString("clientGroup")+n, 0 );
info->clientGroupClient = NULL; info->clientGroupClient = NULL;
info->activities = cg.readEntry( QString("activities")+n, QStringList() );
} }
} }

1
sm.h
View file

@ -68,6 +68,7 @@ struct SessionInfo
int clientGroup; // Unique identifier for the client group that this window is in int clientGroup; // Unique identifier for the client group that this window is in
Client* clientGroupClient; // The first client created that has an identical identifier Client* clientGroupClient; // The first client created that has an identical identifier
QStringList activities;
}; };