Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing resets for hotcorners and window snapping #18

Merged
merged 2 commits into from
Jan 13, 2013
Merged

Fixing resets for hotcorners and window snapping #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ffb11f
Fixed incorrect reset behaviors in Hotcorner and Window snapping tabs
jokerdino Jan 13, 2013
d20d9b7
Monitor update on call to refresh()
samvtran Jan 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 42 additions & 27 deletions unitytweak/compiz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import os, os.path
import cairo

from gi.repository import Gtk, Gio, Gdk
from gi.repository import Gtk, Gdk
from math import pi, sqrt

from .ui import ui
Expand Down Expand Up @@ -69,10 +69,7 @@ def __init__(self, container):
'cbox_window_snapping_right': [0, 'right-edge-action'],
'cbox_window_snapping_bottomright': [0, 'bottom-right-corner-action']
}
for box in self.window_snapping_cboxes:
self.window_snapping_cboxes[box][0] = gsettings.grid.get_int(self.window_snapping_cboxes[box][1])
self.ui[box].set_active(self.window_snapping_cboxes[box][0])
self.ui[box].connect("changed", self.on_cbox_window_snapping_changed, box)


self.hotcorners_cboxes = {
'cbox_hotcorners_top': [0, 'Top'],
Expand All @@ -84,24 +81,7 @@ def __init__(self, container):
'cbox_hotcorners_right': [0, 'Right'],
'cbox_hotcorners_bottomright': [0, 'BottomRight']
}
self.hotcorner_values = {
'show_desktop': gsettings.core.get_string('show-desktop-edge').split('|'),
'expo': gsettings.expo.get_string('expo-edge').split('|'),
'window_spread': gsettings.scale.get_string('initiate-edge').split('|')
}

for box in self.hotcorners_cboxes:
if self.hotcorners_cboxes[box][1] in self.hotcorner_values['show_desktop']:
self.hotcorners_cboxes[box][0] = 1
elif self.hotcorners_cboxes[box][1] in self.hotcorner_values['expo']:
self.hotcorners_cboxes[box][0] = 2
elif self.hotcorners_cboxes[box][1] in self.hotcorner_values['window_spread']:
self.hotcorners_cboxes[box][0] = 3
else:
self.hotcorners_cboxes[box][0] = 0

self.ui[box].set_active(self.hotcorners_cboxes[box][0])
self.ui[box].connect("changed", self.on_cbox_hotcorners_changed, box)
self.refresh()
self.builder.connect_signals(self)

Expand Down Expand Up @@ -432,6 +412,30 @@ def refresh(self):
self.ui['color_outline_color'].set_color(gdkcolor)
del color, valid, gdkcolor

for box in self.window_snapping_cboxes:
self.window_snapping_cboxes[box][0] = gsettings.grid.get_int(self.window_snapping_cboxes[box][1])
self.ui[box].set_active(self.window_snapping_cboxes[box][0])
self.ui[box].connect("changed", self.on_cbox_window_snapping_changed, box)

# ===== Hotcorners settings ===== #
self.hotcorner_values = {
'show_desktop': gsettings.core.get_string('show-desktop-edge').split('|'),
'expo': gsettings.expo.get_string('expo-edge').split('|'),
'window_spread': gsettings.scale.get_string('initiate-edge').split('|')
}
for box in self.hotcorners_cboxes:
if self.hotcorners_cboxes[box][1] in self.hotcorner_values['show_desktop']:
self.hotcorners_cboxes[box][0] = 1
elif self.hotcorners_cboxes[box][1] in self.hotcorner_values['expo']:
self.hotcorners_cboxes[box][0] = 2
elif self.hotcorners_cboxes[box][1] in self.hotcorner_values['window_spread']:
self.hotcorners_cboxes[box][0] = 3
else:
self.hotcorners_cboxes[box][0] = 0
self.ui[box].set_active(self.hotcorners_cboxes[box][0])
self.ui[box].connect("changed", self.on_cbox_hotcorners_changed, box)


# TODO : Find a clever way or set each one manually.
# Do it the dumb way now. BIIIG refactoring needed later.

Expand Down Expand Up @@ -700,11 +704,16 @@ def on_color_fill_color_color_set(self, widget, udata=None):

def on_b_compiz_windowsnapping_reset_clicked(self, widget):
gsettings.core.reset('active-plugins')
gsettings.core.reset('show-desktop-edge')
gsettings.expo.reset('expo-edge')
gsettings.grid.reset('fill-color')
gsettings.grid.reset('outline-color')
gsettings.grid.reset('top-left-corner-action')
gsettings.grid.reset('top-edge-action')
gsettings.grid.reset('top-right-corner-action')
gsettings.grid.reset('left-edge-action')
gsettings.grid.reset('right-edge-action')
gsettings.grid.reset('bottom-left-corner-action')
gsettings.grid.reset('bottom-edge-action')
gsettings.grid.reset('bottom-right-corner-action')
self.refresh()


Expand All @@ -719,21 +728,27 @@ def on_switch_hotcorners_active_notify(self, widget, udata = None):
'cbox_hotcorners_bottomright',
'cbox_hotcorners_top',
'cbox_hotcorners_bottom']

if not hasattr(self, 'hotcorners_previous'):
self.hotcorners_previous = {}

if widget.get_active():
self.ui.sensitize(dependants)
for box in self.hotcorners_cboxes:
self.ui[box].set_active(self.hotcorners_previous[box])

else:
self.ui.unsensitize(dependants)
for box in self.hotcorners_cboxes:
self.hotcorners_previous[box] = self.hotcorners_cboxes[box][0]
self.ui[box].set_active(0)

def on_b_compiz_hotcorners_reset_clicked(self, widget):
gsettings.core.reset('show-desktop-edge')
gsettings.expo.reset('expo-edge')
gsettings.scale.reset('initiate-edge')
self.refresh()

if __name__ == '__main__':
# Fire up the Engines
Compizsettings()
Expand Down
1 change: 1 addition & 0 deletions unitytweak/data/compiz.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,6 +1802,7 @@
<property name="margin_left">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<signal name="clicked" handler="on_b_compiz_hotcorners_reset_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
Expand Down