Skip to content

Commit

Permalink
Merge pull request #5 from Jax-Core/v2
Browse files Browse the repository at this point in the history
V2
  • Loading branch information
EnhancedJax authored Aug 12, 2022
2 parents 62b83c0 + fd02b9b commit 1a6e9e8
Show file tree
Hide file tree
Showing 102 changed files with 59 additions and 48 deletions.
Binary file modified @Resources/Actions/HotKeys.ini
Binary file not shown.
Binary file modified @Resources/Actions/Source code/YourFlyouts.ahk
Binary file not shown.
Binary file added @Resources/Fonts/Cantarell-Bold.ttf
Binary file not shown.
Binary file added @Resources/Fonts/Cantarell-Regular.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-BoldItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-ExtraBold.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-ExtraBoldItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-ExtraLight.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-ExtraLightItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-Italic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-LightItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-Medium.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-MediumItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-SemiBoldItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMono-ThinItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-Bold.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-BoldItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-ExtraBold.ttf
Binary file not shown.
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-ExtraLight.ttf
Binary file not shown.
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-Italic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-Light.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-LightItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-Medium.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-MediumItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-Regular.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-SemiBold.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-SemiBoldItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-Thin.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/JetBrainsMonoNL-ThinItalic.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/Poppins-ExtraBold.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/Poppins-ExtraLight.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/Runic-Regular.otf
Binary file not shown.
Binary file removed @Resources/Fonts/UbuntuMono-B.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/UbuntuMono-BI.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/UbuntuMono-R.ttf
Binary file not shown.
Binary file removed @Resources/Fonts/UbuntuMono-RI.ttf
Binary file not shown.
Binary file modified @Resources/Images/Cover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified @Resources/Images/YourFlyouts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion @Resources/Includes/GlobalBrightness0.inc

This file was deleted.

