Merge branch 'main' into application-volume-control

.github/workflows/gettext.yml

@@ -2,7 +2,7 @@ name: Gettext Updates
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   build:
@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/main.yml

@@ -1,8 +1,6 @@
 name: CI
 
 on:
-  push:
-    branches: [master]
   pull_request:
     types:
       - opened
@@ -21,11 +19,11 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: |
           apt update
-          apt install -y libcanberra-gtk3-dev libgranite-dev libgtk-3-dev libswitchboard-2.0-dev libpulse-dev meson valac
+          apt install -y libadwaita-1-dev libcanberra-dev libgranite-7-dev libgtk-4-dev libswitchboard-3-dev libpulse-dev meson valac
       - name: Build
         env:
           DESTDIR: out
@@ -41,6 +39,6 @@ jobs:
       image: valalang/lint
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Lint
         run: io.elementary.vala-lint -d .

.github/workflows/release.yml

@@ -2,14 +2,14 @@ name: Release
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
     types: [closed]
 jobs:
   release:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: elementary/actions/release@master
         env:
           GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

README.md

@@ -1,4 +1,4 @@
-# Switchboard Sound Plug
+# Sound Settings
 [![Translation status](https://l10n.elementary.io/widgets/switchboard/-/switchboard-plug-sound/svg-badge.svg)](https://l10n.elementary.io/engage/switchboard/?utm_source=widget)
 
 ![screenshot](data/screenshot-output.png?raw=true)
@@ -7,11 +7,12 @@
 
 You'll need the following dependencies:
 
-* libcanberra-gtk3-dev
-* libgranite-dev
-* libgtk-3-dev
+* libadwaita-1-dev
+* libcanberra-dev
+* libgranite-7-dev
+* libgtk-4-dev
 * libpulse-dev
-* libswitchboard-2.0-dev
+* libswitchboard-3-dev
 * meson
 * valac
 
@@ -23,4 +24,4 @@ Run `meson` to configure the build environment and then `ninja` to build
 
 To install, use `ninja install`
 
-    sudo ninja install
+    ninja install

data/icons.gresource.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/io/elementary/switchboard/sound/icons/scalable/devices/">
+  <gresource prefix="/io/elementary/settings/sound/icons/scalable/devices/">
     <file alias="audio-speaker-center-back-testing.svg" compressed="true" preprocess="xml-stripblanks">audio-speaker-center-back-testing.svg</file>
     <file alias="audio-speaker-center.svg" compressed="true" preprocess="xml-stripblanks">audio-speaker-center.svg</file>
     <file alias="audio-speaker-center-testing.svg" compressed="true" preprocess="xml-stripblanks">audio-speaker-center-testing.svg</file>

data/meson.build

@@ -1,6 +1,6 @@
 i18n.merge_file(
     input: 'sound.metainfo.xml.in',
-    output: 'io.elementary.switchboard.sound.metainfo.xml',
+    output: meson.project_name() + '.metainfo.xml',
     po_dir: meson.source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,

data/sound.metainfo.xml.in

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
-  <id>io.elementary.switchboard.sound</id>
-  <extends>io.elementary.switchboard</extends>
-  <translation type="gettext">sound-plug</translation>
+  <id>io.elementary.settings.sound</id>
+  <extends>io.elementary.settings</extends>
+  <translation type="gettext">io.elementary.settings.sound</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
 

meson.build

@@ -1,10 +1,9 @@
 project(
-    'sound',
+    'io.elementary.settings.sound',
     'vala', 'c',
     version: '2.3.3'
 )
 
-gettext_name = meson.project_name() + '-plug'
 gnome = import('gnome')
 i18n = import('i18n')
 
@@ -13,7 +12,7 @@ datadir = join_paths(prefix, get_option('datadir'))
 libdir = join_paths(prefix, get_option('libdir'))
 
 add_project_arguments(
-    '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
+    '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
     language:'c'
 )
 
@@ -30,7 +29,7 @@ plug_resources = gnome.compile_resources(
 
 config_data = configuration_data()
 config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
-config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name() + '-plug')
+config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 config_file = configure_file(
     input: 'src/Config.vala.in',
     output: '@BASENAME@',

po/aa.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-07-20 18:40+0000\n"
+"POT-Creation-Date: 2023-10-16 17:32+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -13,37 +13,37 @@ msgstr ""
 msgid "Change sound and microphone volume"
 msgstr ""
 
-#: src/Plug.vala:38 src/Plug.vala:93 src/Plug.vala:94 src/Plug.vala:95
-#: src/Plug.vala:96 src/Plug.vala:97 src/Plug.vala:98 src/Device.vala:101
+#: src/Plug.vala:38 src/Plug.vala:94 src/Plug.vala:95 src/Plug.vala:96
+#: src/Plug.vala:97 src/Plug.vala:98 src/Plug.vala:99 src/Device.vala:101
 msgid "Output"
 msgstr ""
 
-#: src/Plug.vala:39 src/Plug.vala:99 src/Plug.vala:100 src/Plug.vala:101
-#: src/Plug.vala:102 src/Plug.vala:103 src/Device.vala:101
+#: src/Plug.vala:39 src/Plug.vala:100 src/Plug.vala:101 src/Plug.vala:102
+#: src/Plug.vala:103 src/Plug.vala:104 src/Device.vala:101
 msgid "Input"
 msgstr ""
 
-#: src/Plug.vala:94 src/Plug.vala:100
+#: src/Plug.vala:95 src/Plug.vala:101
 msgid "Device"
 msgstr ""
 
-#: src/Plug.vala:95
+#: src/Plug.vala:96
 msgid "Event Sounds"
 msgstr ""
 
-#: src/Plug.vala:96 src/Plug.vala:101
+#: src/Plug.vala:97 src/Plug.vala:102
 msgid "Port"
 msgstr ""
 
-#: src/Plug.vala:97 src/Plug.vala:102 src/OutputPanel.vala:59
+#: src/Plug.vala:98 src/Plug.vala:103 src/OutputPanel.vala:60
 msgid "Volume"
 msgstr ""
 
-#: src/Plug.vala:98
+#: src/Plug.vala:99
 msgid "Balance"
 msgstr ""
 
-#: src/Plug.vala:103
+#: src/Plug.vala:104
 msgid "Enable"
 msgstr ""
 
@@ -60,44 +60,44 @@ msgstr ""
 msgid "No Connected Output Devices Detected"
 msgstr ""
 
-#: src/OutputPanel.vala:40
+#: src/OutputPanel.vala:41
 msgid ""
 "Check that all cables are securely attached and audio output devices are "
 "powered on."
 msgstr ""
 
-#: src/OutputPanel.vala:78
+#: src/OutputPanel.vala:82
 msgid "Left"
 msgstr ""
 
-#: src/OutputPanel.vala:79
+#: src/OutputPanel.vala:83
 msgid "Center"
 msgstr ""
 
-#: src/OutputPanel.vala:80
+#: src/OutputPanel.vala:84
 msgid "Right"
 msgstr ""
 
-#: src/OutputPanel.vala:82
+#: src/OutputPanel.vala:86
 msgid "Event Alerts"
 msgstr ""
 
-#: src/OutputPanel.vala:84
-msgid "Play sound"
-msgstr ""
-
-#: src/OutputPanel.vala:88
-msgid "Flash screen"
-msgstr ""
-
-#: src/OutputPanel.vala:93
+#: src/OutputPanel.vala:87
 msgid ""
 "Notify when the system can't do something in response to input, like "
 "attempting to backspace in an empty input or switch windows when only one is "
 "open."
 msgstr ""
 
-#: src/OutputPanel.vala:105
+#: src/OutputPanel.vala:90
+msgid "Play sound"
+msgstr ""
+
+#: src/OutputPanel.vala:94
+msgid "Flash screen"
+msgstr ""
+
+#: src/OutputPanel.vala:103
 msgid "Test Speakers…"
 msgstr ""
 
@@ -109,21 +109,21 @@ msgstr ""
 msgid "No Connected Audio Devices Detected"
 msgstr ""
 
-#: src/InputPanel.vala:22
+#: src/InputPanel.vala:23
 msgid ""
 "Check that all cables are securely attached and audio input devices are "
 "powered on."
 msgstr ""
 
-#: src/InputPanel.vala:45
+#: src/InputPanel.vala:46
 msgid "Input Volume"
 msgstr ""
 
-#: src/InputPanel.vala:53
+#: src/InputPanel.vala:54
 msgid "Unamplified"
 msgstr ""
 
-#: src/InputPanel.vala:54
+#: src/InputPanel.vala:55
 msgid "100%"
 msgstr ""