-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #130380 from bobby285271/switchboard
Pantheon 6.0.2
- Loading branch information
Showing
115 changed files
with
1,764 additions
and
1,581 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { config, lib, pkgs, ... }: | ||
|
|
||
| with lib; | ||
|
|
||
| let cfg = config.services.touchegg; | ||
|
|
||
| in { | ||
| meta = { | ||
| maintainers = teams.pantheon.members; | ||
| }; | ||
|
|
||
| ###### interface | ||
| options.services.touchegg = { | ||
| enable = mkEnableOption "touchegg, a multi-touch gesture recognizer"; | ||
|
|
||
| package = mkOption { | ||
| type = types.package; | ||
| default = pkgs.touchegg; | ||
| defaultText = "pkgs.touchegg"; | ||
| description = "touchegg derivation to use."; | ||
| }; | ||
| }; | ||
|
|
||
| ###### implementation | ||
| config = mkIf cfg.enable { | ||
| systemd.services.touchegg = { | ||
| description = "Touchegg Daemon"; | ||
| serviceConfig = { | ||
| Type = "simple"; | ||
| ExecStart = "${cfg.package}/bin/touchegg --daemon"; | ||
| Restart = "on-failure"; | ||
| }; | ||
| wantedBy = [ "multi-user.target" ]; | ||
| }; | ||
|
|
||
| environment.systemPackages = [ cfg.package ]; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index de9cbfa850..647f617605 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -92,6 +92,7 @@ iso_codes_dep = dependency('iso-codes', version: '>= 0.35') | ||
| json_glib_dep = dependency('json-glib-1.0', version: '>= 1.6') | ||
| libarchive_dep = dependency('libarchive') | ||
| libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1') | ||
| +libgranite_dep = dependency('granite', version: '>= 6.0.0') | ||
| libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') | ||
| libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') | ||
| libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0') | ||
| diff --git a/src/ephy-shell.c b/src/ephy-shell.c | ||
| index 650531da86..b9d1355e86 100644 | ||
| --- a/src/ephy-shell.c | ||
| +++ b/src/ephy-shell.c | ||
| @@ -50,6 +50,7 @@ | ||
|
|
||
| #include <glib/gi18n.h> | ||
| #include <gtk/gtk.h> | ||
| +#include <granite.h> | ||
| #include <handy.h> | ||
|
|
||
| struct _EphyShell { | ||
| @@ -483,6 +484,20 @@ run_in_background_set_mapping (const GValue *value, | ||
| return g_variant_new_boolean (g_variant_get_boolean (var)); | ||
| } | ||
|
|
||
| +static void | ||
| +ephy_shell_set_prefers_color_scheme (EphyShell *shell) | ||
| +{ | ||
| + GtkSettings* gtk_settings = gtk_settings_get_default (); | ||
| + GraniteSettings* granite_settings = granite_settings_get_default (); | ||
| + | ||
| + g_object_set ( | ||
| + gtk_settings, | ||
| + "gtk-application-prefer-dark-theme", | ||
| + granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, | ||
| + NULL | ||
| + ); | ||
| +} | ||
| + | ||
| static void | ||
| ephy_shell_startup (GApplication *application) | ||
| { | ||
| @@ -490,11 +505,18 @@ ephy_shell_startup (GApplication *application) | ||
| EphyShell *shell = EPHY_SHELL (application); | ||
| EphyEmbedShellMode mode; | ||
| GAction *action; | ||
| + GraniteSettings* granite_settings = granite_settings_get_default (); | ||
|
|
||
| G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); | ||
|
|
||
| hdy_init (); | ||
|
|
||
| + ephy_shell_set_prefers_color_scheme (shell); | ||
| + | ||
| + g_signal_connect (granite_settings, "notify::prefers-color-scheme", | ||
| + G_CALLBACK (ephy_shell_set_prefers_color_scheme), shell | ||
| + ); | ||
| + | ||
| /* If we are under Pantheon set the icon-theme and cursor-theme accordingly. */ | ||
| if (is_desktop_pantheon ()) { | ||
| GtkSettings *settings = gtk_settings_get_default (); | ||
| diff --git a/src/meson.build b/src/meson.build | ||
| index 5bf3eb92ec..d17b1b6d93 100644 | ||
| --- a/src/meson.build | ||
| +++ b/src/meson.build | ||
| @@ -74,6 +74,7 @@ libephymain_deps = [ | ||
| gdk_dep, | ||
| gvdb_dep, | ||
| libarchive_dep, | ||
| + libgranite_dep, | ||
| libhandy_dep | ||
| ] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/src/resources/gtk/action-bar-start.ui b/src/resources/gtk/action-bar-start.ui | ||
| index e604b9601f..2bfe244d53 100644 | ||
| --- a/src/resources/gtk/action-bar-start.ui | ||
| +++ b/src/resources/gtk/action-bar-start.ui | ||
| @@ -7,7 +7,6 @@ | ||
| <property name="visible">True</property> | ||
| <property name="orientation">horizontal</property> | ||
| <style> | ||
| - <class name="linked"/> | ||
| <class name="navigation-box"/> | ||
| </style> | ||
| <child> |
Oops, something went wrong.