print-editor: Make accels work

Sadly, they don't show up anymore with this.
This commit is contained in:
Matthias Clasen 2021-06-16 10:16:41 -04:00
parent df1116a010
commit 7b1a7629bc

View File

@ -721,7 +721,6 @@ static const char ui_info[] =
" <item>" " <item>"
" <attribute name='label'>_New</attribute>" " <attribute name='label'>_New</attribute>"
" <attribute name='action'>app.new</attribute>" " <attribute name='action'>app.new</attribute>"
" <attribute name='accel'>&lt;Primary&gt;n</attribute>"
" </item>" " </item>"
" <item>" " <item>"
" <attribute name='label'>_Open</attribute>" " <attribute name='label'>_Open</attribute>"
@ -730,12 +729,10 @@ static const char ui_info[] =
" <item>" " <item>"
" <attribute name='label'>_Save</attribute>" " <attribute name='label'>_Save</attribute>"
" <attribute name='action'>app.save</attribute>" " <attribute name='action'>app.save</attribute>"
" <attribute name='accel'>&lt;Primary&gt;s</attribute>"
" </item>" " </item>"
" <item>" " <item>"
" <attribute name='label'>Save _As...</attribute>" " <attribute name='label'>Save _As...</attribute>"
" <attribute name='action'>app.save-as</attribute>" " <attribute name='action'>app.save-as</attribute>"
" <attribute name='accel'>&lt;Primary&gt;s</attribute>"
" </item>" " </item>"
" </section>" " </section>"
" <section>" " <section>"
@ -756,7 +753,6 @@ static const char ui_info[] =
" <item>" " <item>"
" <attribute name='label'>_Quit</attribute>" " <attribute name='label'>_Quit</attribute>"
" <attribute name='action'>app.quit</attribute>" " <attribute name='action'>app.quit</attribute>"
" <attribute name='accel'>&lt;Primary&gt;q</attribute>"
" </item>" " </item>"
" </section>" " </section>"
" </submenu>" " </submenu>"
@ -766,7 +762,6 @@ static const char ui_info[] =
" <item>" " <item>"
" <attribute name='label'>_About Print Editor</attribute>" " <attribute name='label'>_About Print Editor</attribute>"
" <attribute name='action'>app.about</attribute>" " <attribute name='action'>app.about</attribute>"
" <attribute name='accel'>&lt;Primary&gt;a</attribute>"
" </item>" " </item>"
" </section>" " </section>"
" </submenu>" " </submenu>"
@ -794,6 +789,15 @@ startup (GApplication *app)
{ {
GtkBuilder *builder; GtkBuilder *builder;
GMenuModel *menubar; 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 (); builder = gtk_builder_new ();
gtk_builder_add_from_string (builder, ui_info, -1, NULL); 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); 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); g_object_unref (builder);
} }