v.licheni.net
/
stack
/
code
/
dboxswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2c94e3c
)
refactored activateProfile to pass a path instead of a profile name
author
stack
<stack@inventati.org>
Sun, 8 Jul 2012 18:58:05 +0000
(20:58 +0200)
committer
stack
<stack@inventati.org>
Sun, 8 Jul 2012 18:58:05 +0000
(20:58 +0200)
gui.py
patch
|
blob
|
history
profhandler.py
patch
|
blob
|
history
diff --git
a/gui.py
b/gui.py
index
56d0802
..
51e058b
100755
(executable)
--- a/
gui.py
+++ b/
gui.py
@@
-125,9
+125,9
@@
class Gui(QtGui.QDialog):
profiles = self.profileManager.getProfilesList()
for pr in profiles:
profiles = self.profileManager.getProfilesList()
for pr in profiles:
- pr = os.path.basename(pr)
+ #pr is a profile path
menuItem_Profile = self.menuProfiles.addAction(pr)
menuItem_Profile = self.menuProfiles.addAction(pr)
-
+ pr = os.path.basename(pr)
#Using lambda function to pass additional arguments to the function, in this case the path of the profile
receiver = self.activateProfileAction(pr)
self.connect(menuItem_Profile, SIGNAL('triggered()'), receiver)
#Using lambda function to pass additional arguments to the function, in this case the path of the profile
receiver = self.activateProfileAction(pr)
self.connect(menuItem_Profile, SIGNAL('triggered()'), receiver)
diff --git
a/profhandler.py
b/profhandler.py
index
3d3060f
..
e5abd82
100755
(executable)
--- a/
profhandler.py
+++ b/
profhandler.py
@@
-116,15
+116,15
@@
class ProfHandler():
else:
return False
else:
return False
- def activateProfile(self, p
name
):
- if p
name
in self.getProfilesList():
+ def activateProfile(self, p
path
):
+ if p
path
in self.getProfilesList():
self.stopDropbox()
try:
self.stopDropbox()
try:
- with open(
os.path.join(self.getProfileFolder(), pname)
) as pdir:
+ with open(
ppath
) as pdir:
os.unlink(self.getDropboxDirectory())
os.unlink(self.getDropboxDirectory())
- os.symlink(
os.path.join(self.getProfileFolder(), pname)
, self.getDropboxDirectory())
+ os.symlink(
ppath
, self.getDropboxDirectory())
except IOError as e:
except IOError as e:
- raise AppError('Error on activating Profile: '+p
name
)
+ raise AppError('Error on activating Profile: '+p
path
)
self.startDropbox()
else:
raise AppError("Trying to acrivate non existant profile")
self.startDropbox()
else:
raise AppError("Trying to acrivate non existant profile")