Binary file removed @Resources/Includes/GlobalBrightness1.inc
Binary file not shown.
Binary file modified @Resources/Includes/GlobalMusicAuto1.inc
Binary file not shown.
Binary file modified @Resources/Lua/Func.lua
Binary file not shown.
Binary file modified @Resources/PatchNoteVar.inc
Binary file not shown.
Binary file modified @Resources/Presets/DEFAULT.inc
Binary file not shown.
Binary file added @Resources/Presets/Gnome.inc
Binary file not shown.
Binary file added @Resources/Presets/Pixel.inc
Binary file not shown.
Binary file added @Resources/Presets/PixelColorTheme-You Blue.inc
Binary file not shown.
Binary file added @Resources/Presets/PixelColorTheme-You Gold.inc
Binary file not shown.
Binary file added @Resources/Presets/PixelColorTheme-You Green.inc
Binary file not shown.
Binary file added @Resources/Presets/PixelColorTheme-You LightBlue.inc
Binary file not shown.
Binary file added @Resources/Presets/PixelColorTheme-You Pink.inc
Binary file not shown.
Binary file added @Resources/Presets/Win11.inc
Binary file not shown.
Binary file modified @Resources/Vars.inc
Binary file not shown.
Binary file modified @Resources/Version.inc
Binary file not shown.
Binary file modified @Start/DownloadFile/Parsed.inc
Binary file not shown.
Binary file modified Core/#page.inc
Binary file not shown.
Binary file added Core/Animation.inc
Binary file not shown.
Binary file modified Core/AppearanceStyles/Fluent.inc
Binary file not shown.
Binary file added Core/AppearanceStyles/Gnome.inc
Binary file not shown.
Binary file added Core/AppearanceStyles/Pixel.inc
Binary file not shown.
Binary file added Core/AppearanceStyles/Win11.inc
Binary file not shown.
Binary file added Core/DropDown/Pixel/BottomAction.inc
Binary file not shown.
Binary file added Core/DropDown/Pixel/color_theme.inc
Binary file not shown.
Binary file modified Core/General.inc
Binary file not shown.
Binary file modified Core/Layout.inc
Binary file not shown.
Binary file added Core/Layout/1.inc
Binary file not shown.
Binary file added Core/Layout/2.inc
Binary file not shown.
Binary file modified Core/Layout/Amber.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/Center.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/CoreUI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/Fluent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/FluentOld.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Core/Layout/Gnome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/Mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/Modern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Core/Layout/Pixel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/Plainext.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/Layout/Simple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Core/Layout/Win11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Core/PatchNote/Main1.inc
Binary file not shown.
Binary file modified Core/Window/Setup.inc
Binary file not shown.
Binary file modified Core/Window/Setup/1.inc
Binary file not shown.
Binary file modified Core/Window/Setup/4.inc
Binary file not shown.
Binary file modified Core/Window/Setup/5.inc
Binary file not shown.
Binary file modified Core/Window/Setup/6.inc
Binary file not shown.
Binary file removed Core/Window/Setup/7.inc
Binary file not shown.
Binary file removed Core/Window/Setup/8.inc
Binary file not shown.
13 changes: 13 additions & 0 deletions Gallery.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Screenshots of styles
![Screenshot 22-08-11 at 134349](https://user-images.githubusercontent.com/80020581/184072655-190f482d-84df-471b-b1c2-afd64437b78c.png)
![Screenshot 22-08-11 at 134525](https://user-images.githubusercontent.com/80020581/184072665-05ca43be-d6ac-4be7-af40-eeefd88b9f69.png)
![Screenshot 22-08-11 at 134719](https://user-images.githubusercontent.com/80020581/184072671-74c6c56e-8519-4c1e-acab-3b17b8a63e79.png)
![Screenshot 22-08-11 at 134750](https://user-images.githubusercontent.com/80020581/184072674-ad3f185b-52ef-48d9-b2a2-15b0e614c4e3.png)
![Screenshot 22-08-11 at 134756](https://user-images.githubusercontent.com/80020581/184072680-e1de6153-0ea9-4632-a3d0-e6239785c680.png)
![Screenshot 22-08-11 at 134918](https://user-images.githubusercontent.com/80020581/184072686-fa913bc3-426d-4bae-a4c1-a3524ab1bf27.png)
![Screenshot 22-08-11 at 134943](https://user-images.githubusercontent.com/80020581/184072692-e82025c4-5391-4aed-a847-1a25a52f2fb1.png)
![Screenshot 22-08-11 at 135030](https://user-images.githubusercontent.com/80020581/184072699-3f680810-2068-44ad-86fd-c3587a9bf273.png)
![Screenshot 22-08-11 at 135055](https://user-images.githubusercontent.com/80020581/184072705-67ce394f-9363-4dca-94a7-0627f8423f38.png)
![Screenshot 22-08-11 at 135120](https://user-images.githubusercontent.com/80020581/184072706-384cc6ce-4a06-4950-91da-209c0629ea5c.png)
![Screenshot 22-08-11 at 135124](https://user-images.githubusercontent.com/80020581/184072711-d2b64b4b-2a18-4ff7-85ab-c98f51c85769.png)
![Screenshot 22-08-11 at 135146](https://user-images.githubusercontent.com/80020581/184072716-f7be9338-1bd8-4b9f-972e-8d09080f3983.png)
Binary file modified Main/Layout/Center.inc
Binary file not shown.
50 changes: 37 additions & 13 deletions Main/Layout/Fluent.inc
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,23 @@ LeftMouseDownAction=[!SetOption MediaHoverCircle Stroke "Stroke Color #FontColor
; Function ;
; ---------------------------------------------------------------------------- ;


[mVolume]
OnUpdateAction=[!SetOption VolumeString Text """[&Func:volumeLevel()]"""][!SetOption VolumeString FontFace "#FontFace#"]

[mBrightness]
IfCondition=(mBrightness == 0)
IfTrueAction=[!SetOption VolumeString Text "[\xEC8A]"][!SetOption VolumeString FontFace "Segoe MDL2 Assets"]
IfCondition2=(mBrightness > 0)
IfTrueAction2=[!SetOption VolumeString Text "[\xE706]"][!SetOption VolumeString FontFace "Segoe MDL2 Assets"]
IfConditionMode=1

[FrostedGlass]
Measure=Plugin
Plugin=FrostedGlass
Type=#Blur#
Corner=#BlurCorner#
Border=None
Border=All

[SysColor]
Measure=Plugin
Expand All @@ -56,11 +67,20 @@ Disabled=(1-#SysAccent#)

; --------------------------------- VolumeBar -------------------------------- ;

[StrokeB]
Meter=Shape
X=#Border#
Y=#Border#
Shape=Rectangle 0,0,(#VolumeW#+#MediaW#*#MusicVisible#),(#H#),#StaticWin11Corner# | Stroke Color #FontColor#,50 | StrokeWidth (#Border#*#Scale#) | Fill Color 0,0,0,0
DynamicVariables=1
Group=Standard | Music
Hidden=(1-#Border#)

[VolumeB]
Meter=Shape
X=1
Y=1
Shape=Rectangle 0,0,#VolumeW#,#H#,[&Func:returnCorner()] | StrokeWidth #Stroke# | Fill Color #PrimaryColor#,#PrimaryOpacity#
X=r
Y=r
Shape=Rectangle 0,0,#VolumeW#,#H#,#StaticWin11Corner# | StrokeWidth 0 | Fill Color #PrimaryColor#,#PrimaryOpacity#
Group=Standard
DynamicVariables=1
MouseScrollUpAction=[!CommandMeasure "mVolume" "ChangeVolume 2"][!UpdateMeasure mVolume]
Expand All @@ -69,7 +89,7 @@ MouseScrollDownAction=[!CommandMeasure "mVolume" "ChangeVolume -2"][!UpdateMeasu
Meter=Shape
X=r
Y=r
Shape=Rectangle 0,0,#VolumeW#,#H#,[&Func:returnCorner()] | StrokeWidth 0
Shape=Rectangle 0,0,#VolumeW#,#H#,#StaticWin11Corner# | StrokeWidth 0
Group=Standard
DynamicVariables=1

Expand Down Expand Up @@ -110,10 +130,10 @@ Container=VolumeC

[MediaB]
Meter=Shape
X=1
X=r
Y=r
Shape=Rectangle 0,0,(#MediaW#+#VolumeW#),#H#,[&Func:returnCorner()] | StrokeWidth #Stroke# | Fill Color #PrimaryColor#,#PrimaryOpacity#
Shape2=Rectangle 0,0,#VolumeW#,#H#,([&Func:returnCorner()]+1) | StrokeWidth #Stroke#
Shape=Rectangle 0,0,(#MediaW#+#VolumeW#),#H#,#StaticWin11Corner# | StrokeWidth 0 | Fill Color #PrimaryColor#,#PrimaryOpacity#
Shape2=Rectangle 0,0,#VolumeW#,#H#,(#StaticWin11Corner#+1) | StrokeWidth 0
Shape3=Combine Shape | XOR Shape2
Shape4=Line #VolumeW#,(#P#),#VolumeW#,(#P#+(#H#-#P#*2)*#TweenNode1#) | StrokeStartCap Round | StrokeEndCap ROund | StrokeWidth (1*#Scale#) | Stroke Color #FontColor#,50
DynamicVariables=1
Expand All @@ -123,7 +143,7 @@ Meter=Shape
X=(#VolumeW#)
Y=r
DynamicVariables=1
Shape=Rectangle 0,0,(#MediaW#*#TweenNode1#+1),#H#,[&Func:returnCorner()] | StrokeWidth 0 | Fill Color 255,255,255,(255*#TweenNode1#)
Shape=Rectangle 0,0,(#MediaW#*#TweenNode1#+1),#H#,#StaticWin11Corner# | StrokeWidth 0 | Fill Color 255,255,255,(255*#TweenNode1#)
Group=Music | Standard | Animated

[MediaImage]
Expand Down Expand Up @@ -296,16 +316,16 @@ Container=MediaC

[LocksB]
Meter=Shape
X=1
Y=1
Shape=Rectangle 0,0,#LocksW#,#LocksH#,[&Func:returnCorner()] | StrokeWidth #Stroke# | Fill Color #PrimaryColor#,#PrimaryOpacity# | Stroke Color #SecondaryColor#,#SecondaryOpacity#
X=#Border#
Y=#Border#
Shape=Rectangle 0,0,#LocksW#,#LocksH#,#StaticWin11Corner# | StrokeWidth (#Border#*#Scale#) | Fill Color #PrimaryColor#,#PrimaryOpacity# | Stroke Color #FontColor#,50
Group=Locks | Special
Hidden=1
[LocksC]
Meter=Shape
X=r
Y=r
Shape=Rectangle 0,0,#LocksW#,#LocksH#,[&Func:returnCorner()] | StrokeWidth 0
Shape=Rectangle 0,0,#LocksW#,#LocksH#,#StaticWin11Corner# | StrokeWidth 0
Group=Locks | Special
Hidden=1

Expand Down Expand Up @@ -334,6 +354,10 @@ Hidden=1
Text=[\xe73a]
[LocksIcon.Off:S]
Text=[\xe739]
[FlightIcon.On:S]
Text=[\xe709]
[FlightIcon.Off:S]
Text=[\xe709]



Expand Down
Binary file added Main/Layout/Gnome.inc
Binary file not shown.
Binary file added Main/Layout/Pixel.inc
Binary file not shown.
Binary file modified Main/Layout/Simple.inc
Binary file not shown.
Binary file added Main/Layout/Win11.inc
Binary file not shown.
Binary file modified Main/Main.ini
Binary file not shown.
4 changes: 2 additions & 2 deletions Main/Vars/Fluent.inc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[Variables]
Height=180
Height=200

FontFace=Segoe UI
Stroke=0
Border=1
Cap=Round

PrimaryColor=12,12,12
Expand Down
Binary file added Main/Vars/Gnome.inc
Binary file not shown.
Binary file added Main/Vars/Pixel.inc
Binary file not shown.
Binary file added Main/Vars/WIn11.inc
Binary file not shown.
39 changes: 7 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
# YourFlyouts v2 rework WIP!
Full brightness support, airplane mode and more, coming soon!

<!-- START Header.mustache -->
<br />
<div align="center">
<a href="https://github.com/Jax-Core/YourFlyouts">
<img src="https://raw.githubusercontent.com/Jax-Core/ReadME-Template/main/Resources/Icons/YourFlyouts.png" alt="Logo" width="180" height="180">
</a>

<h3 align="center">YourFlyouts</h3>
<p align="center">
Windows Audio / Volume flyouts replacement
<br />
<a href="https://discord.gg/JmgehPSDD6">Help, Report Bugs & Request Features »</a>
</p>
</div>

<!-- END Header.mustache -->
<!-- START ShieldsFull.mustache -->
<p align="center">
Expand All @@ -34,12 +17,13 @@ Full brightness support, airplane mode and more, coming soon!
![YourFlyouts](https://raw.githubusercontent.com/Jax-Core/ReadME-Template/main/Resources/Splash/YourFlyouts.png)

<!-- END About.mustache -->
![YourFlyouts](https://user-images.githubusercontent.com/80020581/173569289-ef77a148-f115-4796-ba0e-dcb258b1403a.png)

**YourFlyouts** provides multiple replacements for the old, built-in, Metro Design based Audio/Media/Brightness flyouts in Windows which are shown while pressing the media or volume keys.
![YourFlyouts2](https://user-images.githubusercontent.com/80020581/184153360-6ad1d33e-cde4-4982-849f-43747adea7cd.png)

**YourFlyouts** provides multiple replacements for the default Audio/Media/Brightness/Flight flyouts in Windows which are shown while pressing the volume/multimedia/brightness/flight keys.
Along with a number of unique designs, it also provides additional customizability towards the behavioral **and** appearance side of things!

This project is heavily inspired by [ModernFlyouts](https://github.com/ModernFlyouts-Community/ModernFlyouts)! YourFlyouts is still multiple steps from being a complete replacement, but it excels in other ways!
This project is heavily inspired by [ModernFlyouts](https://github.com/ModernFlyouts-Community/ModernFlyouts)!
> Note: Built-in flyout will not be permanently affected. It will be hidden temporarily while YourFlyouts is running, hence it does not modify any system files.
> You can also use YourFlyouts to disable the flyout completely!
Expand All @@ -48,7 +32,8 @@ This project is heavily inspired by [ModernFlyouts](https://github.com/ModernFly
## Features<!-- END Features.mustache -->
* Smooth animations, with the avability to reduce & turn off
* Multiple visual styles
* Supports [NowPlaying](https://docs.rainmeter.net/manual/measures/nowplaying/) and [WebNowPlaying](https://github.com/tjhrulz/WebNowPlaying)
* No setup needed
* Also supports [NowPlaying](https://docs.rainmeter.net/manual/measures/nowplaying/) and [WebNowPlaying](https://github.com/tjhrulz/WebNowPlaying)
* Extra flyouts for toggling CapsLock, NumLock and ScrollLock
* Customizable Hotkeys
* Supports multiple monitors
Expand Down Expand Up @@ -86,17 +71,7 @@ For more information, visit [JaxCore's documentation](https://jaxcore.gitbook.io
<br><!-- END Setup.mustache -->

## Screenshot gallery
<p align="center">
<img src="https://user-images.githubusercontent.com/80020581/173567622-520d0b47-c0e9-4852-91b2-878c7f6f5273.png" width="100%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567633-7c14fcc1-c881-456e-aabf-89c664058579.png" width="100%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567590-b5d1b602-455b-4717-b543-4c539919198d.png" width="90%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567597-53327b9e-60f3-414f-ade7-ec3f3a10b9ba.png" width="80%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567602-c8757b1b-a0cf-44b1-bc62-8e8f01a66dfc.png" width="75%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567577-54b7b698-0d9b-4ae4-8bde-59317a100917.png" width="75%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567580-eee21fd2-24cb-4973-9f9d-1f015a5fbc61.png" width="70%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567587-84e0f515-f90c-49e4-b894-69a9feefed7e.png" width="70%"/>
<img src="https://user-images.githubusercontent.com/80020581/173567594-6db14d30-57b8-4e87-adf9-0d7c99d8e063.png" width="60%"/>
</p>
Moved it to [here](https://github.com/Jax-Core/YourFlyouts/blob/main/Gallery.md)

<!-- START Footer.mustache -->

Expand Down

0 comments on commit 1a6e9e8

Please sign in to comment.