diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-06-17 17:53:16 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-06-17 17:53:16 +0000 |
| commit | 1bda665662b9db0baa16d86298f36927434ccc21 (patch) | |
| tree | 7063b75abd20f9a555cdb1dab2d82b2bfba7efbc /demos | |
| parent | fad4c60499bf7e115306e9f057358990409e3c62 (diff) | |
| parent | 47bb5563270219b18b79090d52e895415356bb13 (diff) | |
| download | gtk+-1bda665662b9db0baa16d86298f36927434ccc21.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
action muxer fixes
See merge request GNOME/gtk!3678
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/print-editor/print-editor.c | 17 | ||||
| -rw-r--r-- | demos/widget-factory/widget-factory.c | 1 |
2 files changed, 13 insertions, 5 deletions
diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c index 27202dd2ee..3737affd49 100644 --- a/demos/print-editor/print-editor.c +++ b/demos/print-editor/print-editor.c @@ -721,7 +721,6 @@ static const char ui_info[] = " <item>" " <attribute name='label'>_New</attribute>" " <attribute name='action'>app.new</attribute>" - " <attribute name='accel'><Primary>n</attribute>" " </item>" " <item>" " <attribute name='label'>_Open</attribute>" @@ -730,12 +729,10 @@ static const char ui_info[] = " <item>" " <attribute name='label'>_Save</attribute>" " <attribute name='action'>app.save</attribute>" - " <attribute name='accel'><Primary>s</attribute>" " </item>" " <item>" " <attribute name='label'>Save _As...</attribute>" " <attribute name='action'>app.save-as</attribute>" - " <attribute name='accel'><Primary>s</attribute>" " </item>" " </section>" " <section>" @@ -756,7 +753,6 @@ static const char ui_info[] = " <item>" " <attribute name='label'>_Quit</attribute>" " <attribute name='action'>app.quit</attribute>" - " <attribute name='accel'><Primary>q</attribute>" " </item>" " </section>" " </submenu>" @@ -766,7 +762,6 @@ static const char ui_info[] = " <item>" " <attribute name='label'>_About Print Editor</attribute>" " <attribute name='action'>app.about</attribute>" - " <attribute name='accel'><Primary>a</attribute>" " </item>" " </section>" " </submenu>" @@ -794,6 +789,15 @@ startup (GApplication *app) { GtkBuilder *builder; GMenuModel *menubar; + struct { + const char *action_and_target; + const char *accelerators[2]; + } accels[] = { + { "app.new", { "<Control>n", NULL } }, + { "app.quit", { "<Control>q", NULL } }, + { "app.save", { "<Control>s", NULL } }, + { "app.about", { "<Control>a", NULL } }, + }; builder = gtk_builder_new (); gtk_builder_add_from_string (builder, ui_info, -1, NULL); @@ -802,6 +806,9 @@ startup (GApplication *app) gtk_application_set_menubar (GTK_APPLICATION (app), menubar); + for (int i = 0; i < G_N_ELEMENTS (accels); i++) + gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators); + g_object_unref (builder); } diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index b5a6662ec9..5b10ecdd74 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -1997,6 +1997,7 @@ activate (GApplication *app) const char *accelerators[2]; } accels[] = { { "app.about", { "F1", NULL } }, + { "app.shortcuts", { "<Control>question", NULL } }, { "app.quit", { "<Control>q", NULL } }, { "app.open-in", { "<Control>n", NULL } }, { "win.dark", { "<Control>d", NULL } }, |