From 9c9759d5fd88d73453910333927dd781673a9938 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Mon, 17 Aug 2020 08:26:47 +0200 Subject: [PATCH] menu and conky fixes in live overlay --- .../etc/skel/.config/jgmenu/prepend.csv | 2 +- .../.config/conky/grey_manjaro_JWM.conkyrc | 76 ++++++++++--------- .../etc/skel/.config/jgmenu/prepend.csv | 29 +++++-- .../etc/skel/.config/jgmenu/prepend.csv | 1 + .../.config/conky/grey_manjaro_JWM.conkyrc | 76 ++++++++++--------- .../etc/skel/.config/jgmenu/prepend.csv | 26 ++++++- 6 files changed, 128 insertions(+), 82 deletions(-) diff --git a/mabox-en/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv b/mabox-en/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv index 94eb5fa..b223d04 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv +++ b/mabox-en/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv @@ -46,7 +46,7 @@ Menu Font Size,^checkout(size) Sync jgmenu with OB theme,obtheme2jgmenu,system-reboot ^tag(userguide) . /usr/share/mb-jgtools/userguide.csv -^tag(rozmiar) +^tag(size) tiny,cat ~/.config/mabox/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main small,cat ~/.config/mabox/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main normal,cat ~/.config/mabox/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main diff --git a/mabox-en/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc b/mabox-en/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc index 373cc6b..0dcb6f5 100644 --- a/mabox-en/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc +++ b/mabox-en/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc @@ -1,54 +1,57 @@ +conky.config = { -own_window yes -own_window_type desktop -# own_window_argb_visual yes -# own_window_argb_value 125 -own_window_transparent yes -own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager -own_window_colour 000000 -own_window_class Conky -own_window_title Mabox Quakeworld Monitor Conky + own_window = true, + own_window_type = 'desktop', +-- own_window_argb_visual yes +-- own_window_argb_value 125 + own_window_transparent = true, + own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', + own_window_colour = '#000000', + own_window_class = 'Conky', + own_window_title = 'Mabox Quakeworld Monitor Conky', -gap_x 15 -gap_y 50 -alignment tr -minimum_width 200 -minimum_size 200 + gap_x = 15, + gap_y = 50, + alignment = 'top_right', + minimum_width = '200', + minimum_width = 200, -use_xft yes -xftfont Cantarell:size=9 -xftalpha 1 -override_utf8_locale yes -draw_shades no #yes -default_shade_color 000000 -draw_outline no -default_outline_color 000000 + use_xft = true, + font = 'Cantarell:size=9', + xftalpha = 1, + override_utf8_locale = true, + draw_shades = false,--yes + default_shade_color = '#000000', + draw_outline = false, + default_outline_color = '#000000', -color2 777777 -cpu_avg_samples 2 -default_color FFFFFF + color2 = '#777777', + cpu_avg_samples = 2, + default_color = '#FFFFFF', -draw_borders no #yes + draw_borders = false,--yes -stippled_borders 5 -border_inner_margin 5 -border_outer_margin 0 -border_width 2 + stippled_borders = 5, + border_inner_margin = 5, + border_outer_margin = 0, + border_width = 2, -background yes -no_buffers yes -imlib_cache_size 0 + background = true, + no_buffers = true, + imlib_cache_size = 0, -double_buffer yes -update_interval 1 + double_buffer = true, + update_interval = 1, -TEXT +}; + +conky.text = [[ ${voffset 8}$color${font Cantarell:size=16}${time %A}$font${voffset -18}$alignr${color 006600}${font Cantarell:size=38}${time %e}$font $color${voffset -20}$color${font Cantarell:size=18}${time %B}$font${voffset -1} $color${font Cantarell:size=20}${time %Y}$font #${voffset 10}$alignr$color Kraków (PL) ${weather http://weather.noaa.gov/pub/data/observations/metar/stations/ EPKK temperature temperature 15}°C @@ -79,3 +82,4 @@ ${alignr}${color2}${font Cantarell:size=9}${alignr}kernel ${color}${kernel} ${alignr}${color2}${font Cantarell:size=9}${alignr}arch ${color}${machine} ${alignr}${color2}${font Cantarell:size=9}${alignr}filesystem ${color}${fs_type} ${voffset 10}${alignr}${color} installed pkgs: ${color2}${execi 10000 pacman -Q | wc -l} +]]; diff --git a/mabox-en/live-overlay/etc/skel/.config/jgmenu/prepend.csv b/mabox-en/live-overlay/etc/skel/.config/jgmenu/prepend.csv index 4ea721d..0a11570 100644 --- a/mabox-en/live-overlay/etc/skel/.config/jgmenu/prepend.csv +++ b/mabox-en/live-overlay/etc/skel/.config/jgmenu/prepend.csv @@ -5,6 +5,7 @@ Install Mabox,calamares_polkit,distributor-logo-mabox Terminal,exo-open --launch TerminalEmulator,utilities-terminal WWW Browser,exo-open --launch WebBrowser,firefox File Manager,exo-open --launch FileManager,system-file-manager +Add/Remove software,pamac-manager,pamac ^sep() Applications,^checkout(lx-apps),applications-other @@ -17,7 +18,6 @@ Lock screen,blurlock,system-lock-screen Exit,mb-jgtools mblogout,system-shutdown ^tag(settings) - Mabox Control Center,mcc,distributor-logo-mabox ^sep(Desktop) Look and Feel,lxappearance,preferences-desktop-theme @@ -26,18 +26,37 @@ Notifications,xfce4-notifyd-config,xfce4-notifyd Conkies,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects Tint2 panels,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf Composer,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton +Menu,^checkout(menu),menu-editor ^sep(Settings) Preferred applications,exo-preferred-applications,preferences-desktop-default-applications -Login Manager,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings Power Manager,xfce4-power-manager-settings,xfce4-power-manager-settings +Login Manager settings,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings ^sep(Openbox) - -Autostart,geany ~/.config/openbox/autostart,geany +Openbox Configuration Manager,obconf,obconf +Autostart,^checkout(autostart),geany RC - configuration file,geany ~/.config/openbox/rc.xml,geany - Reconfigure Openbox,openbox --reconfigure,openbox ^sep(Mabox Themes) Theme manager,mb-obthemes,preferences-desktop-theme +^sep(Help) +User Guide (online),^checkout(userguide),distributor-logo-mabox +MaboxForum,exo-open --launch WebBrowser https://forum.maboxlinux.org/,distributor-logo-mabox +^tag(menu) +Edit Schema,geany ~/.config/jgmenu/prepend.csv,geany +Edit Settings,geany ~/.config/mabox/mabox.conf,geany +Menu Font Size,^checkout(size) +Sync jgmenu with OB theme,obtheme2jgmenu,system-reboot +^tag(userguide) +. /usr/share/mb-jgtools/userguide.csv +^tag(size) +tiny,cat ~/.config/mabox/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +small,cat ~/.config/mabox/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +normal,cat ~/.config/mabox/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +big,cat ~/.config/mabox/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +huge,cat ~/.config/mabox/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +^tag(autostart) +Choose apps/services (GUI Editor),yautostart +Edit autostart file (advanced),geany ~/.config/openbox/autostart,geany ^tag(lx-apps) diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv b/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv index 434063d..47821e6 100644 --- a/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv +++ b/mabox-pl/desktop-overlay/etc/skel/.config/jgmenu/prepend.csv @@ -1,4 +1,5 @@ @search,,44,6,150,20,2,left,top,auto,#000000 0,Pisz aby wyszukać +^sep() Terminal,exo-open --launch TerminalEmulator,utilities-terminal Przeglądarka WWW,exo-open --launch WebBrowser,firefox Menedżer plików,exo-open --launch FileManager,system-file-manager diff --git a/mabox-pl/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc b/mabox-pl/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc index 50d2cc9..1d6e42e 100644 --- a/mabox-pl/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc +++ b/mabox-pl/live-overlay/etc/skel/.config/conky/grey_manjaro_JWM.conkyrc @@ -1,50 +1,53 @@ -own_window yes -own_window_type desktop -# own_window_argb_visual yes -# own_window_argb_value 125 -own_window_transparent yes -own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager -own_window_colour 000000 -own_window_class Conky -own_window_title Mabox Quakeworld Monitor Conky +conky.config = { + own_window = true, + own_window_type = 'desktop', +-- own_window_argb_visual yes +-- own_window_argb_value 125 + own_window_transparent = true, + own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', + own_window_colour = '#000000', + own_window_class = 'Conky', + own_window_title = 'Mabox Quakeworld Monitor Conky', -gap_x 15 -gap_y 50 -alignment tr -minimum_width 200 -minimum_size 200 + gap_x = 15, + gap_y = 50, + alignment = 'top_right', + minimum_width = '200', + minimum_width = 200, -use_xft yes -xftfont Cantarell:size=9 -xftalpha 1 -override_utf8_locale yes -draw_shades no #yes -default_shade_color 000000 -draw_outline no -default_outline_color 000000 + use_xft = true, + font = 'Cantarell:size=9', + xftalpha = 1, + override_utf8_locale = true, + draw_shades = false,--yes + default_shade_color = '#000000', + draw_outline = false, + default_outline_color = '#000000', -color2 777777 -cpu_avg_samples 2 -default_color FFFFFF + color2 = '#777777', + cpu_avg_samples = 2, + default_color = '#FFFFFF', -draw_borders no #yes + draw_borders = false,--yes -stippled_borders 5 -border_inner_margin 5 -border_outer_margin 0 -border_width 2 + stippled_borders = 5, + border_inner_margin = 5, + border_outer_margin = 0, + border_width = 2, -background yes -no_buffers yes -imlib_cache_size 0 + background = true, + no_buffers = true, + imlib_cache_size = 0, -double_buffer yes -update_interval 1 + double_buffer = true, + update_interval = 1, -TEXT +}; + +conky.text = [[ ${voffset 8}$color${font Cantarell:size=16}${time %A}${voffset -18}$alignr${color 006600}${font Cantarell:size=38}${time %e} $alignr$color${voffset -40}$color${font Cantarell:size=18}${time %B} ${voffset -30}${goto 40}$color${font Cantarell:size=20}${time %Y} @@ -76,3 +79,4 @@ ${alignr}${color2}${font Cantarell:size=9}${alignr}arch ${color}${machine} ${alignr}${color2}${font Cantarell:size=9}${alignr}system plików ${color}${fs_type} ${voffset 10}${alignr}${color}${font} zainstalowane pakiety: ${color2}${execi 10000 pacman -Q | wc -l} +]]; diff --git a/mabox-pl/live-overlay/etc/skel/.config/jgmenu/prepend.csv b/mabox-pl/live-overlay/etc/skel/.config/jgmenu/prepend.csv index 1ac3d14..8b830c0 100644 --- a/mabox-pl/live-overlay/etc/skel/.config/jgmenu/prepend.csv +++ b/mabox-pl/live-overlay/etc/skel/.config/jgmenu/prepend.csv @@ -13,7 +13,7 @@ Zrzut ekranu,mb-jgtools screenshot,emblem-photos ^sep() Ustawienia,^checkout(ustawienia),applications-utilities ^sep() -Zablokuj ekran,blurlock,system-lock-screen +Zablokuj ekran,betterlockscreen -l,system-lock-screen Wyjście,mb-jgtools mblogout,system-shutdown ^tag(ustawienia) @@ -26,18 +26,36 @@ Powiadomienia,xfce4-notifyd-config,xfce4-notifyd Zarządzaj Conky,^pipe(jgmenu_run ob --cmd=mabox-conky-pipemenu),desktop-effects Zarządzaj panelami tint2,^pipe(jgmenu_run ob --cmd=mabox-tint2-pipemenu),tint2conf Kompozytor,^pipe(jgmenu_run ob --cmd=mabox-compositor),compton +Menu,^checkout(menu),menu-editor ^sep(Ustawienia) Preferowane aplikacje,exo-preferred-applications,preferences-desktop-default-applications -Menedżer logowania,pkexec lightdm-settings,lightdm-settings +Menedżer logowania,lightdm-gtk-greeter-settings-pkexec,lightdm-gtk-greeter-settings Ustawienia zasilania,xfce4-power-manager-settings,xfce4-power-manager-settings ^sep(Openbox) - -Autostart,geany ~/.config/openbox/autostart,geany +Autostart,^checkout(autostart),geany RC - plik konfiguracyjny,geany ~/.config/openbox/rc.xml,geany Rekonfiguruj Openbox,openbox --reconfigure,openbox ^sep(Motywy Maboxa) Zarządzaj motywami,mb-obthemes,preferences-desktop-theme +^sep(Pomoc) +Przewodnik Użytkownika (online),^checkout(userguide),distributor-logo-mabox +Forum dyskusyjne Mabox,exo-open --launch WebBrowser https://forum.maboxlinux.org/,distributor-logo-mabox +^tag(autostart) +Wybierz programy/usługi (GUI Edytor),yautostart +Edycja pliku (zaawansowane),geany ~/.config/openbox/autostart,geany +^tag(userguide) +. /usr/share/mb-jgtools/userguide_PL.csv +^tag(menu) +Edytuj pozycje menu,geany ~/.config/jgmenu/prepend.csv,geany +Edytuj ustawienia,geany ~/.config/mabox/mabox.conf,geany +Rozmiar,^checkout(rozmiar) +^tag(rozmiar) +malutki,cat ~/.config/mabox/tiny > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +mały,cat ~/.config/mabox/small > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +normalny,cat ~/.config/mabox/normal > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +duży,cat ~/.config/mabox/big > ~/.config/mabox/jgmenusize.conf && mb-jgtools main +wielki,cat ~/.config/mabox/huge > ~/.config/mabox/jgmenusize.conf && mb-jgtools main ^tag(lx-apps)