From d87b8222b96b7ff19eba9fd62abdf9be4a7bfe54 Mon Sep 17 00:00:00 2001 From: Jakob Hauser Date: Sat, 12 Oct 2024 10:50:36 +0200 Subject: [PATCH] main/postmarketos-ui-mate: improve touch-friendliness (MR 5713) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Maintenance: - Renamed gschema override files for "system background" and "screensaver" to prefix number "10", that's more common for distribution-delivered gschema override files. Basically the prefix number just separates the override files from the xml files. - For gschema override files "caja single click" and "mate terminal colors" replaced underline by dash character for better alphabetic sorting. - In the APKBUILD, adapted the install of file "gtk.css" to the "-t" option, as no file name change is needed. - Sorted the installs alphabetically per path, except the for the file "61-lightdm-autologin.conf", this one is at the end because it doesn't use the "-t" option due to file renaming. Touch-friendliness: - Increased size of the upper and lower panel from 24 to 36 px. This also increases the size of the icons in the panel. Unfortunately, at installation the panel layout config file is stronger than the gsettings override of the panel size, therefore a new panel layout config file is needed. It corresponds to the upstream default layout, just the panel size values were changed. - Increased the size of the window buttons by changing the window border theme to "HighContrast". That's not the nicest looking theme but the one with the largest window buttons – convenient for touch devices. - Increased general font sizes from 10 to 12 px. This goes along with increased panel size and window button size, avoiding looking it too unproportional. - Changed the layout of the panel clock to just show the time (no date or week day). This saves space on devices with small screen. As the panel size was increased, display size gets tight on devices with small screen. - Changed the layout of the panel workspace switcher to show names in the format of "- x -". This is a workaround to artificially increase the size of the workspace switcher buttons on portrait displays. Because otherwise these buttons are very squeezed on portrait displays due to the display ratio. - Add an application shortcut for a maximized terminal to the users Desktop upon installation. [ci:skip-build]: already built successfully in CI --- ... => 10_caja-single-click.gschema.override} | 0 .../10_mate-font-size.gschema.override | 10 +++ .../10_mate-panel-clock.gschema.override | 6 ++ .../10_mate-panel-layout.gschema.override | 2 + ...-panel-workspace-switcher.gschema.override | 8 +++ ... 10_mate-terminal-colors.gschema.override} | 0 .../10_mate-window-buttons.gschema.override | 2 + ...erride => 10_screensaver.gschema.override} | 0 ... => 10_system-background.gschema.override} | 0 main/postmarketos-ui-mate/APKBUILD | 65 +++++++++++++------ .../mate-terminal-maximized.desktop | 7 ++ main/postmarketos-ui-mate/pmOS-panel.layout | 53 +++++++++++++++ 12 files changed, 133 insertions(+), 20 deletions(-) rename main/postmarketos-ui-mate/{10_caja_single-click.gschema.override => 10_caja-single-click.gschema.override} (100%) create mode 100644 main/postmarketos-ui-mate/10_mate-font-size.gschema.override create mode 100644 main/postmarketos-ui-mate/10_mate-panel-clock.gschema.override create mode 100644 main/postmarketos-ui-mate/10_mate-panel-layout.gschema.override create mode 100644 main/postmarketos-ui-mate/10_mate-panel-workspace-switcher.gschema.override rename main/postmarketos-ui-mate/{10_mate-terminal_colors.gschema.override => 10_mate-terminal-colors.gschema.override} (100%) create mode 100644 main/postmarketos-ui-mate/10_mate-window-buttons.gschema.override rename main/postmarketos-ui-mate/{001-screensaver.gschema.override => 10_screensaver.gschema.override} (100%) rename main/postmarketos-ui-mate/{000-system-background.gschema.override => 10_system-background.gschema.override} (100%) create mode 100644 main/postmarketos-ui-mate/mate-terminal-maximized.desktop create mode 100644 main/postmarketos-ui-mate/pmOS-panel.layout diff --git a/main/postmarketos-ui-mate/10_caja_single-click.gschema.override b/main/postmarketos-ui-mate/10_caja-single-click.gschema.override similarity index 100% rename from main/postmarketos-ui-mate/10_caja_single-click.gschema.override rename to main/postmarketos-ui-mate/10_caja-single-click.gschema.override diff --git a/main/postmarketos-ui-mate/10_mate-font-size.gschema.override b/main/postmarketos-ui-mate/10_mate-font-size.gschema.override new file mode 100644 index 000000000..8cc90f96f --- /dev/null +++ b/main/postmarketos-ui-mate/10_mate-font-size.gschema.override @@ -0,0 +1,10 @@ +[org.mate.Marco.general] +titlebar-font='Sans Bold 12' + +[org.mate.caja.desktop] +font='Sans 12' + +[org.mate.interface] +document-font-name='Sans 12' +font-name='Sans 12' +monospace-font-name='Monospace 12' diff --git a/main/postmarketos-ui-mate/10_mate-panel-clock.gschema.override b/main/postmarketos-ui-mate/10_mate-panel-clock.gschema.override new file mode 100644 index 000000000..06d1329b8 --- /dev/null +++ b/main/postmarketos-ui-mate/10_mate-panel-clock.gschema.override @@ -0,0 +1,6 @@ +[org.mate.panel.applet.clock] +show-date=false +show-temperature=false +show-tooltip=false +show-weather=false +show-week-numbers=false diff --git a/main/postmarketos-ui-mate/10_mate-panel-layout.gschema.override b/main/postmarketos-ui-mate/10_mate-panel-layout.gschema.override new file mode 100644 index 000000000..36c0b513e --- /dev/null +++ b/main/postmarketos-ui-mate/10_mate-panel-layout.gschema.override @@ -0,0 +1,2 @@ +[org.mate.panel] +default-layout='pmOS-panel' diff --git a/main/postmarketos-ui-mate/10_mate-panel-workspace-switcher.gschema.override b/main/postmarketos-ui-mate/10_mate-panel-workspace-switcher.gschema.override new file mode 100644 index 000000000..ceba96232 --- /dev/null +++ b/main/postmarketos-ui-mate/10_mate-panel-workspace-switcher.gschema.override @@ -0,0 +1,8 @@ +[org.mate.panel.applet.workspace-switcher] +display-workspace-names=true + +[org.mate.Marco.workspace-names] +name-1='- 1 -' +name-2='- 2 -' +name-3='- 3 -' +name-4='- 4 -' diff --git a/main/postmarketos-ui-mate/10_mate-terminal_colors.gschema.override b/main/postmarketos-ui-mate/10_mate-terminal-colors.gschema.override similarity index 100% rename from main/postmarketos-ui-mate/10_mate-terminal_colors.gschema.override rename to main/postmarketos-ui-mate/10_mate-terminal-colors.gschema.override diff --git a/main/postmarketos-ui-mate/10_mate-window-buttons.gschema.override b/main/postmarketos-ui-mate/10_mate-window-buttons.gschema.override new file mode 100644 index 000000000..bd466127d --- /dev/null +++ b/main/postmarketos-ui-mate/10_mate-window-buttons.gschema.override @@ -0,0 +1,2 @@ +[org.mate.Marco.general] +theme='HighContrast' diff --git a/main/postmarketos-ui-mate/001-screensaver.gschema.override b/main/postmarketos-ui-mate/10_screensaver.gschema.override similarity index 100% rename from main/postmarketos-ui-mate/001-screensaver.gschema.override rename to main/postmarketos-ui-mate/10_screensaver.gschema.override diff --git a/main/postmarketos-ui-mate/000-system-background.gschema.override b/main/postmarketos-ui-mate/10_system-background.gschema.override similarity index 100% rename from main/postmarketos-ui-mate/000-system-background.gschema.override rename to main/postmarketos-ui-mate/10_system-background.gschema.override diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index 0a30a18a8..38aaa29fe 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Jakko pkgname=postmarketos-ui-mate -pkgver=7 -pkgrel=5 +pkgver=8 +pkgrel=0 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" @@ -35,35 +35,53 @@ _pmb_recommends=" install="$pkgname.post-install $pkgname.post-upgrade" subpackages="$pkgname-openrc" source=" - 000-system-background.gschema.override - 001-screensaver.gschema.override - 10_caja_single-click.gschema.override - 10_mate-terminal_colors.gschema.override + 10_caja-single-click.gschema.override + 10_mate-font-size.gschema.override + 10_mate-panel-clock.gschema.override + 10_mate-panel-layout.gschema.override + 10_mate-panel-workspace-switcher.gschema.override + 10_mate-terminal-colors.gschema.override + 10_mate-window-buttons.gschema.override 10_onboard.gschema.override + 10_screensaver.gschema.override + 10_system-background.gschema.override 61-lightdm-autologin.conf gtk.css + mate-terminal-maximized.desktop onboard-autostart.desktop + pmOS-panel.layout unclutter-xfixes.desktop " options="!check" package() { - install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \ - "$srcdir"/000-system-background.gschema.override \ - "$srcdir"/001-screensaver.gschema.override \ - "$srcdir"/10_caja_single-click.gschema.override \ - "$srcdir"/10_mate-terminal_colors.gschema.override \ - "$srcdir"/10_onboard.gschema.override - install -Dm644 -t "$pkgdir"/etc/skel/.config/autostart \ "$srcdir"/onboard-autostart.desktop \ "$srcdir"/unclutter-xfixes.desktop + install -Dm644 -t "$pkgdir"/etc/skel/.config/gtk-3.0 \ + "$srcdir"/gtk.css + + install -Dm755 -t "$pkgdir"/etc/skel/Desktop \ + "$srcdir"/mate-terminal-maximized.desktop + + install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \ + "$srcdir"/10_caja-single-click.gschema.override \ + "$srcdir"/10_mate-font-size.gschema.override \ + "$srcdir"/10_mate-panel-clock.gschema.override \ + "$srcdir"/10_mate-panel-layout.gschema.override \ + "$srcdir"/10_mate-panel-workspace-switcher.gschema.override \ + "$srcdir"/10_mate-terminal-colors.gschema.override \ + "$srcdir"/10_mate-window-buttons.gschema.override \ + "$srcdir"/10_onboard.gschema.override \ + "$srcdir"/10_screensaver.gschema.override \ + "$srcdir"/10_system-background.gschema.override + + install -Dm644 -t "$pkgdir"/usr/share/mate-panel/layouts \ + "$srcdir"/pmOS-panel.layout + install -Dm644 "$srcdir"/61-lightdm-autologin.conf \ "$pkgdir"/usr/share/lightdm/lightdm.conf.d/61-autologin.conf - - install -Dm644 "$srcdir"/gtk.css \ - "$pkgdir"/etc/skel/.config/gtk-3.0/gtk.css } openrc() { @@ -80,13 +98,20 @@ openrc() { } sha512sums=" -b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285ce988d78db236bea7507e7868c39fe020e5d23c230dd36242 000-system-background.gschema.override -fe6a37a1e22fbf29a8b6de3b3e137bc19becd6d80d391ad1a0c7908cb996dd9982c88ef55b84fd258a81263e37d47df5a81566ce7c337886ae4c0d7a83d640aa 001-screensaver.gschema.override -c69d44f1c69e3880ba822a4b98bc59f4049f7b8e228bec31076b9d3fa510e8e205ecf7e3e4b7b00fb28b39a447a55126aaede7e5e5741350aff2a37172b77659 10_caja_single-click.gschema.override -edef87a2b88a09d023dd51e8b32e2fc1cc9f5bec4a00b88b4f2adfb844ae2dc72747ef8891fc8a08652ae563fb1b914fba214c28a93e77de76b489a5fb50a96c 10_mate-terminal_colors.gschema.override +c69d44f1c69e3880ba822a4b98bc59f4049f7b8e228bec31076b9d3fa510e8e205ecf7e3e4b7b00fb28b39a447a55126aaede7e5e5741350aff2a37172b77659 10_caja-single-click.gschema.override +7052d73fbcf2dd205a25efb346ce72e76b40f70d0e16d5c95b6a9c65cdf56a640dd7185cd6306b309621b579da4a2f3838f4132408316cb8422f9d38328b14e6 10_mate-font-size.gschema.override +55474e1c663205bb1dd2a6ed17e128a05fd75d25dff3aafe417a038b43b9c975b4720a55f7c6b6388c875ffdd703bac84fd0e4e9dfa78bae0434841b1f33cac1 10_mate-panel-clock.gschema.override +f2195bb331959b99f25f6328446f7644edbfa7d24758bb2bc48a627ce9aa0f768e8bd0478be9ba05560b72812490402bd2ab76be2eb27ca60fd755e6ad0f1d60 10_mate-panel-layout.gschema.override +c2ddff42da4880fbf8c4b0a1dc6fb4698af90f4fc44796e893f79e1ffeaffe3425898785a896e903a1289cefcebfd38a55919d0efc3cff9ddf4fa0ea82462f76 10_mate-panel-workspace-switcher.gschema.override +edef87a2b88a09d023dd51e8b32e2fc1cc9f5bec4a00b88b4f2adfb844ae2dc72747ef8891fc8a08652ae563fb1b914fba214c28a93e77de76b489a5fb50a96c 10_mate-terminal-colors.gschema.override +4e91b44aad0b9d290b0c76bfa1fd1eabc6aa3b06a4e96068cc67c54de75bb3ba495b0fe46db58eb304f2fc63eea4d26d2618ca191f66f1dde98efe5a418bd1b6 10_mate-window-buttons.gschema.override 114d77e6e7c11fc87244fc7c179244274c8f8711f111fcb1b9774ef6b226bd2bea01f85395da130f53670a870cfe571babd7f1c233ba85e1ef5a056ab65bd0b7 10_onboard.gschema.override +fe6a37a1e22fbf29a8b6de3b3e137bc19becd6d80d391ad1a0c7908cb996dd9982c88ef55b84fd258a81263e37d47df5a81566ce7c337886ae4c0d7a83d640aa 10_screensaver.gschema.override +b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285ce988d78db236bea7507e7868c39fe020e5d23c230dd36242 10_system-background.gschema.override 225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000 61-lightdm-autologin.conf 4532cf5c4cb687947c922d75cc942f26d4a695762a6b90cf53fddab84f2185799b7ee04c95b5e2263655e68a9a111967d92062ef5eb99b4122068c8585cf43a1 gtk.css +adff2ad4dbd82debd3be32e521c8d70f8ea7a05c4942f1f72b28146149f93fcda7c0569d4be80b61fb3a46aa3d3312629c06f0ae112515efb8e735b19d9a1d53 mate-terminal-maximized.desktop d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747 onboard-autostart.desktop +eb6269566be4114be04fb27ced5c3233b361478f3e63a777deb109723658876b41644bf39446dc40c062e0e618c33baff627f7066f699d0a3d6c811a4466c84b pmOS-panel.layout b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a unclutter-xfixes.desktop " diff --git a/main/postmarketos-ui-mate/mate-terminal-maximized.desktop b/main/postmarketos-ui-mate/mate-terminal-maximized.desktop new file mode 100644 index 000000000..e5551452a --- /dev/null +++ b/main/postmarketos-ui-mate/mate-terminal-maximized.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=MATE Terminal +TryExec=mate-terminal +Exec=mate-terminal --maximize +Icon=utilities-terminal +Type=Application +StartupNotify=true diff --git a/main/postmarketos-ui-mate/pmOS-panel.layout b/main/postmarketos-ui-mate/pmOS-panel.layout new file mode 100644 index 000000000..d77fd6139 --- /dev/null +++ b/main/postmarketos-ui-mate/pmOS-panel.layout @@ -0,0 +1,53 @@ +[Toplevel top] +expand=true +orientation=top +size=36 + +[Toplevel bottom] +expand=true +orientation=bottom +size=36 + +[Object menu-bar] +object-type=menu-bar +toplevel-id=top +position=0 +locked=true + +[Object notification-area] +object-type=applet +applet-iid=NotificationAreaAppletFactory::NotificationArea +toplevel-id=top +position=10 +panel-right-stick=true +locked=true + +[Object clock] +object-type=applet +applet-iid=ClockAppletFactory::ClockApplet +toplevel-id=top +position=0 +panel-right-stick=true +locked=true + +[Object show-desktop] +object-type=applet +applet-iid=WnckletFactory::ShowDesktopApplet +toplevel-id=bottom +position=0 +locked=true + +[Object window-list] +object-type=applet +applet-iid=WnckletFactory::WindowListApplet +toplevel-id=bottom +position=20 +locked=true + +[Object workspace-switcher] +object-type=applet +applet-iid=WnckletFactory::WorkspaceSwitcherApplet +toplevel-id=bottom +position=0 +panel-right-stick=true +locked=true