Merge branch 'master' into danirabbit/wallpapercontainer-moregtk4prep

elementary · Nov 17, 2023 · 476457e · 476457e
2 parents 484d414 + 3413d37
commit 476457e
Show file tree

Hide file tree

Showing 410 changed files with 6,817 additions and 5,233 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Dependencies
         run: |
           apt update
-          apt install -y libgnome-desktop-3-dev libgranite-dev libgranite-7-dev libgtk-3-dev libgtk-4-dev libswitchboard-2.0-dev libgexiv2-dev meson valac
+          apt install -y libgranite-dev libgranite-7-dev libgtk-3-dev libgtk-4-dev libswitchboard-2.0-dev libgexiv2-dev meson valac
       - name: Build
         env:
           DESTDIR: out

diff --git a/README.md b/README.md
@@ -9,7 +9,6 @@ You'll need the following dependencies:
 
 * gnome-settings-daemon-dev
 * libswitchboard-2.0-dev
-* libgnome-desktop-3-dev
 * libgee-0.8-dev
 * libgexiv2-dev
 * libgtk-3-dev (>= 3.22)

diff --git a/data/Check.css b/data/Check.css
diff --git a/data/icons.gresource.xml b/data/icons.gresource.xml
@@ -3,8 +3,7 @@
   <gresource prefix="/io/elementary/switchboard/plug/pantheon-shell">
     <file alias="appearance-default.svg" compressed="true" preprocess="xml-stripblanks">appearance-default.svg</file>
     <file alias="appearance-dark.svg" compressed="true" preprocess="xml-stripblanks">appearance-dark.svg</file>
-    <file compressed="true">Check.css</file>
-    <file alias="plug.css" compressed="true">plug.css</file>
+    <file compressed="true">plug.css</file>
   </gresource>
   <gresource prefix="io/elementary/switchboard/icons">
     <file alias="32x32@2/apps/dock-icon-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/32.svg</file>

diff --git a/data/plug.css b/data/plug.css
@@ -26,8 +26,8 @@
         ),
         linear-gradient(
             to bottom,
-            alpha (@accent_color_500, 0.1),
-            alpha (@accent_color_500, 0.1)
+            alpha(@accent_color_500, 0.1),
+            alpha(@accent_color_500, 0.1)
         );
     background-repeat: no-repeat;
     background-size: 48px 48px, cover;
