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

Merge functionality of blur-providers extension in to this one #35

Closed
wants to merge 1 commit into from
Closed

Merge functionality of blur-providers extension in to this one #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/prefs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const PrefsWidget = GObject.registerClass({
'hacks_level0',
'hacks_level1',
'hacks_level2',
'blur_applications',
],
}, class PrefsWidget extends Gtk.Box {
_init(params = {}) {
Expand All @@ -43,6 +44,9 @@ const PrefsWidget = GObject.registerClass({
// ! blur lockscreen
this._blur_lockscreen.set_active(config.BLUR_LOCKSCREEN.get());

// ! blur applications
this._blur_applications.set_active(config.BLUR_APPLICATIONS.get());

// ! dash hacks
if (config.HACKS_LEVEL.get() == 0) {
this._hacks_level0.set_active(true);
Expand Down Expand Up @@ -89,6 +93,11 @@ const PrefsWidget = GObject.registerClass({
config.BLUR_LOCKSCREEN.set(value);
}

blur_applications_toggled(w) {
let is_active = w.get_active();
config.BLUR_APPLICATIONS.set(value);
}

hacks_level0_toggled(w) {
let is_active = w.get_active();
if (is_active) { config.HACKS_LEVEL.set(0) }
Expand All @@ -113,4 +122,4 @@ function init() { }

function buildPrefsWidget() {
return new PrefsWidget();
}
}
43 changes: 33 additions & 10 deletions src/prefs.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<layout>
<property name="column">0</property>
<property name="row">3</property>
<property name="row-span">4</property>
<property name="row-span">5</property>
</layout>
</object>
</child>
Expand All @@ -114,6 +114,17 @@
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="blur_overview">
<property name="label" translatable="yes">overview</property>
<property name="active">1</property>
<signal name="toggled" handler="blur_overview_toggled" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">5</property>
</layout>
</object>
</child>
<child>
<object class="GtkCheckButton" id="blur_lockscreen">
<property name="label" translatable="yes">lockscreen</property>
Expand All @@ -126,13 +137,14 @@
</object>
</child>
<child>
<object class="GtkCheckButton" id="blur_overview">
<property name="label" translatable="yes">overview</property>
<object class="GtkCheckButton" id="blur_applications">
<property name="label" translatable="yes">applications (coming soon)</property>
<property name="active">1</property>
<signal name="toggled" handler="blur_overview_toggled" swapped="no" />
<property name="sensitive">0</property>
<signal name="toggled" handler="blur_applications_toggled" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">5</property>
<property name="row">7</property>
</layout>
</object>
</child>
Expand All @@ -142,7 +154,7 @@
<property name="orientation">vertical</property>
<layout>
<property name="column">0</property>
<property name="row">7</property>
<property name="row">8</property>
<property name="column-span">2</property>
</layout>
</object>
Expand All @@ -156,7 +168,7 @@
<property name="justify">center</property>
<layout>
<property name="column">0</property>
<property name="row">8</property>
<property name="row">9</property>
<property name="row-span">3</property>
</layout>
</object>
Expand All @@ -168,7 +180,7 @@
<signal name="toggled" handler="hacks_level0_toggled" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">8</property>
<property name="row">9</property>
</layout>
</object>
</child>
Expand All @@ -180,7 +192,7 @@
<signal name="toggled" handler="hacks_level1_toggled" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">9</property>
<property name="row">10</property>
</layout>
</object>
</child>
Expand All @@ -193,7 +205,18 @@
<signal name="toggled" handler="hacks_level2_toggled" swapped="no" />
<layout>
<property name="column">1</property>
<property name="row">10</property>
<property name="row">11</property>
</layout>
</object>
</child>
<child>
<object class="GtkSeparator">
<property name="can_focus">0</property>
<property name="orientation">vertical</property>
<layout>
<property name="column">0</property>
<property name="row">12</property>
<property name="column-span">2</property>
</layout>
</object>
</child>
Expand Down
Binary file modified src/schemas/gschemas.compiled
View file
Open in desktop
Binary file not shown.
8 changes: 7 additions & 1 deletion src/schemas/org.gnome.shell.extensions.blur-my-shell.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,17 @@
<summary>Boolean, whether to blur lockscreen or not</summary>
<description />
</key>
<!-- BLUR APPLICATIONS -->
<key type="b" name="blur-applications">
<default>false</default>
<summary>Boolean, whether to blur applications that request it or not</summary>
<description />
</key>
<!-- HACKS LEVEL -->
<key type="i" name="hacks-level">
<default>1</default>
<summary>Level of hacks to use (from 0 to 2)</summary>
<description />
</key>
</schema>
</schemalist>
</schemalist>
18 changes: 17 additions & 1 deletion src/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,22 @@ var Prefs = class Prefs {
}
};

this.BLUR_APPLICATIONS = {
key: 'blur-applications',
get: function () {
return settings.get_boolean(this.key);
},
set: function (v) {
settings.set_boolean(this.key, v);
},
changed: function (cb) {
return settings.connect('changed::' + this.key, cb);
},
disconnect: function () {
return settings.disconnect.apply(settings, arguments);
}
};

this.HACKS_LEVEL = {
key: 'hacks-level',
get: function () {
Expand All @@ -143,4 +159,4 @@ var Prefs = class Prefs {
},
};
}
};
};