Skip to content

Commit

Permalink
Version 2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
luigifab committed Jul 7, 2021
1 parent c59d6a6 commit 35e433b
Show file tree
Hide file tree
Showing 47 changed files with 1,377 additions and 1,389 deletions.
50 changes: 29 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,49 @@ A widget factory is a theme preview application for GTK. It displays the various
GTK 2\
[![Preview with GTK 2 - Main window](images/thumbs/gtk2.png?raw=true)](images/gtk2.png?raw=true)
[![Preview with GTK 2 - Menu](images/thumbs/gtk2-menu.png?raw=true)](images/gtk2-menu.png?raw=true)
[![Preview with GTK 2 - RTL - Main window](images/thumbs/gtk2-rtl.png?raw=true)](images/gtk2-rtl.png?raw=true)
[![Preview with GTK 2 - RTL - Menu](images/thumbs/gtk2-rtl-menu.png?raw=true)](images/gtk2-rtl-menu.png?raw=true)

GTK 3\
[![Preview with GTK 3 - Main window](images/thumbs/gtk3.png?raw=true)](images/gtk3.png?raw=true)
[![Preview with GTK 3 - Menu](images/thumbs/gtk3-menu.png?raw=true)](images/gtk3-menu.png?raw=true)
[![Preview with GTK 3 - RTL - Main window](images/thumbs/gtk3-rtl.png?raw=true)](images/gtk3-rtl.png?raw=true)
[![Preview with GTK 3 - RTL - Menu](images/thumbs/gtk3-rtl-menu.png?raw=true)](images/gtk3-rtl-menu.png?raw=true)

GTK 4\
[![Preview with GTK 4 - Main window](images/thumbs/gtk4.png?raw=true)](images/gtk4.png?raw=true)
[![Preview with GTK 4 - Menu](images/thumbs/gtk4-menu.png?raw=true)](images/gtk4-menu.png?raw=true)
[![Preview with GTK 4 - RTL - Main window](images/thumbs/gtk4-rtl.png?raw=true)](images/gtk4-rtl.png?raw=true)
[![Preview with GTK 4 - RTL - Menu](images/thumbs/gtk4-rtl-menu.png?raw=true)](images/gtk4-rtl-menu.png?raw=true)

Theme used for the screenshots is available [here](https://github.com/luigifab/human-theme). Pango 1.42 for screenshots with GTK 2 and 3, Pango 1.48 for screenshots with GTK 4.

* Some options are available from command line (read -h).
* The options menu allow to run some standard dialogs.
* The minus toolbar button allow to switch text direction.
* The plus toolbar button allow to show or hide: arrows on notebooks, text and marks on progress bars and scales.
* The refresh toolbar button and the refresh menu item allow to reload the current theme (like the sighup signal).
* The menu items keyboard shortcut can be updated on hover (GTK 2.24 and 3.0-3.24, *gtk-can-change-accels*).
* For Ubuntu, the menu items keyboard shortcut can be updated on hover with: `export UBUNTU_MENUPROXY= && awf-gtk3`
* The refresh toolbar button and the refresh menu allow to reload the current theme (like the *sighup* signal).
* The menu keyboard shortcuts can be updated on hover (GTK 2.24 and 3.x, *gtk-can-change-accels*).
* The tabs of notebooks are scrollable with mouse (GTK 3.x and 4.x, *gtk-scroll-tabs*).
* For Ubuntu, the menu keyboard shortcuts can be updated on hover with: `export UBUNTU_MENUPROXY= && awf-gtk3`

## Installation

It require **GTK 2.24+** or **GTK 3.0+** *(including 3.24)* or **GTK 4.0+** *(experimental)*, and *GLIB 2.28+*.
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))

* Fedora: `sudo dnf install awf-gtk2 awf-gtk3 awf-gtk4`

* OpenSuse: `sudo zypper install awf-gtk2 awf-gtk3 awf-gtk4`
* openSUSE: `sudo zypper install awf-gtk2 awf-gtk3 awf-gtk4`

* The *build.sh* script will compile the program with all major GTK versions available.

* The *debian-gtkx/deb.sh* scripts will compile the program and create packages for Debian and Ubuntu.

* The *fedora-gtkx/rpm.sh* scripts will compile the program and create packages for Fedora.

* The *opensuse-gtkx/rpm.sh* scripts will compile the program and create packages for OpenSuse.
* The *opensuse-gtkx/rpm.sh* scripts will compile the program and create packages for openSUSE.

## PPA

