mirrors/Authenticator
1
0
Fork 0
mirror of https://gitlab.gnome.org/World/Authenticator.git synced 2025-03-04 08:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/cdavis/use-shortcuts' into 'master'

Browse source 
Use GtkShortcut instead of GtkEventControllerKey

See merge request World/Authenticator!170
This commit is contained in:
Bilal Elmoussaoui 2021-01-14 22:07:12 +00:00
commit 5ab811ddf2
4 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/resources/ui/account_add.ui
View file

@ -221,6 +221,17 @@
</child>
</object>
</child>
<child>
<object class='GtkShortcutController'>
<property name='scope'>global</property>
<child>
<object class='GtkShortcut'>
<property name='trigger'>Escape</property>
<property name='action'>action(window.close)</property>
</object>
</child>
</object>
</child>
</template>
<object class="GtkEntryCompletion" id="provider_completion">
<property name="minimum-key-length">1</property>

11
data/resources/ui/providers_dialog.ui
View file

@ -76,5 +76,16 @@
</child>
</object>
</child>
<child>
<object class='GtkShortcutController'>
<property name='scope'>global</property>
<child>
<object class='GtkShortcut'>
<property name='trigger'>Escape</property>
<property name='action'>action(window.close)</property>
</object>
</child>
</object>
</child>
</template>
</interface>

11
src/widgets/accounts/add.rs
View file

@ -136,17 +136,6 @@ impl AccountAddDialog {
self_
.token_entry
.connect_changed(clone!(@weak self as win => move |_| win.validate()));
let event_controller = gtk::EventControllerKey::new();
event_controller.connect_key_pressed(
clone!(@weak self as widget => @default-return Inhibit(false), move |_, k, _, _| {
if k == gdk::keys::Key::from_name("Escape") {
widget.close();
}
Inhibit(false)
}),
);
self.add_controller(&event_controller);
}
fn scan_qr(&self) -> Result<()> {

11
src/widgets/providers/dialog.rs
View file

@ -144,17 +144,6 @@ impl ProvidersDialog {
let deck_page = self_.deck.append(&self_.page).unwrap();
deck_page.set_name("provider");
let event_controller = gtk::EventControllerKey::new();
event_controller.connect_key_pressed(
clone!(@weak self as widget => @default-return Inhibit(false), move |_, k, _, _| {
if k == gdk::keys::Key::from_name("Escape") {
widget.close();
}
Inhibit(false)
}),
);
self.add_controller(&event_controller);
}
fn setup_actions(&self) {