diff --git a/README.md b/README.md index 6308d84..42aac89 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Theme used for the screenshots is available [here](https://github.com/luigifab/h It require **GTK 2.24+** or **GTK 3.0+** *(including 3.24)* or **GTK 4.0+**, and *GLIB 2.28+*. -* Debian and Ubuntu: `sudo apt install awf-gtk2 awf-gtk3 awf-gtk4` (coming soon or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)) +* Debian and Ubuntu: `sudo apt install awf-gtk2 awf-gtk3 awf-gtk4` (or via [PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)) * Fedora: `sudo dnf install awf-gtk2 awf-gtk3 awf-gtk4` @@ -60,12 +60,12 @@ sudo apt update sudo apt install awf-gtk2 awf-gtk3 awf-gtk4 # or sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys FFE5BD439356DF7D -echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list +echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list sudo apt update sudo apt install awf-gtk2 awf-gtk3 awf-gtk4 # or sudo wget -O /etc/apt/trusted.gpg.d/luigifab.gpg https://www.luigifab.fr/apt.gpg -echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list +echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu hirsute main" | sudo tee -a /etc/apt/sources.list sudo apt update sudo apt install awf-gtk2 awf-gtk3 awf-gtk4 ``` @@ -88,25 +88,20 @@ ls ~/.themes/yourtheme/gtk-3*/*.css | entr killall -s SIGHUP awf-gtk3 ## Copyright -- Current version: 2.5.0 (07/07/2021) +- Current version: 2.6.0 (09/09/2021) - Compatibility: GTK 2.24 / 3.0 / 3.2 / 3.4 / 3.6 / 3.8 / 3.10 / 3.12 / 3.14 / 3.16 / 3.18 / 3.20 / 3.22 / 3.24 / 4.0 / 4.2 - Translations: English (en), French (fr) - Links: [luigifab.fr](https://www.luigifab.fr/gtk/awf-extended) - [github.com](https://github.com/luigifab/awf-extended)\ -[Debian awf-gtk2.deb](https://tracker.debian.org/pkg/awf-gtk2) - *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959434), - [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959897))* -; [Debian awf-gtk3.deb](https://tracker.debian.org/pkg/awf-gtk3) - *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959436), - [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959892))* -; [Debian awf-gtk4.deb](https://tracker.debian.org/pkg/awf-gtk4) - *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=959433), - [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=986360))*\ +[Debian awf-gtk3.deb](https://packages.debian.org/awf-gtk) +; [Debian awf-gtk4.deb](https://packages.debian.org/awf-gtk)\ [Fedora awf-gtk2.rpm](https://src.fedoraproject.org/rpms/awf-gtk2) ; [Fedora awf-gtk3.rpm](https://src.fedoraproject.org/rpms/awf-gtk3) ; [Fedora awf-gtk4.rpm](https://src.fedoraproject.org/rpms/awf-gtk4)\ [openSUSE awf-gtk2.rpm](https://software.opensuse.org/package/awf-gtk2) ; [openSUSE awf-gtk3.rpm](https://software.opensuse.org/package/awf-gtk3) ; [openSUSE awf-gtk4.rpm](https://software.opensuse.org/package/awf-gtk4)\ +[Ubuntu awf-gtk3.deb](https://packages.ubuntu.com/pkg/awf-gtk) +; [Ubuntu awf-gtk4.deb](https://packages.ubuntu.com/pkg/awf-gtk)\ [Ubuntu PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages) This program is provided under the terms of the **GNU GPLv3+** license.\ diff --git a/configure.ac b/configure.ac index 05559dc..c36ce6a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([A widget factory], [2.5.0]) +AC_INIT([A widget factory], [2.6.0]) AC_CONFIG_SRCDIR([src/awf.c]) AM_INIT_AUTOMAKE diff --git a/debian-gtk/awf-gtk2.install b/debian-gtk/awf-gtk2.install new file mode 100644 index 0000000..90f4f90 --- /dev/null +++ b/debian-gtk/awf-gtk2.install @@ -0,0 +1,4 @@ +applications/awf-gtk2.desktop usr/share/applications +icons-gtk2/* usr/share/icons/hicolor +locale-awf-gtk2/* usr/share/locale +usr/bin/awf-gtk2 usr/bin \ No newline at end of file diff --git a/debian-gtk/awf-gtk3.install b/debian-gtk/awf-gtk3.install new file mode 100644 index 0000000..6393027 --- /dev/null +++ b/debian-gtk/awf-gtk3.install @@ -0,0 +1,4 @@ +applications/awf-gtk3.desktop usr/share/applications +icons-gtk3/* usr/share/icons/hicolor +locale-awf-gtk3/* usr/share/locale +usr/bin/awf-gtk3 usr/bin \ No newline at end of file diff --git a/debian-gtk/awf-gtk4.install b/debian-gtk/awf-gtk4.install new file mode 100644 index 0000000..504fb0d --- /dev/null +++ b/debian-gtk/awf-gtk4.install @@ -0,0 +1,4 @@ +applications/awf-gtk4.desktop usr/share/applications +icons-gtk4/* usr/share/icons/hicolor +locale-awf-gtk4/* usr/share/locale +usr/bin/awf-gtk4 usr/bin \ No newline at end of file diff --git a/debian-gtk/changelog b/debian-gtk/changelog new file mode 100644 index 0000000..4ab603e --- /dev/null +++ b/debian-gtk/changelog @@ -0,0 +1,11 @@ +awf-gtk (2.6.0-1) experimental; urgency=low + + * New upstream version + + -- Fabrice Creuzot Thu, 09 Sep 2021 20:00:00 +0000 + +awf-gtk (2.5.0-5) experimental; urgency=low + + * Initial debian package release (Closes: #959434) + + -- Fabrice Creuzot Wed, 07 Jul 2021 20:00:00 +0000 diff --git a/debian-gtk/control b/debian-gtk/control new file mode 100644 index 0000000..c109189 --- /dev/null +++ b/debian-gtk/control @@ -0,0 +1,40 @@ +Source: awf-gtk +Section: x11 +Priority: optional +Maintainer: Fabrice Creuzot +Build-Depends: debhelper-compat (= 13), libgtk2.0-dev, libgtk-3-dev, libgtk-4-dev +Rules-Requires-Root: no +Standards-Version: 4.5.1 +Homepage: https://github.com/luigifab/awf-extended +Vcs-Browser: https://github.com/luigifab/awf-extended +Vcs-Git: https://github.com/luigifab/awf-extended.git + +Package: awf-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: theme preview application for GTK 2 + A widget factory is a theme preview application for GTK. It displays the + various widget types provided by GTK in a single window allowing to see + the visual effect of the applied theme. + . + This package provides the GTK 2 version. + +Package: awf-gtk3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: theme preview application for GTK 3 + A widget factory is a theme preview application for GTK. It displays the + various widget types provided by GTK in a single window allowing to see + the visual effect of the applied theme. + . + This package provides the GTK 3 version. + +Package: awf-gtk4 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: theme preview application for GTK 4 + A widget factory is a theme preview application for GTK. It displays the + various widget types provided by GTK in a single window allowing to see + the visual effect of the applied theme. + . + This package provides the GTK 4 version. diff --git a/debian-gtk/copyright b/debian-gtk/copyright new file mode 100644 index 0000000..9e5bbdc --- /dev/null +++ b/debian-gtk/copyright @@ -0,0 +1,26 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://github.com/luigifab/awf-extended +Upstream-Contact: Fabrice Creuzot + +Files: * +Copyright: + 2011-2016 Valère Monseur (valr) + 2020-2021 Fabrice Creuzot (luigifab) +License: GPL-3+ + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian-gtk/deb.sh b/debian-gtk/deb.sh new file mode 100644 index 0000000..bf19a20 --- /dev/null +++ b/debian-gtk/deb.sh @@ -0,0 +1,104 @@ +#!/bin/bash +# debian: sudo apt install dpkg-dev devscripts build-essential dh-make dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev + + +cd "$(dirname "$0")" +version="2.6.0" + + +rm -rf builder/ +mkdir builder + +# copy to a tmp directory +if [ true ]; then + cd builder + wget https://github.com/luigifab/awf-extended/archive/v$version/awf-extended-$version.tar.gz + tar xzf awf-extended-$version.tar.gz + cd .. +else + temp=awf-extended-$version + mkdir /tmp/$temp + cp -r ../* /tmp/$temp/ + rm -rf /tmp/$temp/*/builder/ + + mv /tmp/$temp builder/ + cp /usr/share/common-licenses/GPL-3 builder/$temp/LICENSE + + cd builder/ + tar czf $temp.tar.gz $temp + cd .. +fi +rm builder/awf-extended-$version/debian + +# create packages for debian and ubuntu +for serie in experimental; do + + if [ $serie = "experimental" ]; then + # for ubuntu + cp -a builder/awf-extended-$version/ builder/awf-extended-$version+src/ + # debian only + cd builder/awf-extended-$version/ + else + # ubuntu only + cp -a builder/awf-extended-$version+src/ builder/awf-extended-$version+$serie/ + cd builder/awf-extended-$version+$serie/ + fi + + dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-gtk + + rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh + mkdir debian/upstream + cp debian-gtk/* debian/ + mv debian/metadata debian/upstream/metadata + + + + if [ $serie = "experimental" ]; then + dpkg-buildpackage -us -uc + else + # debhelper: experimental:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9 + if [ $serie = "focal" ]; then + sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control + fi + if [ $serie = "bionic" ]; then + sed -i 's/dh $@/dh $@ --with autoreconf/g' debian/rules + sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 9), dh-autoreconf/g' debian/control + fi + if [ $serie = "xenial" ]; then + sed -i 's/dh $@/dh $@ --with autoreconf/g' debian/rules + sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), dh-autoreconf/g' debian/control + sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control + echo 9 > debian/compat + fi + if [ $serie = "trusty" ]; then + sed -i 's/dh $@/dh $@ --with autotools_dev,autoreconf/g' debian/rules + sed -i 's/override_dh_update_autotools_config/override_dh_autotools-dev_updateconfig/g' debian/rules + sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), autotools-dev, dh-autoreconf/g' debian/control + sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control + echo 9 > debian/compat + fi + sed -i 's/experimental/'$serie'/g' debian/changelog + sed -i 's/-1) /-1+'$serie') /' debian/changelog + dpkg-buildpackage -us -uc -ui -d -S + fi + echo "===========================" + cd .. + + if [ $serie = "experimental" ]; then + # debian only + debsign awf-gtk_$version-*.changes + echo "===========================" + lintian -EviIL +pedantic awf-gtk_$version-*.deb + else + # ubuntu only + debsign awf-gtk_$version*+$serie*source.changes + fi + echo "===========================" + cd .. +done + +ls -dltrh builder/*.deb builder/*.changes +echo "===========================" + +# cleanup +rm -rf builder/*/ \ No newline at end of file diff --git a/debian-gtk/metadata b/debian-gtk/metadata new file mode 100644 index 0000000..d72fe51 --- /dev/null +++ b/debian-gtk/metadata @@ -0,0 +1,6 @@ +Bug-Database: https://github.com/luigifab/awf-extended/issues/ +Bug-Submit: https://github.com/luigifab/awf-extended/issues/new +Documentation: https://github.com/luigifab/awf-extended +Repository: https://github.com/luigifab/awf-extended.git +Repository-Browse: https://github.com/luigifab/awf-extended +Screenshots: https://raw.githubusercontent.com/luigifab/awf-extended/levelup/images/gtk3.png \ No newline at end of file diff --git a/debian-gtk/rules b/debian-gtk/rules new file mode 100644 index 0000000..f96abd3 --- /dev/null +++ b/debian-gtk/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ + +override_dh_update_autotools_config: + #sed -i 's/ -eq 2/ -eq -1/g' configure.ac + touch NEWS + touch AUTHORS + touch README + touch ChangeLog + mv LICENSE COPYING + #for gtk in "gtk3" "gtk4"; do \ + for gtk in "gtk2" "gtk3" "gtk4"; do \ + cp -ar icons/ icons-$$gtk/; \ + for file in icons-$$gtk/*/*/awf.png; do mv $$file `dirname $$file`/awf-$$gtk.png; done; \ + for file in icons-$$gtk/*/*/awf.svg; do mv $$file `dirname $$file`/awf-$$gtk.svg; done; \ + for file in src/po/*.po; do \ + code=`basename "$$file" .po`; \ + mkdir -p locale-awf-$$gtk/$$code/LC_MESSAGES/; \ + msgfmt src/po/$$code.po -o locale-awf-$$gtk/$$code/LC_MESSAGES/awf-$$gtk.mo; \ + done; \ + done diff --git a/debian-gtk/watch b/debian-gtk/watch new file mode 100644 index 0000000..07e98ab --- /dev/null +++ b/debian-gtk/watch @@ -0,0 +1,2 @@ +version=4 +https://github.com/luigifab/awf-extended/releases .*awf-([0-9.]+)\.tar\.gz \ No newline at end of file diff --git a/debian-gtk2/changelog b/debian-gtk2/changelog index 5595abf..1292c0a 100644 --- a/debian-gtk2/changelog +++ b/debian-gtk2/changelog @@ -1,4 +1,10 @@ -awf-gtk2 (2.5.0-1) unstable; urgency=low +awf-gtk2 (2.6.0-1) experimental; urgency=low + + * New upstream version + + -- Fabrice Creuzot Thu, 09 Sep 2021 20:00:00 +0000 + +awf-gtk2 (2.5.0-1) experimental; urgency=low * Initial debian package release (Closes: #959434) diff --git a/debian-gtk2/control b/debian-gtk2/control index e7100d4..39d06bc 100644 --- a/debian-gtk2/control +++ b/debian-gtk2/control @@ -12,9 +12,9 @@ Vcs-Git: https://github.com/luigifab/awf-extended.git Package: awf-gtk2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Theme preview application for GTK +Description: theme preview application for GTK 2 A widget factory is a theme preview application for GTK. It displays the various widget types provided by GTK in a single window allowing to see the visual effect of the applied theme. . - This package provides the gtk2 version. + This package provides the GTK 2 version. diff --git a/debian-gtk2/deb.sh b/debian-gtk2/deb.sh index e09c1d4..545d23c 100644 --- a/debian-gtk2/deb.sh +++ b/debian-gtk2/deb.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk2" rm -rf builder/ @@ -28,12 +28,12 @@ else tar czf $temp.tar.gz $temp cd .. fi - +rm builder/awf-extended-$version/debian # create packages for debian and ubuntu -for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do +for serie in experimental impish hirsute focal bionic xenial trusty; do - if [ $serie = "unstable" ]; then + if [ $serie = "experimental" ]; then # for ubuntu cp -a builder/awf-extended-$version/ builder/awf-extended-$version+src/ # debian only @@ -46,17 +46,17 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-$gtk - rm -f debian/*ex debian/*EX debian/README* debian/*doc* + rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh mkdir debian/upstream cp debian-$gtk/* debian/ mv debian/metadata debian/upstream/metadata - if [ $serie = "unstable" ]; then + if [ $serie = "experimental" ]; then dpkg-buildpackage -us -uc else - # debhelper: unstable:13 hirsute:13 groovy:13 focal:12 bionic:9 xenial:9 trusty:9 precise:9 + # debhelper: experimental:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9 if [ $serie = "focal" ]; then sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control fi @@ -77,28 +77,21 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control echo 9 > debian/compat fi - if [ $serie = "precise" ]; then - sed -i 's/dh $@/dh $@ --with autotools_dev,autoreconf/g' debian/rules - sed -i 's/override_dh_update_autotools_config/override_dh_autotools-dev_updateconfig/g' debian/rules - sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), autotools-dev, dh-autoreconf/g' debian/control - sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control - echo 9 > debian/compat - fi - sed -i 's/unstable/'$serie'/g' debian/changelog + sed -i 's/experimental/'$serie'/g' debian/changelog sed -i 's/-1) /-1+'$serie') /' debian/changelog dpkg-buildpackage -us -uc -ui -d -S fi echo "===========================" cd .. - if [ $serie = "unstable" ]; then + if [ $serie = "experimental" ]; then # debian only - debsign awf-$gtk_$version-*.changes + debsign awf-${gtk}_$version-*.changes echo "===========================" - lintian -EviIL +pedantic awf-$gtk_$version-*.deb + lintian -EviIL +pedantic awf-${gtk}_$version-*.deb else # ubuntu only - debsign awf-$gtk_$version*+$serie*source.changes + debsign awf-${gtk}_$version*+$serie*source.changes fi echo "===========================" cd .. diff --git a/debian-gtk3/changelog b/debian-gtk3/changelog index c2c5a06..72d9799 100644 --- a/debian-gtk3/changelog +++ b/debian-gtk3/changelog @@ -1,5 +1,11 @@ -awf-gtk3 (2.5.0-1) unstable; urgency=low +awf-gtk3 (2.6.0-1) experimental; urgency=low - * Initial debian package release (Closes: #959436) + * New upstream version + + -- Fabrice Creuzot Thu, 09 Sep 2021 20:00:00 +0000 + +awf-gtk3 (2.5.0-1) experimental; urgency=low + + * Initial debian package release (Closes: #959434) -- Fabrice Creuzot Wed, 07 Jul 2021 20:00:00 +0000 diff --git a/debian-gtk3/control b/debian-gtk3/control index c704f63..1a3dbb9 100644 --- a/debian-gtk3/control +++ b/debian-gtk3/control @@ -12,9 +12,9 @@ Vcs-Git: https://github.com/luigifab/awf-extended.git Package: awf-gtk3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Theme preview application for GTK +Description: theme preview application for GTK 3 A widget factory is a theme preview application for GTK. It displays the various widget types provided by GTK in a single window allowing to see the visual effect of the applied theme. . - This package provides the gtk3 version. + This package provides the GTK 3 version. diff --git a/debian-gtk3/deb.sh b/debian-gtk3/deb.sh index 08101ad..da4ffe5 100644 --- a/debian-gtk3/deb.sh +++ b/debian-gtk3/deb.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk3" rm -rf builder/ @@ -28,12 +28,12 @@ else tar czf $temp.tar.gz $temp cd .. fi - +rm builder/awf-extended-$version/debian # create packages for debian and ubuntu -for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do +for serie in experimental impish hirsute focal bionic xenial trusty; do - if [ $serie = "unstable" ]; then + if [ $serie = "experimental" ]; then # for ubuntu cp -a builder/awf-extended-$version/ builder/awf-extended-$version+src/ # debian only @@ -46,17 +46,17 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-$gtk - rm -f debian/*ex debian/*EX debian/README* debian/*doc* + rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh mkdir debian/upstream cp debian-$gtk/* debian/ mv debian/metadata debian/upstream/metadata - if [ $serie = "unstable" ]; then + if [ $serie = "experimental" ]; then dpkg-buildpackage -us -uc else - # debhelper: unstable:13 hirsute:13 groovy:13 focal:12 bionic:9 xenial:9 trusty:9 precise:9 + # debhelper: experimental:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9 if [ $serie = "focal" ]; then sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control fi @@ -77,28 +77,21 @@ for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control echo 9 > debian/compat fi - if [ $serie = "precise" ]; then - sed -i 's/dh $@/dh $@ --with autotools_dev,autoreconf/g' debian/rules - sed -i 's/override_dh_update_autotools_config/override_dh_autotools-dev_updateconfig/g' debian/rules - sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), autotools-dev, dh-autoreconf/g' debian/control - sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control - echo 9 > debian/compat - fi - sed -i 's/unstable/'$serie'/g' debian/changelog + sed -i 's/experimental/'$serie'/g' debian/changelog sed -i 's/-1) /-1+'$serie') /' debian/changelog dpkg-buildpackage -us -uc -ui -d -S fi echo "===========================" cd .. - if [ $serie = "unstable" ]; then + if [ $serie = "experimental" ]; then # debian only - debsign awf-$gtk_$version-*.changes + debsign awf-${gtk}_$version-*.changes echo "===========================" - lintian -EviIL +pedantic awf-$gtk_$version-*.deb + lintian -EviIL +pedantic awf-${gtk}_$version-*.deb else # ubuntu only - debsign awf-$gtk_$version*+$serie*source.changes + debsign awf-${gtk}_$version*+$serie*source.changes fi echo "===========================" cd .. diff --git a/debian-gtk4/changelog b/debian-gtk4/changelog index 8b6ea2d..527d10d 100644 --- a/debian-gtk4/changelog +++ b/debian-gtk4/changelog @@ -1,5 +1,11 @@ +awf-gtk4 (2.6.0-1) experimental; urgency=low + + * New upstream version + + -- Fabrice Creuzot Thu, 09 Sep 2021 20:00:00 +0000 + awf-gtk4 (2.5.0-1) experimental; urgency=low - * Initial debian package release (Closes: #959433) + * Initial debian package release (Closes: #959434) -- Fabrice Creuzot Wed, 07 Jul 2021 20:00:00 +0000 diff --git a/debian-gtk4/control b/debian-gtk4/control index 3d29490..7fbf218 100644 --- a/debian-gtk4/control +++ b/debian-gtk4/control @@ -12,9 +12,9 @@ Vcs-Git: https://github.com/luigifab/awf-extended.git Package: awf-gtk4 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Theme preview application for GTK +Description: theme preview application for GTK 4 A widget factory is a theme preview application for GTK. It displays the various widget types provided by GTK in a single window allowing to see the visual effect of the applied theme. . - This package provides the gtk4 version. + This package provides the GTK 4 version. diff --git a/debian-gtk4/deb.sh b/debian-gtk4/deb.sh index 72f36e2..305cbb3 100644 --- a/debian-gtk4/deb.sh +++ b/debian-gtk4/deb.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk4" rm -rf builder/ @@ -28,7 +28,7 @@ else tar czf $temp.tar.gz $temp cd .. fi - +rm builder/awf-extended-$version/debian # create packages for debian and ubuntu for serie in experimental impish hirsute; do @@ -46,7 +46,7 @@ for serie in experimental impish hirsute; do dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-$gtk - rm -f debian/*ex debian/*EX debian/README* debian/*doc* + rm -f debian/*ex debian/*EX debian/README* debian/*doc* debian/deb.sh mkdir debian/upstream cp debian-$gtk/* debian/ mv debian/metadata debian/upstream/metadata @@ -56,7 +56,7 @@ for serie in experimental impish hirsute; do if [ $serie = "experimental" ]; then dpkg-buildpackage -us -uc else - # debhelper: experimental:13 hirsute:13 groovy:13 focal:12 bionic:9 xenial:9 trusty:9 precise:9 + # debhelper: experimental:13 hirsute:13 focal:12 bionic:9 xenial:9 trusty:9 if [ $serie = "focal" ]; then sed -i 's/debhelper-compat (= 13)/debhelper-compat (= 12)/g' debian/control fi @@ -77,13 +77,6 @@ for serie in experimental impish hirsute; do sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control echo 9 > debian/compat fi - if [ $serie = "precise" ]; then - sed -i 's/dh $@/dh $@ --with autotools_dev,autoreconf/g' debian/rules - sed -i 's/override_dh_update_autotools_config/override_dh_autotools-dev_updateconfig/g' debian/rules - sed -i 's/debhelper-compat (= 13)/debhelper (>= 9), autotools-dev, dh-autoreconf/g' debian/control - sed -i ':a;N;$!ba;s/Rules-Requires-Root: no\n//g' debian/control - echo 9 > debian/compat - fi sed -i 's/experimental/'$serie'/g' debian/changelog sed -i 's/-1) /-1+'$serie') /' debian/changelog dpkg-buildpackage -us -uc -ui -d -S @@ -93,12 +86,12 @@ for serie in experimental impish hirsute; do if [ $serie = "experimental" ]; then # debian only - debsign awf-$gtk_$version-*.changes + debsign awf-${gtk}_$version-*.changes echo "===========================" - lintian -EviIL +pedantic awf-$gtk_$version-*.deb + lintian -EviIL +pedantic awf-${gtk}_$version-*.deb else # ubuntu only - debsign awf-$gtk_$version*+$serie*source.changes + debsign awf-${gtk}_$version*+$serie*source.changes fi echo "===========================" cd .. diff --git a/fedora-gtk2/awf-gtk2.spec b/fedora-gtk2/awf-gtk2.spec index a2ab577..24284ab 100644 --- a/fedora-gtk2/awf-gtk2.spec +++ b/fedora-gtk2/awf-gtk2.spec @@ -1,5 +1,5 @@ Name: awf-gtk2 -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: Theme preview application for GTK Summary(fr): Application d'aperçu de thème pour GTK @@ -68,6 +68,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{ %changelog +* Thu Sep 09 2021 Fabrice Creuzot - 2.6.0-1 +- New upstream version + * Wed Jul 07 2021 Fabrice Creuzot - 2.5.0-1 - New upstream version diff --git a/fedora-gtk2/rpm.sh b/fedora-gtk2/rpm.sh index 864b99c..34640fe 100644 --- a/fedora-gtk2/rpm.sh +++ b/fedora-gtk2/rpm.sh @@ -3,7 +3,7 @@ # Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk2" rm -rf builder/ ~/rpmbuild/ diff --git a/fedora-gtk3/awf-gtk3.spec b/fedora-gtk3/awf-gtk3.spec index 66518d0..0ce5074 100644 --- a/fedora-gtk3/awf-gtk3.spec +++ b/fedora-gtk3/awf-gtk3.spec @@ -1,5 +1,5 @@ Name: awf-gtk3 -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: Theme preview application for GTK Summary(fr): Application d'aperçu de thème pour GTK @@ -68,6 +68,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{ %changelog +* Thu Sep 09 2021 Fabrice Creuzot - 2.6.0-1 +- New upstream version + * Wed Jul 07 2021 Fabrice Creuzot - 2.5.0-1 - New upstream version diff --git a/fedora-gtk3/rpm.sh b/fedora-gtk3/rpm.sh index 77c111b..a268ceb 100644 --- a/fedora-gtk3/rpm.sh +++ b/fedora-gtk3/rpm.sh @@ -3,7 +3,7 @@ # Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk3" rm -rf builder/ ~/rpmbuild/ diff --git a/fedora-gtk4/awf-gtk4.spec b/fedora-gtk4/awf-gtk4.spec index 7cee2eb..1ae686c 100644 --- a/fedora-gtk4/awf-gtk4.spec +++ b/fedora-gtk4/awf-gtk4.spec @@ -1,5 +1,5 @@ Name: awf-gtk4 -Version: 2.5.0 +Version: 2.6.0 Release: 1%{?dist} Summary: Theme preview application for GTK Summary(fr): Application d'aperçu de thème pour GTK @@ -68,6 +68,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{ %changelog +* Thu Sep 09 2021 Fabrice Creuzot - 2.6.0-1 +- New upstream version + * Wed Jul 07 2021 Fabrice Creuzot - 2.5.0-1 - New upstream version diff --git a/fedora-gtk4/rpm.sh b/fedora-gtk4/rpm.sh index 1b1e959..2a1a635 100644 --- a/fedora-gtk4/rpm.sh +++ b/fedora-gtk4/rpm.sh @@ -3,7 +3,7 @@ # Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk4" rm -rf builder/ ~/rpmbuild/ diff --git a/images/gtk2-menu.png b/images/gtk2-menu.png index a3e1392..1657b9e 100644 Binary files a/images/gtk2-menu.png and b/images/gtk2-menu.png differ diff --git a/images/gtk2-rtl-menu.png b/images/gtk2-rtl-menu.png index 0c89341..2586332 100644 Binary files a/images/gtk2-rtl-menu.png and b/images/gtk2-rtl-menu.png differ diff --git a/images/gtk2-rtl.png b/images/gtk2-rtl.png index 12c59ef..9058d29 100644 Binary files a/images/gtk2-rtl.png and b/images/gtk2-rtl.png differ diff --git a/images/gtk2.png b/images/gtk2.png index 3162f62..310dc6c 100644 Binary files a/images/gtk2.png and b/images/gtk2.png differ diff --git a/images/gtk3-menu.png b/images/gtk3-menu.png index 5c487c8..71b5668 100644 Binary files a/images/gtk3-menu.png and b/images/gtk3-menu.png differ diff --git a/images/gtk3-rtl-menu.png b/images/gtk3-rtl-menu.png index da8d22a..67669ee 100644 Binary files a/images/gtk3-rtl-menu.png and b/images/gtk3-rtl-menu.png differ diff --git a/images/gtk3-rtl.png b/images/gtk3-rtl.png index 5422dc1..9de7f56 100644 Binary files a/images/gtk3-rtl.png and b/images/gtk3-rtl.png differ diff --git a/images/gtk3.png b/images/gtk3.png index c8fb116..589f9b7 100644 Binary files a/images/gtk3.png and b/images/gtk3.png differ diff --git a/images/gtk4-menu.png b/images/gtk4-menu.png new file mode 100644 index 0000000..b909849 Binary files /dev/null and b/images/gtk4-menu.png differ diff --git a/images/gtk4-rtl-menu.png b/images/gtk4-rtl-menu.png new file mode 100644 index 0000000..18469e4 Binary files /dev/null and b/images/gtk4-rtl-menu.png differ diff --git a/images/gtk4-rtl.png b/images/gtk4-rtl.png new file mode 100644 index 0000000..e989573 Binary files /dev/null and b/images/gtk4-rtl.png differ diff --git a/images/gtk4.png b/images/gtk4.png new file mode 100644 index 0000000..83364f6 Binary files /dev/null and b/images/gtk4.png differ diff --git a/images/thumbs/gtk2-menu.png b/images/thumbs/gtk2-menu.png index 961d59e..ac2c3b4 100644 Binary files a/images/thumbs/gtk2-menu.png and b/images/thumbs/gtk2-menu.png differ diff --git a/images/thumbs/gtk2-rtl-menu.png b/images/thumbs/gtk2-rtl-menu.png index 864ca2b..95a6c55 100644 Binary files a/images/thumbs/gtk2-rtl-menu.png and b/images/thumbs/gtk2-rtl-menu.png differ diff --git a/images/thumbs/gtk2-rtl.png b/images/thumbs/gtk2-rtl.png index abe370a..3f06998 100644 Binary files a/images/thumbs/gtk2-rtl.png and b/images/thumbs/gtk2-rtl.png differ diff --git a/images/thumbs/gtk2.png b/images/thumbs/gtk2.png index d619db2..97d9fbd 100644 Binary files a/images/thumbs/gtk2.png and b/images/thumbs/gtk2.png differ diff --git a/images/thumbs/gtk3-menu.png b/images/thumbs/gtk3-menu.png index a848797..a21679a 100644 Binary files a/images/thumbs/gtk3-menu.png and b/images/thumbs/gtk3-menu.png differ diff --git a/images/thumbs/gtk3-rtl-menu.png b/images/thumbs/gtk3-rtl-menu.png index ac7dd47..ad112e4 100644 Binary files a/images/thumbs/gtk3-rtl-menu.png and b/images/thumbs/gtk3-rtl-menu.png differ diff --git a/images/thumbs/gtk3-rtl.png b/images/thumbs/gtk3-rtl.png index 9e18606..cf8357e 100644 Binary files a/images/thumbs/gtk3-rtl.png and b/images/thumbs/gtk3-rtl.png differ diff --git a/images/thumbs/gtk3.png b/images/thumbs/gtk3.png index 62daf81..216da62 100644 Binary files a/images/thumbs/gtk3.png and b/images/thumbs/gtk3.png differ diff --git a/images/thumbs/gtk4-menu.png b/images/thumbs/gtk4-menu.png index 2085167..f0a2f55 100644 Binary files a/images/thumbs/gtk4-menu.png and b/images/thumbs/gtk4-menu.png differ diff --git a/images/thumbs/gtk4-rtl-menu.png b/images/thumbs/gtk4-rtl-menu.png index 9f6697f..cd0e0cf 100644 Binary files a/images/thumbs/gtk4-rtl-menu.png and b/images/thumbs/gtk4-rtl-menu.png differ diff --git a/images/thumbs/gtk4-rtl.png b/images/thumbs/gtk4-rtl.png index b33b6fc..3424c2d 100644 Binary files a/images/thumbs/gtk4-rtl.png and b/images/thumbs/gtk4-rtl.png differ diff --git a/images/thumbs/gtk4.png b/images/thumbs/gtk4.png index 1113903..e54533e 100644 Binary files a/images/thumbs/gtk4.png and b/images/thumbs/gtk4.png differ diff --git a/opensuse-gtk2/awf-gtk2.spec b/opensuse-gtk2/awf-gtk2.spec index e1ebdce..f39ef67 100644 --- a/opensuse-gtk2/awf-gtk2.spec +++ b/opensuse-gtk2/awf-gtk2.spec @@ -1,8 +1,8 @@ Name: awf-gtk2 -Version: 2.5.0 +Version: 2.6.0 Release: 0 -Summary: Theme preview application for GTK -Summary(fr): Application d'aperçu de thème pour GTK +Summary: Theme preview application for GTK 2 +Summary(fr): Application d'aperçu de thème pour GTK 2 License: GPL-3.0-or-later URL: https://github.com/luigifab/awf-extended Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -22,14 +22,14 @@ A widget factory is a theme preview application for GTK. It displays the various widget types provided by GTK in a single window allowing to see the visual effect of the applied theme. -This package provides the gtk2 version.} +This package provides the GTK 2 version.} %description -l fr %{expand: La fabrique à widgets est une application d'aperçu de thème pour GTK. Elle affiche les différents types de widgets fournis par GTK dans une seule fenêtre permettant de voir l'effet visuel du thème appliqué. -Ce paquet fournit la version gtk2.} +Ce paquet fournit la version GTK 2.} %prep @@ -68,6 +68,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{ %changelog +* Thu Sep 09 2021 Fabrice Creuzot - 2.6.0-1 +- New upstream version + * Wed Jul 07 2021 Fabrice Creuzot - 2.5.0-1 - New upstream version diff --git a/opensuse-gtk2/rpm.sh b/opensuse-gtk2/rpm.sh index aaa1133..d429fc1 100644 --- a/opensuse-gtk2/rpm.sh +++ b/opensuse-gtk2/rpm.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk2" rm -rf builder/ ~/rpmbuild/ diff --git a/opensuse-gtk3/awf-gtk3.spec b/opensuse-gtk3/awf-gtk3.spec index e382fa1..d49db98 100644 --- a/opensuse-gtk3/awf-gtk3.spec +++ b/opensuse-gtk3/awf-gtk3.spec @@ -1,8 +1,8 @@ Name: awf-gtk3 -Version: 2.5.0 +Version: 2.6.0 Release: 0 -Summary: Theme preview application for GTK -Summary(fr): Application d'aperçu de thème pour GTK +Summary: Theme preview application for GTK 3 +Summary(fr): Application d'aperçu de thème pour GTK 3 License: GPL-3.0-or-later URL: https://github.com/luigifab/awf-extended Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -22,14 +22,14 @@ A widget factory is a theme preview application for GTK. It displays the various widget types provided by GTK in a single window allowing to see the visual effect of the applied theme. -This package provides the gtk3 version.} +This package provides the GTK 3 version.} %description -l fr %{expand: La fabrique à widgets est une application d'aperçu de thème pour GTK. Elle affiche les différents types de widgets fournis par GTK dans une seule fenêtre permettant de voir l'effet visuel du thème appliqué. -Ce paquet fournit la version gtk3.} +Ce paquet fournit la version GTK 3.} %prep @@ -68,6 +68,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{ %changelog +* Thu Sep 09 2021 Fabrice Creuzot - 2.6.0-1 +- New upstream version + * Wed Jul 07 2021 Fabrice Creuzot - 2.5.0-1 - New upstream version diff --git a/opensuse-gtk3/rpm.sh b/opensuse-gtk3/rpm.sh index 12be23f..579483b 100644 --- a/opensuse-gtk3/rpm.sh +++ b/opensuse-gtk3/rpm.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk3" rm -rf builder/ ~/rpmbuild/ diff --git a/opensuse-gtk4/awf-gtk4.spec b/opensuse-gtk4/awf-gtk4.spec index d4bac36..e71bd14 100644 --- a/opensuse-gtk4/awf-gtk4.spec +++ b/opensuse-gtk4/awf-gtk4.spec @@ -1,8 +1,8 @@ Name: awf-gtk4 -Version: 2.5.0 +Version: 2.6.0 Release: 0 -Summary: Theme preview application for GTK -Summary(fr): Application d'aperçu de thème pour GTK +Summary: Theme preview application for GTK 4 +Summary(fr): Application d'aperçu de thème pour GTK 4 License: GPL-3.0-or-later URL: https://github.com/luigifab/awf-extended Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -22,14 +22,14 @@ A widget factory is a theme preview application for GTK. It displays the various widget types provided by GTK in a single window allowing to see the visual effect of the applied theme. -This package provides the gtk4 version.} +This package provides the GTK 4 version.} %description -l fr %{expand: La fabrique à widgets est une application d'aperçu de thème pour GTK. Elle affiche les différents types de widgets fournis par GTK dans une seule fenêtre permettant de voir l'effet visuel du thème appliqué. -Ce paquet fournit la version gtk4.} +Ce paquet fournit la version GTK 4.} %prep @@ -68,6 +68,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ applications/%{ %changelog +* Thu Sep 09 2021 Fabrice Creuzot - 2.6.0-1 +- New upstream version + * Wed Jul 07 2021 Fabrice Creuzot - 2.5.0-1 - New upstream version diff --git a/opensuse-gtk4/rpm.sh b/opensuse-gtk4/rpm.sh index 104a422..70440e1 100644 --- a/opensuse-gtk4/rpm.sh +++ b/opensuse-gtk4/rpm.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" -version="2.5.0" +version="2.6.0" gtk="gtk4" rm -rf builder/ ~/rpmbuild/ diff --git a/src/awf.c b/src/awf.c index 841def1..548f258 100644 --- a/src/awf.c +++ b/src/awf.c @@ -1,6 +1,6 @@ /** * Forked M/10/03/2020 - * Updated D/20/06/2021 + * Updated S/21/08/2021 * * Copyright 2020-2021 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/awf-extended @@ -31,8 +31,8 @@ * msgfmt src/po/fr.po -o src/fr/LC_MESSAGES/awf.mo * * Tested with build.sh (via VirtualBox 6.1) with: - * Fedora Rawhide 64 (1536 MB) GTK 2.24/3.24/4.2 + GLIB 2.68 + Pango 1.48 - * Debian Testing 64 (1536 MB) GTK 2.24/3.24/4.0 + GLIB 2.66 + Pango 1.48 + * Fedora Rawhide 64 (1536 MB) GTK 2.24/3.24/4.2 + GLIB 2.69 + Pango 1.48 + * Debian Testing 64 (1536 MB) GTK 2.24/3.24/4.3 + GLIB 2.66 + Pango 1.48 * Ubuntu 21.04 Hirsute Hippo 64 (1536 MB) GTK 2.24/3.24/4.0 + GLIB 2.68 + Pango 1.48 * Ubuntu 17.04 Zesty Zapus 32 (1536 MB) GTK 2.24/3.22 + GLIB 2.52 + Pango 1.40 * Ubuntu 16.10 Yakkety Yak 32 (1536 MB) GTK 2.24/3.20 + GLIB 2.50 + Pango 1.40 @@ -162,6 +162,7 @@ static void update_statusbar (gchar *text); static void update_values (GtkRange *range); static void update_widgets (); static void update_direction (); +static void update_marks (GtkScale *scale, GtkPositionType position, gboolean value); static gboolean sighup_handler (); static gboolean take_screenshot (); // layout and widgets @@ -180,7 +181,7 @@ static void create_spinners (GtkWidget *root); static void create_expander (GtkWidget *root); static void create_frames (GtkWidget *root1, GtkWidget *root2); static void create_notebooks (GtkWidget *root1, GtkWidget *root2); -static void create_notebook_tab (GtkWidget *notebook, gchar *text); +static void create_notebook_tab (GtkWidget *notebook, gchar *text, gboolean close); static void create_treview (GtkWidget *root); static GtkWidget* create_horizontal_scale (gint value, gboolean draw, gboolean inverted); static GtkWidget* create_vertical_scale (gint value, gboolean draw, gboolean inverted); @@ -303,13 +304,13 @@ int main (int argc, gchar **argv) { #if GTK_CHECK_VERSION (4,0,0) GtkApplication *app; - app = gtk_application_new ("org.gtk.awf4", G_APPLICATION_FLAGS_NONE); + app = gtk_application_new ("org.gtk.awf4", G_APPLICATION_NON_UNIQUE); g_signal_connect (app, "activate", G_CALLBACK (create_window), theme); g_application_register (G_APPLICATION (app), NULL, NULL); status = g_application_run (G_APPLICATION (app), 0, NULL); // @todo (app, argc, argv) #elif GTK_CHECK_VERSION (3,4,0) GtkApplication *app; - app = gtk_application_new ("org.gtk.awf3", G_APPLICATION_FLAGS_NONE); + app = gtk_application_new ("org.gtk.awf3", G_APPLICATION_NON_UNIQUE); g_signal_connect (app, "activate", G_CALLBACK (create_window), theme); status = g_application_run (G_APPLICATION (app), 0, NULL); // @todo (app, argc, argv) #else @@ -540,28 +541,10 @@ static void update_widgets () { #endif gtk_scale_clear_marks (GTK_SCALE (scale5)); - if (toggle) { - gtk_scale_add_mark (GTK_SCALE (scale5), 25, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 50, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 75, GTK_POS_LEFT, NULL); - } - else { - gtk_scale_add_mark (GTK_SCALE (scale5), 25, GTK_POS_LEFT, "25"); - gtk_scale_add_mark (GTK_SCALE (scale5), 50, GTK_POS_LEFT, "50"); - gtk_scale_add_mark (GTK_SCALE (scale5), 75, GTK_POS_LEFT, "75"); - } + update_marks (GTK_SCALE (scale5), GTK_POS_LEFT, !toggle); gtk_scale_clear_marks (GTK_SCALE (scale6)); - if (toggle) { - gtk_scale_add_mark (GTK_SCALE (scale6), 25, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 50, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 75, GTK_POS_RIGHT, NULL); - } - else { - gtk_scale_add_mark (GTK_SCALE (scale6), 25, GTK_POS_RIGHT, "25"); - gtk_scale_add_mark (GTK_SCALE (scale6), 50, GTK_POS_RIGHT, "50"); - gtk_scale_add_mark (GTK_SCALE (scale6), 75, GTK_POS_RIGHT, "75"); - } + update_marks (GTK_SCALE (scale6), GTK_POS_RIGHT, !toggle); } static void update_direction () { @@ -569,6 +552,8 @@ static void update_direction () { // https://developer.gnome.org/gtk3/stable/GtkWidget.html // https://developer.gnome.org/gtk3/stable/GtkNotebook.html + gboolean toggle = gtk_notebook_get_scrollable (GTK_NOTEBOOK (notebook1)); + if (gtk_widget_get_default_direction () == gtk_widget_get_direction (window)) { if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) { @@ -581,26 +566,17 @@ static void update_direction () { #endif gtk_scale_clear_marks (GTK_SCALE (scale5)); - gtk_scale_add_mark (GTK_SCALE (scale5), 25, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 50, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 75, GTK_POS_LEFT, NULL); + update_marks (GTK_SCALE (scale5), GTK_POS_LEFT, toggle); gtk_scale_clear_marks (GTK_SCALE (scale6)); - gtk_scale_add_mark (GTK_SCALE (scale6), 25, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 50, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 75, GTK_POS_RIGHT, NULL); - + update_marks (GTK_SCALE (scale6), GTK_POS_RIGHT, toggle); } else { gtk_scale_clear_marks (GTK_SCALE (scale5)); - gtk_scale_add_mark (GTK_SCALE (scale5), 25, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 50, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 75, GTK_POS_RIGHT, NULL); + update_marks (GTK_SCALE (scale5), GTK_POS_RIGHT, toggle); gtk_scale_clear_marks (GTK_SCALE (scale6)); - gtk_scale_add_mark (GTK_SCALE (scale6), 25, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 50, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 75, GTK_POS_LEFT, NULL); + update_marks (GTK_SCALE (scale6), GTK_POS_LEFT, toggle); #if GTK_CHECK_VERSION (3,20,0) && !GTK_CHECK_VERSION (4,0,0) gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook3), GTK_POS_RIGHT); @@ -615,6 +591,24 @@ static void update_direction () { } } +static void update_marks (GtkScale *scale, GtkPositionType position, gboolean value) { + + if (value) { + gtk_scale_add_mark (scale, 0, position, NULL); + gtk_scale_add_mark (scale, 25, position, "25"); + gtk_scale_add_mark (scale, 50, position, "50"); + gtk_scale_add_mark (scale, 75, position, "75"); + gtk_scale_add_mark (scale, 100, position, NULL); + } + else { + gtk_scale_add_mark (scale, 0, position, NULL); + gtk_scale_add_mark (scale, 25, position, NULL); + gtk_scale_add_mark (scale, 50, position, NULL); + gtk_scale_add_mark (scale, 75, position, NULL); + gtk_scale_add_mark (scale, 100, position, NULL); + } +} + static gboolean sighup_handler () { update_theme ("refresh"); @@ -1339,6 +1333,13 @@ static void create_otherbuttons (GtkWidget *root1, GtkWidget *root2, GtkWidget * button6 = gtk_font_button_new (); gtk_widget_set_size_request (button6, 186, -1); + #if GTK_CHECK_VERSION (4,0,0) + // set fixed width for font button + gtk_label_set_ellipsize (GTK_LABEL (gtk_widget_get_first_child (gtk_widget_get_first_child (gtk_widget_get_first_child (button6)))), PANGO_ELLIPSIZE_END); + #elif GTK_CHECK_VERSION (3,0,0) + // set fixed width for font button + gtk_label_set_ellipsize (GTK_LABEL (g_list_first (gtk_container_get_children (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (button6)))))->data), PANGO_ELLIPSIZE_END); + #endif // https://developer.gnome.org/gtk3/stable/GtkFileChooserButton.html // https://developer.gnome.org/gtk4/stable/ch41s02.html#id-1.7.4.4.85 @@ -1516,15 +1517,11 @@ static void create_progressbars (GtkWidget *root1, GtkWidget *root2, GtkWidget * g_signal_connect (scale4, "value_changed", G_CALLBACK (update_values), NULL); scale5 = create_vertical_scale (50, FALSE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale5), 25, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 50, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5), 75, GTK_POS_LEFT, NULL); + update_marks (GTK_SCALE (scale5), GTK_POS_LEFT, FALSE); g_signal_connect (scale5, "value_changed", G_CALLBACK (update_values), NULL); scale6 = create_vertical_scale (50, FALSE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale6), 25, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 50, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale6), 75, GTK_POS_RIGHT, NULL); + update_marks (GTK_SCALE (scale6), GTK_POS_RIGHT, FALSE); g_signal_connect (scale6, "value_changed", G_CALLBACK (update_values), NULL); #if GTK_CHECK_VERSION (3,6,0) @@ -1657,8 +1654,8 @@ static void create_expander (GtkWidget *root) { #if GTK_CHECK_VERSION (4,0,0) scrolled_window = gtk_scrolled_window_new (); - gchar *config = getenv ("GTK_OVERLAY_SCROLLING"); - if (strcmp (config, "0") == 0) + const gchar *config = g_getenv ("GTK_OVERLAY_SCROLLING"); + if (config && (strcmp (config, "0") == 0)) gtk_scrolled_window_set_overlay_scrolling (GTK_SCROLLED_WINDOW (scrolled_window), FALSE); #else scrolled_window = gtk_scrolled_window_new (NULL, NULL); @@ -1764,34 +1761,34 @@ static void create_notebooks (GtkWidget *root1, GtkWidget *root2) { gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook1)); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook1), FALSE); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook1), GTK_POS_TOP); - create_notebook_tab (notebook1, "Tab1"); - create_notebook_tab (notebook1, "Tab2"); - create_notebook_tab (notebook1, "Tab3!"); - create_notebook_tab (notebook1, "Tab4"); + create_notebook_tab (notebook1, "Tab1", FALSE); + create_notebook_tab (notebook1, "Tab2", FALSE); + create_notebook_tab (notebook1, "Tab3!", FALSE); + create_notebook_tab (notebook1, "Tab4", FALSE); gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook2)); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook2), FALSE); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook2), GTK_POS_BOTTOM); - create_notebook_tab (notebook2, "Tab1"); - create_notebook_tab (notebook2, "Tab2"); - create_notebook_tab (notebook2, "Tab3!"); - create_notebook_tab (notebook2, "Tab4"); + create_notebook_tab (notebook2, "Tab1", FALSE); + create_notebook_tab (notebook2, "Tab2", FALSE); + create_notebook_tab (notebook2, "Tab3!", FALSE); + create_notebook_tab (notebook2, "Tab4", FALSE); gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook3)); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook3), FALSE); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook3), GTK_POS_LEFT); - create_notebook_tab (notebook3, "Tab1"); - create_notebook_tab (notebook3, "Tab2"); - create_notebook_tab (notebook3, "Tab3!"); - create_notebook_tab (notebook3, "Tab4"); + create_notebook_tab (notebook3, "Tab1", FALSE); + create_notebook_tab (notebook3, "Tab2", FALSE); + create_notebook_tab (notebook3, "Tab3!", FALSE); + create_notebook_tab (notebook3, "Tab4", FALSE); gtk_notebook_popup_enable (GTK_NOTEBOOK (notebook4)); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook4), FALSE); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook4), GTK_POS_RIGHT); - create_notebook_tab (notebook4, "Tab1"); - create_notebook_tab (notebook4, "Tab2"); - create_notebook_tab (notebook4, "Tab3!"); - create_notebook_tab (notebook4, "Tab4"); + create_notebook_tab (notebook4, "Tab1", TRUE); + create_notebook_tab (notebook4, "Tab2", TRUE); + create_notebook_tab (notebook4, "Tab3!", TRUE); + create_notebook_tab (notebook4, "Tab4", TRUE); add_to (GTK_BOX (root1), notebook1, TRUE, TRUE, 0, 0); add_to (GTK_BOX (root1), notebook2, TRUE, TRUE, 0, 0); @@ -1799,7 +1796,7 @@ static void create_notebooks (GtkWidget *root1, GtkWidget *root2) { add_to (GTK_BOX (root2), notebook4, TRUE, TRUE, 0, 0); } -static void create_notebook_tab (GtkWidget *notebook, gchar *text) { +static void create_notebook_tab (GtkWidget *notebook, gchar *text, gboolean close) { // https://developer.gnome.org/gtk3/stable/GtkNotebook.html // https://developer.gnome.org/gtk4/stable/GtkEventControllerScroll.html @@ -1807,6 +1804,7 @@ static void create_notebook_tab (GtkWidget *notebook, gchar *text) { GtkWidget *head, *content = BOXV; head = gtk_label_new (text); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), content, head); gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (notebook), content, TRUE); @@ -1969,8 +1967,8 @@ static void create_treview (GtkWidget *root) { #if GTK_CHECK_VERSION (4,0,0) scrolled_window = gtk_scrolled_window_new (); - gchar *config = getenv ("GTK_OVERLAY_SCROLLING"); - if (strcmp (config, "0") == 0) + const gchar *config = g_getenv ("GTK_OVERLAY_SCROLLING"); + if (config && (strcmp (config, "0") == 0)) gtk_scrolled_window_set_overlay_scrolling (GTK_SCROLLED_WINDOW (scrolled_window), FALSE); #else scrolled_window = gtk_scrolled_window_new (NULL, NULL); @@ -2067,38 +2065,6 @@ static void create_traditional_menubar (GtkApplication *app, GMenu *root) { GSimpleAction *action; GSList *iterator; - action = g_simple_action_new_stateful ("set-theme", G_VARIANT_TYPE_STRING, g_variant_new_string (current_theme)); - g_signal_connect (action, "activate", G_CALLBACK (gtk40_activate_action), NULL); - g_action_map_add_action (G_ACTION_MAP (g_application_get_default ()), G_ACTION (action)); - - // system - menu = g_menu_new (); - g_menu_append_submenu (root, _app("_System theme"), G_MENU_MODEL (menu)); - for (iterator = list_system_theme; iterator; iterator = iterator->next) { - if (g_slist_find_custom (list_user_theme, iterator->data, &awf_compare_theme)) { - menuitem = g_menu_item_new (iterator->data, "disabled"); // @todo? - g_menu_append_item (menu, menuitem); - } - else { - menuitem = g_menu_item_new (iterator->data, g_strdup_printf ("app.set-theme::%s", (gchar*) iterator->data)); - g_menu_append_item (menu, menuitem); - } - } - - if (!list_system_theme) - g_menu_append (menu, _app("No themes found"), "disabled"); // @todo - - // user - menu = g_menu_new (); - g_menu_append_submenu (root, _app("_User theme"), G_MENU_MODEL (menu)); - for (iterator = list_user_theme; iterator; iterator = iterator->next) { - menuitem = g_menu_item_new (iterator->data, g_strdup_printf ("app.set-theme::%s", (gchar*) iterator->data)); - g_menu_append_item (menu, menuitem); - } - - if (!list_user_theme) - g_menu_append (menu, _app("No themes found"), "disabled"); // @todo - // options menu = g_menu_new (); g_menu_append_submenu (root, _app("_Options"), G_MENU_MODEL (menu)); @@ -2201,6 +2167,39 @@ static void create_traditional_menubar (GtkApplication *app, GMenu *root) { create_menuitem (app, section, _gtk("_Close"), AWF_ACCEL_CLOS, AWF_CLOS, NULL); create_menuitem (app, section, _gtk("_Quit"), AWF_ACCEL_QUIT, AWF_QUIT, quit); + + // themes + action = g_simple_action_new_stateful ("set-theme", G_VARIANT_TYPE_STRING, g_variant_new_string (current_theme)); + g_signal_connect (action, "activate", G_CALLBACK (gtk40_activate_action), NULL); + g_action_map_add_action (G_ACTION_MAP (g_application_get_default ()), G_ACTION (action)); + + // system + menu = g_menu_new (); + g_menu_append_submenu (root, _app("_System theme"), G_MENU_MODEL (menu)); + for (iterator = list_system_theme; iterator; iterator = iterator->next) { + if (g_slist_find_custom (list_user_theme, iterator->data, &awf_compare_theme)) { + menuitem = g_menu_item_new (iterator->data, "disabled"); // @todo? + g_menu_append_item (menu, menuitem); + } + else { + menuitem = g_menu_item_new (iterator->data, g_strdup_printf ("app.set-theme::%s", (gchar*) iterator->data)); + g_menu_append_item (menu, menuitem); + } + } + + if (!list_system_theme) + g_menu_append (menu, _app("No themes found"), "disabled"); // @todo + + // user + menu = g_menu_new (); + g_menu_append_submenu (root, _app("_User theme"), G_MENU_MODEL (menu)); + for (iterator = list_user_theme; iterator; iterator = iterator->next) { + menuitem = g_menu_item_new (iterator->data, g_strdup_printf ("app.set-theme::%s", (gchar*) iterator->data)); + g_menu_append_item (menu, menuitem); + } + + if (!list_user_theme) + g_menu_append (menu, _app("No themes found"), "disabled"); // @todo } static GMenuItem* create_menuitem (GtkApplication *app, GMenu *menu, gchar *text, gchar *accel, gchar *keymap, GCallback function) { @@ -2281,41 +2280,6 @@ static void create_traditional_menubar (GtkWidget *root) { gtk_window_add_accel_group (GTK_WINDOW (window), accels); - // system - menu = create_menu (root, _app("_System theme")); - for (iterator = list_system_theme; iterator; iterator = iterator->next) { - if (g_slist_find_custom (list_user_theme, iterator->data, &awf_compare_theme)) { - menuitem = create_menuitem_radio (menu, iterator->data, FALSE, FALSE, TRUE, group); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); - if (strcmp ((gchar*) current_theme, (gchar*) iterator->data) == 0) - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); - g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (update_theme), iterator->data); - } - else { - menuitem = create_menuitem_radio (menu, iterator->data, FALSE, FALSE, FALSE, group); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); - if (strcmp ((gchar*) current_theme, (gchar*) iterator->data) == 0) - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); - g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (update_theme), iterator->data); - } - } - - if (!list_system_theme) - create_menuitem (menu, _app("No themes found"), TRUE, NULL, NULL, NULL); - - // user - menu = create_menu (root, _app("_User theme")); - for (iterator = list_user_theme; iterator; iterator = iterator->next) { - menuitem = create_menuitem_radio (menu, iterator->data, FALSE, FALSE, FALSE, group); - group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); - if (strcmp ((gchar*) current_theme, (gchar*) iterator->data) == 0) - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); - g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (update_theme), iterator->data); - } - - if (!list_user_theme) - create_menuitem (menu, _app("No themes found"), TRUE, NULL, NULL, NULL); - // options menu = create_menu (root, _app("_Options")); gtk_menu_set_accel_group (GTK_MENU (menu), accels); // very important @@ -2376,6 +2340,41 @@ static void create_traditional_menubar (GtkWidget *root) { create_menuitem (menu, "gtk-close", TRUE, AWF_ACCEL_CLOS, AWF_CLOS, NULL); create_menuitem (menu, "gtk-quit", FALSE, AWF_ACCEL_QUIT, AWF_QUIT, quit); + // system + menu = create_menu (root, _app("_System theme")); + for (iterator = list_system_theme; iterator; iterator = iterator->next) { + if (g_slist_find_custom (list_user_theme, iterator->data, &awf_compare_theme)) { + menuitem = create_menuitem_radio (menu, iterator->data, FALSE, FALSE, TRUE, group); + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); + if (strcmp ((gchar*) current_theme, (gchar*) iterator->data) == 0) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); + g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (update_theme), iterator->data); + } + else { + menuitem = create_menuitem_radio (menu, iterator->data, FALSE, FALSE, FALSE, group); + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); + if (strcmp ((gchar*) current_theme, (gchar*) iterator->data) == 0) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); + g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (update_theme), iterator->data); + } + } + + if (!list_system_theme) + create_menuitem (menu, _app("No themes found"), TRUE, NULL, NULL, NULL); + + // user + menu = create_menu (root, _app("_User theme")); + for (iterator = list_user_theme; iterator; iterator = iterator->next) { + menuitem = create_menuitem_radio (menu, iterator->data, FALSE, FALSE, FALSE, group); + group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); + if (strcmp ((gchar*) current_theme, (gchar*) iterator->data) == 0) + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE); + g_signal_connect_swapped (menuitem, "activate", G_CALLBACK (update_theme), iterator->data); + } + + if (!list_user_theme) + create_menuitem (menu, _app("No themes found"), TRUE, NULL, NULL, NULL); + // gtk-can-change-accels for GTK 3.x (3.2/3.24) accels_load (); g_object_set (gtk_settings_get_default (), "gtk-can-change-accels", FALSE, NULL); @@ -2876,100 +2875,68 @@ static void dialog_scales () { scale1v = create_vertical_scale (value, FALSE, FALSE); scale2v = create_vertical_scale (value, FALSE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale2v), 25, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale2v), 50, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale2v), 75, GTK_POS_LEFT, NULL); + update_marks (GTK_SCALE (scale2v), GTK_POS_LEFT, FALSE); scale3v = create_vertical_scale (value, FALSE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale3v), 25, GTK_POS_LEFT, "25"); - gtk_scale_add_mark (GTK_SCALE (scale3v), 50, GTK_POS_LEFT, "50"); - gtk_scale_add_mark (GTK_SCALE (scale3v), 75, GTK_POS_LEFT, "75"); + update_marks (GTK_SCALE (scale3v), GTK_POS_LEFT, TRUE); scale4v = create_vertical_scale (value, TRUE, FALSE); scale5v = create_vertical_scale (value, TRUE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale5v), 25, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5v), 50, GTK_POS_LEFT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5v), 75, GTK_POS_LEFT, NULL); + update_marks (GTK_SCALE (scale5v), GTK_POS_LEFT, FALSE); scale6v = create_vertical_scale (value, TRUE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale6v), 25, GTK_POS_LEFT, "25"); - gtk_scale_add_mark (GTK_SCALE (scale6v), 50, GTK_POS_LEFT, "50"); - gtk_scale_add_mark (GTK_SCALE (scale6v), 75, GTK_POS_LEFT, "75"); + update_marks (GTK_SCALE (scale6v), GTK_POS_LEFT, TRUE); scale7v = create_vertical_scale (value, FALSE, TRUE); scale8v = create_vertical_scale (value, FALSE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale8v), 25, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale8v), 50, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale8v), 75, GTK_POS_RIGHT, NULL); + update_marks (GTK_SCALE (scale8v), GTK_POS_RIGHT, FALSE); scale9v = create_vertical_scale (value, FALSE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale9v), 25, GTK_POS_RIGHT, "25"); - gtk_scale_add_mark (GTK_SCALE (scale9v), 50, GTK_POS_RIGHT, "50"); - gtk_scale_add_mark (GTK_SCALE (scale9v), 75, GTK_POS_RIGHT, "75"); + update_marks (GTK_SCALE (scale9v), GTK_POS_RIGHT, TRUE); scale10v = create_vertical_scale (value, TRUE, TRUE); scale11v = create_vertical_scale (value, TRUE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale11v), 25, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale11v), 50, GTK_POS_RIGHT, NULL); - gtk_scale_add_mark (GTK_SCALE (scale11v), 75, GTK_POS_RIGHT, NULL); + update_marks (GTK_SCALE (scale11v), GTK_POS_RIGHT, FALSE); scale12v = create_vertical_scale (value, TRUE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale12v), 25, GTK_POS_RIGHT, "25"); - gtk_scale_add_mark (GTK_SCALE (scale12v), 50, GTK_POS_RIGHT, "50"); - gtk_scale_add_mark (GTK_SCALE (scale12v), 75, GTK_POS_RIGHT, "75"); + update_marks (GTK_SCALE (scale12v), GTK_POS_RIGHT, TRUE); // horizontal scales scale1h = create_horizontal_scale (value, FALSE, FALSE); scale2h = create_horizontal_scale (value, FALSE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale2h), 25, GTK_POS_TOP, NULL); - gtk_scale_add_mark (GTK_SCALE (scale2h), 50, GTK_POS_TOP, NULL); - gtk_scale_add_mark (GTK_SCALE (scale2h), 75, GTK_POS_TOP, NULL); + update_marks (GTK_SCALE (scale2h), GTK_POS_TOP, FALSE); scale3h = create_horizontal_scale (value, FALSE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale3h), 25, GTK_POS_TOP, "25"); - gtk_scale_add_mark (GTK_SCALE (scale3h), 50, GTK_POS_TOP, "50"); - gtk_scale_add_mark (GTK_SCALE (scale3h), 75, GTK_POS_TOP, "75"); + update_marks (GTK_SCALE (scale3h), GTK_POS_TOP, TRUE); scale4h = create_horizontal_scale (value, TRUE, FALSE); scale5h = create_horizontal_scale (value, TRUE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale5h), 25, GTK_POS_TOP, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5h), 50, GTK_POS_TOP, NULL); - gtk_scale_add_mark (GTK_SCALE (scale5h), 75, GTK_POS_TOP, NULL); + update_marks (GTK_SCALE (scale5h), GTK_POS_TOP, FALSE); scale6h = create_horizontal_scale (value, TRUE, FALSE); - gtk_scale_add_mark (GTK_SCALE (scale6h), 25, GTK_POS_TOP, "25"); - gtk_scale_add_mark (GTK_SCALE (scale6h), 50, GTK_POS_TOP, "50"); - gtk_scale_add_mark (GTK_SCALE (scale6h), 75, GTK_POS_TOP, "75"); + update_marks (GTK_SCALE (scale6h), GTK_POS_TOP, TRUE); scale7h = create_horizontal_scale (value, FALSE, TRUE); scale8h = create_horizontal_scale (value, FALSE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale8h), 25, GTK_POS_BOTTOM, NULL); - gtk_scale_add_mark (GTK_SCALE (scale8h), 50, GTK_POS_BOTTOM, NULL); - gtk_scale_add_mark (GTK_SCALE (scale8h), 75, GTK_POS_BOTTOM, NULL); + update_marks (GTK_SCALE (scale8h), GTK_POS_BOTTOM, FALSE); scale9h = create_horizontal_scale (value, FALSE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale9h), 25, GTK_POS_BOTTOM, "25"); - gtk_scale_add_mark (GTK_SCALE (scale9h), 50, GTK_POS_BOTTOM, "50"); - gtk_scale_add_mark (GTK_SCALE (scale9h), 75, GTK_POS_BOTTOM, "75"); + update_marks (GTK_SCALE (scale9h), GTK_POS_BOTTOM, TRUE); scale10h = create_horizontal_scale (value, TRUE, TRUE); scale11h = create_horizontal_scale (value, TRUE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale11h), 25, GTK_POS_BOTTOM, NULL); - gtk_scale_add_mark (GTK_SCALE (scale11h), 50, GTK_POS_BOTTOM, NULL); - gtk_scale_add_mark (GTK_SCALE (scale11h), 75, GTK_POS_BOTTOM, NULL); + update_marks (GTK_SCALE (scale11h), GTK_POS_BOTTOM, FALSE); scale12h = create_horizontal_scale (value, TRUE, TRUE); - gtk_scale_add_mark (GTK_SCALE (scale12h), 25, GTK_POS_BOTTOM, "25"); - gtk_scale_add_mark (GTK_SCALE (scale12h), 50, GTK_POS_BOTTOM, "50"); - gtk_scale_add_mark (GTK_SCALE (scale12h), 75, GTK_POS_BOTTOM, "75"); + update_marks (GTK_SCALE (scale12h), GTK_POS_BOTTOM, TRUE); // dialog diff --git a/src/awf.pot b/src/awf.pot index f85e534..314c808 100644 --- a/src/awf.pot +++ b/src/awf.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-20 18:18+0200\n" +"POT-Creation-Date: 2021-08-24 13:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,147 +17,147 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: gtk-awf/src/awf.c:280 gtk-awf/src/awf.c:2731 +#: gtk-awf/src/awf.c:281 gtk-awf/src/awf.c:2730 #, c-format msgid " started with gtk %d.%d.%d and glib %d.%d.%d and pango %s" msgstr "" -#: gtk-awf/src/awf.c:2138 gtk-awf/src/awf.c:2160 gtk-awf/src/awf.c:2176 -#: gtk-awf/src/awf.c:2193 gtk-awf/src/awf.c:2347 gtk-awf/src/awf.c:2354 -#: gtk-awf/src/awf.c:2362 gtk-awf/src/awf.c:2370 +#: gtk-awf/src/awf.c:2104 gtk-awf/src/awf.c:2126 gtk-awf/src/awf.c:2142 +#: gtk-awf/src/awf.c:2159 gtk-awf/src/awf.c:2311 gtk-awf/src/awf.c:2318 +#: gtk-awf/src/awf.c:2326 gtk-awf/src/awf.c:2334 msgid "(checked)" msgstr "" -#: gtk-awf/src/awf.c:2348 gtk-awf/src/awf.c:2355 gtk-awf/src/awf.c:2363 -#: gtk-awf/src/awf.c:2371 +#: gtk-awf/src/awf.c:2312 gtk-awf/src/awf.c:2319 gtk-awf/src/awf.c:2327 +#: gtk-awf/src/awf.c:2335 msgid "(inconsistent)" msgstr "" -#: gtk-awf/src/awf.c:2131 gtk-awf/src/awf.c:2152 gtk-awf/src/awf.c:2173 -#: gtk-awf/src/awf.c:2190 gtk-awf/src/awf.c:2346 gtk-awf/src/awf.c:2353 -#: gtk-awf/src/awf.c:2360 gtk-awf/src/awf.c:2368 +#: gtk-awf/src/awf.c:2097 gtk-awf/src/awf.c:2118 gtk-awf/src/awf.c:2139 +#: gtk-awf/src/awf.c:2156 gtk-awf/src/awf.c:2310 gtk-awf/src/awf.c:2317 +#: gtk-awf/src/awf.c:2324 gtk-awf/src/awf.c:2332 msgid "(unchecked)" msgstr "" -#: gtk-awf/src/awf.c:275 gtk-awf/src/awf.c:698 +#: gtk-awf/src/awf.c:276 gtk-awf/src/awf.c:692 #, c-format msgid "A widget factory - GTK %d - %s" msgstr "" -#: gtk-awf/src/awf.c:1674 gtk-awf/src/awf.c:2671 gtk-awf/src/awf.c:2724 +#: gtk-awf/src/awf.c:1671 gtk-awf/src/awf.c:2670 gtk-awf/src/awf.c:2723 msgid "" "A widget factory is a theme preview application for GTK. It displays the " "various widget types provided by GTK in a single window allowing to see the " "visual effect of the applied theme." msgstr "" -#: gtk-awf/src/awf.c:2108 gtk-awf/src/awf.c:2327 +#: gtk-awf/src/awf.c:2074 gtk-awf/src/awf.c:2291 msgid "Calendar" msgstr "" -#: gtk-awf/src/awf.c:291 +#: gtk-awf/src/awf.c:292 msgid "Don't start spinners" msgstr "" -#: gtk-awf/src/awf.c:2109 gtk-awf/src/awf.c:2328 +#: gtk-awf/src/awf.c:2075 gtk-awf/src/awf.c:2292 msgid "GtkScales" msgstr "" -#: gtk-awf/src/awf.c:290 +#: gtk-awf/src/awf.c:291 msgid "List available themes" msgstr "" -#: gtk-awf/src/awf.c:1652 gtk-awf/src/awf.c:2118 gtk-awf/src/awf.c:2336 +#: gtk-awf/src/awf.c:1649 gtk-awf/src/awf.c:2084 gtk-awf/src/awf.c:2300 msgid "More..." msgstr "" -#: gtk-awf/src/awf.c:2089 gtk-awf/src/awf.c:2100 gtk-awf/src/awf.c:2304 -#: gtk-awf/src/awf.c:2317 +#: gtk-awf/src/awf.c:2191 gtk-awf/src/awf.c:2202 gtk-awf/src/awf.c:2363 +#: gtk-awf/src/awf.c:2376 msgid "No themes found" msgstr "" -#: gtk-awf/src/awf.c:2773 gtk-awf/src/awf.c:2805 +#: gtk-awf/src/awf.c:2772 gtk-awf/src/awf.c:2804 msgid "Ok" msgstr "" -#: gtk-awf/src/awf.c:2107 gtk-awf/src/awf.c:2326 +#: gtk-awf/src/awf.c:2073 gtk-awf/src/awf.c:2290 msgid "Open recent file" msgstr "" -#: gtk-awf/src/awf.c:288 +#: gtk-awf/src/awf.c:289 msgid "Options:" msgstr "" -#: gtk-awf/src/awf.c:2725 +#: gtk-awf/src/awf.c:2724 #, c-format msgid "Remove %s file" msgstr "" -#: gtk-awf/src/awf.c:293 +#: gtk-awf/src/awf.c:294 #, c-format msgid "Run and save a png screenshot on %s" msgstr "" -#: gtk-awf/src/awf.c:292 +#: gtk-awf/src/awf.c:293 msgid "Run with the specified theme" msgstr "" -#: gtk-awf/src/awf.c:289 +#: gtk-awf/src/awf.c:290 msgid "Show version number" msgstr "" -#: gtk-awf/src/awf.c:423 gtk-awf/src/awf.c:738 +#: gtk-awf/src/awf.c:424 gtk-awf/src/awf.c:732 #, c-format msgid "Theme %s loaded." msgstr "" -#: gtk-awf/src/awf.c:402 +#: gtk-awf/src/awf.c:403 #, c-format msgid "Theme %s reloaded." msgstr "" -#: gtk-awf/src/awf.c:674 +#: gtk-awf/src/awf.c:668 #, c-format msgid "Theme reloaded, then screenshot saved (%s)." msgstr "" -#: gtk-awf/src/awf.c:2775 gtk-awf/src/awf.c:2807 +#: gtk-awf/src/awf.c:2774 gtk-awf/src/awf.c:2806 msgid "This is a question bar." msgstr "" -#: gtk-awf/src/awf.c:2781 gtk-awf/src/awf.c:2813 +#: gtk-awf/src/awf.c:2780 gtk-awf/src/awf.c:2812 msgid "This is a warning bar." msgstr "" -#: gtk-awf/src/awf.c:2787 gtk-awf/src/awf.c:2819 +#: gtk-awf/src/awf.c:2786 gtk-awf/src/awf.c:2818 msgid "This is an error bar." msgstr "" -#: gtk-awf/src/awf.c:2769 gtk-awf/src/awf.c:2801 +#: gtk-awf/src/awf.c:2768 gtk-awf/src/awf.c:2800 msgid "This is an info bar." msgstr "" -#: gtk-awf/src/awf.c:284 +#: gtk-awf/src/awf.c:285 msgid "Usage:" msgstr "" -#: gtk-awf/src/awf.c:2104 gtk-awf/src/awf.c:2320 +#: gtk-awf/src/awf.c:2070 gtk-awf/src/awf.c:2284 msgid "_Options" msgstr "" -#: gtk-awf/src/awf.c:2076 gtk-awf/src/awf.c:2285 +#: gtk-awf/src/awf.c:2178 gtk-awf/src/awf.c:2344 msgid "_System theme" msgstr "" -#: gtk-awf/src/awf.c:2093 gtk-awf/src/awf.c:2307 +#: gtk-awf/src/awf.c:2195 gtk-awf/src/awf.c:2366 msgid "_User theme" msgstr "" -#: gtk-awf/src/awf.c:276 gtk-awf/src/awf.c:2727 +#: gtk-awf/src/awf.c:277 gtk-awf/src/awf.c:2726 #, c-format msgid "compiled with gtk %d.%d.%d and glib %d.%d.%d and pango %s" msgstr "" -#: gtk-awf/src/awf.c:2726 +#: gtk-awf/src/awf.c:2725 msgid "to reset keyboard shortcuts." msgstr "" diff --git a/src/po/fr.po b/src/po/fr.po index 0efa720..2505603 100644 --- a/src/po/fr.po +++ b/src/po/fr.po @@ -1,38 +1,38 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-20 18:18+0200\n" +"POT-Creation-Date: 2021-08-24 13:40+0200\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gtk-awf/src/awf.c:280 gtk-awf/src/awf.c:2731 +#: gtk-awf/src/awf.c:281 gtk-awf/src/awf.c:2730 #, c-format msgid " started with gtk %d.%d.%d and glib %d.%d.%d and pango %s" msgstr " démarré avec gtk %d.%d.%d et glib %d.%d.%d et pango %s" -#: gtk-awf/src/awf.c:2138 gtk-awf/src/awf.c:2160 gtk-awf/src/awf.c:2176 -#: gtk-awf/src/awf.c:2193 gtk-awf/src/awf.c:2347 gtk-awf/src/awf.c:2354 -#: gtk-awf/src/awf.c:2362 gtk-awf/src/awf.c:2370 +#: gtk-awf/src/awf.c:2104 gtk-awf/src/awf.c:2126 gtk-awf/src/awf.c:2142 +#: gtk-awf/src/awf.c:2159 gtk-awf/src/awf.c:2311 gtk-awf/src/awf.c:2318 +#: gtk-awf/src/awf.c:2326 gtk-awf/src/awf.c:2334 msgid "(checked)" msgstr "(coché)" -#: gtk-awf/src/awf.c:2348 gtk-awf/src/awf.c:2355 gtk-awf/src/awf.c:2363 -#: gtk-awf/src/awf.c:2371 +#: gtk-awf/src/awf.c:2312 gtk-awf/src/awf.c:2319 gtk-awf/src/awf.c:2327 +#: gtk-awf/src/awf.c:2335 msgid "(inconsistent)" msgstr "(inconsistant)" -#: gtk-awf/src/awf.c:2131 gtk-awf/src/awf.c:2152 gtk-awf/src/awf.c:2173 -#: gtk-awf/src/awf.c:2190 gtk-awf/src/awf.c:2346 gtk-awf/src/awf.c:2353 -#: gtk-awf/src/awf.c:2360 gtk-awf/src/awf.c:2368 +#: gtk-awf/src/awf.c:2097 gtk-awf/src/awf.c:2118 gtk-awf/src/awf.c:2139 +#: gtk-awf/src/awf.c:2156 gtk-awf/src/awf.c:2310 gtk-awf/src/awf.c:2317 +#: gtk-awf/src/awf.c:2324 gtk-awf/src/awf.c:2332 msgid "(unchecked)" msgstr "(décoché)" -#: gtk-awf/src/awf.c:275 gtk-awf/src/awf.c:698 +#: gtk-awf/src/awf.c:276 gtk-awf/src/awf.c:692 #, c-format msgid "A widget factory - GTK %d - %s" msgstr "La fabrique à widgets - GTK %d - %s" -#: gtk-awf/src/awf.c:1674 gtk-awf/src/awf.c:2671 gtk-awf/src/awf.c:2724 +#: gtk-awf/src/awf.c:1671 gtk-awf/src/awf.c:2670 gtk-awf/src/awf.c:2723 msgid "" "A widget factory is a theme preview application for GTK. It displays the " "various widget types provided by GTK in a single window allowing to see the " @@ -42,113 +42,113 @@ msgstr "" "affiche les différents types de widgets fournis par GTK dans une seule " "fenêtre permettant de voir l'effet visuel du thème appliqué." -#: gtk-awf/src/awf.c:2108 gtk-awf/src/awf.c:2327 +#: gtk-awf/src/awf.c:2074 gtk-awf/src/awf.c:2291 msgid "Calendar" msgstr "Calendrier" -#: gtk-awf/src/awf.c:291 +#: gtk-awf/src/awf.c:292 msgid "Don't start spinners" msgstr "Ne pas démarrer les spinners" -#: gtk-awf/src/awf.c:2109 gtk-awf/src/awf.c:2328 +#: gtk-awf/src/awf.c:2075 gtk-awf/src/awf.c:2292 msgid "GtkScales" msgstr "GtkScales" -#: gtk-awf/src/awf.c:290 +#: gtk-awf/src/awf.c:291 msgid "List available themes" msgstr "Lister les thèmes disponibles" -#: gtk-awf/src/awf.c:1652 gtk-awf/src/awf.c:2118 gtk-awf/src/awf.c:2336 +#: gtk-awf/src/awf.c:1649 gtk-awf/src/awf.c:2084 gtk-awf/src/awf.c:2300 msgid "More..." msgstr "Plus..." -#: gtk-awf/src/awf.c:2089 gtk-awf/src/awf.c:2100 gtk-awf/src/awf.c:2304 -#: gtk-awf/src/awf.c:2317 +#: gtk-awf/src/awf.c:2191 gtk-awf/src/awf.c:2202 gtk-awf/src/awf.c:2363 +#: gtk-awf/src/awf.c:2376 msgid "No themes found" msgstr "Aucun thème trouvé" -#: gtk-awf/src/awf.c:2773 gtk-awf/src/awf.c:2805 +#: gtk-awf/src/awf.c:2772 gtk-awf/src/awf.c:2804 msgid "Ok" msgstr "Ok" -#: gtk-awf/src/awf.c:2107 gtk-awf/src/awf.c:2326 +#: gtk-awf/src/awf.c:2073 gtk-awf/src/awf.c:2290 msgid "Open recent file" msgstr "Ouvrir un fichier récent" -#: gtk-awf/src/awf.c:288 +#: gtk-awf/src/awf.c:289 msgid "Options:" msgstr "Options :" -#: gtk-awf/src/awf.c:2725 +#: gtk-awf/src/awf.c:2724 #, c-format msgid "Remove %s file" msgstr "Supprimer le fichier %s" -#: gtk-awf/src/awf.c:293 +#: gtk-awf/src/awf.c:294 #, c-format msgid "Run and save a png screenshot on %s" msgstr "Démarrer et enregistrer une capture d'écran png lors du %s" -#: gtk-awf/src/awf.c:292 +#: gtk-awf/src/awf.c:293 msgid "Run with the specified theme" msgstr "Démarrer avec le thème spécifié" -#: gtk-awf/src/awf.c:289 +#: gtk-awf/src/awf.c:290 msgid "Show version number" msgstr "Afficher le numéro de version" -#: gtk-awf/src/awf.c:423 gtk-awf/src/awf.c:738 +#: gtk-awf/src/awf.c:424 gtk-awf/src/awf.c:732 #, c-format msgid "Theme %s loaded." msgstr "Thème %s chargé." -#: gtk-awf/src/awf.c:402 +#: gtk-awf/src/awf.c:403 #, c-format msgid "Theme %s reloaded." msgstr "Thème %s rechargé." -#: gtk-awf/src/awf.c:674 +#: gtk-awf/src/awf.c:668 #, c-format msgid "Theme reloaded, then screenshot saved (%s)." msgstr "Thème rechargé, puis capture d'écran enregistrée (%s)." -#: gtk-awf/src/awf.c:2775 gtk-awf/src/awf.c:2807 +#: gtk-awf/src/awf.c:2774 gtk-awf/src/awf.c:2806 msgid "This is a question bar." msgstr "Ceci est une barre de question." -#: gtk-awf/src/awf.c:2781 gtk-awf/src/awf.c:2813 +#: gtk-awf/src/awf.c:2780 gtk-awf/src/awf.c:2812 msgid "This is a warning bar." msgstr "Ceci est une barre d'avertissement." -#: gtk-awf/src/awf.c:2787 gtk-awf/src/awf.c:2819 +#: gtk-awf/src/awf.c:2786 gtk-awf/src/awf.c:2818 msgid "This is an error bar." msgstr "Ceci est une barre d'erreur." -#: gtk-awf/src/awf.c:2769 gtk-awf/src/awf.c:2801 +#: gtk-awf/src/awf.c:2768 gtk-awf/src/awf.c:2800 msgid "This is an info bar." msgstr "Ceci est une barre d'information." -#: gtk-awf/src/awf.c:284 +#: gtk-awf/src/awf.c:285 msgid "Usage:" msgstr "Utilisation :" -#: gtk-awf/src/awf.c:2104 gtk-awf/src/awf.c:2320 +#: gtk-awf/src/awf.c:2070 gtk-awf/src/awf.c:2284 msgid "_Options" msgstr "_Options" -#: gtk-awf/src/awf.c:2076 gtk-awf/src/awf.c:2285 +#: gtk-awf/src/awf.c:2178 gtk-awf/src/awf.c:2344 msgid "_System theme" msgstr "Thème _système" -#: gtk-awf/src/awf.c:2093 gtk-awf/src/awf.c:2307 +#: gtk-awf/src/awf.c:2195 gtk-awf/src/awf.c:2366 msgid "_User theme" msgstr "Thème _utilisateur" -#: gtk-awf/src/awf.c:276 gtk-awf/src/awf.c:2727 +#: gtk-awf/src/awf.c:277 gtk-awf/src/awf.c:2726 #, c-format msgid "compiled with gtk %d.%d.%d and glib %d.%d.%d and pango %s" msgstr " compilé avec gtk %d.%d.%d et glib %d.%d.%d et pango %s" -#: gtk-awf/src/awf.c:2726 +#: gtk-awf/src/awf.c:2725 msgid "to reset keyboard shortcuts." msgstr "pour réinitialiser les raccourcis clavier."