+101
-60
lines changedFilter options
+101
-60
lines changed Original file line number Diff line number Diff line change
@@ -102,6 +102,15 @@ install_import_random:
102 102
$(DEST_PLUGIN_DIR)/
103 103 104 104 105 +
install_import_xresources:
106 +
$(eval PLUGIN_NAME := "import_xresources")
107 + 108 +
mkdir -p $(DEST_PLUGIN_DIR)
109 +
cp -prf \
110 +
plugins/$(PLUGIN_NAME) \
111 +
$(DEST_PLUGIN_DIR)/
112 + 113 + 105 114
install_import_images:
106 115
$(eval PLUGIN_NAME := "import_pil")
107 116
@@ -197,8 +206,8 @@ install_icons_suruplus_aspromauros:
197 206 198 207 199 208
.PHONY: install
200 -
.PHONY: install_gui install_import_random install_theme_arc install_theme_oomox install_theme_materia install_export_oomoxify install_import_images install_plugin_base16 install_icons_archdroid install_icons_gnomecolors install_icons_numix install_icons_papirus install_icons_suruplus install_icons_suruplus_aspromauros
201 -
install: install_gui install_theme_arc install_theme_oomox install_theme_materia install_export_oomoxify install_import_images install_plugin_base16 install_icons_archdroid install_icons_gnomecolors install_icons_numix install_icons_papirus install_icons_suruplus install_icons_suruplus_aspromauros
209 +
.PHONY: install_gui install_import_random install_theme_arc install_theme_oomox install_theme_materia install_export_oomoxify install_import_images install_plugin_base16 install_icons_archdroid install_icons_gnomecolors install_icons_numix install_icons_papirus install_icons_suruplus install_icons_suruplus_aspromauros install_import_xresources
210 +
install: install_gui install_theme_arc install_theme_oomox install_theme_materia install_export_oomoxify install_import_images install_plugin_base16 install_icons_archdroid install_icons_gnomecolors install_icons_numix install_icons_papirus install_icons_suruplus install_icons_suruplus_aspromauros install_import_xresources
202 211 203 212
.PHONY: all
204 213
all: install
Original file line number Diff line number Diff line change
@@ -100,7 +100,6 @@ For GUI app itself:
100 100
- `python3-gobject`
101 101
- `gtk3>=3.18`
102 102
- `gdk-pixbuf2`
103 -
- `xorg-xrdb` - optional, for xresources themes
104 103 105 104
##### For plugins:
106 105
@@ -154,6 +153,9 @@ Base16 format support:
154 153
- `python3 pystache`
155 154
- `python3 yaml`
156 155 156 +
Xresources import:
157 +
- `xorg-xrdb` - optional, for xresources themes
158 + 157 159 158 160
#### Installation
159 161
@@ -2,7 +2,6 @@
2 2 3 3
from .i18n import _
4 4
from .theme_model import THEME_MODEL
5 -
from .xrdb import XrdbCache
6 5
from .plugin_loader import IMPORT_PLUGINS
7 6 8 7
@@ -21,16 +20,6 @@ def str_to_bool(value):
21 20
return value.lower() == 'true'
22 21 23 22 24 -
def parse_theme_color_value(result_value):
25 -
if not result_value:
26 -
return None
27 -
if result_value.startswith('xrdb.'):
28 -
xrdb_color = XrdbCache.get().get(result_value.replace('xrdb.', ''))
29 -
if xrdb_color and xrdb_color.startswith('#'):
30 -
result_value = xrdb_color.replace('#', '')
31 -
return result_value
32 - 33 - 34 23
def parse_theme_value(theme_value, colorscheme): # pylint: disable=too-many-branches
35 24
result_value = colorscheme.get(theme_value['key'])
36 25
fallback_key = theme_value.get('fallback_key')
@@ -46,8 +35,6 @@ def parse_theme_value(theme_value, colorscheme): # pylint: disable=too-many-bra
46 35
result_value = fallback_function(colorscheme)
47 36 48 37
value_type = theme_value['type']
49 -
if value_type == 'color':
50 -
result_value = parse_theme_color_value(result_value)
51 38
if value_type == 'bool':
52 39
if isinstance(result_value, str):
53 40
result_value = str_to_bool(result_value)
@@ -106,5 +93,4 @@ def read_colorscheme_from_path(preset_path):
106 93
if from_plugin:
107 94
colorscheme['FROM_PLUGIN'] = from_plugin
108 95 109 -
XrdbCache.clear()
110 96
return colorscheme
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ depends=(
26 26 27 27
'themix-plugin-base16'
28 28 29 -
'themix-theme-arc'
29 +
#'themix-theme-arc'
30 30
'themix-theme-materia'
31 31
'themix-theme-oomox'
32 32
@@ -26,7 +26,7 @@ depends=(
26 26 27 27
'themix-plugin-base16-git'
28 28 29 -
'themix-theme-arc-git'
29 +
#'themix-theme-arc-git'
30 30
'themix-theme-materia-git'
31 31
'themix-theme-oomox-git'
32 32
@@ -28,7 +28,7 @@ optdepends=(
28 28 29 29
'themix-plugin-base16: Import and export from Base16 project format'
30 30 31 -
'themix-theme-arc: Theme Style plugin'
31 +
#'themix-theme-arc: Theme Style plugin'
32 32
'themix-theme-materia: Theme Style plugin'
33 33
'themix-theme-oomox: Theme Style plugin'
34 34
@@ -58,7 +58,7 @@ package() {
58 58
_oomox_gui_dir=${_oomox_dir}/oomox_gui
59 59 60 60
cd "${srcdir}/oomox"
61 -
make DESTDIR="${pkgdir}" APPDIR="${_oomox_dir}" PREFIX="/usr" install_gui
61 +
make DESTDIR="${pkgdir}" APPDIR="${_oomox_dir}" PREFIX="/usr" install_gui install_import_xresources
62 62
python -O -m compileall ${pkgdir}${_oomox_gui_dir} -d ${_oomox_gui_dir}
63 63
}
64 64
@@ -5,4 +5,6 @@ RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releas
5 5
CMD ["/bin/bash", "./packaging/ubuntu/create_ubuntu_package.sh", "control_1810", "--install"]
6 6
RUN apt update --allow-unauthenticated && \
7 7
apt install -y make gettext fakeroot
8 -
COPY . /opt/oomox/
8 +
#COPY . /opt/oomox/
9 + 10 +
# vim: set ft=dockerfile :
Original file line number Diff line number Diff line change
@@ -5,4 +5,6 @@ RUN sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releas
5 5
CMD ["/bin/bash", "./packaging/ubuntu/create_ubuntu_package.sh", "control", "--install"]
6 6
RUN apt-get update && \
7 7
apt-get install -y make gettext fakeroot
8 -
COPY . /opt/oomox/
8 +
#COPY . /opt/oomox/
9 + 10 +
# vim: set ft=dockerfile :
File renamed without changes.
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4