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.

Sign up for GitHub

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: allow custom icons on custom modules #351

Merged
merged 3 commits into from
Oct 22, 2024
Merged

feat: allow custom icons on custom modules #351

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b09d838
feat: allow custom icons on custom modules
rubiin Oct 21, 2024
7c34861
Update options.ts
Jas-SinghFSU Oct 22, 2024
cafcbdf
Update customModules/config.ts
Jas-SinghFSU Oct 22, 2024
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
25 changes: 15 additions & 10 deletions customModules/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
title: 'Button Border',
type: 'boolean',
}),
Option({
opt: options.bar.customModules.ram.icon,
title: 'Ram Icon',
type: 'string',
}),
Option({
opt: options.bar.customModules.ram.label,
title: 'Show Label',
Expand Down Expand Up @@ -93,6 +98,11 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
title: 'Button Border',
type: 'boolean',
}),
Option({
opt: options.bar.customModules.cpu.icon,
title: 'Cpu Icon',
type: 'string',
}),
Option({
opt: options.bar.customModules.cpu.label,
title: 'Show Label',
Expand Down Expand Up @@ -156,8 +166,7 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
Option({
opt: options.bar.customModules.storage.icon,
title: 'Storage Icon',
type: 'enum',
enums: ['󰋊', '', '󱛟', '', '', ''],
type: 'string',
}),
Option({
opt: options.bar.customModules.storage.label,
Expand Down Expand Up @@ -225,8 +234,7 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
Option({
opt: options.bar.customModules.netstat.icon,
title: 'Netstat Icon',
type: 'enum',
enums: ['󰖟', '󰇚', '󰕒', '󰛳', '', '󰣺', '󰖩', '', '󰈀'],
type: 'string',
}),
Option({
opt: options.bar.customModules.netstat.label,
Expand Down Expand Up @@ -293,8 +301,7 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
Option({
opt: options.bar.customModules.kbLayout.icon,
title: 'kbLayout Icon',
Jas-SinghFSU marked this conversation as resolved.
Show resolved Hide resolved
type: 'enum',
enums: ['', '󰌌', '', '󰬴', '󰗊'],
type: 'string',
}),
Option({
opt: options.bar.customModules.kbLayout.label,
Expand Down Expand Up @@ -357,8 +364,7 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
Option({
opt: options.bar.customModules.updates.icon,
title: 'Updates Icon',
type: 'enum',
enums: ['󰚰', '󰇚', '', '󱑢', '󱑣', '󰏖', '', '󰏔', '󰏗'],
type: 'string',
}),
Option({
opt: options.bar.customModules.updates.label,
Expand Down Expand Up @@ -557,8 +563,7 @@ export const CustomModuleSettings = (): Scrollable<GtkWidget, Attribute> =>
Option({
opt: options.bar.customModules.power.icon,
title: 'Power Button Icon',
type: 'enum',
enums: ['', '', '󰍃', '󰿅', '󰒲', '󰤄'],
type: 'string',
}),
Option({
opt: options.bar.customModules.power.leftClick,
Expand Down
4 changes: 2 additions & 2 deletions customModules/cpu/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { BarBoxChild } from 'lib/types/bar';
import { Attribute, Child } from 'lib/types/widget';

// All the user configurable options for the cpu module that are needed
const { label, round, leftClick, rightClick, middleClick, scrollUp, scrollDown, pollingInterval } =
const { label, round, leftClick, rightClick, middleClick, scrollUp, scrollDown, pollingInterval, icon } =
options.bar.customModules.cpu;

export const cpuUsage = Variable(0);
Expand All @@ -35,7 +35,7 @@ export const Cpu = (): BarBoxChild => {
};

const cpuModule = module({
textIcon: '',
textIcon: icon.bind('value'),
label: Utils.merge([cpuUsage.bind('value'), round.bind('value')], (cpuUsg, rnd) => {
return renderLabel(cpuUsg, rnd);
}),
Expand Down
5 changes: 3 additions & 2 deletions customModules/ram/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import { pollVariable } from 'customModules/PollVar';
import { Attribute, Child } from 'lib/types/widget';

// All the user configurable options for the ram module that are needed
const { label, labelType, round, leftClick, rightClick, middleClick, pollingInterval } = options.bar.customModules.ram;
const { label, labelType, round, leftClick, rightClick, middleClick, pollingInterval, icon } =
options.bar.customModules.ram;

const defaultRamData: GenericResourceData = { total: 0, used: 0, percentage: 0, free: 0 };
const ramUsage = Variable<GenericResourceData>(defaultRamData);
Expand All @@ -29,7 +30,7 @@ pollVariable(ramUsage, [round.bind('value')], pollingInterval.bind('value'), cal

export const Ram = (): BarBoxChild => {
const ramModule = module({
textIcon: '',
textIcon: icon.bind('value'),
label: Utils.merge(
[ramUsage.bind('value'), labelType.bind('value'), round.bind('value')],
(rmUsg: GenericResourceData, lblTyp: ResourceLabelType, round: boolean) => {
Expand Down
5 changes: 0 additions & 5 deletions lib/types/bar.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ export type Module = {

export type ResourceLabelType = 'used/total' | 'used' | 'percentage' | 'free';

export type StorageIcon = '󰋊' | '' | '󱛟' | '' | '' | '';

export type NetstatIcon = '󰖟' | '󰇚' | '󰕒' | '󰛳' | '' | '󰣺' | '󰖩' | '' | '󰈀';
export type NetstatLabelType = 'full' | 'in' | 'out';
export type RateUnit = 'GiB' | 'MiB' | 'KiB' | 'auto';

export type UpdatesIcon = '󰚰' | '󰇚' | '' | '󱑢' | '󱑣' | '󰏖' | '' | '󰏔' | '󰏗';

export type PowerIcon = '' | '' | '󰍃' | '󰿅' | '󰒲' | '󰤄';
1 change: 0 additions & 1 deletion lib/types/customModules/kbLayout.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { layoutMap } from 'customModules/kblayout/layouts';

export type KbLabelType = 'layout' | 'code';
export type KbIcon = '' | '󰌌' | '' | '󰬴' | '󰗊';

export type HyprctlKeyboard = {
address: string;
Expand Down
24 changes: 9 additions & 15 deletions options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
import { opt, mkOptions } from 'lib/option';
import {
NetstatIcon,
NetstatLabelType,
PowerIcon,
RateUnit,
ResourceLabelType,
StorageIcon,
UpdatesIcon,
} from 'lib/types/bar';
import { KbIcon, KbLabelType } from 'lib/types/customModules/kbLayout';
import { NetstatLabelType, RateUnit, ResourceLabelType } from 'lib/types/bar';
import { KbLabelType } from 'lib/types/customModules/kbLayout';
import {
ActiveWsIndicator,
BarButtonStyles,
Expand Down Expand Up @@ -951,6 +943,7 @@ const options = mkOptions(OPTIONS, {
customModules: {
scrollSpeed: opt(5),
ram: {
icon: opt(''),
label: opt(true),
labelType: opt<ResourceLabelType>('percentage'),
round: opt(true),
Expand All @@ -960,6 +953,7 @@ const options = mkOptions(OPTIONS, {
middleClick: opt(''),
},
cpu: {
icon: opt(''),
label: opt(true),
round: opt(true),
pollingInterval: opt(2000),
Expand All @@ -971,7 +965,7 @@ const options = mkOptions(OPTIONS, {
},
storage: {
label: opt(true),
icon: opt<StorageIcon>('󰋊'),
icon: opt('󰋊'),
round: opt(false),
labelType: opt<ResourceLabelType>('percentage'),
pollingInterval: opt(2000),
Expand All @@ -982,7 +976,7 @@ const options = mkOptions(OPTIONS, {
netstat: {
label: opt(true),
networkInterface: opt(''),
icon: opt<NetstatIcon>('󰖟'),
icon: opt('󰖟'),
round: opt(true),
labelType: opt<NetstatLabelType>('full'),
rateUnit: opt<RateUnit>('auto'),
Expand All @@ -994,7 +988,7 @@ const options = mkOptions(OPTIONS, {
kbLayout: {
label: opt(true),
labelType: opt<KbLabelType>('code'),
icon: opt<KbIcon>('󰌌'),
icon: opt('󰌌'),
leftClick: opt(''),
rightClick: opt(''),
middleClick: opt(''),
Expand All @@ -1005,7 +999,7 @@ const options = mkOptions(OPTIONS, {
updateCommand: opt('$HOME/.config/ags/scripts/checkUpdates.sh -arch'),
label: opt(true),
padZero: opt(true),
icon: opt<UpdatesIcon>('󰏖'),
icon: opt('󰏖'),
pollingInterval: opt(1000 * 60 * 60 * 6),
leftClick: opt(''),
rightClick: opt(''),
Expand Down Expand Up @@ -1036,7 +1030,7 @@ const options = mkOptions(OPTIONS, {
scrollDown: opt(''),
},
power: {
icon: opt<PowerIcon>(''),
icon: opt(''),
showLabel: opt(true),
leftClick: opt('menu:powerdropdown'),
rightClick: opt(''),
Expand Down
Loading