mitch/gnome-shell-teatime
1
0
Fork 0
mirror of https://github.com/oleid/gnome-shell-teatime.git synced 2022-04-29 18:53:50 +00:00
Code Issues Projects Releases Wiki Activity

Gnome 40 fixes (#54)

Browse Source 
* Gnome 40 fixes: replace Toolbar, FileSelector (Soundfile) and Grid.margin-property
* restore compatibility with gnome < 40, fix select alarm sound
This commit is contained in:
zeners 2021-08-24 15:18:12 +02:00 committed by GitHub
parent dd4da09e05
commit e6d59a4095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/prefs.js
View File

@ -4,12 +4,16 @@
*/ */
const Gtk = imports.gi.Gtk; const Gtk = imports.gi.Gtk;
const Gio = imports.gi.Gio;
const GObject = imports.gi.GObject; const GObject = imports.gi.GObject;
const ExtensionUtils = imports.misc.extensionUtils; const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension(); const Me = ExtensionUtils.getCurrentExtension();
const Utils = Me.imports.utils; const Utils = Me.imports.utils;
const Config = imports.misc.config;
const shellVersion = Number.parseInt(Config.PACKAGE_VERSION.split('.'));
const _ = Utils.getTranslationFunc(); const _ = Utils.getTranslationFunc();
const N_ = function (e) { const N_ = function (e) {
return e; return e;
@ -29,7 +33,10 @@ class TeaTimePrefsWidget extends Gtk.Grid {
orientation: Gtk.Orientation.VERTICAL, orientation: Gtk.Orientation.VERTICAL,
column_homogeneous: false, column_homogeneous: false,
vexpand: true, vexpand: true,
margin: 5, margin_start: 5,
margin_end: 5,
margin_top: 5,
margin_bottom: 5,
row_spacing: 5 row_spacing: 5
}); });
@ -77,31 +84,29 @@ class TeaTimePrefsWidget extends Gtk.Grid {
this.alarmSoundSwitch.connect("notify::active", this._saveUseAlarm.bind(this)); this.alarmSoundSwitch.connect("notify::active", this._saveUseAlarm.bind(this));
this.alarmSoundFile = new Gtk.FileChooserButton({
title: _("Select alarm sound file"),
action: Gtk.FileChooserAction.OPEN
});
this.alarmSoundFileFilter = new Gtk.FileFilter(); this.alarmSoundFileFilter = new Gtk.FileFilter();
this.alarmSoundFile.set_filter(this.alarmSoundFileFilter);
this.alarmSoundFileFilter.add_mime_type("audio/*"); this.alarmSoundFileFilter.add_mime_type("audio/*");
this.alarmSoundFile.connect("selection_changed", this._saveSoundFile.bind(this));
this.alarmSoundFileButton = new Gtk.Button({
label: _("Select alarm sound file")
});
this.alarmSoundFileButton.connect("clicked", this._selectAlarmSoundFile.bind(this));
this.attach(labelGC, 0 /*col*/ , curRow /*row*/ , 2 /*col span*/ , 1 /*row span*/ ); this.attach(labelGC, 0 /*col*/ , curRow /*row*/ , 2 /*col span*/ , 1 /*row span*/ );
this.attach(this.graphicalCountdownSwitch, 2, curRow, 1, 1); this.attach(this.graphicalCountdownSwitch, 3, curRow, 2, 1);
curRow += 1; curRow += 1;
this.attach(labelAS, 0 /*col*/ , curRow /*row*/ , 1 /*col span*/ , 1 /*row span*/ ); this.attach(labelAS, 0 /*col*/ , curRow+1 /*row*/ , 1 /*col span*/ , 1 /*row span*/ );
this.attach(this.alarmSoundFile, 1, curRow, 1, 1); this.attach(this.alarmSoundFileButton, 1, curRow, 1, 2);
this.attach(this.alarmSoundSwitch, 2, curRow, 1, 1); this.attach(this.alarmSoundSwitch, 3, curRow+1, 2, 1);
curRow += 1; curRow += 2;
this.treeview = new Gtk.TreeView({ this.treeview = new Gtk.TreeView({
model: this._tealist, model: this._tealist
expand: true
}); });
this.treeview.set_reorderable(true); this.treeview.set_reorderable(true);
this.treeview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE); this.treeview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE);
this.attach(this.treeview, 0, curRow, 3, 1); this.attach(this.treeview, 0, curRow, 6, 1);
curRow += 1; curRow += 1;
let teaname = new Gtk.TreeViewColumn({ let teaname = new Gtk.TreeViewColumn({
@ -141,25 +146,32 @@ class TeaTimePrefsWidget extends Gtk.Grid {
steeptime.add_attribute(spinrenderer, "adjustment", Columns.ADJUSTMENT); steeptime.add_attribute(spinrenderer, "adjustment", Columns.ADJUSTMENT);
steeptime.add_attribute(spinrenderer, "text", Columns.STEEP_TIME); steeptime.add_attribute(spinrenderer, "text", Columns.STEEP_TIME);
this.treeview.append_column(steeptime); this.treeview.append_column(steeptime);
this.treeview.expand_all();
//this.toolbar = new Gtk.Toolbar({
this.toolbar = new Gtk.Toolbar({ // icon_size: 1
icon_size: 1 //});
}); // this.toolbar.get_style_context().add_class("inline-toolbar");
this.toolbar.get_style_context().add_class("inline-toolbar"); // this.attach(this.toolbar, 0 /*col*/ , curRow /*row*/ , 3 /*col span*/ , 1 /*row span*/ );
this.attach(this.toolbar, 0 /*col*/ , curRow /*row*/ , 3 /*col span*/ , 1 /*row span*/ ); this.addButton = Gtk.Button.new_from_icon_name("list-add-symbolic", 0 /* size: 0 - inherit */);
this.addButton = new Gtk.ToolButton({
icon_name: "list-add-symbolic",
use_action_appearance: false
});
this.addButton.connect("clicked", this._addTea.bind(this)); this.addButton.connect("clicked", this._addTea.bind(this));
this.toolbar.insert(this.addButton, -1); this.attach(this.addButton, 2 /*col*/ , curRow /*row*/ , 2 /*col span*/ , 1 /*row span*/ );
this.removeButton = new Gtk.ToolButton({ this.removeButton = Gtk.Button.new_from_icon_name("list-remove-symbolic", 0);
icon_name: "list-remove-symbolic",
use_action_appearance: false
});
this.removeButton.connect("clicked", this._removeSelectedTea.bind(this)); this.removeButton.connect("clicked", this._removeSelectedTea.bind(this));
this.toolbar.insert(this.removeButton, -1); this.attach(this.removeButton, 4 /*col*/ , curRow /*row*/ , 2 /*col span*/ , 1 /*row span*/ );
}
_selectAlarmSoundFile() {
// recreate -> preselecting file doesn't work on second call if not ...
this.alarmSoundFile = new Gtk.FileChooserNative({
title: _("Select alarm sound file"),
action: Gtk.FileChooserAction.OPEN,
});
this.alarmSoundFile.set_filter(this.alarmSoundFileFilter);
this.alarmSoundFile.connect("response", this._saveSoundFile.bind(this));
this.alarmSoundFile.set_file(Gio.File.new_for_uri(this.alarmSoundFileFile));
this.alarmSoundFile.show();
} }
_refresh() { _refresh() {
@ -170,8 +182,8 @@ class TeaTimePrefsWidget extends Gtk.Grid {
this.graphicalCountdownSwitch.active = this._settings.get_boolean(this.config_keys.graphical_countdown) this.graphicalCountdownSwitch.active = this._settings.get_boolean(this.config_keys.graphical_countdown)
this.alarmSoundSwitch.active = this._settings.get_boolean(this.config_keys.use_alarm_sound) this.alarmSoundSwitch.active = this._settings.get_boolean(this.config_keys.use_alarm_sound)
let list = this._settings.get_value(this.config_keys.steep_times).unpack(); let list = this._settings.get_value(this.config_keys.steep_times).unpack();
let file_name = this._settings.get_string(this.config_keys.alarm_sound); this.alarmSoundFileFile = this._settings.get_string(this.config_keys.alarm_sound);
this.alarmSoundFile.set_uri(file_name); this.alarmSoundFileButton.label = Gio.File.new_for_uri(this.alarmSoundFileFile).get_basename();
// stop everyone from reacting to the changes we are about to produce // stop everyone from reacting to the changes we are about to produce
// in the model // in the model
@ -244,11 +256,11 @@ class TeaTimePrefsWidget extends Gtk.Grid {
this._inhibitUpdate = false; this._inhibitUpdate = false;
} }
_saveSoundFile(sw, data) { _saveSoundFile(sw, response_id, data) {
// don't update the backend if someone else is messing with the model // don't update the backend if someone else is messing with the model or not accept new file
if (this._inhibitUpdate) if (this._inhibitUpdate || response_id != Gtk.ResponseType.ACCEPT)
return; return;
let alarm_sound = this.alarmSoundFile.get_uri(); let alarm_sound = this.alarmSoundFile.get_file().get_uri();
Utils.debug(this._settings.get_string(this.config_keys.alarm_sound) + "-->" + alarm_sound); Utils.debug(this._settings.get_string(this.config_keys.alarm_sound) + "-->" + alarm_sound);
let have_value = Utils.isType(alarm_sound, "string"); let have_value = Utils.isType(alarm_sound, "string");
@ -260,6 +272,8 @@ class TeaTimePrefsWidget extends Gtk.Grid {
Utils.playSound(alarm_sound); Utils.playSound(alarm_sound);
this._settings.set_string(this.config_keys.alarm_sound, alarm_sound); this._settings.set_string(this.config_keys.alarm_sound, alarm_sound);
this._inhibitUpdate = false; this._inhibitUpdate = false;
this.alarmSoundFileFile = alarm_sound;
this.alarmSoundFileButton.label = Gio.File.new_for_uri(this.alarmSoundFileFile).get_basename();
} }
} }
@ -292,7 +306,10 @@ function init() {}
function buildPrefsWidget() { function buildPrefsWidget() {
let widget = new TeaTimePrefsWidget(); let widget = new TeaTimePrefsWidget();
if (shellVersion < 40) {
widget.show_all(); widget.show_all();
} else {
widget.show();
}
return widget; return widget;
} }