Skip to content

Commit

Permalink
UI: -fixed alignment of snapping in viewport, -added about popup
Browse files Browse the repository at this point in the history
  • Loading branch information
Tepilogic committed Sep 17, 2021
1 parent 6ac25b5 commit 3a02caa
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 8 deletions.
17 changes: 10 additions & 7 deletions design-drafts/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 70 additions & 0 deletions resources/engine/gui/popup_about.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<screen id="popup_about" background-color="#00000080" popup="true" min-width="1024" min-height="768" max-width="2560" max-height="1440">
<layout alignment="vertical" horizontal-align="center" vertical-align="center" width="100%" height="100%">

<tabs width="400" height="400">
<tabs-header id="about_tabs-header">
<tab id="about_caption" image="resources/engine/images/tdme.png" text="About" closeable="true"/>
</tabs-header>
<tabs-content>
<tab-content tab-id="about_caption" vertical-align="center">

<layout padding="20" alignment="vertical" horizontal-align="center" vertical-align="center" width="100%" height="100%">

<image width="339" height="94" src="resources/engine/images/tdme_fontlogo_white.png"/>

<layout alignment="horizontal" horizontal-align="center" vertical-align="center" width="100%" height="*">

<layout alignment="vertical" horizontal-align="left" vertical-align="top" width="auto" height="125">
<text font="{$font.default}" color="{$color.font_normal}" text="TDME2" width="auto" height="25" />

<text id="about_version" font="{$font.default}" color="{$color.font_disabled}" text="v1.9.99" width="auto" height="25" />
</layout>

<space width="150"/>

<layout alignment="vertical" horizontal-align="left" vertical-align="top" width="auto" height="125">
<layout alignment="horizontal" horizontal-align="left" vertical-align="center" width="auto" height="25">
<image src="resources/engine/images/weblink.png"/>
<space width="5"/>
<text id="about_releasenotes" font="{$font.default}" color="{$color.font_normal}" text="Release Notes" width="auto" />
</layout>
<layout alignment="horizontal" horizontal-align="left" vertical-align="center" width="auto" height="25">
<image src="resources/engine/images/weblink.png"/>
<space width="5"/>
<text id="about_github" font="{$font.default}" color="{$color.font_normal}" text="GitHub" width="auto" />
</layout>
<layout alignment="horizontal" horizontal-align="left" vertical-align="center" width="auto" height="25">
<image src="resources/engine/images/weblink.png"/>
<space width="5"/>
<text id="about_discord" font="{$font.default}" color="{$color.font_normal}" text="Discord" width="auto" />
</layout>
<layout alignment="horizontal" horizontal-align="left" vertical-align="center" width="auto" height="25">
<image src="resources/engine/images/weblink.png"/>
<space width="5"/>
<text id="about_license" font="{$font.default}" color="{$color.font_normal}" text="License" width="auto" />
</layout>
<layout alignment="horizontal" horizontal-align="left" vertical-align="center" width="auto" height="25">
<image src="resources/engine/images/weblink.png"/>
<space width="5"/>
<text id="about_patreon" font="{$font.default}" color="{$color.font_normal}" text="Patreon" width="auto" />
</layout>

</layout>

</layout>

<multiline-text font="{$font.default}" color="{$color.font_disabled}" width="100%" height="auto" horizontal-align="center">
<![CDATA[
Developed 2012-2021 by drewke.net, mindty.com
]]>
</multiline-text>

</layout>

</tab-content>
</tabs-content>
</tabs>

</layout>
</screen>

2 changes: 1 addition & 1 deletion resources/engine/gui/template_viewport_scene.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<layout show-on="bvs" width="auto" height="auto" alignment="vertical">
<checkbox id="{$id}_checkbox_bvs" image-unchecked="resources/engine/images/checkbox_bvoff.png" image-checked="resources/engine/images/checkbox_bvon.png" value="1" />
</layout>
<layout show-on="snapping" width="auto" height="auto" alignment="vertical">
<layout show-on="snapping" width="auto" height="auto" alignment="horizontal">
<checkbox id="{$id}_checkbox_snapping" image-unchecked="resources/engine/images/checkbox_snappingoff.png" image-checked="resources/engine/images/checkbox_snappingon.png" value="1" on-mouse-click="snapping_details.condition!=snapping_on" />
<element id="{$id}_snapping_details">
<layout show-on="{$id}_checkbox_snapping.checked" width="auto" height="auto" alignment="horizontal" horizontal-align="center" vertical-align="center">
Expand Down
Binary file added resources/engine/images/info.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 resources/engine/images/question.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/engine/models/empty.tm
Binary file not shown.

0 comments on commit 3a02caa

Please sign in to comment.