Expand All @@ -52,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 hirsute main" | sudo tee -a /etc/apt/sources.list
echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish 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 hirsute main" | sudo tee -a /etc/apt/sources.list
echo "deb http://ppa.launchpad.net/luigifab/packages/ubuntu impish main" | sudo tee -a /etc/apt/sources.list
sudo apt update
sudo apt install awf-gtk2 awf-gtk3 awf-gtk4
```
Expand All @@ -74,32 +82,32 @@ pub rsa4096 2020-10-31 [SC]

To reload theme when source files change, you can use [Entr](https://github.com/eradman/entr) with the *sighup* signal:
```
sudo apt install entr or sudo dnf install entr or sudo zypper install entr
ls ~/.themes/yourtheme/gtk-3.0/*.css | entr killall -s SIGHUP awf-gtk3
sudo apt install entr or sudo dnf install entr or sudo zypper install entr or ...
ls ~/.themes/yourtheme/gtk-3*/*.css | entr killall -s SIGHUP awf-gtk3
```

## Copyright

- Current version: 2.4.0 (05/05/2021)
- Current version: 2.5.0 (07/07/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)
[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)
; [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)
; [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))*\
[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 PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)
[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 PPA](https://launchpad.net/~luigifab/+archive/ubuntu/packages)

This program is provided under the terms of the **GNU GPLv3+** license.\
If you like, take some of your time to improve the translations, go to https://bit.ly/2HyCCEc.
Expand Down
8 changes: 4 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# debian: sudo apt install build-essential dh-make dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev
# fedora: sudo dnf install autoconf automake gtk2-devel gtk3-devel gtk4-devel desktop-file-utils
# opensuse: sudo zypper install autoconf automake gtk2-devel gtk3-devel gtk4-devel desktop-file-utils
# Debian: sudo apt install build-essential dh-make dh-autoreconf intltool libgtk2.0-dev libgtk-3-dev libgtk-4-dev
# Fedora: sudo dnf install autoconf automake gtk2-devel gtk3-devel gtk4-devel desktop-file-utils
# openSUSE: sudo zypper install autoconf automake gtk2-devel gtk3-devel gtk4-devel desktop-file-utils

# remove old builds
rm -f awf-gtk2 awf-gtk3 awf-gtk4
Expand All @@ -22,7 +22,7 @@ cp src/awf.c builder/src/
cd builder/
autoreconf -f -i
./configure
make
make -s

# final
cp src/awf-gtk* ..
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([A widget factory], [2.4.0])
AC_INIT([A widget factory], [2.5.0])
AC_CONFIG_SRCDIR([src/awf.c])

AM_INIT_AUTOMAKE
Expand Down
4 changes: 2 additions & 2 deletions debian-gtk2/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
awf-gtk2 (2.4.0-1) unstable; urgency=low
awf-gtk2 (2.5.0-1) unstable; urgency=low

* Initial debian package release (Closes: #959434)

-- Fabrice Creuzot <code@luigifab.fr> Wed, 05 May 2021 20:00:00 +0000
-- Fabrice Creuzot <code@luigifab.fr> Wed, 07 Jul 2021 20:00:00 +0000
44 changes: 22 additions & 22 deletions debian-gtk2/deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


cd "$(dirname "$0")"
version="2.4.0"
version="2.5.0"
gtk="gtk2"

rm -rf builder/
Expand All @@ -12,43 +12,43 @@ 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
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/
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
mv /tmp/$temp builder/
cp /usr/share/common-licenses/GPL-3 builder/$temp/LICENSE

cd builder/
tar czf ${temp}.tar.gz ${temp}
tar czf $temp.tar.gz $temp
cd ..
fi


# create packages for debian and ubuntu
for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do

if [ $serie = "unstable" ]; then
# for ubuntu
cp -a builder/awf-extended-${version}/ builder/awf-extended-${version}+src/
cp -a builder/awf-extended-$version/ builder/awf-extended-$version+src/
# debian only
cd builder/awf-extended-${version}/
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}/
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}
dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-$gtk

rm -f debian/*ex debian/*EX debian/README* debian/*doc*
mkdir debian/upstream
cp debian-${gtk}/* debian/
cp debian-$gtk/* debian/
mv debian/metadata debian/upstream/metadata


Expand Down Expand Up @@ -84,21 +84,21 @@ for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
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/-1) /-1+'${serie}') /' debian/changelog
sed -i 's/unstable/'$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
# 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 ..
Expand Down
4 changes: 2 additions & 2 deletions debian-gtk3/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
awf-gtk3 (2.4.0-1) unstable; urgency=low
awf-gtk3 (2.5.0-1) unstable; urgency=low

* Initial debian package release (Closes: #959436)

-- Fabrice Creuzot <code@luigifab.fr> Wed, 05 May 2021 20:00:00 +0000
-- Fabrice Creuzot <code@luigifab.fr> Wed, 07 Jul 2021 20:00:00 +0000
44 changes: 22 additions & 22 deletions debian-gtk3/deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@


cd "$(dirname "$0")"
version="2.4.0"
version="2.5.0"
gtk="gtk3"

rm -rf builder/
Expand All @@ -12,43 +12,43 @@ 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
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/
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
mv /tmp/$temp builder/
cp /usr/share/common-licenses/GPL-3 builder/$temp/LICENSE

cd builder/
tar czf ${temp}.tar.gz ${temp}
tar czf $temp.tar.gz $temp
cd ..
fi


# create packages for debian and ubuntu
for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
for serie in unstable impish hirsute groovy focal bionic xenial trusty precise; do

if [ $serie = "unstable" ]; then
# for ubuntu
cp -a builder/awf-extended-${version}/ builder/awf-extended-${version}+src/
cp -a builder/awf-extended-$version/ builder/awf-extended-$version+src/
# debian only
cd builder/awf-extended-${version}/
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}/
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}
dh_make -s -y -f ../awf-extended-$version.tar.gz -p awf-$gtk

rm -f debian/*ex debian/*EX debian/README* debian/*doc*
mkdir debian/upstream
cp debian-${gtk}/* debian/
cp debian-$gtk/* debian/
mv debian/metadata debian/upstream/metadata


Expand Down Expand Up @@ -84,21 +84,21 @@ for serie in unstable hirsute groovy focal bionic xenial trusty precise; do
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/-1) /-1+'${serie}') /' debian/changelog
sed -i 's/unstable/'$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
# 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 ..
Expand Down
4 changes: 2 additions & 2 deletions debian-gtk4/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
awf-gtk4 (2.4.0-1) experimental; urgency=low
awf-gtk4 (2.5.0-1) experimental; urgency=low

* Initial debian package release (Closes: #959433)

-- Fabrice Creuzot <code@luigifab.fr> Wed, 05 May 2021 20:00:00 +0000
-- Fabrice Creuzot <code@luigifab.fr> Wed, 07 Jul 2021 20:00:00 +0000
Loading

0 comments on commit 35e433b

Please sign in to comment.