brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modalDialog: give more control over the layout

Browse Source 
Make the button layout public for callers to be able to have more
control over like adding custom widgets. Also, the clearButtons and
addButton methods are added as convenience for the most frequent usage.

https://bugzilla.gnome.org/show_bug.cgi?id=687113
This commit is contained in:
Stéphane Démurget 2012-11-01 17:07:48 +01:00
parent 3b70094151
commit c10e4c3117
1 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
js/ui/modalDialog.js
View File

@ -95,10 +95,10 @@ const ModalDialog = new Lang.Class({
x_align: St.Align.MIDDLE, x_align: St.Align.MIDDLE,
y_align: St.Align.START }); y_align: St.Align.START });
this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box', this.buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
visible: false, visible: false,
vertical: false }); vertical: false });
this.dialogLayout.add(this._buttonLayout, this.dialogLayout.add(this.buttonLayout,
{ expand: true, { expand: true,
x_align: St.Align.MIDDLE, x_align: St.Align.MIDDLE,
y_align: St.Align.END }); y_align: St.Align.END });
@ -117,31 +117,17 @@ const ModalDialog = new Lang.Class({
this._actionKeys[key] = action; this._actionKeys[key] = action;
}, },
setButtons: function(buttons) { clearButtons: function() {
this._buttonLayout.destroy_all_children(); this.buttonLayout.destroy_all_children();
this._actionKeys = {}; this._actionKeys = {};
},
this._buttonLayout.visible = (buttons.length > 0); setButtons: function(buttons) {
this.clearButtons();
this.buttonLayout.visible = (buttons.length > 0);
for (let i = 0; i < buttons.length; i++) { for (let i = 0; i < buttons.length; i++) {
let buttonInfo = buttons[i]; let buttonInfo = buttons[i];
let label = buttonInfo['label'];
let action = buttonInfo['action'];
let key = buttonInfo['key'];
let isDefault = buttonInfo['default'];
if (isDefault && !key) {
this._actionKeys[Clutter.KEY_KP_Enter] = action;
this._actionKeys[Clutter.KEY_ISO_Enter] = action;
key = Clutter.KEY_Return;
}
buttonInfo.button = new St.Button({ style_class: 'modal-dialog-button',
reactive: true,
can_focus: true,
label: label });
if (isDefault)
buttonInfo.button.add_style_pseudo_class('default');
let x_alignment; let x_alignment;
if (buttons.length == 1) if (buttons.length == 1)
@ -153,22 +139,46 @@ const ModalDialog = new Lang.Class({
else else
x_alignment = St.Align.MIDDLE; x_alignment = St.Align.MIDDLE;
if (!this._initialKeyFocusDestroyId) let button = this.addButton(buttonInfo, { expand: true,
this._initialKeyFocus = buttonInfo.button; x_fill: false,
this._buttonLayout.add(buttonInfo.button, y_fill: false,
{ expand: true, x_align: x_alignment,
x_fill: false, y_align: St.Align.MIDDLE });
y_fill: false, buttonInfo.button = button;
x_align: x_alignment, }
y_align: St.Align.MIDDLE }); },
buttonInfo.button.connect('clicked', action); addButton: function(buttonInfo, layoutInfo) {
let label = buttonInfo['label'];
let action = buttonInfo['action'];
let key = buttonInfo['key'];
let isDefault = buttonInfo['default'];
if (key) if (isDefault && !key) {
this._actionKeys[key] = action; this._actionKeys[Clutter.KEY_KP_Enter] = action;
this._actionKeys[Clutter.KEY_ISO_Enter] = action;
key = Clutter.KEY_Return;
} }
this.emit('buttons-set'); let button = new St.Button({ style_class: 'modal-dialog-button',
reactive: true,
can_focus: true,
label: label });
button.connect('clicked', action);
if (isDefault)
button.add_style_pseudo_class('default');
if (!this._initialKeyFocusDestroyId)
this._initialKeyFocus = button;
if (key)
this._actionKeys[key] = action;
this.buttonLayout.add(button, layoutInfo);
return button;
}, },
_onKeyReleaseEvent: function(object, event) { _onKeyReleaseEvent: function(object, event) {