diff --git a/core/layout.lua b/core/layout.lua index 9cc1de1..191e1a0 100644 --- a/core/layout.lua +++ b/core/layout.lua @@ -52,7 +52,7 @@ awful.screen.connect_for_each_screen(function(s) s.mywibox = awful.wibar({ position = "top", screen = s, - bg = beautiful.topbar_bg + bg = beautiful.topbar_bg, }) -- Add screen lock require("widgets.lock")({screen = s, obscure = true}) @@ -75,10 +75,25 @@ awful.screen.connect_for_each_screen(function(s) layout = wibox.layout.align.horizontal, { -- Left widgets layout = wibox.layout.fixed.horizontal, - require("core.widgets.menu_launcher"), + { + { + require("core.widgets.menu_launcher"), + widget = wibox.container.place, + halign = "center" + }, + bg = "#26262633", + widget = wibox.container.background, + forced_width = require("beautiful.xresources").apply_dpi(61), + }, --require("widgets.polylauncher")({vertical = false}), - s.mytaglist, + --s.mytaglist, s.mypromptbox, + require("widgets.current_window")({ + style = { + icon_bg_normal = beautiful.topbar_bg + } + }), + spacing = 3 }, -- Middle widget { @@ -96,19 +111,38 @@ awful.screen.connect_for_each_screen(function(s) awful.widget.keyboardlayout(), require("widgets.wallpapers")({ screen = s, - path = os.getenv("HOME").."/Pictures/Wallpapers/" + path = os.getenv("HOME").."/Pictures/Wallpapers/", + style = { + icon_bg_normal = beautiful.topbar_bg + } }), require("widgets.mailbox")({ screen = s, style = { - rounding = 1 + rounding = 1, + icon_bg_normal = beautiful.topbar_bg + } + }), + --wibox.widget.systray(), + require("widgets.volume")({ + style = { + icon_bg_normal = beautiful.topbar_bg + } + }), + require("widgets.battery")({ + percentage = true, + style = { + icon_bg_normal = beautiful.topbar_bg } }), - wibox.widget.systray(), - require("widgets.volume")({}), - require("widgets.battery")({percentage = true}), wibox.widget.textclock(), + require("widgets.username")({ + style = { + icon_bg_normal = beautiful.topbar_bg + } + }), s.mylayoutbox, + spacing = 4 }, } end) diff --git a/core/titlebar.lua b/core/titlebar.lua index 987c25b..d7d7f2d 100644 --- a/core/titlebar.lua +++ b/core/titlebar.lua @@ -88,21 +88,39 @@ return function(c) return awful.titlebar(c) : setup { { -- Left c.menu_button, + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c), + buttons = buttons + }, + spacing = 10, layout = wibox.layout.fixed.horizontal }, { -- Middle - { -- Title - align = "center", - widget = awful.titlebar.widget.titlewidget(c) - }, buttons = buttons, layout = wibox.layout.flex.horizontal }, { -- Right - awful.titlebar.widget.maximizedbutton(c), - awful.titlebar.widget.minimizebutton (c), - awful.titlebar.widget.closebutton (c), - layout = wibox.layout.fixed.horizontal() + { + { + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.minimizebutton (c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal(), + widget = wibox.container.margin, + margins = 3 + }, + widget = wibox.container.background, + shape = gears.shape.rounded_bar, + bg = { + type = "linear", + from = { 0, 15 }, + to = { 0, 0}, + stops = { { 0, "#5d5d5955"} , {1, "39383555"} } + }, + }, + widget = wibox.container.margin, + margins = 2 }, layout = wibox.layout.align.horizontal, } diff --git a/core/vars.lua b/core/vars.lua index d7bc1cb..9c6ef06 100644 --- a/core/vars.lua +++ b/core/vars.lua @@ -5,7 +5,7 @@ global = {} global.awesome_dir = os.getenv("HOME").."/.config/awesome/" global.config_dir = os.getenv("HOME").."/.awesome/" global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/" -global.theme = global.awesome_dir .. "themes/unity2/theme.lua" +global.theme = global.awesome_dir .. "themes/unity/theme.lua" global.terminal = "xterm" global.editor = os.getenv("EDITOR") or "vim" global.editor_cmd = global.terminal .. " -e ".. global.editor diff --git a/themes/icons.lua b/themes/icons.lua index e1b1a74..30cbc9c 100644 --- a/themes/icons.lua +++ b/themes/icons.lua @@ -13,11 +13,6 @@ end global.themes_dir = global.themes_dir or (os.getenv("HOME").."/.config/awesome/themes/") beautiful.name = beautiful.name or "default" beautiful.icon_dir = beautiful.icon_dir or global.themes_dir..beautiful.name.."/icons/" -print(beautiful.icon_dir) --- Recolor icons -beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_normal,"normal") -beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_focus,"focus") -beautiful_assets.recolor_layout(beautiful,beautiful.fg_normal) local temp = {} -- Powermenu icons temp.powercontrol_icon_shutdown = beautiful.icon_dir.."shutdown.svg" @@ -51,5 +46,5 @@ beautiful.recolor_icon_group(temp,"^battery_.+",beautiful.fg_normal) -- Widget icons beautiful.wallpapers_icon = gears.color.recolor_image(beautiful.icon_dir.."wallpaper.svg",beautiful.fg_normal) beautiful.mailbox_icon = gears.color.recolor_image(beautiful.icon_dir.."mail.svg",beautiful.fg_normal) - +beautiful.username_logout_icon = gears.color.recolor_image(beautiful.icon_dir.."system-log-out-symbolic.svg",beautiful.fg_normal) diff --git a/themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg b/themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg rename to themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_orange_RGB.svg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg b/themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg rename to themes/unity/Focal_Fossa_Wallpapers/Focal Fossa_white_RGB.svg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/.DS_Store b/themes/unity/Focal_Fossa_Wallpapers/JPG/.DS_Store similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/.DS_Store rename to themes/unity/Focal_Fossa_Wallpapers/JPG/.DS_Store diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_1920x1080_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_2560x1440_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_4096x2304_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_Plain_WP_8192x4608_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_1920x1080_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_2560x1440_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_4096x2304_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg b/themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg rename to themes/unity/Focal_Fossa_Wallpapers/JPG/Focal-Fossa_WP_8192x4608_GREY.jpg diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_1920x1080_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_2560x1440_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_Plain_WP_4096x2304_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_1920x1080_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_2560x1440_GREY.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304.png diff --git a/themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png b/themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png similarity index 100% rename from themes/unity2/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png rename to themes/unity/Focal_Fossa_Wallpapers/PNG/Focal-Fossa_WP_4096x2304_GREY.png diff --git a/themes/unity2/background.png b/themes/unity/background.png similarity index 100% rename from themes/unity2/background.png rename to themes/unity/background.png diff --git a/themes/unity2/icons/README.md b/themes/unity/icons/README.md similarity index 92% rename from themes/unity2/icons/README.md rename to themes/unity/icons/README.md index b43f74a..d9f2e1b 100644 --- a/themes/unity2/icons/README.md +++ b/themes/unity/icons/README.md @@ -1,5 +1,7 @@ battery status icons, lock/shutdown/suspend icons, volume status icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later) +logout icon is taken from the adwaita project + battery status icons in particular were modified to look somewhat less ugly when recolored to a single color. this was done because the config automatically recolors all icons to the color value of the foreground (text) color. the author of this config does not claim copyright of any icons present in this folder unless stated otherwise in the icon's license metadata. diff --git a/themes/unity2/icons/battery-caution-charging-symbolic.svg b/themes/unity/icons/battery-caution-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-caution-charging-symbolic.svg rename to themes/unity/icons/battery-caution-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-caution-symbolic.svg b/themes/unity/icons/battery-caution-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-caution-symbolic.svg rename to themes/unity/icons/battery-caution-symbolic.svg diff --git a/themes/unity2/icons/battery-empty-charging-symbolic.svg b/themes/unity/icons/battery-empty-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-empty-charging-symbolic.svg rename to themes/unity/icons/battery-empty-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-empty-symbolic.svg b/themes/unity/icons/battery-empty-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-empty-symbolic.svg rename to themes/unity/icons/battery-empty-symbolic.svg diff --git a/themes/unity2/icons/battery-full-charged-symbolic.svg b/themes/unity/icons/battery-full-charged-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-full-charged-symbolic.svg rename to themes/unity/icons/battery-full-charged-symbolic.svg diff --git a/themes/unity2/icons/battery-full-charging-symbolic.svg b/themes/unity/icons/battery-full-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-full-charging-symbolic.svg rename to themes/unity/icons/battery-full-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-full-symbolic.svg b/themes/unity/icons/battery-full-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-full-symbolic.svg rename to themes/unity/icons/battery-full-symbolic.svg diff --git a/themes/unity2/icons/battery-good-charging-symbolic.svg b/themes/unity/icons/battery-good-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-good-charging-symbolic.svg rename to themes/unity/icons/battery-good-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-good-symbolic.svg b/themes/unity/icons/battery-good-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-good-symbolic.svg rename to themes/unity/icons/battery-good-symbolic.svg diff --git a/themes/unity2/icons/battery-low-charging-symbolic.svg b/themes/unity/icons/battery-low-charging-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-low-charging-symbolic.svg rename to themes/unity/icons/battery-low-charging-symbolic.svg diff --git a/themes/unity2/icons/battery-low-symbolic.svg b/themes/unity/icons/battery-low-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-low-symbolic.svg rename to themes/unity/icons/battery-low-symbolic.svg diff --git a/themes/unity2/icons/battery-missing-symbolic.svg b/themes/unity/icons/battery-missing-symbolic.svg similarity index 100% rename from themes/unity2/icons/battery-missing-symbolic.svg rename to themes/unity/icons/battery-missing-symbolic.svg diff --git a/themes/unity2/icons/lock.svg b/themes/unity/icons/lock.svg similarity index 100% rename from themes/unity2/icons/lock.svg rename to themes/unity/icons/lock.svg diff --git a/themes/unity2/icons/mail.svg b/themes/unity/icons/mail.svg similarity index 100% rename from themes/unity2/icons/mail.svg rename to themes/unity/icons/mail.svg diff --git a/themes/unity2/icons/shutdown.svg b/themes/unity/icons/shutdown.svg similarity index 100% rename from themes/unity2/icons/shutdown.svg rename to themes/unity/icons/shutdown.svg diff --git a/themes/unity2/icons/suspend.svg b/themes/unity/icons/suspend.svg similarity index 100% rename from themes/unity2/icons/suspend.svg rename to themes/unity/icons/suspend.svg diff --git a/themes/unity/icons/system-log-out-symbolic.svg b/themes/unity/icons/system-log-out-symbolic.svg new file mode 100644 index 0000000..9f1676e --- /dev/null +++ b/themes/unity/icons/system-log-out-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/unity2/icons/volume-high.svg b/themes/unity/icons/volume-high.svg similarity index 100% rename from themes/unity2/icons/volume-high.svg rename to themes/unity/icons/volume-high.svg diff --git a/themes/unity2/icons/volume-low.svg b/themes/unity/icons/volume-low.svg similarity index 100% rename from themes/unity2/icons/volume-low.svg rename to themes/unity/icons/volume-low.svg diff --git a/themes/unity2/icons/volume-medium.svg b/themes/unity/icons/volume-medium.svg similarity index 100% rename from themes/unity2/icons/volume-medium.svg rename to themes/unity/icons/volume-medium.svg diff --git a/themes/unity2/icons/volume-muted.svg b/themes/unity/icons/volume-muted.svg similarity index 100% rename from themes/unity2/icons/volume-muted.svg rename to themes/unity/icons/volume-muted.svg diff --git a/themes/unity2/icons/wallpaper.svg b/themes/unity/icons/wallpaper.svg similarity index 100% rename from themes/unity2/icons/wallpaper.svg rename to themes/unity/icons/wallpaper.svg diff --git a/themes/unity2/layouts/cornerne.png b/themes/unity/layouts/cornerne.png similarity index 100% rename from themes/unity2/layouts/cornerne.png rename to themes/unity/layouts/cornerne.png diff --git a/themes/unity2/layouts/cornernew.png b/themes/unity/layouts/cornernew.png similarity index 100% rename from themes/unity2/layouts/cornernew.png rename to themes/unity/layouts/cornernew.png diff --git a/themes/unity2/layouts/cornernw.png b/themes/unity/layouts/cornernw.png similarity index 100% rename from themes/unity2/layouts/cornernw.png rename to themes/unity/layouts/cornernw.png diff --git a/themes/unity2/layouts/cornernww.png b/themes/unity/layouts/cornernww.png similarity index 100% rename from themes/unity2/layouts/cornernww.png rename to themes/unity/layouts/cornernww.png diff --git a/themes/unity2/layouts/cornerse.png b/themes/unity/layouts/cornerse.png similarity index 100% rename from themes/unity2/layouts/cornerse.png rename to themes/unity/layouts/cornerse.png diff --git a/themes/unity2/layouts/cornersew.png b/themes/unity/layouts/cornersew.png similarity index 100% rename from themes/unity2/layouts/cornersew.png rename to themes/unity/layouts/cornersew.png diff --git a/themes/unity2/layouts/cornersw.png b/themes/unity/layouts/cornersw.png similarity index 100% rename from themes/unity2/layouts/cornersw.png rename to themes/unity/layouts/cornersw.png diff --git a/themes/unity2/layouts/cornersww.png b/themes/unity/layouts/cornersww.png similarity index 100% rename from themes/unity2/layouts/cornersww.png rename to themes/unity/layouts/cornersww.png diff --git a/themes/unity2/layouts/dwindle.png b/themes/unity/layouts/dwindle.png similarity index 100% rename from themes/unity2/layouts/dwindle.png rename to themes/unity/layouts/dwindle.png diff --git a/themes/unity2/layouts/dwindlew.png b/themes/unity/layouts/dwindlew.png similarity index 100% rename from themes/unity2/layouts/dwindlew.png rename to themes/unity/layouts/dwindlew.png diff --git a/themes/unity2/layouts/fairh.png b/themes/unity/layouts/fairh.png similarity index 100% rename from themes/unity2/layouts/fairh.png rename to themes/unity/layouts/fairh.png diff --git a/themes/unity2/layouts/fairhw.png b/themes/unity/layouts/fairhw.png similarity index 100% rename from themes/unity2/layouts/fairhw.png rename to themes/unity/layouts/fairhw.png diff --git a/themes/unity2/layouts/fairv.png b/themes/unity/layouts/fairv.png similarity index 100% rename from themes/unity2/layouts/fairv.png rename to themes/unity/layouts/fairv.png diff --git a/themes/unity2/layouts/fairvw.png b/themes/unity/layouts/fairvw.png similarity index 100% rename from themes/unity2/layouts/fairvw.png rename to themes/unity/layouts/fairvw.png diff --git a/themes/unity2/layouts/floating.png b/themes/unity/layouts/floating.png similarity index 100% rename from themes/unity2/layouts/floating.png rename to themes/unity/layouts/floating.png diff --git a/themes/unity2/layouts/floatingw.png b/themes/unity/layouts/floatingw.png similarity index 100% rename from themes/unity2/layouts/floatingw.png rename to themes/unity/layouts/floatingw.png diff --git a/themes/unity2/layouts/fullscreen.png b/themes/unity/layouts/fullscreen.png similarity index 100% rename from themes/unity2/layouts/fullscreen.png rename to themes/unity/layouts/fullscreen.png diff --git a/themes/unity2/layouts/fullscreenw.png b/themes/unity/layouts/fullscreenw.png similarity index 100% rename from themes/unity2/layouts/fullscreenw.png rename to themes/unity/layouts/fullscreenw.png diff --git a/themes/unity2/layouts/magnifier.png b/themes/unity/layouts/magnifier.png similarity index 100% rename from themes/unity2/layouts/magnifier.png rename to themes/unity/layouts/magnifier.png diff --git a/themes/unity2/layouts/magnifierw.png b/themes/unity/layouts/magnifierw.png similarity index 100% rename from themes/unity2/layouts/magnifierw.png rename to themes/unity/layouts/magnifierw.png diff --git a/themes/unity2/layouts/max.png b/themes/unity/layouts/max.png similarity index 100% rename from themes/unity2/layouts/max.png rename to themes/unity/layouts/max.png diff --git a/themes/unity2/layouts/maxw.png b/themes/unity/layouts/maxw.png similarity index 100% rename from themes/unity2/layouts/maxw.png rename to themes/unity/layouts/maxw.png diff --git a/themes/unity2/layouts/spiral.png b/themes/unity/layouts/spiral.png similarity index 100% rename from themes/unity2/layouts/spiral.png rename to themes/unity/layouts/spiral.png diff --git a/themes/unity2/layouts/spiralw.png b/themes/unity/layouts/spiralw.png similarity index 100% rename from themes/unity2/layouts/spiralw.png rename to themes/unity/layouts/spiralw.png diff --git a/themes/unity2/layouts/tile.png b/themes/unity/layouts/tile.png similarity index 100% rename from themes/unity2/layouts/tile.png rename to themes/unity/layouts/tile.png diff --git a/themes/unity2/layouts/tilebottom.png b/themes/unity/layouts/tilebottom.png similarity index 100% rename from themes/unity2/layouts/tilebottom.png rename to themes/unity/layouts/tilebottom.png diff --git a/themes/unity2/layouts/tilebottomw.png b/themes/unity/layouts/tilebottomw.png similarity index 100% rename from themes/unity2/layouts/tilebottomw.png rename to themes/unity/layouts/tilebottomw.png diff --git a/themes/unity2/layouts/tileleft.png b/themes/unity/layouts/tileleft.png similarity index 100% rename from themes/unity2/layouts/tileleft.png rename to themes/unity/layouts/tileleft.png diff --git a/themes/unity2/layouts/tileleftw.png b/themes/unity/layouts/tileleftw.png similarity index 100% rename from themes/unity2/layouts/tileleftw.png rename to themes/unity/layouts/tileleftw.png diff --git a/themes/unity2/layouts/tiletop.png b/themes/unity/layouts/tiletop.png similarity index 100% rename from themes/unity2/layouts/tiletop.png rename to themes/unity/layouts/tiletop.png diff --git a/themes/unity2/layouts/tiletopw.png b/themes/unity/layouts/tiletopw.png similarity index 100% rename from themes/unity2/layouts/tiletopw.png rename to themes/unity/layouts/tiletopw.png diff --git a/themes/unity2/layouts/tilew.png b/themes/unity/layouts/tilew.png similarity index 100% rename from themes/unity2/layouts/tilew.png rename to themes/unity/layouts/tilew.png diff --git a/themes/unity2/menu.lua b/themes/unity/menu.lua similarity index 100% rename from themes/unity2/menu.lua rename to themes/unity/menu.lua diff --git a/themes/unity2/submenu.png b/themes/unity/submenu.png similarity index 100% rename from themes/unity2/submenu.png rename to themes/unity/submenu.png diff --git a/themes/unity2/taglist/squarefw.png b/themes/unity/taglist/squarefw.png similarity index 100% rename from themes/unity2/taglist/squarefw.png rename to themes/unity/taglist/squarefw.png diff --git a/themes/unity2/taglist/squarew.png b/themes/unity/taglist/squarew.png similarity index 100% rename from themes/unity2/taglist/squarew.png rename to themes/unity/taglist/squarew.png diff --git a/themes/unity2/theme.lua b/themes/unity/theme.lua similarity index 83% rename from themes/unity2/theme.lua rename to themes/unity/theme.lua index fc21716..60ddd24 100644 --- a/themes/unity2/theme.lua +++ b/themes/unity/theme.lua @@ -4,15 +4,17 @@ local dpi = xresources.apply_dpi local theme = {} -theme.name = "unity2" +theme.name = "unity" -theme.font = "Ubuntu Regular 9" -theme.unitybar_width = dpi(55) +theme.font = "Ubuntu Regular 10" +theme.unitybar_width = dpi(60) +theme.unitybar_bg = "#0D0D09AA" theme.icon_rounding = 5 theme.tasklist_button_shape_border_width = dpi(1) theme.tasklist_button_shape_border_color = "#262626AA" theme.launcher_button_shape_border_width = dpi(1) theme.launcher_button_shape_border_color = "#262626AA" +theme.username_container_spacing_horizontal = 3 theme.launcher_button_size = 44 theme.tasklist_button_size = 44 theme.macbar_rounding = 5 @@ -20,7 +22,7 @@ theme.macbar_height = 45 theme.menu_button_inner_margin = 2 theme.container_rounding = 4 theme.button_rounding = 4 -theme.bg_normal = "#181819" +theme.bg_normal = "#19191D" theme.bg_focus = "#3E3E3E" theme.bg_urgent = "#2E2E2E" theme.bg_minimize = "#2E2E2E" @@ -33,11 +35,54 @@ theme.fg_minimize = "#e1dec7" theme.useless_gap = dpi(10) theme.border_width = dpi(1) -theme.border_normal = theme.bg_normal +theme.border_normal = theme.bg_focus theme.border_focus = theme.bg_focus theme.border_marked = theme.bg_marked +theme.tasklist_bg_focus = { + type = "radial", + from = {25,-20,7}, + to = {25,5,55}, + stops = { + { 0 , "#8c8c8cBB"}, + { 0.5, "#414141AA"}, + { 1, "#535353FF"} + } +} + +theme.tasklist_bg_normal = { + type = "radial", + from = {25,-20,7}, + to = {25,5,55}, + stops = { + { 0 , "#8c8c8cBB"}, + { 0.5, "#232323AA"}, + { 1, "#313131FF"} + } +} -- There are other variable sets + +theme.launcher_button_bg_focus = { + type = "radial", + from = {25,-20,7}, + to = {25,5,55}, + stops = { + { 0 , "#8c8c8cBB"}, + { 0.5, "#414141AA"}, + { 1, "#535353FF"} + } +} + +theme.launcher_button_bg_normal = { + type = "radial", + from = {25,-20,7}, + to = {25,5,55}, + stops = { + { 0 , "#8c8c8cBB"}, + { 0.5, "#232323AA"}, + { 1, "#313131FF"} + } +} -- overriding the default one when -- defined, the sets are: -- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile] @@ -56,19 +101,20 @@ theme.titlebar_bg_focus = { type = "linear", from = { 0, 15 }, to = { 0, 0 }, - stops = { { 0, "#3C3C3C"} , { 1 , "#424242"} } + stops = { { 0, "#3C3B37"} , { 1 , "#5C5B56"} } } theme.titlebar_bg_normal = { type = "linear", from = { 0, 15 }, to = { 0, 0 }, - stops = { { 0, "#161617"} , { 1 , "#222223"} } + stops = { { 0, "#3A3A36"} , { 1 , "#454440"} } } -theme.topbar_bg = theme.titlebar_bg_normal +theme.topbar_bg = "#3C3B37" theme.titlebar_rounding = 6 - +theme.bg_systray = "#3A3A36" +theme.prompt_bg = theme.titlebar_bg_normal -- Generate taglist squares: local taglist_square_size = dpi(4) theme.taglist_squares_sel = theme_assets.taglist_squares_sel( @@ -143,12 +189,12 @@ theme.layout_cornernw = global.themes_dir..theme.name.."/layouts/cornernww.png" theme.layout_cornerne = global.themes_dir..theme.name.."/layouts/cornernew.png" theme.layout_cornersw = global.themes_dir..theme.name.."/layouts/cornersww.png" theme.layout_cornerse = global.themes_dir..theme.name.."/layouts/cornersew.png" +theme_assets.recolor_layout(theme, theme.fg_normal) -- Generate Awesome icon: theme.awesome_icon = theme_assets.awesome_icon( theme.menu_height, theme.bg_focus, theme.fg_focus ) - -- Define the icon theme for application icons. If not set then the icons -- from /usr/share/icons and /usr/share/icons/hicolor will be used. theme.icon_theme = "Adwaita" diff --git a/themes/unity/titlebar/close_focus.png b/themes/unity/titlebar/close_focus.png new file mode 100644 index 0000000..51b1a80 Binary files /dev/null and b/themes/unity/titlebar/close_focus.png differ diff --git a/themes/unity/titlebar/close_normal.png b/themes/unity/titlebar/close_normal.png new file mode 100644 index 0000000..f6b83d2 Binary files /dev/null and b/themes/unity/titlebar/close_normal.png differ diff --git a/themes/unity2/titlebar/floating_focus_active.png b/themes/unity/titlebar/floating_focus_active.png similarity index 100% rename from themes/unity2/titlebar/floating_focus_active.png rename to themes/unity/titlebar/floating_focus_active.png diff --git a/themes/unity2/titlebar/floating_focus_inactive.png b/themes/unity/titlebar/floating_focus_inactive.png similarity index 100% rename from themes/unity2/titlebar/floating_focus_inactive.png rename to themes/unity/titlebar/floating_focus_inactive.png diff --git a/themes/unity2/titlebar/floating_normal_active.png b/themes/unity/titlebar/floating_normal_active.png similarity index 100% rename from themes/unity2/titlebar/floating_normal_active.png rename to themes/unity/titlebar/floating_normal_active.png diff --git a/themes/unity2/titlebar/floating_normal_inactive.png b/themes/unity/titlebar/floating_normal_inactive.png similarity index 100% rename from themes/unity2/titlebar/floating_normal_inactive.png rename to themes/unity/titlebar/floating_normal_inactive.png diff --git a/themes/unity/titlebar/maximized_focus_active.png b/themes/unity/titlebar/maximized_focus_active.png new file mode 100644 index 0000000..189d0f4 Binary files /dev/null and b/themes/unity/titlebar/maximized_focus_active.png differ diff --git a/themes/unity/titlebar/maximized_focus_inactive.png b/themes/unity/titlebar/maximized_focus_inactive.png new file mode 100644 index 0000000..199b853 Binary files /dev/null and b/themes/unity/titlebar/maximized_focus_inactive.png differ diff --git a/themes/unity/titlebar/maximized_normal_active.png b/themes/unity/titlebar/maximized_normal_active.png new file mode 100644 index 0000000..f3832ad Binary files /dev/null and b/themes/unity/titlebar/maximized_normal_active.png differ diff --git a/themes/unity/titlebar/maximized_normal_inactive.png b/themes/unity/titlebar/maximized_normal_inactive.png new file mode 100644 index 0000000..7af085e Binary files /dev/null and b/themes/unity/titlebar/maximized_normal_inactive.png differ diff --git a/themes/unity/titlebar/minimize_focus.png b/themes/unity/titlebar/minimize_focus.png new file mode 100644 index 0000000..8ec8e4c Binary files /dev/null and b/themes/unity/titlebar/minimize_focus.png differ diff --git a/themes/unity/titlebar/minimize_normal.png b/themes/unity/titlebar/minimize_normal.png new file mode 100644 index 0000000..9d46d90 Binary files /dev/null and b/themes/unity/titlebar/minimize_normal.png differ diff --git a/themes/unity2/titlebar/ontop_focus_active.png b/themes/unity/titlebar/ontop_focus_active.png similarity index 100% rename from themes/unity2/titlebar/ontop_focus_active.png rename to themes/unity/titlebar/ontop_focus_active.png diff --git a/themes/unity2/titlebar/ontop_focus_inactive.png b/themes/unity/titlebar/ontop_focus_inactive.png similarity index 100% rename from themes/unity2/titlebar/ontop_focus_inactive.png rename to themes/unity/titlebar/ontop_focus_inactive.png diff --git a/themes/unity2/titlebar/ontop_normal_active.png b/themes/unity/titlebar/ontop_normal_active.png similarity index 100% rename from themes/unity2/titlebar/ontop_normal_active.png rename to themes/unity/titlebar/ontop_normal_active.png diff --git a/themes/unity2/titlebar/ontop_normal_inactive.png b/themes/unity/titlebar/ontop_normal_inactive.png similarity index 100% rename from themes/unity2/titlebar/ontop_normal_inactive.png rename to themes/unity/titlebar/ontop_normal_inactive.png diff --git a/themes/unity2/titlebar/sticky_focus_active.png b/themes/unity/titlebar/sticky_focus_active.png similarity index 100% rename from themes/unity2/titlebar/sticky_focus_active.png rename to themes/unity/titlebar/sticky_focus_active.png diff --git a/themes/unity2/titlebar/sticky_focus_inactive.png b/themes/unity/titlebar/sticky_focus_inactive.png similarity index 100% rename from themes/unity2/titlebar/sticky_focus_inactive.png rename to themes/unity/titlebar/sticky_focus_inactive.png diff --git a/themes/unity2/titlebar/sticky_normal_active.png b/themes/unity/titlebar/sticky_normal_active.png similarity index 100% rename from themes/unity2/titlebar/sticky_normal_active.png rename to themes/unity/titlebar/sticky_normal_active.png diff --git a/themes/unity2/titlebar/sticky_normal_inactive.png b/themes/unity/titlebar/sticky_normal_inactive.png similarity index 100% rename from themes/unity2/titlebar/sticky_normal_inactive.png rename to themes/unity/titlebar/sticky_normal_inactive.png diff --git a/themes/unity2/titlebar/close_focus.png b/themes/unity/titlebar_normal/close_focus.png similarity index 100% rename from themes/unity2/titlebar/close_focus.png rename to themes/unity/titlebar_normal/close_focus.png diff --git a/themes/unity2/titlebar/close_normal.png b/themes/unity/titlebar_normal/close_normal.png similarity index 100% rename from themes/unity2/titlebar/close_normal.png rename to themes/unity/titlebar_normal/close_normal.png diff --git a/themes/unity/titlebar_normal/floating_focus_active.png b/themes/unity/titlebar_normal/floating_focus_active.png new file mode 100644 index 0000000..82dcc7c Binary files /dev/null and b/themes/unity/titlebar_normal/floating_focus_active.png differ diff --git a/themes/unity/titlebar_normal/floating_focus_inactive.png b/themes/unity/titlebar_normal/floating_focus_inactive.png new file mode 100644 index 0000000..c19ba80 Binary files /dev/null and b/themes/unity/titlebar_normal/floating_focus_inactive.png differ diff --git a/themes/unity/titlebar_normal/floating_normal_active.png b/themes/unity/titlebar_normal/floating_normal_active.png new file mode 100644 index 0000000..62342d1 Binary files /dev/null and b/themes/unity/titlebar_normal/floating_normal_active.png differ diff --git a/themes/unity/titlebar_normal/floating_normal_inactive.png b/themes/unity/titlebar_normal/floating_normal_inactive.png new file mode 100644 index 0000000..e2bbdfa Binary files /dev/null and b/themes/unity/titlebar_normal/floating_normal_inactive.png differ diff --git a/themes/unity2/titlebar/maximized_focus_active.png b/themes/unity/titlebar_normal/maximized_focus_active.png similarity index 100% rename from themes/unity2/titlebar/maximized_focus_active.png rename to themes/unity/titlebar_normal/maximized_focus_active.png diff --git a/themes/unity2/titlebar/maximized_focus_inactive.png b/themes/unity/titlebar_normal/maximized_focus_inactive.png similarity index 100% rename from themes/unity2/titlebar/maximized_focus_inactive.png rename to themes/unity/titlebar_normal/maximized_focus_inactive.png diff --git a/themes/unity2/titlebar/maximized_normal_active.png b/themes/unity/titlebar_normal/maximized_normal_active.png similarity index 100% rename from themes/unity2/titlebar/maximized_normal_active.png rename to themes/unity/titlebar_normal/maximized_normal_active.png diff --git a/themes/unity2/titlebar/maximized_normal_inactive.png b/themes/unity/titlebar_normal/maximized_normal_inactive.png similarity index 100% rename from themes/unity2/titlebar/maximized_normal_inactive.png rename to themes/unity/titlebar_normal/maximized_normal_inactive.png diff --git a/themes/unity2/titlebar/minimize_focus.png b/themes/unity/titlebar_normal/minimize_focus.png similarity index 100% rename from themes/unity2/titlebar/minimize_focus.png rename to themes/unity/titlebar_normal/minimize_focus.png diff --git a/themes/unity2/titlebar/minimize_normal.png b/themes/unity/titlebar_normal/minimize_normal.png similarity index 100% rename from themes/unity2/titlebar/minimize_normal.png rename to themes/unity/titlebar_normal/minimize_normal.png diff --git a/themes/unity/titlebar_normal/ontop_focus_active.png b/themes/unity/titlebar_normal/ontop_focus_active.png new file mode 100644 index 0000000..312c00b Binary files /dev/null and b/themes/unity/titlebar_normal/ontop_focus_active.png differ diff --git a/themes/unity/titlebar_normal/ontop_focus_inactive.png b/themes/unity/titlebar_normal/ontop_focus_inactive.png new file mode 100644 index 0000000..a48e1c5 Binary files /dev/null and b/themes/unity/titlebar_normal/ontop_focus_inactive.png differ diff --git a/themes/unity/titlebar_normal/ontop_normal_active.png b/themes/unity/titlebar_normal/ontop_normal_active.png new file mode 100644 index 0000000..117a203 Binary files /dev/null and b/themes/unity/titlebar_normal/ontop_normal_active.png differ diff --git a/themes/unity/titlebar_normal/ontop_normal_inactive.png b/themes/unity/titlebar_normal/ontop_normal_inactive.png new file mode 100644 index 0000000..d3a10c8 Binary files /dev/null and b/themes/unity/titlebar_normal/ontop_normal_inactive.png differ diff --git a/themes/unity/titlebar_normal/sticky_focus_active.png b/themes/unity/titlebar_normal/sticky_focus_active.png new file mode 100644 index 0000000..814499b Binary files /dev/null and b/themes/unity/titlebar_normal/sticky_focus_active.png differ diff --git a/themes/unity/titlebar_normal/sticky_focus_inactive.png b/themes/unity/titlebar_normal/sticky_focus_inactive.png new file mode 100644 index 0000000..21b000d Binary files /dev/null and b/themes/unity/titlebar_normal/sticky_focus_inactive.png differ diff --git a/themes/unity/titlebar_normal/sticky_normal_active.png b/themes/unity/titlebar_normal/sticky_normal_active.png new file mode 100644 index 0000000..bdb5595 Binary files /dev/null and b/themes/unity/titlebar_normal/sticky_normal_active.png differ diff --git a/themes/unity/titlebar_normal/sticky_normal_inactive.png b/themes/unity/titlebar_normal/sticky_normal_inactive.png new file mode 100644 index 0000000..a96b9b1 Binary files /dev/null and b/themes/unity/titlebar_normal/sticky_normal_inactive.png differ diff --git a/widgets/current_window.lua b/widgets/current_window.lua new file mode 100644 index 0000000..18e4226 --- /dev/null +++ b/widgets/current_window.lua @@ -0,0 +1,22 @@ +local awful = require("awful") +local gears = require("gears") +local wibox = require("wibox") +local awmtk = require("awmtk") + +return function(args) + local style = awmtk.style(awmtk.defaults, args.style or {},"username_") + local icon = style.icon({ + { + widget = wibox.widget.textbox, + markup = "This ain't no gnome", + id = "widget_text" + }, + layout = wibox.layout.fixed.horizontal, + spacing = style.username_container_spacing_horizontal or 4 + }) + local text = icon:get_children_by_id("widget_text")[1] + client.connect_signal("focus", function() + text.markup = "This ain't not gnome" + end) + return icon +end diff --git a/widgets/polytasklist.lua b/widgets/polytasklist.lua index eb7a0c7..c15c6e4 100644 --- a/widgets/polytasklist.lua +++ b/widgets/polytasklist.lua @@ -29,8 +29,6 @@ local tasklist_buttons = gears.table.join( return function(options) local style = awmtk.style(awmtk.defaults,options.style or {},"tasklist_") -- Color definitions - local button_bg_on = style.tasklist_button_bg_focus - local button_bg_off = style.tasklist_button_bg_normal local constraint = options.constraint or style.tasklist_constraint local _style = awmtk._create_preprocess_style(style,"tasklist_") _style.button_shape = awmtk.preprocess.button_shape(_style) diff --git a/widgets/unitybar.lua b/widgets/unitybar.lua index 4b63e92..179f1a8 100644 --- a/widgets/unitybar.lua +++ b/widgets/unitybar.lua @@ -9,7 +9,10 @@ function unitybar(s,args) screen = s, border_width = style.unitybar_border_width or 1, border_color = style.unitybar_border_color or "#262626AA", - bg = style.unitybar_bg or ((style.bg_normal:len() < 8) and style.bg_normal.."AA"), + bg = style.unitybar_bg or ( + (type(style.bg_normal) == "string") and + (style.bg_normal:len() < 8) and + style.bg_normal.."AA"), width = style.unitybar_width or 50, }) local top_widgets = { diff --git a/widgets/username.lua b/widgets/username.lua new file mode 100644 index 0000000..0a41567 --- /dev/null +++ b/widgets/username.lua @@ -0,0 +1,27 @@ +local awful = require("awful") +local gears = require("gears") +local wibox = require("wibox") +local awmtk = require("awmtk") + +return function(args) + local style = awmtk.style(awmtk.defaults, args.style or {},"username_") + local icon = style.icon({ + { + widget = wibox.widget.imagebox, + image = style["username_logout_icon"], + id = "widget_icon", + resize = true + }, + { + widget = wibox.widget.textbox, + markup = os.getenv("USER"), + id = "widget_text" + }, + layout = wibox.layout.fixed.horizontal, + spacing = style.username_container_spacing_horizontal or 4 + }) + icon:get_children_by_id("widget_icon")[1]:connect_signal("button::press",function() + awesome.quit() + end) + return icon +end