CoverGloobus

Merge lp:~jaapz-b/covergloobus/desktopstick into lp:covergloobus

  1. desktopstick
  2. Merge into trunk
Proposed by Jaap Broekhuizen
Status: Merged
Merge reported by: BadChoice
Merged at revision: not available
Proposed branch: lp:~jaapz-b/covergloobus/desktopstick
Merge into: lp:covergloobus
Diff against target: 96 lines (+20/-4)
2 files modified
src/covergloobus-config.py (+14/-2)
src/covergloobus.py (+6/-2)
To merge this branch: bzr merge lp:~jaapz-b/covergloobus/desktopstick
Reviewer Review Type Date Requested Status
BadChoice Pending
Review via email: mp+16584@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/covergloobus-config.py'
2--- src/covergloobus-config.py 2009-12-19 11:34:57 +0000
3+++ src/covergloobus-config.py 2009-12-25 16:58:09 +0000
4@@ -90,6 +90,7 @@
5 config.add_section('Tabs')
6 config.add_section('AmazonCovers')
7 config.add_section('Docky')
8+ config.add_section('DesktopStick')
9 config.set('StartPosition', 'x', "20")
10 config.set('StartPosition', 'y', "20")
11 config.set('StartPosition', 'ontop', "0")
12@@ -99,6 +100,7 @@
13 config.set('Tabs', 'name', 'ultimateguitar')
14 config.set('AmazonCovers', 'value', '1')
15 config.set('Docky', 'value', '0')
16+ config.set('DesktopStick', 'value', '1')
17
18 homedir = os.path.expanduser("~")
19
20@@ -136,6 +138,7 @@
21 c.debug("On top?:" + config.get("StartPosition","ontop"))
22 c.debug("Amazon Covers:" + config.get("AmazonCovers","value"))
23 c.debug("Docky:" + config.get("Docky","value"))
24+ c.debug("Stick to desktop:" + config.get("DesktopStick","value"))
25
26 if(debug):
27 print get_themes_names()
28@@ -161,7 +164,8 @@
29 entry6 = None #On top checkbox
30 entry8 = None #Tabs combo box
31 entry9 = None #Amazon checkbox
32- entry10 = None #Docky chekcbox
33+ entry10 = None #Docky checkbox
34+ entry11 = None #Stick to Desktop checkbox
35 image = None #Image to show theme screenshot
36
37 def __init__(self):
38@@ -274,7 +278,11 @@
39 self.entry10 = gtk.CheckButton(label=_("Enable Covers on Docky"), use_underline=False)
40 c.debug("Docky:" + str(bool(config.get("Docky","value"))))
41 self.entry10.set_active(int(config.get("Docky","value")))
42-
43+
44+ #============= STICK TO DESKTOP ================ #
45+ self.entry11 = gtk.CheckButton(label=_("Stick to Desktop"), use_underline=False)
46+ c.debug("Stick to desktop:" + str(bool(config.get("DesktopStick","value"))))
47+ self.entry11.set_active(int(config.get("DesktopStick","value")))
48
49 #=================== BUTTONS ===================== #
50 ok_button = gtk.Button(_("Save"))
51@@ -296,6 +304,7 @@
52 general_container.add(container7)
53 general_container.add(container9) #Amazon Covers
54 general_container.add(self.entry10) #Docky
55+ general_container.add(self.entry11) #Stick to Desktop
56 general_container.add(container8)
57
58
59@@ -314,6 +323,8 @@
60 c.debug("Tabs:" + self.entry6.get_active_text())
61 c.debug("Ontop:" + str(int(self.entry7.get_active())))
62 c.debug("Amazon Covers:" + str(int(self.entry9.get_active())))
63+ c.debug("Docky:" + str(int(self.entry10.get_active())))
64+ c.debug("Stick to desktop:" + str(int(self.entry11.get_active())))
65
66 config.set('StartPosition', 'x', self.entry1.get_text())
67 config.set('StartPosition', 'y', self.entry2.get_text())
68@@ -324,6 +335,7 @@
69 config.set('Tabs', 'name', self.entry6.get_active_text())
70 config.set('AmazonCovers', 'value', str(int(self.entry9.get_active()))) #Amazon Covers
71 config.set('Docky', 'value', str(int(self.entry10.get_active()))) #Docky
72+ config.set('DesktopStick', 'value', str(int(self.entry11.get_active()))) #Stick to Desktop
73
74 #print "PATH==> "+ path;
75 homedir = os.path.expanduser("~")
76
77=== modified file 'src/covergloobus.py'
78--- src/covergloobus.py 2009-12-23 15:47:19 +0000
79+++ src/covergloobus.py 2009-12-25 16:58:09 +0000
80@@ -165,10 +165,14 @@
81 if event.button == 2:
82 l = Lyrics(self.config,g)
83 l.show_lyrics(self.player.get_artist(), self.player.get_title());
84-
85
86 elif event.button == 1:
87- self.win.begin_move_drag(event.button, int(event.x_root), int(event.y_root), event.time)
88+ stick = int(self.config.get("DesktopStick", "value"))
89+ if stick == 0:
90+ g.debug("Moving")
91+ self.win.begin_move_drag(event.button, int(event.x_root), int(event.y_root), event.time)
92+ else:
93+ g.debug("Sticked to desktop, can't move!")
94
95 elif event.button == 3:
96 g.debug("Right Button Pressed, Launch menu")

Subscribers

People subscribed via source and target branches