diff --git a/data/gtk/menus.ui b/data/gtk/menus.ui deleted file mode 100644 index ca92d48..0000000 --- a/data/gtk/menus.ui +++ /dev/null @@ -1,17 +0,0 @@ - - - - -
- - _About - app.about - - - _Quit - app.quit - <Primary>q - -
- - diff --git a/data/teleport.gresource.xml b/data/teleport.gresource.xml index 80df0a4..4793853 100644 --- a/data/teleport.gresource.xml +++ b/data/teleport.gresource.xml @@ -1,7 +1,6 @@ - gtk/menus.ui window.ui settings.ui device_settings.ui diff --git a/src/settings.ui b/src/settings.ui index 91ec01f..dbee25b 100644 --- a/src/settings.ui +++ b/src/settings.ui @@ -1,204 +1,254 @@ - + + - - + + + False - + True - 10 + False + vertical + 12 - + True - 0 - Save received files in: - 6 + False + + + True + False + 6 + Save received files in: + 0 + + + 0 + 0 + + + + + True + False + select-folder + Choose download dir + + + 0 + 1 + + + + + False + 18 + 6 + Automatically enable Teleport on these networks: + 0 + + + 0 + 2 + 2 + + + + + False + none + + + True + True + False + + + True + False + 12 + 6 + 12 + 6 + 6 + 6 + 16 + + + True + False + True + o2-WLAN09 + True + 0 + + + 0 + 0 + + + + + True + False + center + True + + + 35 + True + True + False + + + True + False + window-close-symbolic + + + + + + 0 + 0 + + + + + + 1 + 0 + + + + + + + + + True + True + False + + + True + False + 12 + 6 + 12 + 6 + 6 + 6 + 16 + + + True + False + True + Add Network + True + 0 + + + 0 + 0 + + + + + True + False + center + True + + + 35 + True + True + False + + + True + False + list-add-symbolic + + + + + + 0 + 0 + + + + + + 1 + 0 + + + + + + + + + 0 + 4 + 2 + + + + + + + + + + + + + + - 0 - 0 - 1 - 1 + False + True + 0 - + True - True - select-folder - Choose download dir + False + 6 - 0 - 1 - 1 - 1 + False + True + 1 - - False - 0 - Automatically enable Teleport on these networks: - 6 - 18 - - - 0 - 2 - 2 - 1 - - - - - False + + True True - none - - - True - True - false - - - True - False - 0 - 16 - 12 - 6 - 6 - 6 - - - True - False - True - 0 - o2-WLAN09 - True - - - 0 - 0 - 1 - 1 - - - - - True - False - center - True - - - - True - True - 35 - - - True - False - window-close-symbolic - - - - - - - - 1 - 0 - 1 - 1 - - - - - - - - - True - True - false - - - True - False - 0 - 16 - 12 - 6 - 6 - 6 - - - True - False - True - 0 - Add Network - True - - - 0 - 0 - 1 - 1 - - - - - True - False - center - True - - - - True - True - 35 - - - True - False - list-add-symbolic - - - - - - - - 1 - 0 - 1 - 1 - - - - - - - + True + app.about + _About Fragments - 0 - 4 - 2 - 1 + False + True + 2 diff --git a/src/teleport-app.c b/src/teleport-app.c index 723be9b..51296ed 100644 --- a/src/teleport-app.c +++ b/src/teleport-app.c @@ -354,6 +354,7 @@ static void teleport_app_startup (GApplication *app) { TeleportAppPrivate *priv; GtkStyleProvider *provider; + static const gchar *quit_accels[] = { "q", NULL }; mainApplication = TELEPORT_APP (app); priv = mainApplication->priv; @@ -363,6 +364,8 @@ teleport_app_startup (GApplication *app) { G_N_ELEMENTS (app_entries), app); + gtk_application_set_accels_for_action (GTK_APPLICATION (app), "app.quit", quit_accels); + G_APPLICATION_CLASS (teleport_app_parent_class)->startup (app); /* window */