major fixes

This commit is contained in:
Ward Nakchbandi 2023-03-25 16:17:53 +03:00
parent 5f49ae0061
commit 4c141d749a
5 changed files with 33 additions and 10 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
pika-gnome-layouts (2.0-99pika2) kinetic; urgency=low pika-gnome-layouts (2.0-99pika3) kinetic; urgency=low
* Fix Windows 11 layout * Fix Windows 11 layout

View File

@ -22,4 +22,9 @@ dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/night "'
dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "'Orchis-$1-Light'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "'Orchis-$1-Light'"
dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "'Orchis-$1-Dark'" dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "'Orchis-$1-Dark'"
fi fi
if dconf read /org/gnome/desktop/interface/color-scheme | grep dark
then
/usr/lib/pika/gnome-layouts/libadwaita.sh dark
else
/usr/lib/pika/gnome-layouts/libadwaita.sh /usr/lib/pika/gnome-layouts/libadwaita.sh
fi

View File

@ -1,8 +1,26 @@
#! /bin/bash #! /bin/bash
rm -rfv $HOME/.config/gtk-4.0 rm -rfv $HOME/.config/gtk-4.0
cp -rfv /usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | sed "s+'++" | sed "s+'++")/gtk-4.0 $HOME/.config/ THEME=$(dconf read /org/gnome/desktop/interface/gtk-theme | sed "s+'++" | sed "s+'++" | sed "s+-Dark++" | sed "s+-Light++" )
kvantummanager --set Orchis if echo $THEME | grep -i orchis
then
if [[ $1 = dark ]] if [[ $1 = dark ]]
then then
kvantummanager --set Orchis-dark kvantummanager --set Orchis-dark
cp -rfv /usr/share/themes/$THEME-Dark/gtk-4.0 $HOME/.config/
else
kvantummanager --set Orchis
cp -rfv /usr/share/themes/$THEME-Light/gtk-4.0 $HOME/.config/
fi
else
if [ -f $HOME/.config/pika_theme ]
then
if [[ $1 = dark ]]
then
kvantummanager --set $(cat $HOME/.config/pika_theme | grep 'KVANTUM_THEME_DARK=' | head -n1 | sed "s#KVANTUM_THEME_DARK=##")
cp -rfv $(cat $HOME/.config/pika_theme | grep 'GTK_THEME_PATH_DARK=' | head -n1 | sed "s#GTK_THEME_PATH_DARK=##")/gtk-4.0 $HOME/.config/
else
kvantummanager --set $(cat $HOME/.config/pika_theme | grep 'KVANTUM_THEME_LIGHT=' | head -n1 | sed "s#KVANTUM_THEME_LIGHT=##")
cp -rfv $(cat $HOME/.config/pika_theme | grep 'GTK_THEME_PATH_LIGHT=' | head -n1 | sed "s#GTK_THEME_PATH_LIGHT=##")/gtk-4.0 $HOME/.config/
fi
fi
fi fi

View File

@ -245,10 +245,10 @@ class Application:
subprocess.run(["echo 'theme change done!'"], shell=True) subprocess.run(["echo 'theme change done!'"], shell=True)
def teal_accent_button_pressed_cb (self, widget): def teal_accent_button_pressed_cb (self, widget):
subprocess.run(["/usr/lib/pika/gnome-layouts/dconf-accent.sh Teal"], shell=True) subprocess.run(["/usr/lib/pika/gnome-layouts/dconf-accent.sh Teal"], shell=True)
subprocess.run(["pkexec /usr/lib/pika/gnome-layouts/-u -C teal"], shell=True) subprocess.run(["pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C teal"], shell=True)
subprocess.run(["echo 'theme change done!'"], shell=True) subprocess.run(["echo 'theme change done!'"], shell=True)
def gray_accent_button_pressed_cb (self, widget): def gray_accent_button_pressed_cb (self, widget):
subprocess.run(["/usr/lib/pika/gnome-layouts/dconf-accent.sh Gray"], shell=True) subprocess.run(["/usr/lib/pika/gnome-layouts/dconf-accent.sh Grey"], shell=True)
subprocess.run(["pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C grey"], shell=True) subprocess.run(["pkexec /usr/lib/pika/gnome-layouts/papirus-folders -u -C grey"], shell=True)
subprocess.run(["echo 'theme change done!'"], shell=True) subprocess.run(["echo 'theme change done!'"], shell=True)

View File

@ -617,7 +617,7 @@
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="relief">none</property> <property name="relief">none</property>
<signal name="pressed" handler="magenta_accent_button_pressed_cb" swapped="no"/> <signal name="pressed" handler="pink_accent_button_pressed_cb" swapped="no"/>
<child> <child>
<object class="GtkImage" id="pink_accent_image"> <object class="GtkImage" id="pink_accent_image">
<property name="visible">True</property> <property name="visible">True</property>
@ -665,7 +665,7 @@
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="relief">none</property> <property name="relief">none</property>
<signal name="pressed" handler="brown_accent_button_pressed_cb" swapped="no"/> <signal name="pressed" handler="teal_accent_button_pressed_cb" swapped="no"/>
<child> <child>
<object class="GtkImage" id="teal_accent_image"> <object class="GtkImage" id="teal_accent_image">
<property name="visible">True</property> <property name="visible">True</property>