Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: change the importing way to be more simpler #10

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions examples/bar/bar.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
"""desktop status bar example"""

import fabric
import os
import psutil
from loguru import logger
from fabric.widgets.box import Box
from fabric.widgets.label import Label
from fabric.widgets import (
Box,
Label,
Overlay,
EventBox,
DateTime,
CenterBox,
CircularProgressBar,
)
from fabric.system_tray import SystemTray
from fabric.widgets.wayland import Window
from fabric.widgets.overlay import Overlay
from fabric.widgets.eventbox import EventBox
from fabric.widgets.date_time import DateTime
from fabric.widgets.centerbox import CenterBox
from fabric.utils.string_formatter import FormattedString
from fabric.widgets.circular_progress_bar import CircularProgressBar
from fabric.hyprland.widgets import WorkspaceButton, Workspaces, ActiveWindow, Language
from fabric.utils.helpers import (
set_stylesheet_from_file,
Expand Down Expand Up @@ -101,11 +104,13 @@ def __init__(
self.active_window = ActiveWindow(
formatter=FormattedString(
"{test_title(win_class)}",
test_title=lambda x, max_length=20: "Desktop"
if len(x) == 0
else x
if len(x) <= max_length
else x[: max_length - 3] + "...",
test_title=lambda x, max_length=20: (
"Desktop"
if len(x) == 0
else x
if len(x) <= max_length
else x[: max_length - 3] + "..."
),
),
name="hyprland-window",
)
Expand Down
4 changes: 2 additions & 2 deletions examples/desktop-widget/desktop_widget.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"""dead simple desktop widget that shows the time and date."""

import fabric
import os
from loguru import logger
from fabric.widgets.box import Box
from fabric.widgets import Box, DateTime
from fabric.widgets.wayland import Window
from fabric.widgets.date_time import DateTime
from fabric.utils.helpers import (
set_stylesheet_from_file,
monitor_file,
Expand Down
6 changes: 2 additions & 4 deletions examples/side-panel/side_panel.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
"""side panel example, contains info about the system"""

import fabric
import os
import time
import psutil
from loguru import logger
from gi.repository import GLib
from fabric.widgets.box import Box
from fabric.widgets.label import Label
from fabric.widgets import Box, Label, Overlay, DateTime
from fabric.widgets.wayland import Window
from fabric.widgets.overlay import Overlay
from fabric.widgets.date_time import DateTime
from fabric.utils.helpers import (
set_stylesheet_from_file,
monitor_file,
Expand Down
27 changes: 12 additions & 15 deletions examples/vertical-bar/vertical_bar.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import fabric
import time
import psutil
from fabric.widgets.box import Box
from fabric.widgets.image import Image
from fabric.widgets.label import Label
from fabric.widgets.button import Button
from fabric.widgets import Box, Image, Label, Button, CenterBox, DateTime
from fabric.widgets.wayland import Window
from fabric.widgets.date_time import DateTime
from fabric.widgets.centerbox import CenterBox
from fabric.utils.fabricator.fabricator import Fabricate
from fabric.utils.string_formatter import FormattedString
from fabric.hyprland.widgets import Language, WorkspaceButton, Workspaces
Expand Down Expand Up @@ -97,15 +92,17 @@ def __init__(self):
)
self.time_sep_var = Fabricate(
value="",
poll_from=lambda _: [
"",
self.time_sep.set_style_classes(["day"]),
][0]
if time.strftime("%p").lower() == "am"
else [
"",
self.time_sep.set_style_classes(["night"]),
][0],
poll_from=lambda _: (
[
"",
self.time_sep.set_style_classes(["day"]),
][0]
if time.strftime("%p").lower() == "am"
else [
"",
self.time_sep.set_style_classes(["night"]),
][0]
),
interval=1000,
)
self.time_sep.bind_property(
Expand Down
4 changes: 3 additions & 1 deletion fabric/system_tray/system_tray.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ def icon(self) -> GdkPixbuf.Pixbuf:
if icon_name is not None
else None
)
return icon_pixbuf.scale_simple(self.icon_size, self.icon_size, GdkPixbuf.InterpType.BILINEAR)
return icon_pixbuf.scale_simple(
self.icon_size, self.icon_size, GdkPixbuf.InterpType.BILINEAR
)

def create_menu(self, dbus_name: str, menu_object_path: str) -> DbusmenuGtk3.Menu:
menu = DbusmenuGtk3.Menu().new(
Expand Down
14 changes: 14 additions & 0 deletions fabric/widgets/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
from .box import Box
from .button import Button
from .centerbox import CenterBox
from .chart import Chart
from .circular_progress_bar import CircularProgressBar
from .container import Container
from .date_time import DateTime
from .entry import Entry
from .eventbox import EventBox
from .image import Image
from .label import Label
from .overlay import Overlay
from .revealer import Revealer
from .stack import Stack