[gnome-shell/wip/aggregate-menu: 67/69] components: Remove the built-in recorder keybinding and component
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/aggregate-menu: 67/69] components: Remove the built-in recorder keybinding and component
- Date: Fri, 26 Jul 2013 04:37:37 +0000 (UTC)
commit 010b3adae9224f4303f17d60d5f7a34be570c69e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jul 17 21:22:54 2013 -0400
components: Remove the built-in recorder keybinding and component
The keybinding is now part of gnome-settings-daemon
data/org.gnome.shell.gschema.xml.in.in | 46 ------------------------
js/Makefile.am | 1 -
js/ui/components/recorder.js | 61 --------------------------------
js/ui/sessionMode.js | 8 ++---
4 files changed, 3 insertions(+), 113 deletions(-)
---
diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index 816a1bc..aa289ff 100644
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -74,7 +74,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
</_description>
</key>
<child name="calendar" schema="org.gnome.shell.calendar"/>
- <child name="recorder" schema="org.gnome.shell.recorder"/>
<child name="keybindings" schema="org.gnome.shell.keybindings"/>
<child name="keyboard" schema="org.gnome.shell.keyboard"/>
</schema>
@@ -128,13 +127,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
Keybinding to focus the active notification.
</_description>
</key>
- <key name="toggle-recording" type="as">
- <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
- <_summary>Keybinding to toggle the screen recorder</_summary>
- <_description>
- Keybinding to start/stop the builtin screen recorder.
- </_description>
- </key>
</schema>
<schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
@@ -148,44 +140,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
</key>
</schema>
- <schema id="org.gnome.shell.recorder" path="/org/gnome/shell/recorder/"
- gettext-domain="@GETTEXT_PACKAGE@">
- <key name="framerate" type="i">
- <default>30</default>
- <_summary>Framerate used for recording screencasts.</_summary>
- <_description>
- The framerate of the resulting screencast recordered
- by GNOME Shell's screencast recorder in frames-per-second.
- </_description>
- </key>
- <key name="pipeline" type="s">
- <default>''</default>
- <_summary>The gstreamer pipeline used to encode the screencast</_summary>
- <_description>
- Sets the GStreamer pipeline used to encode recordings.
- It follows the syntax used for gst-launch. The pipeline should have
- an unconnected sink pad where the recorded video is recorded. It will
- normally have a unconnected source pad; output from that pad
- will be written into the output file. However the pipeline can also
- take care of its own output - this might be used to send the output
- to an icecast server via shout2send or similar. When unset or set
- to an empty value, the default pipeline will be used. This is currently
- 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
- and records to WEBM using the VP8 codec. %T is used as a placeholder
- for a guess at the optimal thread count on the system.
- </_description>
- </key>
- <key name="file-extension" type="s">
- <default>'webm'</default>
- <_summary>File extension used for storing the screencast</_summary>
- <_description>
- The filename for recorded screencasts will be a unique filename
- based on the current date, and use this extension. It should be
- changed when recording to a different container format.
- </_description>
- </key>
- </schema>
-
<schema id="org.gnome.shell.app-switcher"
path="/org/gnome/shell/app-switcher/"
gettext-domain="@GETTEXT_PACKAGE@">
diff --git a/js/Makefile.am b/js/Makefile.am
index cfaf104..11a1d5f 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -115,7 +115,6 @@ nobase_dist_js_DATA = \
ui/components/automountManager.js \
ui/components/networkAgent.js \
ui/components/polkitAgent.js \
- ui/components/recorder.js \
ui/components/telepathyClient.js \
ui/components/keyring.js \
$(NULL)
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 0f8b091..eb04c62 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -21,6 +21,7 @@ const _modes = {
showCalendarEvents: false,
allowSettings: false,
allowExtensions: false,
+ allowScreencast: false,
enabledExtensions: [],
hasRunDialog: false,
hasWorkspaces: false,
@@ -83,6 +84,7 @@ const _modes = {
showCalendarEvents: true,
allowSettings: true,
allowExtensions: true,
+ allowScreencast: true,
hasRunDialog: true,
hasWorkspaces: true,
hasWindows: true,
@@ -91,7 +93,7 @@ const _modes = {
isPrimary: true,
unlockDialog: imports.ui.unlockDialog.UnlockDialog,
components: ['networkAgent', 'polkitAgent', 'telepathyClient',
- 'keyring', 'recorder', 'autorunManager', 'automountManager'],
+ 'keyring', 'autorunManager', 'automountManager'],
panel: {
left: ['activities', 'appMenu'],
center: ['dateMenu'],
@@ -183,10 +185,6 @@ const SessionMode = new Lang.Class({
return this._modeStack[this._modeStack.length - 1];
},
- get allowScreencast() {
- return this.components.indexOf('recorder') != -1;
- },
-
_sync: function() {
let params = this._modes[this.currentMode];
let defaults;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]