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

Jump to bottom

feat: install/uninstall modules from welcome window #593

Merged
merged 19 commits into from
Feb 21, 2021
Merged

feat: install/uninstall modules from welcome window #593

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
13a6ca1
Setup module installation.
erikas-taroza Feb 16, 2021
52b6595
fix null ref
erikas-taroza Feb 16, 2021
07bc043
Finished install and uninstall functions. Redesigned UI.
erikas-taroza Feb 17, 2021
6f2f564
Updated modules page.
erikas-taroza Feb 17, 2021
1755cc6
Added modules.
erikas-taroza Feb 17, 2021
df2dcd2
fix smells
erikas-taroza Feb 17, 2021
c7aa3ac
update discord url
erikas-taroza Feb 17, 2021
2a82e58
Fix smells
erikas-taroza Feb 17, 2021
e3e3aaf
Add steam transports to module list.
erikas-taroza Feb 17, 2021
6f5540f
Merge branch 'master' of https://github.com/MirageNet/Mirage.git into…
erikas-taroza Feb 19, 2021
e9dbc17
Update package names and urls
erikas-taroza Feb 19, 2021
b73e365
Merge branch 'master' of https://github.com/MirageNet/Mirage.git into…
erikas-taroza Feb 20, 2021
c6b1394
rename from module -> package
erikas-taroza Feb 20, 2021
580b204
add comments
erikas-taroza Feb 20, 2021
2e6a433
changes based on suggestions
erikas-taroza Feb 20, 2021
81998b1
Merge branch 'master' of https://github.com/MirageNet/Mirage.git into…
erikas-taroza Feb 21, 2021
d617526
fix issues after merging
erikas-taroza Feb 21, 2021
02459e8
disable install button after it is clicked. prevents errors being thr…
erikas-taroza Feb 21, 2021
381d001
fix smell
erikas-taroza Feb 21, 2021
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
12 changes: 10 additions & 2 deletions Assets/Mirage/Editor/WelcomeWindow/Resources/WelcomeWindow.uss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
-unity-text-align: upper-left;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 10px;
padding-top: 5px;
padding-bottom: 15px;
padding-top: 0;
flex: 3;
white-space: normal;
}
Expand Down Expand Up @@ -98,3 +98,11 @@ Button {
flex-direction: column;
justify-content: space-between;
}

#Module {
flex-basis: 20px;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 3px;
}
25 changes: 23 additions & 2 deletions Assets/Mirage/Editor/WelcomeWindow/Resources/WelcomeWindow.uxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<Style src="WelcomeWindow.uss" />
<ui:VisualElement name="Banner">
<ui:VisualElement name="Banner" style="background-color: rgb(11, 12, 11);">
erikas-taroza marked this conversation as resolved.
Show resolved Hide resolved
<ui:Label name="VersionText" text="Placeholder" />
<ui:Image name="Icon" style="background-image: url(&apos;/Assets/Mirage/Editor/WelcomeWindow/Resources/MirageIcon.png&apos;);" />
</ui:VisualElement>
Expand All @@ -9,6 +9,7 @@
<ui:VisualElement name="LeftColumnBox">
<ui:Button name="WelcomeButton" text="Welcome" />
<ui:Button name="QuickStartButton" text="Quick Start Guide" />
<ui:Button name="PackagesButton" text="Packages" />
<ui:Button name="FaqButton" text="FAQ" />
<ui:Button name="BestPracticesButton" text="Best Practices" />
<ui:Button name="ChangeLogButton" text="Change Log" />
Expand All @@ -17,7 +18,7 @@
</ui:VisualElement>
<ui:VisualElement name="Spacer" />
<ui:VisualElement name="RightColumnBox">
<ui:VisualElement name="Welcome" style="flex-grow: 0; width: 100%; height: 100%;">
<ui:VisualElement name="Welcome" style="flex-grow: 0; width: 100%; height: 100%; display: none;">
erikas-taroza marked this conversation as resolved.
Show resolved Hide resolved
<ui:Label name="Header" text="Welcome" />
<ui:Label name="Description" text="Hello! Thank you for installing Mirage. Please visit all the pages on this window. Clicking the button at the bottom of the pages will redirect you to a webpage. Additionally, there are example projects that you can import from the Unity Package Manager. &#10;&#10;Have fun using Mirage!" style="-unity-text-align: upper-left;" />
<ui:VisualElement name="Spacer" />
Expand Down Expand Up @@ -59,6 +60,26 @@
<ui:VisualElement name="Spacer" />
<ui:Button name="Redirect" text="Join Discord" class="redirect" />
</ui:VisualElement>
<ui:ScrollView name="Packages">
<ui:Label name="Header" text="Packages" />
<ui:Label name="Description" text="Mirage is a modular networking library. It ships with the foundation that you can build upon by installing packages." style="flex-basis: auto; flex-grow: 0; flex-shrink: 0;" />
<ui:Label text="Available Packages" display-tooltip-when-elided="True" style="padding-left: 10px; -unity-font-style: bold;" />
<ui:VisualElement name="ModulesList" style="flex-grow: 1; padding-left: 10px; padding-right: 10px;">
<ui:VisualElement name="Module" tooltip="Automatically find games within the same network.">
<ui:Label text="LAN Discovery" name="Name" />
<ui:Button text="Install" display-tooltip-when-elided="True" name="InstallButton" style="flex-shrink: 1; height: auto;" />
</ui:VisualElement>
<ui:VisualElement name="Module" tooltip="A transport that uses Facepunch&apos;s Steam SDK.">
<ui:Label text="Steam (Facepunch)" name="Name" />
<ui:Button text="Install" display-tooltip-when-elided="True" name="InstallButton" style="flex-shrink: 1; height: auto;" />
</ui:VisualElement>
<ui:VisualElement name="Module" tooltip="A transport that uses Steamworks.NET.">
<ui:Label text="Steam (Steamworks.NET)" name="Name" />
<ui:Button text="Install" display-tooltip-when-elided="True" name="InstallButton" style="flex-shrink: 1; height: auto;" />
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement name="Spacer" />
</ui:ScrollView>
</ui:VisualElement>
</ui:Box>
</ui:UXML>
Loading