diff --git a/mabox-en/Packages-Desktop b/mabox-en/Packages-Desktop index dd3f20c..13e7638 100644 --- a/mabox-en/Packages-Desktop +++ b/mabox-en/Packages-Desktop @@ -175,7 +175,7 @@ dmidecode feh gsimplecal hddtemp -htop +bashtop inxi jp2a lsof @@ -233,11 +233,11 @@ chicago95-icon-theme-git elementary-xfce-icons gtk-theme-elementary + #---------=> fonts packages -manjaro-openbox-fonts ttf-dejavu -###ttf-font-awesome -###ttf-font-logos +ttf-hack +ttf-nerd-fonts-symbols ttf-roboto noto-fonts @@ -293,6 +293,7 @@ xdotool zenity yad #---------=> Mabox +bashrc-mabox mabox-common mabox-release mabox-keyring @@ -332,7 +333,6 @@ gnome-themes-extra hicolor-icon-theme vertex-maia-icon-theme vertex-maia-themes -ttf-icomoon-icons mabox-themes #---------=> system fonts @@ -340,8 +340,7 @@ freetype2 #---------=> system accountsservice -zensu -#gnome-keyring +gnome-keyring manjaro-hotfixes polkit polkit-gnome @@ -351,7 +350,8 @@ qt5-styleplugins xdg-user-dirs xdg-user-dirs-gtk xdg-utils -xdg-su +zensu +#xdg-su - usunięte lipiec 2020 yay #---------=> xorg diff --git a/mabox-en/desktop-overlay/etc/skel/.config/autostart/clipit-startup.desktop b/mabox-en/desktop-overlay/etc/skel/.config/autostart/clipit-startup.desktop index b42de7b..153ebfb 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/autostart/clipit-startup.desktop +++ b/mabox-en/desktop-overlay/etc/skel/.config/autostart/clipit-startup.desktop @@ -34,4 +34,4 @@ Exec=clipit Terminal=false Type=Application X-GNOME-Autostart-enabled=true -Hidden=false +Hidden=true diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/RainForest.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/RainForest.tint2rc index 60f5e00..b32eb59 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/RainForest.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/RainForest.tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf 6cdc ---- +#---- Generated by tint2conf 0ae6 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -174,7 +174,7 @@ task_thumbnail_size = 210 task_font_color = #5c616c 100 task_active_font_color = #5f8a45 100 task_urgent_font_color = #dc143c 100 -task_iconified_font_color = #5c616c 86 +task_iconified_font_color = #5c616c 85 task_icon_asb = 80 0 0 task_active_icon_asb = 100 0 10 task_urgent_icon_asb = 100 0 0 @@ -269,7 +269,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 16 @@ -278,15 +278,15 @@ button_max_icon_size = 16 button = new button_icon = distributor-logo-mabox button_text = -button_tooltip = Main Menu +button_tooltip = Left -> Main Menu, Right -> Settings Menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 24 @@ -303,7 +303,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 16 diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/fullwidth_transp_dark.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/fullwidth_transp_dark.tint2rc new file mode 100644 index 0000000..d017c35 --- /dev/null +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/fullwidth_transp_dark.tint2rc @@ -0,0 +1,311 @@ +#---- Generated by tint2conf 4495 ---- +# See https://gitlab.com/o9000/tint2/wikis/Configure for +# full documentation of the configuration options. +#------------------------------------- +# Gradients +#------------------------------------- +# Backgrounds +# Background 1: Default task, Iconified task, Launcher +rounded = 0 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 0 +border_color = #000000 0 +background_color_hover = #000000 0 +border_color_hover = #000000 0 +background_color_pressed = #000000 0 +border_color_pressed = #000000 0 + +# Background 2: +rounded = 3 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffffff 30 +border_color = #ffffff 0 +background_color_hover = #ffffff 30 +border_color_hover = #ffffff 0 +background_color_pressed = #ffffff 30 +border_color_pressed = #ffffff 0 + +# Background 3: Urgent task +rounded = 3 +border_width = 2 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #4285f4 30 +border_color = #4285f4 100 +background_color_hover = #4285f4 30 +border_color_hover = #4285f4 100 +background_color_pressed = #4285f4 30 +border_color_pressed = #4285f4 100 + +# Background 4: Active task, Button, Panel +rounded = 2 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 40 +border_color = #000000 50 +background_color_hover = #000000 40 +border_color_hover = #000000 50 +background_color_pressed = #000000 40 +border_color_pressed = #000000 50 + +# Background 5: Tooltip +rounded = 3 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 100 +border_color = #000000 0 +background_color_hover = #000000 100 +border_color_hover = #000000 0 +background_color_pressed = #000000 100 +border_color_pressed = #000000 0 + +# Background 6: Inactive taskbar +rounded = 0 +border_width = 0 +border_sides = +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 50 +border_color = #000000 0 +background_color_hover = #000000 50 +border_color_hover = #000000 0 +background_color_pressed = #000000 50 +border_color_pressed = #000000 0 + +#------------------------------------- +# Panel +panel_items = P:L:TS:C:P +panel_size = 100% 40 +panel_margin = 0 0 +panel_padding = 0 0 0 +panel_background_id = 4 +wm_menu = 1 +panel_dock = 0 +panel_pivot_struts = 0 +panel_position = bottom center horizontal +panel_layer = top +panel_monitor = all +panel_shrink = 0 +autohide = 0 +autohide_show_timeout = 0.5 +autohide_hide_timeout = 0.5 +autohide_height = 5 +strut_policy = follow_size +panel_window_name = tint2 +disable_transparency = 0 +mouse_effects = 0 +font_shadow = 0 +mouse_hover_icon_asb = 100 0 10 +mouse_pressed_icon_asb = 100 0 0 +scale_relative_to_dpi = 0 +scale_relative_to_screen_height = 0 + +#------------------------------------- +# Taskbar +taskbar_mode = single_desktop +taskbar_hide_if_empty = 0 +taskbar_padding = 10 0 20 +taskbar_background_id = 6 +taskbar_active_background_id = 0 +taskbar_name = 0 +taskbar_hide_inactive_tasks = 0 +taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 +taskbar_always_show_all_desktop_tasks = 0 +taskbar_name_padding = 0 0 +taskbar_name_background_id = 0 +taskbar_name_active_background_id = 0 +taskbar_name_font = Montserrat 8 +taskbar_name_font_color = #ffffff 20 +taskbar_name_active_font_color = #ffffff 40 +taskbar_distribute_size = 0 +taskbar_sort_order = none +task_align = left + +#------------------------------------- +# Task +task_text = 1 +task_icon = 1 +task_centered = 1 +urgent_nb_of_blink = 5 +task_maximum_size = 180 5 +task_padding = 10 10 10 +task_font = Source Sans Pro 9 +task_tooltip = 1 +task_thumbnail = 0 +task_thumbnail_size = 210 +task_font_color = #ffffff 80 +task_active_font_color = #ffffff 80 +task_urgent_font_color = #ffffff 100 +task_iconified_font_color = #d8d8d8 60 +task_icon_asb = 50 0 0 +task_active_icon_asb = 100 0 0 +task_urgent_icon_asb = 100 0 0 +task_iconified_icon_asb = 100 0 0 +task_background_id = 1 +task_active_background_id = 4 +task_urgent_background_id = 3 +task_iconified_background_id = 1 +mouse_left = toggle_iconify +mouse_middle = none +mouse_right = close +mouse_scroll_up = none +mouse_scroll_down = none + +#------------------------------------- +# System tray (notification area) +systray_padding = 0 0 10 +systray_background_id = 0 +systray_sort = right2left +systray_icon_size = 22 +systray_icon_asb = 30 0 50 +systray_monitor = primary +systray_name_filter = + +#------------------------------------- +# Launcher +launcher_padding = 2 2 10 +launcher_background_id = 1 +launcher_icon_background_id = 0 +launcher_icon_size = 28 +launcher_icon_asb = 100 0 0 +launcher_icon_theme = Numix-Square-Light +launcher_icon_theme_override = 1 +startup_notifications = 0 +launcher_tooltip = 1 +launcher_item_app = ~/.local/share/applications/show_desktop.desktop +launcher_item_app = ~/.local/share/applications/exo-file-manager.desktop +launcher_item_app = ~/.local/share/applications/exo-terminal-emulator.desktop +launcher_item_app = ~/.local/share/applications/exo-web-browser.desktop +launcher_apps_dir = ~/.local/share/applictations/ + +#------------------------------------- +# Clock +time1_format = %H:%M +time2_format = +time1_font = Source Sans Pro Semi-Bold 11 +time1_timezone = +time2_timezone = +clock_font_color = #aaaaaa 100 +clock_padding = 10 0 +clock_background_id = 0 +clock_tooltip = Lewy -> kalendarz, Prawy - ustawienia daty i czasu +clock_tooltip_timezone = +clock_lclick_command = gsimplecal +clock_rclick_command = manjaro-settings-manager -m msm_timedate +clock_mclick_command = +clock_uwheel_command = +clock_dwheel_command = + +#------------------------------------- +# Battery +battery_tooltip = 0 +battery_low_status = 100 +battery_low_cmd = +battery_full_cmd = +bat1_font = Liberation Mono 8 +bat2_font = Liberation Mono 8 +battery_font_color = #b5b5b5 100 +bat1_format = +bat2_format = +battery_padding = 2 0 +battery_background_id = 0 +battery_hide = 100 +battery_lclick_command = +battery_rclick_command = +battery_mclick_command = +battery_uwheel_command = +battery_dwheel_command = +ac_connected_cmd = +ac_disconnected_cmd = + +#------------------------------------- +# Separator 1 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 15 +separator_padding = 1 0 + +#------------------------------------- +# Separator 2 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 5 +separator_padding = 1 0 + +#------------------------------------- +# Separator 3 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 5 +separator_padding = 1 0 + +#------------------------------------- +# Separator 4 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 5 +separator_padding = 1 0 + +#------------------------------------- +# Button 1 +button = new +button_icon = ~/.config/tint2/menu.png +button_text = +button_tooltip = Left-> Main Menu, Right -> Settings Menu +button_lclick_command = mb-jgtools main ipc +button_rclick_command = mb-jgtools settings ipc +button_mclick_command = +button_uwheel_command = +button_dwheel_command = +button_font_color = #000000 100 +button_padding = 0 0 +button_background_id = 4 +button_centered = 0 +button_max_icon_size = 0 + +#------------------------------------- +# Button 2 +button = new +button_icon = ~/.config/tint2/session.png +button_text = +button_tooltip = Exit... (win + x) +button_lclick_command = mb-jgtools mblogout ipc +button_rclick_command = sudo sync && notify-send "Sync complete" +button_mclick_command = +button_uwheel_command = +button_dwheel_command = +button_font_color = #000000 100 +button_padding = 12 12 +button_background_id = 4 +button_centered = 1 +button_max_icon_size = 0 + +#------------------------------------- +# Tooltip +tooltip_show_timeout = 0 +tooltip_hide_timeout = 0 +tooltip_padding = 4 4 +tooltip_background_id = 5 +tooltip_font_color = #ffffff 71 +tooltip_font = Sans normal 10 + diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/gradient.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/gradient.tint2rc index 70ebafb..38b4f90 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/gradient.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/gradient.tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf 233d ---- +#---- Generated by tint2conf 871b ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -38,7 +38,7 @@ end_color = #171717 100 #------------------------------------- # Backgrounds -# Background 1: Zminimalizowane +# Background 1: Iconified task rounded = 4 border_width = 1 border_sides = TBLR @@ -80,7 +80,7 @@ border_color_hover = #161616 100 background_color_pressed = #292929 100 border_color_pressed = #161616 100 -# Background 4: Aktywne, Domyślne zadanie, Nazwa aktywnego pulpitu, Nazwa nieaktywnego pulpitu +# Background 4: Active desktop name, Active task, Default task, Inactive desktop name rounded = 4 border_width = 0 border_sides = TBLR @@ -94,7 +94,7 @@ border_color_hover = #0f0f0f 100 background_color_pressed = #464646 100 border_color_pressed = #0f0f0f 100 -# Background 5: Pilne +# Background 5: Urgent task rounded = 0 border_width = 1 border_sides = TBLR @@ -108,7 +108,7 @@ border_color_hover = #ffde00 100 background_color_pressed = #a54d4d 100 border_color_pressed = #ffde00 100 -# Background 6: Podpowiedzi +# Background 6: Tooltip rounded = 4 border_width = 1 border_sides = TBLR @@ -121,7 +121,7 @@ border_color_hover = #161616 40 background_color_pressed = #e7e7f0 40 border_color_pressed = #161616 40 -# Background 7: Aktywne zadanie, Bateria, Nieaktywne zadanie, Panel, Zasobnik systemowy, Zegar +# Background 7: Active taskbar, Battery, Clock, Inactive taskbar, Panel, Systray rounded = 4 border_width = 0 border_sides = TBLR @@ -179,7 +179,7 @@ taskbar_name_padding = 8 0 taskbar_name_background_id = 4 taskbar_name_active_background_id = 4 taskbar_name_font = Ubuntu 10 -taskbar_name_font_color = #a1a1a1 24 +taskbar_name_font_color = #a1a1a1 23 taskbar_name_active_font_color = #f3f3ff 100 taskbar_distribute_size = 1 taskbar_sort_order = none @@ -288,7 +288,7 @@ ac_disconnected_cmd = notify-send "AC Disconected" # Separator 1 separator = new separator_background_id = 0 -separator_color = #777777 84 +separator_color = #777777 83 separator_style = empty separator_size = 0 separator_padding = 4 0 @@ -297,7 +297,7 @@ separator_padding = 4 0 # Separator 2 separator = new separator_background_id = 0 -separator_color = #777777 84 +separator_color = #777777 83 separator_style = empty separator_size = 0 separator_padding = 4 0 @@ -306,7 +306,7 @@ separator_padding = 4 0 # Separator 3 separator = new separator_background_id = 0 -separator_color = #777777 84 +separator_color = #777777 83 separator_style = empty separator_size = 0 separator_padding = 4 0 @@ -316,8 +316,9 @@ separator_padding = 4 0 button = new button_icon = distributor-logo-mabox button_text = +button_tooltip = Left - main menu, Right - settings menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2-top.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2-top.tint2rc index 9b41cbd..9992b6e 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2-top.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2-top.tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf 9488 ---- +#---- Generated by tint2conf 2319 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -72,7 +72,7 @@ border_color_pressed = #000000 100 #------------------------------------- # Panel -panel_items = PPL:TSBCPP +panel_items = PPL:TSBCP panel_size = 100% 32 panel_margin = 0 0 panel_padding = 4 0 2 @@ -232,7 +232,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 16 @@ -241,8 +241,9 @@ button_max_icon_size = 16 button = new button_icon = distributor-logo-mabox button_text = +button_tooltip = Left -> main menu, Right - settings menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = @@ -255,23 +256,6 @@ button_max_icon_size = 0 #------------------------------------- # Button 3 button = new -button_icon = tint2conf -button_text = -button_tooltip = Panel settings -button_lclick_command = tint2conf -button_rclick_command = -button_mclick_command = -button_uwheel_command = -button_dwheel_command = -button_font_color = #000000 100 -button_padding = 0 0 -button_background_id = 0 -button_centered = 0 -button_max_icon_size = 20 - -#------------------------------------- -# Button 4 -button = new button_icon = arrow-right button_text = button_tooltip = Right SidePanel (super+tab) @@ -282,7 +266,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 16 diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc index ffd9f09..6cd0acf 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf f461 ---- +#---- Generated by tint2conf 9b96 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -18,7 +18,7 @@ border_color_hover = #000000 60 background_color_pressed = #000000 60 border_color_pressed = #000000 60 -# Background 2: Domyślne zadanie +# Background 2: Default task rounded = 0 border_width = 3 border_sides = B @@ -44,7 +44,7 @@ border_color_hover = #222222 0 background_color_pressed = #f1f1f1 0 border_color_pressed = #ffffff 0 -# Background 4: Aktywne +# Background 4: Active task rounded = 1 border_width = 2 border_sides = B @@ -57,7 +57,7 @@ border_color_hover = #f2e4e4 60 background_color_pressed = #000000 60 border_color_pressed = #e9e4e4 60 -# Background 5: Podpowiedzi +# Background 5: Tooltip rounded = 0 border_width = 2 border_sides = B @@ -70,7 +70,7 @@ border_color_hover = #f2e4e4 60 background_color_pressed = #000000 60 border_color_pressed = #e9e4e4 60 -# Background 6: Nazwa aktywnego pulpitu +# Background 6: Active desktop name rounded = 1 border_width = 1 border_sides = TBLR @@ -83,7 +83,7 @@ border_color_hover = #f2e4e4 60 background_color_pressed = #000000 60 border_color_pressed = #e9e4e4 60 -# Background 7: Nazwa nieaktywnego pulpitu, Programy, Zasobnik systemowy, Zegar +# Background 7: Clock, Inactive desktop name, Launcher, Systray rounded = 4 border_width = 0 border_sides = TBLR @@ -98,7 +98,7 @@ border_color_pressed = #ffffff 0 #------------------------------------- # Panel -panel_items = PPLTSCPP +panel_items = PPLTSCP panel_size = 98% 34 panel_margin = 4 4 panel_padding = 1 1 4 @@ -264,8 +264,9 @@ button_max_icon_size = 0 button = new button_icon = distributor-logo-mabox button_text = +button_tooltip = Left -> main menu, Right -> settings menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = @@ -278,23 +279,6 @@ button_max_icon_size = 0 #------------------------------------- # Button 3 button = new -button_icon = tint2conf -button_text = -button_tooltip = Edit panel configuration -button_lclick_command = tint2conf $HOME/.config/tint2/mabox2001.tint2rc -button_rclick_command = -button_mclick_command = -button_uwheel_command = -button_dwheel_command = -button_font_color = #000000 100 -button_padding = 8 4 -button_background_id = 7 -button_centered = 0 -button_max_icon_size = 0 - -#------------------------------------- -# Button 4 -button = new button_icon = arrow-right button_text = button_tooltip = Right SidePanel (super+tab) diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/menu.png b/mabox-en/desktop-overlay/etc/skel/.config/tint2/menu.png new file mode 100644 index 0000000..42243ef Binary files /dev/null and b/mabox-en/desktop-overlay/etc/skel/.config/tint2/menu.png differ diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/micro95_bottom.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/micro95_bottom.tint2rc index fc92056..df8f28b 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/micro95_bottom.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/micro95_bottom.tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf 7534 ---- +#---- Generated by tint2conf 6e20 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -153,7 +153,7 @@ taskbar_name_padding = 6 3 taskbar_name_background_id = 6 taskbar_name_active_background_id = 7 taskbar_name_font = sans bold 9 -taskbar_name_font_color = #222222 47 +taskbar_name_font_color = #222222 46 taskbar_name_active_font_color = #222222 100 taskbar_distribute_size = 1 taskbar_sort_order = none @@ -265,7 +265,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 16 @@ -274,8 +274,9 @@ button_max_icon_size = 16 button = new button_icon = distributor-logo-mabox button_text = +button_tooltip = Left -> main menu, Right -> settings menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = @@ -298,7 +299,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 16 diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/quakeworld.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/quakeworld.tint2rc index 70ddfe2..ee549ed 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/quakeworld.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/quakeworld.tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf bcef ---- +#---- Generated by tint2conf 376b ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -57,7 +57,7 @@ border_color_hover = #aa7733 100 background_color_pressed = #555555 4 border_color_pressed = #aa7733 100 -# Background 5: Button, Clock, Tooltip +# Background 5: Clock, Tooltip rounded = 1 border_width = 0 border_sides = TBLR @@ -98,7 +98,7 @@ border_color_pressed = #000000 100 #------------------------------------- # Panel -panel_items = PPLTSBCPP +panel_items = PPLTSBCP panel_size = 80% 30 panel_margin = 0 0 panel_padding = 2 2 0 @@ -251,7 +251,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 0 @@ -260,8 +260,9 @@ button_max_icon_size = 0 button = new button_icon = distributor-logo-mabox button_text = +button_tooltip = Left -> Main menu, Right -> settings menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = @@ -274,22 +275,6 @@ button_max_icon_size = 0 #------------------------------------- # Button 3 button = new -button_icon = tint2conf -button_text = -button_lclick_command = tint2conf -button_rclick_command = -button_mclick_command = -button_uwheel_command = -button_dwheel_command = -button_font_color = #000000 100 -button_padding = 0 0 -button_background_id = 5 -button_centered = 0 -button_max_icon_size = 0 - -#------------------------------------- -# Button 4 -button = new button_icon = arrow-right button_text = button_tooltip = Right SidePanel (super+tab) @@ -300,7 +285,7 @@ button_uwheel_command = button_dwheel_command = button_font_color = #000000 100 button_padding = 0 0 -button_background_id = -1 +button_background_id = 0 button_centered = 0 button_max_icon_size = 0 diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/session.png b/mabox-en/desktop-overlay/etc/skel/.config/tint2/session.png new file mode 100644 index 0000000..c2d727d Binary files /dev/null and b/mabox-en/desktop-overlay/etc/skel/.config/tint2/session.png differ diff --git a/mabox-en/desktop-overlay/etc/skel/.config/tint2/transparent.tint2rc b/mabox-en/desktop-overlay/etc/skel/.config/tint2/transparent.tint2rc index 6cb2235..cff796d 100644 --- a/mabox-en/desktop-overlay/etc/skel/.config/tint2/transparent.tint2rc +++ b/mabox-en/desktop-overlay/etc/skel/.config/tint2/transparent.tint2rc @@ -1,11 +1,11 @@ -#---- Generated by tint2conf 3897 ---- +#---- Generated by tint2conf 846b ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- # Gradients #------------------------------------- # Backgrounds -# Background 1: Panel, Zegar +# Background 1: Clock, Panel rounded = 0 border_width = 5 border_sides = TBLR @@ -18,7 +18,7 @@ border_color_hover = #000000 60 background_color_pressed = #000000 60 border_color_pressed = #000000 60 -# Background 2: Domyślne zadanie +# Background 2: Default task rounded = 0 border_width = 3 border_sides = B @@ -31,7 +31,7 @@ border_color_hover = #222222 68 background_color_pressed = #f1f1f1 40 border_color_pressed = #ffffff 68 -# Background 3: Programy, Zasobnik systemowy +# Background 3: Launcher, Systray rounded = 1 border_width = 0 border_sides = TBLR @@ -44,7 +44,7 @@ border_color_hover = #222222 0 background_color_pressed = #f1f1f1 0 border_color_pressed = #ffffff 0 -# Background 4: Aktywne +# Background 4: Active task rounded = 1 border_width = 2 border_sides = B @@ -57,7 +57,7 @@ border_color_hover = #f2e4e4 60 background_color_pressed = #000000 60 border_color_pressed = #e9e4e4 60 -# Background 5: Podpowiedzi +# Background 5: Tooltip rounded = 6 border_width = 2 border_sides = B @@ -70,7 +70,7 @@ border_color_hover = #f2e4e4 60 background_color_pressed = #000000 60 border_color_pressed = #e9e4e4 60 -# Background 6: Nazwa aktywnego pulpitu +# Background 6: Active desktop name rounded = 1 border_width = 1 border_sides = TBLR @@ -83,7 +83,7 @@ border_color_hover = #f2e4e4 60 background_color_pressed = #000000 60 border_color_pressed = #e9e4e4 60 -# Background 7: Nazwa nieaktywnego pulpitu +# Background 7: Inactive desktop name rounded = 4 border_width = 0 border_sides = TBLR @@ -98,7 +98,7 @@ border_color_pressed = #ffffff 0 #------------------------------------- # Panel -panel_items = PPFTFSCPP +panel_items = PPFTFSCP panel_size = 100% 30 panel_margin = 0 0 panel_padding = 0 1 4 @@ -246,7 +246,7 @@ ac_disconnected_cmd = # Button 1 button = new button_text = < -button_tooltip = Lewy panel - Miejsca (ctrl+tab) +button_tooltip = Left panel - Places (ctrl+tab) button_lclick_command = mb-jgtools places button_rclick_command = button_mclick_command = @@ -261,9 +261,10 @@ button_max_icon_size = 0 #------------------------------------- # Button 2 button = new -button_text =  Programy +button_text =  Applications +button_tooltip = Left -> Main Menu, Right -> Settings Menu button_lclick_command = mb-jgtools main ipc -button_rclick_command = +button_rclick_command = mb-jgtools settings ipc button_mclick_command = button_uwheel_command = button_dwheel_command = @@ -276,25 +277,8 @@ button_max_icon_size = 0 #------------------------------------- # Button 3 button = new -button_text =  -button_tooltip = Edytuj ten panel -button_lclick_command = tint2conf $HOME/.config/tint2/transparent.tint2rc -button_rclick_command = -button_mclick_command = -button_uwheel_command = -button_dwheel_command = -button_font = Noto Sans 8 -button_font_color = #ffffff 100 -button_padding = 0 0 -button_background_id = 0 -button_centered = 1 -button_max_icon_size = 0 - -#------------------------------------- -# Button 4 -button = new button_text = > -button_tooltip = Prawy panel (super+tab) +button_tooltip = Right panel (super+tab) button_lclick_command = mb-jgtools right button_rclick_command = button_mclick_command = diff --git a/mabox-en/desktop-overlay/etc/skel/.gkrellm2/user-config b/mabox-en/desktop-overlay/etc/skel/.gkrellm2/user-config index 4af0188..e4bb884 100644 --- a/mabox-en/desktop-overlay/etc/skel/.gkrellm2/user-config +++ b/mabox-en/desktop-overlay/etc/skel/.gkrellm2/user-config @@ -1,5 +1,5 @@ ### GKrellM user config. Auto written, do not edit (usually) ### -### Version 2.3.9 ### +### Version 2.3.11 ### enable_hostname 1 hostname_short 0 enable_sysname 1 @@ -33,6 +33,7 @@ clock_cal clock_format %k:%M %S cpu enable 0 cpu smp_mode 0 cpu enabled cpu 1 +cpu launch cpu terminator -T bashtop -e bashtop cpu extra_info cpu 0 cpu chart_config cpu 50 20 0 0 0 0 : 0 0 0 0 500 : 0 0 0 0 500 : 0 0 0 0 500 cpu show_panel_labels 1 @@ -48,15 +49,15 @@ proc text_format \w88\a$p\f procs\n\e$u\f users proc chart_config 50 100 0 0 0 0 : 1 0 0 0 500 : 0 0 0 0 500 disk assign_method 2 disk device Disk 0 0 0 1 1 0 0 Dysk -disk chart_config Disk 50 10 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500 -disk device sda 0 0 12 0 1 -1 0 sda -disk device sda1 0 0 12 0 1 1 0 sda1 -disk device sr0 0 0 15 0 1 -1 0 sr0 +disk chart_config Disk 50 3000000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500 +disk device sda 0 0 45 0 1 -1 0 sda +disk device sda1 0 0 45 0 1 1 0 sda1 +disk device sr0 0 0 96 0 1 -1 0 sr0 disk text_format $T inet text_format all \t$a\f $l\N$A\f $L inet update_interval all 1 net enables enp0s3 1 1 0 -net chart_config enp0s3 50 70 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500 +net chart_config enp0s3 50 2000 0 1 0 0 : 0 0 0 0 500 : 0 0 0 0 500 net enables lo 0 1 0 net timer_enabled 1 net timer_seconds 1 @@ -70,7 +71,7 @@ net net_stats_window_height 200 meminfo mem_meter 1 0 0 meminfo swap_meter 1 0 meminfo swap_chart 0 1 -meminfo mem_launch terminator -e htop +meminfo mem_launch terminator -T bashtop -e bashtop meminfo mem_tooltip htop meminfo mem_data_format $t - $f wolne meminfo swap_launch @@ -82,6 +83,22 @@ fs nfs_check_timeout 16 fs auto_eject 0 fs binary_units 0 fs data_format $t - $f wolne +mail mailbox-local mbox /var/spool/mail/napcok +mail mua +mail notify +mail fetch_command +mail remote_check_timeout 5 +mail local_check_timeout 4 +mail fetch_check_is_local 0 +mail msg_count_mode 0 +mail animation_select_mode 3 +mail fetch_check_only_mode 0 +mail reset_remote_mode 0 +mail unseen_is_new 0 +mail enable 1 0 0 0 +mail animation_continuous 0 +mail show_tooltip 1 +mail mh_seq_ignore 0 battery enable 0 battery enable_composite 0 battery estimate_time 0 diff --git a/mabox-en/desktop-overlay/usr/share/grub/background-mabox.png b/mabox-en/desktop-overlay/usr/share/grub/background-mabox.png index 36f7c27..d516e8d 100644 Binary files a/mabox-en/desktop-overlay/usr/share/grub/background-mabox.png and b/mabox-en/desktop-overlay/usr/share/grub/background-mabox.png differ diff --git a/mabox-en/live-overlay/etc/calamares/branding/manjaro/branding.desc b/mabox-en/live-overlay/etc/calamares/branding/manjaro/branding.desc index 21cf704..0b6859e 100755 --- a/mabox-en/live-overlay/etc/calamares/branding/manjaro/branding.desc +++ b/mabox-en/live-overlay/etc/calamares/branding/manjaro/branding.desc @@ -4,10 +4,10 @@ componentName: manjaro strings: productName: Mabox Linux shortProductName: Mabox - version: 20.02 - shortVersion: 20.02 - versionedName: Mabox Linux 20.02 Calanthe - shortVersionedName: Mabox 20.02 + version: 20.08 + shortVersion: 20.08 + versionedName: Mabox Linux 20.08 Dijkstra + shortVersionedName: Mabox 20.08 bootloaderEntryName: Mabox images: @@ -17,6 +17,8 @@ images: slideshow: "show.qml" +slideshowAPI: 1 + style: sidebarBackground: "#292F34" sidebarText: "#FFFFFF" diff --git a/mabox-en/live-overlay/usr/share/grub/themes/manjaro-live/background.png b/mabox-en/live-overlay/usr/share/grub/themes/manjaro-live/background.png new file mode 100644 index 0000000..5d1c8c0 Binary files /dev/null and b/mabox-en/live-overlay/usr/share/grub/themes/manjaro-live/background.png differ diff --git a/mabox-pl/Packages-Desktop b/mabox-pl/Packages-Desktop index ab122b7..60e0ebb 100644 --- a/mabox-pl/Packages-Desktop +++ b/mabox-pl/Packages-Desktop @@ -175,7 +175,7 @@ catimg dmidecode feh gsimplecal -htop +bashtop hddtemp inxi jp2a @@ -236,10 +236,9 @@ elementary-xfce-icons gtk-theme-elementary #---------=> fonts packages -manjaro-openbox-fonts ttf-dejavu -###ttf-font-awesome -###ttf-font-logos +ttf-hack +ttf-nerd-fonts-symbols ttf-roboto noto-fonts @@ -336,7 +335,6 @@ gnome-themes-extra hicolor-icon-theme vertex-maia-icon-theme vertex-maia-themes -ttf-icomoon-icons mabox-themes #---------=> system fonts @@ -345,7 +343,7 @@ freetype2 #---------=> system accountsservice zensu -#gnome-keyring +gnome-keyring manjaro-hotfixes polkit polkit-gnome @@ -355,7 +353,8 @@ qt5-styleplugins xdg-user-dirs xdg-user-dirs-gtk xdg-utils -xdg-su +zensu +#xdg-su - usunięte lipiec 2020 yay #---------=> xorg xorg-fonts-75dpi diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/mabox/jgtype.csv b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/jgtype.csv new file mode 100644 index 0000000..536bc0e --- /dev/null +++ b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/jgtype.csv @@ -0,0 +1,25 @@ +^sep(jgtype - pomocnik wpisywania komend) +Aktualizacje,^checkout(updates) +Mirrory i klucze,^checkout(mirrors) +^sep() +Konfiguruj,geany ~/.config/mabox/jgtype.csv +Pomoc, +^sep() + + + +#TAGS +^tag(updates) +^sep(Pacman) +Aktualizacja sudo pacman -Syu,jgtype "sudo pacman -Syu" +Odśw. baz + aktualizacja sudo pacman -Syyu,jgtype "sudo pacman -Syyu" +^sep(Yay) +Aktualizacja yay,jgtype "yay" +Odśw. baz + aktualizacja yay -Syyu,jgtype "yay -Syyu" + +^tag(mirrors) +^sep(Ustaw Mirrory) +Szybko sudo pacman-mirrors -f5,jgtype "sudo pacman-mirrors -f5" +Najbliższe wg GeoIP sudo pacman-mirrors -i --geoip, jgtype "sudo pacman-mirrors -i --geoip" +Wszystkie sudo pacman-mirrors -i -c all,jgtype "sudo pacman-mirrors -i -c all" + diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-prepend.csv b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-prepend.csv index e7f9a41..f021b8c 100644 --- a/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-prepend.csv +++ b/mabox-pl/desktop-overlay/etc/skel/.config/mabox/places-prepend.csv @@ -1,2 +1,2 @@ ^sep(Narzędzia) - Wyszukiwarka FSearch, fsearch +Wyszukiwarka FSearch, fsearch diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml b/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml index 66b96f9..4eb1be4 100644 --- a/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml +++ b/mabox-pl/desktop-overlay/etc/skel/.config/openbox/rc.xml @@ -317,7 +317,9 @@ - + + mabox-terminal + @@ -372,19 +374,9 @@ root-menu --> - - - Miejsca - - - - - Oprogramowanie - - - exo-open --launch TerminalEmulator htop + exo-open --launch TerminalEmulator bashtop @@ -392,6 +384,11 @@ mb-jgtools mblogout + + + jgtype + + openbox --reconfigure @@ -457,6 +454,7 @@ synclient TouchpadOff=1 --> + @@ -538,40 +536,162 @@ 50% - - - - 0 - 0 - 50% - 100% + + + + + + client-menu - - + + + + + + + + - 0 - -0 - 100% - 50% + 25% + 100% + 0% + 0% + + + + + + 50% + 100% + 0% + 0% - + - -0 - 0 50% 100% + 50% + 0% + + + + + + 25% + 100% + 75% + 0% + + + + + + 100% + 50% + 0% + 50% + + + + + + 100% + 25% + 0% + 75% - + - 0 - 0 100% 50% + 0% + 0% + + + + + + 100% + 25% + 0% + 0% + + + + + + 50% + 50% + 0% + 0% + + + + + + 25% + 50% + 0% + 0% + + + + + + 50% + 50% + 0% + 50% + + + + + + 25% + 50% + 0% + 50% + + + + + + 50% + 50% + 50% + 0% + + + + + + 25% + 50% + 75% + 0% + + + + + + 50% + 50% + 50% + 50% + + + + + + 25% + 50% + 75% + 50% @@ -723,6 +843,13 @@ + + + + autosnap + + + diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/terminator/config b/mabox-pl/desktop-overlay/etc/skel/.config/terminator/config index 3794fd7..5435614 100644 --- a/mabox-pl/desktop-overlay/etc/skel/.config/terminator/config +++ b/mabox-pl/desktop-overlay/etc/skel/.config/terminator/config @@ -21,7 +21,7 @@ group_tab = None group_tab_toggle = t help = None - hide_window = None + hide_window = F12 insert_number = None insert_padded = None move_tab_left = None diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/tint2/fullwidth_transp_dark.tint2rc b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/fullwidth_transp_dark.tint2rc new file mode 100644 index 0000000..56fdffd --- /dev/null +++ b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/fullwidth_transp_dark.tint2rc @@ -0,0 +1,311 @@ +#---- Generated by tint2conf d246 ---- +# See https://gitlab.com/o9000/tint2/wikis/Configure for +# full documentation of the configuration options. +#------------------------------------- +# Gradients +#------------------------------------- +# Backgrounds +# Background 1: Domyślne zadanie, Programy, Zminimalizowane +rounded = 0 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 0 +border_color = #000000 0 +background_color_hover = #000000 0 +border_color_hover = #000000 0 +background_color_pressed = #000000 0 +border_color_pressed = #000000 0 + +# Background 2: +rounded = 3 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffffff 30 +border_color = #ffffff 0 +background_color_hover = #ffffff 30 +border_color_hover = #ffffff 0 +background_color_pressed = #ffffff 30 +border_color_pressed = #ffffff 0 + +# Background 3: Pilne +rounded = 3 +border_width = 2 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #4285f4 30 +border_color = #4285f4 100 +background_color_hover = #4285f4 30 +border_color_hover = #4285f4 100 +background_color_pressed = #4285f4 30 +border_color_pressed = #4285f4 100 + +# Background 4: Aktywne, Button, Panel +rounded = 2 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 40 +border_color = #000000 50 +background_color_hover = #000000 40 +border_color_hover = #000000 50 +background_color_pressed = #000000 40 +border_color_pressed = #000000 50 + +# Background 5: Podpowiedzi +rounded = 3 +border_width = 0 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 100 +border_color = #000000 0 +background_color_hover = #000000 100 +border_color_hover = #000000 0 +background_color_pressed = #000000 100 +border_color_pressed = #000000 0 + +# Background 6: Nieaktywne zadanie +rounded = 0 +border_width = 0 +border_sides = +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #000000 50 +border_color = #000000 0 +background_color_hover = #000000 50 +border_color_hover = #000000 0 +background_color_pressed = #000000 50 +border_color_pressed = #000000 0 + +#------------------------------------- +# Panel +panel_items = P:L:TS:C:P +panel_size = 100% 40 +panel_margin = 0 0 +panel_padding = 0 0 0 +panel_background_id = 4 +wm_menu = 1 +panel_dock = 0 +panel_pivot_struts = 0 +panel_position = bottom center horizontal +panel_layer = top +panel_monitor = all +panel_shrink = 0 +autohide = 0 +autohide_show_timeout = 0.5 +autohide_hide_timeout = 0.5 +autohide_height = 5 +strut_policy = follow_size +panel_window_name = tint2 +disable_transparency = 0 +mouse_effects = 0 +font_shadow = 0 +mouse_hover_icon_asb = 100 0 10 +mouse_pressed_icon_asb = 100 0 0 +scale_relative_to_dpi = 0 +scale_relative_to_screen_height = 0 + +#------------------------------------- +# Taskbar +taskbar_mode = single_desktop +taskbar_hide_if_empty = 0 +taskbar_padding = 10 0 20 +taskbar_background_id = 6 +taskbar_active_background_id = 0 +taskbar_name = 0 +taskbar_hide_inactive_tasks = 0 +taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 +taskbar_always_show_all_desktop_tasks = 0 +taskbar_name_padding = 0 0 +taskbar_name_background_id = 0 +taskbar_name_active_background_id = 0 +taskbar_name_font = Montserrat 8 +taskbar_name_font_color = #ffffff 20 +taskbar_name_active_font_color = #ffffff 40 +taskbar_distribute_size = 0 +taskbar_sort_order = none +task_align = left + +#------------------------------------- +# Task +task_text = 1 +task_icon = 1 +task_centered = 1 +urgent_nb_of_blink = 5 +task_maximum_size = 180 5 +task_padding = 10 10 10 +task_font = Source Sans Pro 9 +task_tooltip = 1 +task_thumbnail = 0 +task_thumbnail_size = 210 +task_font_color = #ffffff 80 +task_active_font_color = #ffffff 80 +task_urgent_font_color = #ffffff 100 +task_iconified_font_color = #d8d8d8 60 +task_icon_asb = 50 0 0 +task_active_icon_asb = 100 0 0 +task_urgent_icon_asb = 100 0 0 +task_iconified_icon_asb = 100 0 0 +task_background_id = 1 +task_active_background_id = 4 +task_urgent_background_id = 3 +task_iconified_background_id = 1 +mouse_left = toggle_iconify +mouse_middle = none +mouse_right = close +mouse_scroll_up = none +mouse_scroll_down = none + +#------------------------------------- +# System tray (notification area) +systray_padding = 0 0 10 +systray_background_id = 0 +systray_sort = right2left +systray_icon_size = 22 +systray_icon_asb = 30 0 50 +systray_monitor = primary +systray_name_filter = + +#------------------------------------- +# Launcher +launcher_padding = 2 2 10 +launcher_background_id = 1 +launcher_icon_background_id = 0 +launcher_icon_size = 28 +launcher_icon_asb = 100 0 0 +launcher_icon_theme = Numix-Square-Light +launcher_icon_theme_override = 1 +startup_notifications = 0 +launcher_tooltip = 1 +launcher_item_app = ~/.local/share/applications/show_desktop.desktop +launcher_item_app = ~/.local/share/applications/exo-file-manager.desktop +launcher_item_app = ~/.local/share/applications/exo-terminal-emulator.desktop +launcher_item_app = ~/.local/share/applications/exo-web-browser.desktop +launcher_apps_dir = ~/.local/share/applictations/ + +#------------------------------------- +# Clock +time1_format = %H:%M +time2_format = +time1_font = Source Sans Pro Semi-Bold 11 +time1_timezone = +time2_timezone = +clock_font_color = #aaaaaa 100 +clock_padding = 10 0 +clock_background_id = 0 +clock_tooltip = Lewy -> kalendarz, Prawy - ustawienia daty i czasu +clock_tooltip_timezone = +clock_lclick_command = gsimplecal +clock_rclick_command = manjaro-settings-manager -m msm_timedate +clock_mclick_command = +clock_uwheel_command = +clock_dwheel_command = + +#------------------------------------- +# Battery +battery_tooltip = 0 +battery_low_status = 100 +battery_low_cmd = +battery_full_cmd = +bat1_font = Liberation Mono 8 +bat2_font = Liberation Mono 8 +battery_font_color = #b5b5b5 100 +bat1_format = +bat2_format = +battery_padding = 2 0 +battery_background_id = 0 +battery_hide = 100 +battery_lclick_command = +battery_rclick_command = +battery_mclick_command = +battery_uwheel_command = +battery_dwheel_command = +ac_connected_cmd = +ac_disconnected_cmd = + +#------------------------------------- +# Separator 1 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 15 +separator_padding = 1 0 + +#------------------------------------- +# Separator 2 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 5 +separator_padding = 1 0 + +#------------------------------------- +# Separator 3 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 5 +separator_padding = 1 0 + +#------------------------------------- +# Separator 4 +separator = new +separator_background_id = 0 +separator_color = #777777 80 +separator_style = empty +separator_size = 5 +separator_padding = 1 0 + +#------------------------------------- +# Button 1 +button = new +button_icon = ~/.config/tint2/menu.png +button_text = +button_tooltip = Lewy -> Menu główne, Prawy -> Menu ustawień +button_lclick_command = mb-jgtools main ipc +button_rclick_command = mb-jgtools settings ipc +button_mclick_command = +button_uwheel_command = +button_dwheel_command = +button_font_color = #000000 100 +button_padding = 0 0 +button_background_id = 4 +button_centered = 0 +button_max_icon_size = 0 + +#------------------------------------- +# Button 2 +button = new +button_icon = ~/.config/tint2/session.png +button_text = +button_tooltip = Wyjście... (win + x) +button_lclick_command = mb-jgtools mblogout ipc +button_rclick_command = sudo sync && notify-send "Sync complete" +button_mclick_command = +button_uwheel_command = +button_dwheel_command = +button_font_color = #000000 100 +button_padding = 12 12 +button_background_id = 4 +button_centered = 1 +button_max_icon_size = 0 + +#------------------------------------- +# Tooltip +tooltip_show_timeout = 0 +tooltip_hide_timeout = 0 +tooltip_padding = 4 4 +tooltip_background_id = 5 +tooltip_font_color = #ffffff 72 +tooltip_font = Sans normal 10 + diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc index 7b09434..b38caef 100644 --- a/mabox-pl/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc +++ b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/mabox2001.tint2rc @@ -247,9 +247,9 @@ ac_disconnected_cmd = button = new button_icon = arrow-left button_text = -button_tooltip = Lewy -> Menu główne, Prawy -> Menu ustawień +button_tooltip = Lewy panel (ctrl + tab) button_lclick_command = mb-jgtools places ipc -button_rclick_command = mb-jgtools settings ipc +button_rclick_command = button_mclick_command = button_uwheel_command = button_dwheel_command = diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/tint2/menu.png b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/menu.png new file mode 100644 index 0000000..42243ef Binary files /dev/null and b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/menu.png differ diff --git a/mabox-pl/desktop-overlay/etc/skel/.config/tint2/session.png b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/session.png new file mode 100644 index 0000000..c2d727d Binary files /dev/null and b/mabox-pl/desktop-overlay/etc/skel/.config/tint2/session.png differ diff --git a/mabox-pl/desktop-overlay/etc/skel/.gkrellm2/user-config b/mabox-pl/desktop-overlay/etc/skel/.gkrellm2/user-config index 4b52146..76a3dad 100644 --- a/mabox-pl/desktop-overlay/etc/skel/.gkrellm2/user-config +++ b/mabox-pl/desktop-overlay/etc/skel/.gkrellm2/user-config @@ -33,7 +33,7 @@ clock_cal clock_format %k:%M %S cpu enable 0 cpu smp_mode 0 cpu enabled cpu 1 -cpu launch cpu terminator -T "htop" -e htop +cpu launch cpu terminator -T "bashtop" -e bashtop cpu tooltip_comment cpu htop cpu extra_info cpu 1 cpu chart_config cpu 60 100 1 0 0 0 : 0 0 0 0 500 : 0 0 0 0 500 : 0 0 0 0 500 diff --git a/mabox-pl/desktop-overlay/etc/skel/bin/autosnap b/mabox-pl/desktop-overlay/etc/skel/bin/autosnap new file mode 100755 index 0000000..b0af2e3 --- /dev/null +++ b/mabox-pl/desktop-overlay/etc/skel/bin/autosnap @@ -0,0 +1,63 @@ +#!/bin/bash +#=================================================================================== +# AUTOSNAP +# FILE: autosnap +# USAGE: autosnap +# DESCRIPTION: Snap current windows according the mouse position +# REQUIREMENTS: xdotool, xrandr +# AUTHOR: Leonardo Marco +# VERSION: 1.0 +# CREATED: 12.10.2017 +# LAST-UPDATE: 12.10.2017 +#=================================================================================== + +# Key combinations in openbox (same as configured in rc.xml) +topleft_key="super+KP_Home" +top_key="super+KP_Up" +topright_key="super+KP_Prior" +left_key="super+KP_Left" +center_key="super+KP_Begin" +right_key="super+KP_Right" +bottomleft_key="super+KP_End" +bottom_key="super+KP_Down" +bottomright_key="super+KP_Next" + +# Format xrandr output +xrandr="$(xrandr | grep -w "connected" | grep -o "[0-9]\+x[0-9]\++[0-9]\++[0-9]\+" | tr "x+" " " | sort -nk 4)" +# Get num of monitors +num_screens=$(echo "$xrandr" | wc -l) +[ "$num_screens" -gt 2 ] && echo "Script cannot deal with more than 2 monitors" >&2 && exit 1 +# Get screen resolution +screen_left=($(echo "$xrandr" | head -1)) +[ "$num_screens" -gt 1 ] && screen_right=($(echo "$xrandr" | tail -1)) + +# Get current mouse position +out="$(xdotool getmouselocation)" +out=(${out//[^0-9 ]/}) +current_x="${out[0]}" +current_y="${out[1]}" + +# Calculate current monitor and relative position to this monitor +if [ "$num_screens" -gt 1 ] && [ "$current_x" -gt "${screen_right[2]}" ]; then + current_screen=(${screen_right[*]}) + current_x=$(($current_x-${screen_right[2]})) +else + current_screen=(${screen_left[*]}) +fi + +# Check zone-position +if [ "$current_y" -lt "$((${current_screen[1]}*1/3))" ]; then # IN-TOP + var_key="top" +elif [ "$current_y" -gt "$((${current_screen[1]}*2/3))" ]; then # IN-BOTTOM + var_key="bottom" +fi +if [ "$current_x" -lt "$((${current_screen[0]}*1/3))" ]; then # IN-LEFT + var_key="${var_key}left" +elif [ "$current_x" -gt "$((${current_screen[0]}*2/3))" ]; then # IN-RIGHT + var_key="${var_key}right" +fi +[ ! "$var_key" ] && var_key="center" +var_key="${var_key}_key" + +# Press openbox snap combination according position +xdotool key "${!var_key}" diff --git a/mabox-pl/desktop-overlay/etc/skel/bin/jgtype b/mabox-pl/desktop-overlay/etc/skel/bin/jgtype new file mode 100755 index 0000000..71cd100 --- /dev/null +++ b/mabox-pl/desktop-overlay/etc/skel/bin/jgtype @@ -0,0 +1,95 @@ +#!/bin/bash + +if [ "$1" ]; then + case "$1" in + edit) edit;; + reset) reset;; + *) xdotool type --delay 0 "$1" + exit 1 + ;; + esac +fi + + +# IF exist ~/.config/mabox/jgtype.csv CSV="$HOME/.config/mabox/jgtype.csv +# ELSE CSV=/usr/share/mb-jgtools/jgtype.csv + + +. $HOME/.config/mabox/mabox.conf + +jgmenu_theme=${jgmenu_theme:-obtheme} +jgmenu_use_icons=${jgmenu_use_icons:-true} +case $jgmenu_theme in + default) + export color_norm_fg="#FFFFFF " + ;; + obtheme) + export color_title_fg="#FFFFFF " + ob_file=$HOME/.config/openbox/rc.xml + [[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") + while read -r a b c + do + [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c" + done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc + ;; + *) + export color_norm_fg="#FFFFFF " + ;; +esac +. $HOME/.config/mabox/jgmenusize.conf + + + + + +config_file=$(mktemp) +menu_file=$(mktemp) +trap "rm -f ${config_file} ${menu_file}" EXIT + +cat <${config_file} +stay_alive = 0 +menu_width = 340 +#menu_height_min = 480 +menu_padding_top = ${MENU_PADDING_TOP:-4} +menu_padding_right = ${MENU_PADDING_RIGHT:-4} +menu_padding_bottom = ${MENU_PADDING_BOTTOM:-4} +menu_padding_left = ${MENU_PADDING_LEFT:-4} +menu_radius = ${MENU_RADIUS:-0} +menu_halign = center +menu_valign = center +tabs = ${TABS:-80} +item_margin_y = 4 +item_height = 24 +item_padding_x = 10 +item_radius = 0 +item_border = 1 + + +icon_size = 0 + +color_menu_bg = ${color_menu_bg:-#222222 80} +color_menu_border = ${color_menu_border:-#2f9b85 100} +color_norm_bg = ${color_norm_bg:-#000000 0} +color_norm_fg = ${color_norm_fg:-#CCCCCC 100} +color_sel_bg = ${color_sel_bg:-#169f6f 60} +color_sel_fg = ${color_sel_fg:-#f8f8f8 100} +color_sel_border = ${color_sel_border:-#504e65 100} +color_sep_fg = ${color_sep_fg:-#4D4D4D 100} +color_sep_bg = ${color_sep_bg:-#262626 100} +color_title_fg = ${color_title_fg:-#4D4D4D 100} +color_title_border = ${color_title_border:-#169f6f 100} +color_title_bg = ${color_title_bg:-#262626 100} +color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100} + + +sep_markup = weight="bold" foreground="${color_title_fg% *}" +sep_height = ${sep_height:-5} +font = ${jgmenu_font:-Noto Sans Medium 9} +EOF + +cat <${menu_file} +. ~/.config/mabox/jgtype.csv + +EOF + +jgmenu --config-file=${config_file} --csv-file=${menu_file} diff --git a/mabox-pl/desktop-overlay/etc/skel/bin/mabox-terminal b/mabox-pl/desktop-overlay/etc/skel/bin/mabox-terminal new file mode 100755 index 0000000..4b2595b --- /dev/null +++ b/mabox-pl/desktop-overlay/etc/skel/bin/mabox-terminal @@ -0,0 +1,22 @@ +#!/bin/bash + +# Author: Daniel Napora +# "Show-Hide" terminal wrapper for terminator for use with keybind eg. super + enter. +# Depenging on actual state it start, show or hide terminal window. + +ID=$(wmctrl -x -l | grep mabox-terminal | awk '{print $1}' | head -n 1) +if [ -z "${ID}" ]; then + TOP=$(wmctrl -d|grep "*"|awk '{print $8}'|cut -d',' -f2) + LEFT=$[$(wmctrl -d|grep "*"|awk '{print $4}'|cut -d'x' -f1)/8] + HEIGHT=$[$(wmctrl -d|grep "*"|awk '{print $4}'|cut -d'x' -f2)/2] + WIDTH=$[${LEFT}*6] + terminator -T mabox-terminal -b --geometry "${WIDTH}x${HEIGHT}+${LEFT}+${TOP}" +else + ID_DEC=$((${ID})) + ACTIVE_WIN_DEC=$(xdotool getactivewindow) + if [ "${ACTIVE_WIN_DEC}" == "${ID_DEC}" ]; then + xdotool windowminimize ${ID_DEC} + else + xdotool windowactivate ${ID_DEC} + fi +fi diff --git a/mabox-pl/desktop-overlay/usr/share/grub/background-mabox.png b/mabox-pl/desktop-overlay/usr/share/grub/background-mabox.png index 36f7c27..d516e8d 100644 Binary files a/mabox-pl/desktop-overlay/usr/share/grub/background-mabox.png and b/mabox-pl/desktop-overlay/usr/share/grub/background-mabox.png differ diff --git a/mabox-pl/live-overlay/etc/calamares/branding/manjaro/branding.desc b/mabox-pl/live-overlay/etc/calamares/branding/manjaro/branding.desc index 21cf704..0b6859e 100755 --- a/mabox-pl/live-overlay/etc/calamares/branding/manjaro/branding.desc +++ b/mabox-pl/live-overlay/etc/calamares/branding/manjaro/branding.desc @@ -4,10 +4,10 @@ componentName: manjaro strings: productName: Mabox Linux shortProductName: Mabox - version: 20.02 - shortVersion: 20.02 - versionedName: Mabox Linux 20.02 Calanthe - shortVersionedName: Mabox 20.02 + version: 20.08 + shortVersion: 20.08 + versionedName: Mabox Linux 20.08 Dijkstra + shortVersionedName: Mabox 20.08 bootloaderEntryName: Mabox images: @@ -17,6 +17,8 @@ images: slideshow: "show.qml" +slideshowAPI: 1 + style: sidebarBackground: "#292F34" sidebarText: "#FFFFFF" diff --git a/mabox-pl/live-overlay/etc/skel/.config/openbox/rc.xml b/mabox-pl/live-overlay/etc/skel/.config/openbox/rc.xml deleted file mode 100644 index 66b96f9..0000000 --- a/mabox-pl/live-overlay/etc/skel/.config/openbox/rc.xml +++ /dev/null @@ -1,1089 +0,0 @@ - - - - 10 - 20 - - - yes - - no - - yes - - no - - 200 - - no - - - - Smart - -
yes
- - Primary - - 1 - - - - Mabox-superdesk - NDSLIMC - - yes - yes - - Sans - 9 - - Bold - - Normal - - - - Sans - 9 - - Bold - - Normal - - - - Sans - 11 - - Normal - - Normal - - - - Sans - 10 - - Normal - - Normal - - - - sans - 9 - - bold - - normal - - - - sans - 9 - - bold - - normal - - - - - - 4 - 1 - - 1 - 2 - 3 - 4 - - 875 - - - - yes - Always - - Center - - - - 10 - - 10 - - - - - - 0 - 0 - 0 - 0 - - - Right - - 0 - 0 - yes - Above - - Vertical - - yes - 300 - - 300 - - Middle - - - - C-g - - - - - - left - no - - - - - right - no - - - - - up - no - - - - - down - no - - - - - - - - - - - - - - - - - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - - - - - yes - yes - - - - - - - - - - - - - - - - - geany - - - - - xkill - - - - - rofr.sh - - - - - compton_toggle - - - - - exo-open --launch TerminalEmulator - - - - - exo-open --launch TerminalEmulator - - - - - - - - exo-open --launch WebBrowser - - - - - exo-open --launch FileManager - - - - - pavucontrol - - - - - mb-jgtools right - - - - - betterlockscreen -l dim -t "Wpisz hasło aby odblokować" - - - - - mb-jgtools screenshot - - - - - mb-scrot -s - - - - - mb-jgtools main ipc - - - - - gmrun - - - - - mb-jgtools main - - - - - - Miejsca - - - - - Oprogramowanie - - - - - exo-open --launch TerminalEmulator htop - - - - - mb-jgtools mblogout - - - - - openbox --reconfigure - - - - - mb-jgtools places - - - - - - pamixer -i 2 - - - - - pamixer -d 2 - - - - - pamixer -t - - - - - playerctl stop - - - - - playerctl play-pause - - - - - playerctl previous - - - - - playerctl next - - - - - - - 0 - -0 - 50% - 50% - - - - - - 0 - -0 - 100% - 50% - - - - - - -0 - -0 - 50% - 50% - - - - - - 0 - 0 - 50% - 100% - - - - - - center - center - 50% - 50% - - - - - - -0 - 0 - 50% - 100% - - - - - - 0 - 0 - 50% - 50% - - - - - - 0 - 0 - 100% - 50% - - - - - - -0 - 0 - 50% - 50% - - - - - - 0 - 0 - 50% - 100% - - - - - - 0 - -0 - 100% - 50% - - - - - - -0 - 0 - 50% - 100% - - - - - - 0 - 0 - 100% - 50% - - - - - -20 - - - - - 20 - - - - - -20 - - - - - 20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - 500 - - 400 - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - - - - - - - - - no - - - - - - - - - - - yes - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - top - - - - - - - left - - - - - - - right - - - - - - - bottom - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vertical - - - - - horizontal - - - - - - - - - - - - - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - - - - - - - - - - - - client-list-combined-menu - - - - - mb-jgtools main - - - - - - - - previous - - - - - next - - - - - previous - - - - - next - - - - - - - - menu.xml - miejsca.xml - oprogramowanie.xml - 200 - - no - - 100 - - 400 - - yes - - yes - - - - - yes - - - all - above - no - - -10 - -10 - - - 20% - 20% - - - - - diff --git a/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/background.png b/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/background.png new file mode 100644 index 0000000..5d1c8c0 Binary files /dev/null and b/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/background.png differ diff --git a/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/theme.txt b/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/theme.txt index 60b49cf..810bd1f 100644 --- a/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/theme.txt +++ b/mabox-pl/live-overlay/usr/share/grub/themes/manjaro-live/theme.txt @@ -75,8 +75,8 @@ terminal-border: "0" left = 50%-125 top = 80% width = 250 - + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[↵] Boot selected OS" } - + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[↑ and ↓ Key] Navigation" } - + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[E] Edit Selection" } - + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[C] GRUB Commandline" } + + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[↵] Uruchom wybrany system" } + + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[↑ and ↓ Key] Nawigacja" } + + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[E] Edytuj wybrane" } + + label { width = 250 height = 20 align = "center" color = "#ffffff" font = "Terminus 16" text = "[C] Linia komend GRUB-a" } }