Skip to content
This repository has been archived by the owner on May 13, 2018. It is now read-only.

Commit

Permalink
Merge pull request freyja-dev#109 from snwh/master
Browse files Browse the repository at this point in the history 
Removed the Sync to VBlank option.
  • Loading branch information
Sam Hewitt committed May 8, 2013
2 parents 76b9386 + 732481a commit 6e673e5
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 69 deletions.
4 changes: 0 additions & 4 deletions UnityTweakTool/section/spaghetti/compiz.py
View file
Expand Up @@ -254,7 +254,6 @@ def refresh(self):
del model, zoom_in_key, iter_zoom_in_key, zoom_out_key, iter_zoom_out_key

self.ui['cbox_opengl'].set_active(gsettings.opengl.get_int('texture-filter'))
self.ui['check_synctovblank'].set_active(gsettings.opengl.get_boolean('sync-to-vblank'))

model = self.ui['list_compiz_general_keys_accelerators']

Expand Down Expand Up @@ -525,9 +524,6 @@ def on_craccel_compiz_general_zoom_accel_cleared(self, craccel, path, model = No
def on_cbox_opengl_changed(self, widget, udata = None):
gsettings.opengl.set_int('texture-filter', self.ui['cbox_opengl'].get_active())

def on_check_synctovblank_toggled(self, widget, udata = None):
gsettings.opengl.set_boolean('sync-to-vblank', self.ui['check_synctovblank'].get_active())

def on_craccel_compiz_general_keys_accel_edited(self, craccel, path, key, mods, hwcode, model = None):
model = self.ui['list_compiz_general_keys_accelerators']
accel = Gtk.accelerator_name(key, mods)
Expand Down
13 changes: 1 addition & 12 deletions UnityTweakTool/section/windowmanager.py
View file
Expand Up @@ -67,16 +67,6 @@
'map' : {0:0,1:1,2:2}
})

check_synctovblank= CheckBox({
'id' : 'check_synctovblank',
'builder' : WindowManager.builder,
'schema' : 'org.compiz.opengl',
'path' : '/org/compiz/profiles/unity/plugins/opengl/',
'key' : 'sync-to-vblank',
'type' : 'boolean',
'map' : {True:True,False:False},
'dependants': []
})

# TODO:
# TypeError: unhashable type: 'list'
Expand Down Expand Up @@ -132,8 +122,7 @@
# cbox_unminimize_animation
# list_compiz_general_keys_accelerators

GeneralIcons=Tab([cbox_opengl,
check_synctovblank ]) #,
GeneralIcons=Tab([cbox_opengl]) #,
# cbox_minimize_animation,
# cbox_unminimize_animation])

Expand Down
26 changes: 14 additions & 12 deletions data/unity.ui
View file
Expand Up @@ -2110,39 +2110,41 @@
</packing>
</child>
<child>
<object class="GtkCheckButton" id="check_minimizedwindows_switch">
<property name="label" translatable="yes">Switch between minimized windows</property>
<object class="GtkCheckButton" id="check_autoexposewindows">
<property name="label" translatable="yes">Automatically expose windows</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="tooltip_markup" translatable="yes">If enabled, the window switcher will switch through minimized windows</property>
<property name="tooltip_text" translatable="yes">If enabled, the window switcher will switch through minimized windows</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If enabled, the window switcher will expose minimized windows</property>
<property name="tooltip_text" translatable="yes">If enabled, the window switcher will expose minimized windows</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_check_minimizedwindows_switch_toggled" swapped="no"/>
<signal name="toggled" handler="on_check_autoexposewindows_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="check_autoexposewindows">
<property name="label" translatable="yes">Automatically expose windows</property>
<object class="GtkCheckButton" id="check_minimizedwindows_switch">
<property name="label" translatable="yes">Switch between minimized windows</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="tooltip_markup" translatable="yes">If enabled, the window switcher will expose minimized windows</property>
<property name="tooltip_text" translatable="yes">If enabled, the window switcher will expose minimized windows</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">If enabled, the window switcher will switch through minimized windows</property>
<property name="tooltip_text" translatable="yes">If enabled, the window switcher will switch through minimized windows</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_check_autoexposewindows_toggled" swapped="no"/>
<signal name="toggled" handler="on_check_minimizedwindows_switch_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
Expand Down
57 changes: 16 additions & 41 deletions data/windowmanager.ui
View file
Expand Up @@ -252,26 +252,6 @@
<property name="position">-1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="check_synctovblank">
<property name="label" translatable="yes">Update display during VBlank</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">When enabled, screen updates are performed when the monitor is in vertical blank mode.</property>
<property name="tooltip_text" translatable="yes">When enabled, screen updates are performed when the monitor is in vertical blank mode.</property>
<property name="halign">start</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_check_synctovblank_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand Down Expand Up @@ -590,6 +570,21 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="color_desk_outline">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<signal name="color-set" handler="on_color_desk_outline_color_set" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="l_vertical_desktop">
<property name="visible">True</property>
Expand Down Expand Up @@ -626,21 +621,6 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkColorButton" id="color_desk_outline">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<signal name="color-set" handler="on_color_desk_outline_color_set" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spin_vertical_desktop">
<property name="visible">True</property>
Expand Down Expand Up @@ -1178,7 +1158,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">start</property>
<property name="use_alpha">False</property>
<signal name="color-set" handler="on_color_outline_color_color_set" swapped="no"/>
</object>
<packing>
Expand Down Expand Up @@ -1485,7 +1464,6 @@
<object class="GtkBox" id="box_compiz_hotcorners">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="l_hotcorners_general">
Expand Down Expand Up @@ -1571,8 +1549,7 @@
<object class="GtkGrid" id="grid_hotcorners">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">18</property>
<property name="margin_right">18</property>
<property name="halign">center</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<child>
Expand Down Expand Up @@ -2203,7 +2180,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="use_alpha">False</property>
<signal name="color-set" handler="on_colorbutton_resize_outline_color_set" swapped="no"/>
</object>
<packing>
Expand All @@ -2218,7 +2194,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="use_alpha">False</property>
<signal name="color-set" handler="on_colorbutton_resize_fill_color_set" swapped="no"/>
</object>
<packing>
Expand Down

0 comments on commit 6e673e5

Please sign in to comment.