multiple profiles update
- Wix: new profile managed, it appear at launch in place of the contact list, and disappear once the profile is choosen - SàT: default profile is now saved, first one is choosed is no default profile - Bridge: new delete profile method
This commit is contained in:
parent
9fd444d937
commit
595a594b64
1 changed files with 224 additions and 23 deletions
|
|
@ -119,14 +119,22 @@ class Param():
|
|||
|
||||
def createProfile(self, name):
|
||||
"""Create a new profile
|
||||
@param name: Name of the profile
|
||||
@param default: True if default value"""
|
||||
@param name: Name of the profile"""
|
||||
if self.params.has_key(name):
|
||||
info ('The profile name already exists')
|
||||
return 1
|
||||
self.params[name]={}
|
||||
return 0
|
||||
|
||||
def deleteProfile(self, name):
|
||||
"""Delete an existing profile
|
||||
@param name: Name of the profile"""
|
||||
if not self.params.has_key(name):
|
||||
error ('Trying to delete an unknown profile')
|
||||
return 1
|
||||
del self.params[name]
|
||||
return 0
|
||||
|
||||
def getProfileName(self, profile_key):
|
||||
"""return profile according to profile_key
|
||||
@param profile_key: profile name or key which can be
|
||||
|
|
@ -136,10 +144,14 @@ class Param():
|
|||
if profile_key=='@DEFAULT@':
|
||||
if not self.params:
|
||||
return ""
|
||||
info('No default profile, returning first one') #TODO: manage real default profile
|
||||
return self.params.keys()[0] #FIXME: gof: temporary, must use real default value, and fallback to first one if it doesn't exists
|
||||
default = self.host.memory.getPrivate('Profile_default')
|
||||
if not default or not default in self.params:
|
||||
info('No default profile, returning first one') #TODO: manage real default profile
|
||||
default = self.params.keys()[0]
|
||||
self.host.memory.setPrivate('Profile_default', default)
|
||||
return default #FIXME: gof: temporary, must use real default value, and fallback to first one if it doesn't exists
|
||||
if not self.params.has_key(profile_key):
|
||||
error ('Trying to access an unknown profile')
|
||||
info ('Trying to access an unknown profile')
|
||||
return ""
|
||||
return profile_key
|
||||
|
||||
|
|
@ -451,12 +463,16 @@ class Memory:
|
|||
@return: profile name or None if it doesn't exist"""
|
||||
return self.params.getProfileName(profile_key)
|
||||
|
||||
def createProfile(self, name, default=False):
|
||||
def createProfile(self, name):
|
||||
"""Create a new profile
|
||||
@param name: Profile name
|
||||
@param default: True if default profile (replace previous default)
|
||||
"""
|
||||
return self.params.createProfile(name, default)
|
||||
return self.params.createProfile(name)
|
||||
|
||||
def deleteProfile(self, name):
|
||||
"""Delete an existing profile
|
||||
@param name: Name of the profile"""
|
||||
return self.params.deleteProfile(name)
|
||||
|
||||
def addToHistory(self, me_jid, from_jid, to_jid, type, message):
|
||||
me_short=me_jid.userhost()
|
||||
|
|
|
|||
Loading…
Reference in a new issue