@@ -66,23 +66,29 @@
 
 .wallpaper-container .card:checked {
     box-shadow:
-        0 0 0 4px alpha (@text_color, 0.2),
-        0 0 0 1px alpha (#000, 0.05),
-        0 3px 3px alpha (#000, 0.22);
+        0 0 0 4px alpha(@text_color, 0.2),
+        0 0 0 1px alpha(#000, 0.05),
+        0 3px 3px alpha(#000, 0.22);
 }
 
 .wallpaper-container:focus .card {
     box-shadow:
         0 0 0 4px @accent_color,
-        0 0 0 1px alpha (#000, 0.05),
-        0 3px 3px alpha (#000, 0.22);
+        0 0 0 1px alpha(#000, 0.05),
+        0 3px 3px alpha(#000, 0.22);
+}
+
+.wallpaper-container radio {
+    min-height: 20px;
+    min-width: 20px;
+    -gtk-icon-transform: scale(0.6);
 }
 
 radiobutton .card {
     background-image:
         linear-gradient(
             to bottom,
-            alpha (@accent_color_300, 0.1),
-            alpha (@accent_color_500, 0.1)
+            alpha(@accent_color_300, 0.1),
+            alpha(@accent_color_500, 0.1)
         );
 }
diff --git a/meson.build b/meson.build
@@ -14,15 +14,9 @@ libexecdir = join_paths(prefix, get_option('libexecdir'))
 
 add_project_arguments(
     '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
-    '-DGNOME_DESKTOP_USE_UNSTABLE_API',
     language: 'c'
 )
 
-add_project_arguments(
-    ['--vapidir', join_paths(meson.current_source_dir(), 'vapi')],
-    language: 'vala'
-)
-
 gio_dep = dependency('gio-2.0')
 glib_dep = dependency('glib-2.0')
 gobject_dep = dependency('gobject-2.0')

diff --git a/po/aa.po b/po/aa.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-08 09:47+0000\n"
+"POT-Creation-Date: 2023-11-17 02:33+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Style"
 msgstr ""
 
-#: src/Views/Appearance.vala:86
+#: src/Views/Appearance.vala:86 src/Views/Dock.vala:31
 msgid "Default"
 msgstr ""
 
@@ -214,27 +214,39 @@ msgid ""
 "Disable animations in the window manager and some other interface elements."
 msgstr ""
 
-#: src/Views/Dock.vala:12
+#: src/Views/Dock.vala:11
+msgid "Dock Icon Size"
+msgstr ""
+
+#: src/Views/Dock.vala:20
+msgid "Small"
+msgstr ""
+
+#: src/Views/Dock.vala:42
+msgid "Large"
+msgstr ""
+
+#: src/Views/Dock.vala:58
 msgid "Panel Translucency"
 msgstr ""
 
-#: src/Views/Dock.vala:14
+#: src/Views/Dock.vala:60
 msgid "Automatically transparent or opaque based on the wallpaper"
 msgstr ""
 
-#: src/Views/Dock.vala:33
+#: src/Views/Dock.vala:79
 msgid "Show in Panel"
 msgstr ""
 
-#: src/Views/Dock.vala:40
+#: src/Views/Dock.vala:86
 msgid "Accessibility"
 msgstr ""
 
-#: src/Views/Dock.vala:50
+#: src/Views/Dock.vala:96
 msgid "Caps Lock ⇪"
 msgstr ""
 
-#: src/Views/Dock.vala:51
+#: src/Views/Dock.vala:97
 msgid "Num Lock"
 msgstr ""
 
@@ -308,51 +320,51 @@ msgid ""
 "legibility and reading speed."
 msgstr ""
 
-#: src/Views/Wallpaper.vala:92
+#: src/Views/Wallpaper.vala:83
 msgid "Import Photo…"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:95
+#: src/Views/Wallpaper.vala:90
 msgid "Dim with dark style:"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:106
+#: src/Views/Wallpaper.vala:101
 msgid "Centered"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:107
+#: src/Views/Wallpaper.vala:102
 msgid "Zoom"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:108
+#: src/Views/Wallpaper.vala:103
 msgid "Spanned"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:153
+#: src/Views/Wallpaper.vala:148
 msgid "Import Photo"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:154
+#: src/Views/Wallpaper.vala:149
 msgid "Import"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:155
+#: src/Views/Wallpaper.vala:150
 msgid "Cancel"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:530
+#: src/Views/Wallpaper.vala:512
 msgid "Wallpaper Deleted"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:531
+#: src/Views/Wallpaper.vala:513
 msgid "Undo"
 msgstr ""
 
-#: src/Widgets/WallpaperContainer.vala:138
+#: src/Widgets/WallpaperContainer.vala:134
 msgid "Remove"
 msgstr ""
 
-#: src/Widgets/WallpaperContainer.vala:202
+#: src/Widgets/WallpaperContainer.vala:198
 #, c-format
 msgid "Artist: %s"
 msgstr ""

diff --git a/po/ab.po b/po/ab.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-08 09:47+0000\n"
+"POT-Creation-Date: 2023-11-17 02:33+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -117,7 +117,7 @@ msgstr ""
 msgid "Style"
 msgstr ""
 
-#: src/Views/Appearance.vala:86
+#: src/Views/Appearance.vala:86 src/Views/Dock.vala:31
 msgid "Default"
 msgstr ""
 
@@ -214,27 +214,39 @@ msgid ""
 "Disable animations in the window manager and some other interface elements."
 msgstr ""
 
-#: src/Views/Dock.vala:12
+#: src/Views/Dock.vala:11
+msgid "Dock Icon Size"
+msgstr ""
+
+#: src/Views/Dock.vala:20
+msgid "Small"
+msgstr ""
+
+#: src/Views/Dock.vala:42
+msgid "Large"
+msgstr ""
+
+#: src/Views/Dock.vala:58
 msgid "Panel Translucency"
 msgstr ""
 
-#: src/Views/Dock.vala:14
+#: src/Views/Dock.vala:60
 msgid "Automatically transparent or opaque based on the wallpaper"
 msgstr ""
 
-#: src/Views/Dock.vala:33
+#: src/Views/Dock.vala:79
 msgid "Show in Panel"
 msgstr ""
 
-#: src/Views/Dock.vala:40
+#: src/Views/Dock.vala:86
 msgid "Accessibility"
 msgstr ""
 
-#: src/Views/Dock.vala:50
+#: src/Views/Dock.vala:96
 msgid "Caps Lock ⇪"
 msgstr ""
 
-#: src/Views/Dock.vala:51
+#: src/Views/Dock.vala:97
 msgid "Num Lock"
 msgstr ""
 
@@ -308,51 +320,51 @@ msgid ""
 "legibility and reading speed."
 msgstr ""
 
-#: src/Views/Wallpaper.vala:92
+#: src/Views/Wallpaper.vala:83
 msgid "Import Photo…"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:95
+#: src/Views/Wallpaper.vala:90
 msgid "Dim with dark style:"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:106
+#: src/Views/Wallpaper.vala:101
 msgid "Centered"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:107
+#: src/Views/Wallpaper.vala:102
 msgid "Zoom"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:108
+#: src/Views/Wallpaper.vala:103
 msgid "Spanned"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:153
+#: src/Views/Wallpaper.vala:148
 msgid "Import Photo"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:154
+#: src/Views/Wallpaper.vala:149
 msgid "Import"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:155
+#: src/Views/Wallpaper.vala:150
 msgid "Cancel"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:530
+#: src/Views/Wallpaper.vala:512
 msgid "Wallpaper Deleted"
 msgstr ""
 
-#: src/Views/Wallpaper.vala:531
+#: src/Views/Wallpaper.vala:513
 msgid "Undo"
 msgstr ""
 
-#: src/Widgets/WallpaperContainer.vala:138
+#: src/Widgets/WallpaperContainer.vala:134
 msgid "Remove"
 msgstr ""
 
-#: src/Widgets/WallpaperContainer.vala:202
+#: src/Widgets/WallpaperContainer.vala:198
 #, c-format
 msgid "Artist: %s"
 msgstr ""