[gnome-music] Fix to bug 707454.
- From: Vadim Rutkovsky <vrutkovsky src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-music] Fix to bug 707454.
- Date: Fri, 7 Mar 2014 09:58:17 +0000 (UTC)
commit 445e2dad7603e37293d6f8c735145833095275b6
Author: Sai Suman Prayaga <suman sai14 gmail com>
Date: Fri Mar 7 01:21:03 2014 +0530
Fix to bug 707454.
data/PlayerToolbar.ui | 10 +++++-----
data/application.css | 14 +++++++++++++-
data/headerbar.ui.in | 10 +++++-----
gnomemusic/window.py | 8 ++++++--
4 files changed, 29 insertions(+), 13 deletions(-)
---
diff --git a/data/PlayerToolbar.ui b/data/PlayerToolbar.ui
index 86e2495..1739d5a 100644
--- a/data/PlayerToolbar.ui
+++ b/data/PlayerToolbar.ui
@@ -60,7 +60,7 @@
<property name="width_request">42</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="image">previous_image</property>
<property name="always_show_image">True</property>
@@ -76,7 +76,7 @@
<property name="width_request">60</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="image">play_image</property>
<property name="always_show_image">True</property>
@@ -92,7 +92,7 @@
<property name="width_request">42</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="image">next_image</property>
<property name="always_show_image">True</property>
@@ -201,7 +201,7 @@
<child>
<object class="GtkScale" id="progress_scale">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="draw_value">False</property>
@@ -304,7 +304,7 @@
<child>
<object class="GtkMenuButton" id="menuButton">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="has_focus">False</property>
<property name="is_focus">False</property>
<property name="receives_default">True</property>
diff --git a/data/application.css b/data/application.css
index 48b06f3..2709a2c 100644
--- a/data/application.css
+++ b/data/application.css
@@ -11,7 +11,19 @@
@define-color music_selection_button_dark_a #3b3b3b;
@define-color music_selection_button_dark_b #1c1c1c;
@define-color music_selection_box_dark_border #3e7b05;
-
+ binding-set UnbindSpace{
+ unbind "space";
+}
+
+GdMainListView{
+ gtk-key-bindings: UnbindSpace;
+}
+GdMainView{
+ gtk-key-bindings: UnbindSpace;
+}
+GtkTreeView{
+ gtk-key-bindings: UnbindSpace;
+}
.cover{
padding-left:24px;
}
diff --git a/data/headerbar.ui.in b/data/headerbar.ui.in
index 69a8d89..77e0b12 100644
--- a/data/headerbar.ui.in
+++ b/data/headerbar.ui.in
@@ -61,7 +61,7 @@
<child>
<object class="GtkToggleButton" id="search-button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="sensitive">True</property>
<style>
@@ -83,7 +83,7 @@
<child>
<object class="GtkToggleButton" id="select-button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="sensitive">True</property>
<style>
@@ -106,7 +106,7 @@
<object class="GtkButton" id="done-button">
<property name="visible">False</property>
<property name="no_show_all">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Cancel</property>
<property name="valign">center</property>
<property name="sensitive">True</property>
@@ -121,7 +121,7 @@
<child>
<object class="GtkButton" id="back-button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="sensitive">True</property>
<style>
@@ -153,7 +153,7 @@
<child>
<object class="GtkButton" id="close-button">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
<property name="relief">none</property>
<property name="sensitive">True</property>
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index ecce354..194d64d 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -34,7 +34,7 @@ from gi.repository import Gtk, Gdk, Gio, GLib, Tracker
from gettext import gettext as _, ngettext
from gnomemusic.toolbar import Toolbar, ToolbarState
-from gnomemusic.player import Player, SelectionToolbar
+from gnomemusic.player import Player, SelectionToolbar, PlaybackStatus
from gnomemusic.query import Query
import gnomemusic.view as Views
import gnomemusic.widgets as Widgets
@@ -143,7 +143,8 @@ class Window(Gtk.ApplicationWindow):
self._stack = Stack(
transition_type=StackTransitionType.CROSSFADE,
transition_duration=100,
- visible=True)
+ visible=True,
+ can_focus=False)
if Gtk.get_minor_version() > 8:
self.set_titlebar(self.toolbar.header_bar)
else:
@@ -254,6 +255,9 @@ class Window(Gtk.ApplicationWindow):
event_and_modifiers == 0) and \
GLib.unichar_isprint(chr(Gdk.keyval_to_unicode(event.keyval))):
self.toolbar.searchbar.show_bar(True)
+ else:
+ if not self.toolbar.searchbar.get_reveal_child() and event.keyval == Gdk.KEY_space:
+ self.player.play_pause()
def _notify_mode_disconnect(self, data=None):
self._stack.disconnect(self._on_notify_model_id)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]