Added Highscore page, Menu and Registration
This commit is contained in:
parent
148ff8bcb6
commit
b5b62e2b07
47 changed files with 763 additions and 159 deletions
499
.idea/workspace.xml
generated
499
.idea/workspace.xml
generated
|
|
@ -1,7 +1,32 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="" />
|
<list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/resources/images/logout.png" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/resources/images/scores.png" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java" />
|
||||||
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home$1.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home$1.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Page.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Page.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Register.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Register.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTButton.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTButton.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTImage.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTImage.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
|
||||||
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
|
||||||
|
</list>
|
||||||
<ignored path="$PROJECT_DIR$/out/" />
|
<ignored path="$PROJECT_DIR$/out/" />
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||||
<option name="TRACKING_ENABLED" value="true" />
|
<option name="TRACKING_ENABLED" value="true" />
|
||||||
|
|
@ -11,7 +36,7 @@
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="CoverageDataManager">
|
<component name="CoverageDataManager">
|
||||||
<SUITE FILE_PATH="coverage/TextTwist$Main__1_.coverage" NAME="Main (1) Coverage Results" MODIFIED="1497356519865" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
|
<SUITE FILE_PATH="coverage/TextTwist$Main__1_.coverage" NAME="Main (1) Coverage Results" MODIFIED="1497395192247" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
|
||||||
<FILTER>com.texttwist.client.*</FILTER>
|
<FILTER>com.texttwist.client.*</FILTER>
|
||||||
</SUITE>
|
</SUITE>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -21,8 +46,8 @@
|
||||||
<file leaf-file-name="Home.java" pinned="false" current-in-tab="false">
|
<file leaf-file-name="Home.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1040">
|
<state relative-caret-position="473">
|
||||||
<caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
|
<caret line="60" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
|
@ -33,18 +58,8 @@
|
||||||
<file leaf-file-name="Register.java" pinned="false" current-in-tab="false">
|
<file leaf-file-name="Register.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="294">
|
<state relative-caret-position="219">
|
||||||
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
|
<caret line="23" column="22" lean-forward="true" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="Entrypoint.java" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="221">
|
|
||||||
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
|
@ -52,59 +67,85 @@
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="Page.java" pinned="false" current-in-tab="true">
|
<file leaf-file-name="Page.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="126">
|
<state relative-caret-position="95">
|
||||||
<caret line="6" column="21" lean-forward="true" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
|
<caret line="41" column="48" lean-forward="true" selection-start-line="41" selection-start-column="48" selection-end-line="41" selection-end-column="48" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="179">
|
||||||
|
<caret line="17" column="22" lean-forward="true" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="Highscores.java" pinned="false" current-in-tab="true">
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="410">
|
||||||
|
<caret line="66" column="33" lean-forward="true" selection-start-line="66" selection-start-column="33" selection-end-line="66" selection-end-column="33" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="e#655#663#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="TTScrollList.java" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="63">
|
||||||
|
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
|
<file leaf-file-name="Palette.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="420">
|
<state relative-caret-position="105">
|
||||||
<caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
|
<caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="TTPasswordField.java" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="284">
|
||||||
|
<caret line="39" column="0" lean-forward="true" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="e#832#1245#0" expanded="true" />
|
||||||
|
<element signature="e#1244#1245#0" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file leaf-file-name="TTImage.java" pinned="false" current-in-tab="false">
|
<file leaf-file-name="MatchRequests.java" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="399">
|
<state relative-caret-position="147">
|
||||||
<caret line="19" column="28" lean-forward="false" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
|
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="e#182#183#0" expanded="true" />
|
||||||
</folding>
|
<element signature="e#211#212#0" expanded="true" />
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="TTContainer.java" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="21">
|
|
||||||
<caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file leaf-file-name="TTLabelBtn.java" pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="141">
|
|
||||||
<caret line="14" column="3" lean-forward="true" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
@ -145,19 +186,26 @@
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.form" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.form" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/PasswordField.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/PasswordField.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
|
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
|
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
|
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java" />
|
||||||
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
|
||||||
|
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -189,8 +237,6 @@
|
||||||
<foldersAlwaysOnTop value="true" />
|
<foldersAlwaysOnTop value="true" />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
<pane id="Scope" />
|
|
||||||
<pane id="PackagesPane" />
|
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
<PATH>
|
<PATH>
|
||||||
|
|
@ -370,6 +416,10 @@
|
||||||
<option name="myItemId" value="resources" />
|
<option name="myItemId" value="resources" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
|
<PATH_ELEMENT>
|
||||||
|
<option name="myItemId" value="images" />
|
||||||
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
|
</PATH_ELEMENT>
|
||||||
</PATH>
|
</PATH>
|
||||||
<PATH>
|
<PATH>
|
||||||
<PATH_ELEMENT>
|
<PATH_ELEMENT>
|
||||||
|
|
@ -388,14 +438,12 @@
|
||||||
<option name="myItemId" value="resources" />
|
<option name="myItemId" value="resources" />
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||||
</PATH_ELEMENT>
|
</PATH_ELEMENT>
|
||||||
<PATH_ELEMENT>
|
|
||||||
<option name="myItemId" value="fonts" />
|
|
||||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
||||||
</PATH_ELEMENT>
|
|
||||||
</PATH>
|
</PATH>
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
|
<pane id="Scope" />
|
||||||
<pane id="Scratches" />
|
<pane id="Scratches" />
|
||||||
|
<pane id="PackagesPane" />
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
|
|
@ -407,18 +455,19 @@
|
||||||
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
|
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<key name="CopyFile.RECENT_KEYS">
|
||||||
<recent name="C:\Users\loke\TextTwist\Client\resources\fonts" />
|
|
||||||
<recent name="C:\Users\loke\TextTwist\Client\resources\images" />
|
<recent name="C:\Users\loke\TextTwist\Client\resources\images" />
|
||||||
<recent name="C:\Users\loke\TextTwist\Client\resources" />
|
<recent name="C:\Users\loke\TextTwist\Client\img" />
|
||||||
<recent name="C:\Users\loke\TextTwist\Client\src\com\texttwist\client\ui" />
|
|
||||||
<recent name="C:\Users\loke\TextTwist\Client" />
|
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyClassDialog.RECENTS_KEY">
|
<key name="CopyClassDialog.RECENTS_KEY">
|
||||||
<recent name="" />
|
<recent name="" />
|
||||||
</key>
|
</key>
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
<key name="MoveFile.RECENT_KEYS">
|
||||||
<recent name="C:\Users\loke\TextTwist\Client\img" />
|
<recent name="C:\Users\loke\TextTwist\Client\resources\images" />
|
||||||
|
<recent name="C:\Users\loke\TextTwist\Client\resources" />
|
||||||
|
<recent name="C:\Users\loke\TextTwist\Client\resources\fonts" />
|
||||||
|
<recent name="C:\Users\loke\TextTwist\Client\src\com\texttwist\client\ui" />
|
||||||
|
<recent name="C:\Users\loke\TextTwist\Client" />
|
||||||
</key>
|
</key>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunDashboard">
|
<component name="RunDashboard">
|
||||||
|
|
@ -857,12 +906,13 @@
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1497277836157</updated>
|
<updated>1497277836157</updated>
|
||||||
<workItem from="1497277840504" duration="21181000" />
|
<workItem from="1497277840504" duration="21181000" />
|
||||||
<workItem from="1497343606634" duration="28691000" />
|
<workItem from="1497343606634" duration="28876000" />
|
||||||
|
<workItem from="1497387626373" duration="13263000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="49872000" />
|
<option name="totallyTimeSpent" value="63320000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-1709" y="-107" width="1718" height="928" extended-state="6" />
|
<frame x="-1709" y="-107" width="1718" height="928" extended-state="6" />
|
||||||
|
|
@ -878,8 +928,8 @@
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19216181" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19216181" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
<window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
|
|
@ -917,6 +967,86 @@
|
||||||
<option name="FILTER_TARGETS" value="false" />
|
<option name="FILTER_TARGETS" value="false" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="1008">
|
||||||
|
<caret line="52" column="36" lean-forward="false" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="294">
|
||||||
|
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="210">
|
||||||
|
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="336">
|
||||||
|
<caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="252">
|
||||||
|
<caret line="19" column="28" lean-forward="false" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="105">
|
||||||
|
<caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="126">
|
||||||
|
<caret line="14" column="3" lean-forward="true" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="147">
|
||||||
|
<caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="273">
|
<state relative-caret-position="273">
|
||||||
|
|
@ -1067,14 +1197,6 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="284">
|
|
||||||
<caret line="14" column="59" lean-forward="true" selection-start-line="14" selection-start-column="59" selection-end-line="14" selection-end-column="59" />
|
|
||||||
<folding />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/awt/event/MouseAdapter.java">
|
<entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/awt/event/MouseAdapter.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="-240">
|
<state relative-caret-position="-240">
|
||||||
|
|
@ -1083,28 +1205,6 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="-69">
|
|
||||||
<caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="452">
|
|
||||||
<caret line="41" column="11" lean-forward="true" selection-start-line="28" selection-start-column="6" selection-end-line="41" selection-end-column="11" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
<element signature="e#832#1245#0" expanded="true" />
|
|
||||||
<element signature="e#1244#1245#0" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="116">
|
<state relative-caret-position="116">
|
||||||
|
|
@ -1115,40 +1215,10 @@
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="399">
|
|
||||||
<caret line="19" column="28" lean-forward="false" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="21">
|
|
||||||
<caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="420">
|
<state relative-caret-position="336">
|
||||||
<caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
|
<caret line="20" column="9" lean-forward="false" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="141">
|
|
||||||
<caret line="14" column="3" lean-forward="true" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
|
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
|
@ -1157,18 +1227,81 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="221">
|
<state relative-caret-position="394">
|
||||||
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
|
<caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1040">
|
<state relative-caret-position="147">
|
||||||
<caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
|
<caret line="15" column="23" lean-forward="true" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="273">
|
||||||
|
<caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="e#561#945#0" expanded="true" />
|
||||||
|
<element signature="e#944#945#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="119">
|
||||||
|
<caret line="25" column="73" lean-forward="true" selection-start-line="25" selection-start-column="73" selection-end-line="25" selection-end-column="73" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="189">
|
||||||
|
<caret line="9" column="22" lean-forward="true" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#177#178#0" expanded="true" />
|
||||||
|
<element signature="e#206#207#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="347">
|
||||||
|
<caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="25" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="263">
|
||||||
|
<caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="105">
|
||||||
|
<caret line="5" column="24" lean-forward="true" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
|
@ -1177,20 +1310,94 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="294">
|
<state relative-caret-position="219">
|
||||||
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
|
<caret line="23" column="22" lean-forward="true" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
|
||||||
<folding />
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="147">
|
||||||
|
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#182#183#0" expanded="true" />
|
||||||
|
<element signature="e#211#212#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="179">
|
||||||
|
<caret line="17" column="22" lean-forward="true" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="126">
|
<state relative-caret-position="95">
|
||||||
<caret line="6" column="21" lean-forward="true" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
|
<caret line="41" column="48" lean-forward="true" selection-start-line="41" selection-start-column="48" selection-end-line="41" selection-end-column="48" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="284">
|
||||||
|
<caret line="39" column="0" lean-forward="true" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="e#832#1245#0" expanded="true" />
|
||||||
|
<element signature="e#1244#1245#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="105">
|
||||||
|
<caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="63">
|
||||||
|
<caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="473">
|
||||||
|
<caret line="60" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="410">
|
||||||
|
<caret line="66" column="33" lean-forward="true" selection-start-line="66" selection-start-column="33" selection-end-line="66" selection-end-column="33" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="e#655#663#0" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
<component name="masterDetails">
|
<component name="masterDetails">
|
||||||
<states>
|
<states>
|
||||||
|
|
|
||||||
BIN
Client/resources/images/back.png
Normal file
BIN
Client/resources/images/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 860 B |
BIN
Client/resources/images/logout.png
Normal file
BIN
Client/resources/images/logout.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
Client/resources/images/scores.png
Normal file
BIN
Client/resources/images/scores.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
|
|
@ -15,7 +15,7 @@ public class Palette {
|
||||||
public static Color registerLblBtn_color = new Color(95,0,0);
|
public static Color registerLblBtn_color = new Color(95,0,0);
|
||||||
public static Color registerLblBtn_onmouseover_color = new Color(95,0,0, 127);
|
public static Color registerLblBtn_onmouseover_color = new Color(95,0,0, 127);
|
||||||
public static Color registerLblBtn_onmouseclick_color = new Color(53,66,32);
|
public static Color registerLblBtn_onmouseclick_color = new Color(53,66,32);
|
||||||
|
public static Color scrollPanel_backgroundColor = new Color(220,229,207);
|
||||||
|
|
||||||
public static Font button_font = new Font("DK Trained Monkey", Font.BOLD, 30);
|
public static Font button_font = new Font("DK Trained Monkey", Font.BOLD, 30);
|
||||||
|
|
||||||
|
|
|
||||||
80
Client/src/com/texttwist/client/pages/Highscores.java
Normal file
80
Client/src/com/texttwist/client/pages/Highscores.java
Normal file
|
|
@ -0,0 +1,80 @@
|
||||||
|
package com.texttwist.client.pages;
|
||||||
|
|
||||||
|
import com.texttwist.client.constants.Palette;
|
||||||
|
import com.texttwist.client.ui.*;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import javax.swing.event.ListDataListener;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class Highscores extends Page{
|
||||||
|
|
||||||
|
public TTContainer highscoreContainer;
|
||||||
|
Highscores(JFrame window) throws IOException {
|
||||||
|
super(window);
|
||||||
|
createUIComponents();
|
||||||
|
window.setVisible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private DefaultListModel fetchHighscores(){
|
||||||
|
DefaultListModel<String> highscoreList = new DefaultListModel<String>();
|
||||||
|
highscoreList.addElement("USA");
|
||||||
|
highscoreList.addElement("India");
|
||||||
|
highscoreList.addElement("Vietnam");
|
||||||
|
highscoreList.addElement("Canada");
|
||||||
|
highscoreList.addElement("Denmark");
|
||||||
|
highscoreList.addElement("France");
|
||||||
|
|
||||||
|
highscoreList.addElement("France");
|
||||||
|
highscoreList.addElement("Great Britain");
|
||||||
|
highscoreList.addElement("Japan");
|
||||||
|
|
||||||
|
highscoreList.addElement("France");
|
||||||
|
highscoreList.addElement("Great Britain");
|
||||||
|
highscoreList.addElement("Japan");
|
||||||
|
|
||||||
|
highscoreList.addElement("France");
|
||||||
|
highscoreList.addElement("Great Britain");
|
||||||
|
highscoreList.addElement("Japan");
|
||||||
|
highscoreList.addElement("Great Britain");
|
||||||
|
highscoreList.addElement("Japan");
|
||||||
|
return highscoreList;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void createUIComponents() throws IOException {
|
||||||
|
addLogo(root);
|
||||||
|
highscoreContainer = new TTContainer(
|
||||||
|
null,
|
||||||
|
new Dimension(1150,220),
|
||||||
|
Palette.root_backgroundColor,
|
||||||
|
-1,
|
||||||
|
root);
|
||||||
|
|
||||||
|
TTLabel title = new TTLabel(
|
||||||
|
new Point(200,0),
|
||||||
|
new Dimension(350,50),
|
||||||
|
"Highscores",
|
||||||
|
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 38),
|
||||||
|
null,
|
||||||
|
highscoreContainer);
|
||||||
|
|
||||||
|
TTScrollList highscoreList = new TTScrollList(
|
||||||
|
new Point(0, 60),
|
||||||
|
new Dimension(575, 142),
|
||||||
|
fetchHighscores(),
|
||||||
|
highscoreContainer);
|
||||||
|
addBack(root,
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
return new Menu(Page.window);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -20,7 +20,6 @@ public class Home extends Page {
|
||||||
@Override
|
@Override
|
||||||
public void createUIComponents(){
|
public void createUIComponents(){
|
||||||
addLogo(root);
|
addLogo(root);
|
||||||
|
|
||||||
loginDataContainer = new TTContainer(
|
loginDataContainer = new TTContainer(
|
||||||
null,
|
null,
|
||||||
new Dimension(1150,250),
|
new Dimension(1150,250),
|
||||||
|
|
@ -33,15 +32,25 @@ public class Home extends Page {
|
||||||
new Dimension(210,50),
|
new Dimension(210,50),
|
||||||
"Username",
|
"Username",
|
||||||
loginDataContainer);
|
loginDataContainer);
|
||||||
|
|
||||||
TTPasswordField passwordField = new TTPasswordField(
|
TTPasswordField passwordField = new TTPasswordField(
|
||||||
new Point(290,60),
|
new Point(290,60),
|
||||||
new Dimension(210,50),
|
new Dimension(210,50),
|
||||||
loginDataContainer);
|
loginDataContainer);
|
||||||
|
|
||||||
TTButton loginBtn = new TTButton(
|
TTButton loginBtn = new TTButton(
|
||||||
new Point(70,120),
|
new Point(70,120),
|
||||||
new Dimension(430,50),
|
new Dimension(430,50),
|
||||||
"Go!",
|
"Go!",
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
//TODO CHIAMA API PER LOGIN E SE TUTTO OKEY MANDA A PAGINA DEL MENU
|
||||||
|
return new Menu(Page.window);
|
||||||
|
}
|
||||||
|
},
|
||||||
loginDataContainer);
|
loginDataContainer);
|
||||||
|
|
||||||
TTLabel registerText = new TTLabel(
|
TTLabel registerText = new TTLabel(
|
||||||
new Point(70,200),
|
new Point(70,200),
|
||||||
new Dimension(350,50),
|
new Dimension(350,50),
|
||||||
|
|
@ -49,18 +58,20 @@ public class Home extends Page {
|
||||||
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 24),
|
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 24),
|
||||||
null,
|
null,
|
||||||
loginDataContainer);
|
loginDataContainer);
|
||||||
|
|
||||||
TTLabelBtn registerField = new TTLabelBtn(
|
TTLabelBtn registerField = new TTLabelBtn(
|
||||||
new Point(360, 200),
|
new Point(360, 200),
|
||||||
new Dimension(210, 50),
|
new Dimension(210, 50),
|
||||||
"Register!",
|
"Register!",
|
||||||
new Font(Palette.inputBox_font.getFontName(), Font.BOLD, 34),
|
new Font(Palette.inputBox_font.getFontName(), Font.BOLD, 34),
|
||||||
null,
|
null,
|
||||||
new Callable<Page>() {
|
new Callable<Object>() {
|
||||||
@Override
|
@Override
|
||||||
public Page call() throws Exception {
|
public Object call() throws Exception {
|
||||||
return new Register(Page.window);
|
return new Register(Page.window);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
loginDataContainer);
|
loginDataContainer);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
12
Client/src/com/texttwist/client/pages/MatchRequests.java
Normal file
12
Client/src/com/texttwist/client/pages/MatchRequests.java
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
package com.texttwist.client.pages;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class MatchRequests extends Page{
|
||||||
|
public MatchRequests(JFrame window){
|
||||||
|
super(window);
|
||||||
|
}
|
||||||
|
}
|
||||||
12
Client/src/com/texttwist/client/pages/MatchSetup.java
Normal file
12
Client/src/com/texttwist/client/pages/MatchSetup.java
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
package com.texttwist.client.pages;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class MatchSetup extends Page {
|
||||||
|
public MatchSetup(JFrame window){
|
||||||
|
super(window);
|
||||||
|
}
|
||||||
|
}
|
||||||
96
Client/src/com/texttwist/client/pages/Menu.java
Normal file
96
Client/src/com/texttwist/client/pages/Menu.java
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
package com.texttwist.client.pages;
|
||||||
|
import com.texttwist.client.constants.Palette;
|
||||||
|
import com.texttwist.client.ui.*;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class Menu extends Page{
|
||||||
|
|
||||||
|
private TTContainer menuBar;
|
||||||
|
|
||||||
|
public Menu(JFrame window) throws IOException {
|
||||||
|
super(window);
|
||||||
|
createUIComponents();
|
||||||
|
window.setVisible(true);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void createUIComponents() throws IOException {
|
||||||
|
addLogo(root);
|
||||||
|
menuBar = new TTContainer(
|
||||||
|
null,
|
||||||
|
new Dimension(1150,220),
|
||||||
|
Palette.root_backgroundColor,
|
||||||
|
-1,
|
||||||
|
root);
|
||||||
|
TTButton newMatch = new TTButton(
|
||||||
|
new Point(25,30),
|
||||||
|
new Dimension(250,75),
|
||||||
|
"New Match!",
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
|
||||||
|
//TODO CHIAMA API PER REGISTRAZIONE E SE TUTTO OKEY MANDA A PAGINA LOGIN
|
||||||
|
return new MatchSetup(window);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
menuBar);
|
||||||
|
TTButton matchRequests = new TTButton(
|
||||||
|
new Point(290,30),
|
||||||
|
new Dimension(250,75),
|
||||||
|
"In pending",
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
//TODO CHIAMA API PER REGISTRAZIONE E SE TUTTO OKEY MANDA A PAGINA LOGIN
|
||||||
|
return new MatchRequests(window);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
menuBar);
|
||||||
|
TTCircleCounter circleCounter = new TTCircleCounter(
|
||||||
|
new Point(290,30),
|
||||||
|
new Dimension(25,25),
|
||||||
|
menuBar.getGraphics(),
|
||||||
|
menuBar);
|
||||||
|
|
||||||
|
TTButton highscores = new TTButton(
|
||||||
|
new Point(25, 115),
|
||||||
|
new Dimension(250, 75),
|
||||||
|
"Highscores",
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
return new Highscores(Page.window);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
menuBar);
|
||||||
|
|
||||||
|
TTButton logout = new TTButton(
|
||||||
|
new Point(290, 115),
|
||||||
|
new Dimension(250, 75),
|
||||||
|
"Logout",
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
return new Home(Page.window);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
menuBar);
|
||||||
|
addBack(root,
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
return new Home(Page.window);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,11 +3,14 @@ package com.texttwist.client.pages;
|
||||||
import com.texttwist.client.constants.Palette;
|
import com.texttwist.client.constants.Palette;
|
||||||
import com.texttwist.client.ui.TTContainer;
|
import com.texttwist.client.ui.TTContainer;
|
||||||
import com.texttwist.client.ui.TTImage;
|
import com.texttwist.client.ui.TTImage;
|
||||||
|
import com.texttwist.client.ui.TTImageBtn;
|
||||||
|
import com.texttwist.client.ui.TTLabel;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by loke on 13/06/2017.
|
* Created by loke on 13/06/2017.
|
||||||
|
|
@ -31,10 +34,9 @@ public class Page {
|
||||||
BoxLayout.Y_AXIS,
|
BoxLayout.Y_AXIS,
|
||||||
null);
|
null);
|
||||||
window.add(root);
|
window.add(root);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void createUIComponents(){}
|
public void createUIComponents() throws IOException {}
|
||||||
|
|
||||||
public void addLogo(TTContainer parent) {
|
public void addLogo(TTContainer parent) {
|
||||||
TTContainer container = new TTContainer(
|
TTContainer container = new TTContainer(
|
||||||
|
|
@ -54,4 +56,25 @@ public class Page {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void addBack(TTContainer parent, Callable<Object> clickHandler) {
|
||||||
|
try {
|
||||||
|
TTImageBtn back = new TTImageBtn(
|
||||||
|
new Point(0, 800),
|
||||||
|
new Dimension(0, 0),
|
||||||
|
new ImageIcon(new File("./Client/resources/images/back.png").getCanonicalPath()),
|
||||||
|
clickHandler,
|
||||||
|
parent);
|
||||||
|
TTLabel registerText = new TTLabel(
|
||||||
|
new Point(55,775),
|
||||||
|
new Dimension(350,0),
|
||||||
|
"Back",
|
||||||
|
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 24),
|
||||||
|
null,
|
||||||
|
parent);
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,18 @@
|
||||||
package com.texttwist.client.pages;
|
package com.texttwist.client.pages;
|
||||||
|
|
||||||
|
import com.texttwist.client.constants.Palette;
|
||||||
|
import com.texttwist.client.ui.*;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by loke on 13/06/2017.
|
* Created by loke on 13/06/2017.
|
||||||
*/
|
*/
|
||||||
public class Register extends Page {
|
public class Register extends Page {
|
||||||
|
|
||||||
|
private TTContainer registerDataContainer;
|
||||||
public Register(JFrame window) {
|
public Register(JFrame window) {
|
||||||
super(window);
|
super(window);
|
||||||
createUIComponents();
|
createUIComponents();
|
||||||
|
|
@ -16,6 +22,48 @@ public class Register extends Page {
|
||||||
@Override
|
@Override
|
||||||
public void createUIComponents() {
|
public void createUIComponents() {
|
||||||
addLogo(root);
|
addLogo(root);
|
||||||
|
registerDataContainer = new TTContainer(
|
||||||
|
null,
|
||||||
|
new Dimension(1150,220),
|
||||||
|
Palette.root_backgroundColor,
|
||||||
|
-1,
|
||||||
|
root);
|
||||||
|
TTLabel registerText = new TTLabel(
|
||||||
|
new Point(70,35),
|
||||||
|
new Dimension(400,40),
|
||||||
|
"<html><h2>Insert your datas and press Register!</h2></html>",
|
||||||
|
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 12),
|
||||||
|
null,
|
||||||
|
registerDataContainer);
|
||||||
|
TTInputField usernameField = new TTInputField(
|
||||||
|
new Point(70,90),
|
||||||
|
new Dimension(210,50),
|
||||||
|
"Username",
|
||||||
|
registerDataContainer);
|
||||||
|
TTPasswordField passwordField = new TTPasswordField(
|
||||||
|
new Point(290,90),
|
||||||
|
new Dimension(210,50),
|
||||||
|
registerDataContainer);
|
||||||
|
TTButton register = new TTButton(
|
||||||
|
new Point(70,150),
|
||||||
|
new Dimension(430,50),
|
||||||
|
"Register!",
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
|
||||||
|
//TODO CHIAMA API PER REGISTRAZIONE E SE TUTTO OKEY MANDA A PAGINA LOGIN
|
||||||
|
return new Home(window);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
registerDataContainer);
|
||||||
|
addBack(root,
|
||||||
|
new Callable<Object>() {
|
||||||
|
@Override
|
||||||
|
public Object call() throws Exception {
|
||||||
|
return new Home(Page.window);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,20 @@
|
||||||
package com.texttwist.client.ui;
|
package com.texttwist.client.ui;
|
||||||
|
|
||||||
import com.texttwist.client.constants.Palette;
|
import com.texttwist.client.constants.Palette;
|
||||||
|
import com.texttwist.client.pages.Page;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.MouseAdapter;
|
import java.awt.event.MouseAdapter;
|
||||||
import java.awt.event.MouseEvent;
|
import java.awt.event.MouseEvent;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by loke on 13/06/2017.
|
* Created by loke on 13/06/2017.
|
||||||
*/
|
*/
|
||||||
public class TTButton extends JButton{
|
public class TTButton extends JButton{
|
||||||
|
|
||||||
public TTButton(Point position, Dimension dimension, String caption, JPanel parent) {
|
public TTButton(Point position, Dimension dimension, String caption, Callable<Object> clickHandler, JPanel parent) {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
setBackground(Palette.button_backgroundColor);
|
setBackground(Palette.button_backgroundColor);
|
||||||
|
|
@ -22,7 +24,25 @@ public class TTButton extends JButton{
|
||||||
setPreferredSize(dimension);
|
setPreferredSize(dimension);
|
||||||
setText(caption);
|
setText(caption);
|
||||||
|
|
||||||
parent.add(this);
|
addMouseListener(new MouseAdapter() {
|
||||||
|
@Override
|
||||||
|
public void mousePressed(MouseEvent e) {
|
||||||
|
super.mouseClicked(e);
|
||||||
|
setForeground(Palette.registerLblBtn_onmouseclick_color);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseReleased(MouseEvent e) {
|
||||||
|
super.mouseClicked(e);
|
||||||
|
setForeground(Palette.registerLblBtn_color);
|
||||||
|
try {
|
||||||
|
clickHandler.call();
|
||||||
|
} catch (Exception e1) {
|
||||||
|
e1.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
parent.add(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
35
Client/src/com/texttwist/client/ui/TTCircleCounter.java
Normal file
35
Client/src/com/texttwist/client/ui/TTCircleCounter.java
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
package com.texttwist.client.ui;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.geom.Ellipse2D;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class TTCircleCounter extends JComponent{
|
||||||
|
|
||||||
|
private Point position;
|
||||||
|
private Dimension dimension;
|
||||||
|
|
||||||
|
public TTCircleCounter(Point position, Dimension dimension, Graphics g, TTContainer parent){
|
||||||
|
this.position=position;
|
||||||
|
this.dimension=dimension;
|
||||||
|
|
||||||
|
Graphics2D g2d = (Graphics2D)g;
|
||||||
|
Ellipse2D.Double circle = new Ellipse2D.Double(position.x, position.y, dimension.width, dimension.height);
|
||||||
|
g2d.fill(circle);
|
||||||
|
g2d.setColor(Color.RED);
|
||||||
|
|
||||||
|
parent.add(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void paintComponent(Graphics g) {
|
||||||
|
super.paintComponent(g);
|
||||||
|
Graphics2D g2d = (Graphics2D)g;
|
||||||
|
Ellipse2D.Double circle = new Ellipse2D.Double(position.x, position.y, dimension.width, dimension.height);
|
||||||
|
g2d.setColor(Color.RED);
|
||||||
|
g2d.fill(circle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -14,11 +14,8 @@ import java.io.IOException;
|
||||||
*/
|
*/
|
||||||
public class TTImage extends JLabel{
|
public class TTImage extends JLabel{
|
||||||
|
|
||||||
public TTImage(Point position, Dimension dimension, ImageIcon image , JPanel parent) throws IOException {
|
public TTImage(Point position, Dimension dimension, ImageIcon image, JPanel parent) throws IOException {
|
||||||
super();
|
super();
|
||||||
|
|
||||||
//setBackground(Palette.inputBox_backgroundColor);
|
|
||||||
//setFont(Palette.inputBox_font);
|
|
||||||
setBounds(position.x,position.y,dimension.width, dimension.height);
|
setBounds(position.x,position.y,dimension.width, dimension.height);
|
||||||
setPreferredSize(dimension);
|
setPreferredSize(dimension);
|
||||||
setIcon(image);
|
setIcon(image);
|
||||||
|
|
|
||||||
32
Client/src/com/texttwist/client/ui/TTImageBtn.java
Normal file
32
Client/src/com/texttwist/client/ui/TTImageBtn.java
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
package com.texttwist.client.ui;
|
||||||
|
|
||||||
|
import com.texttwist.client.constants.Palette;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.event.MouseAdapter;
|
||||||
|
import java.awt.event.MouseEvent;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class TTImageBtn extends TTImage {
|
||||||
|
public TTImageBtn(Point position, Dimension dimension, ImageIcon image, Callable<Object> clickHandler, JPanel parent) throws IOException {
|
||||||
|
super(position,dimension,image,parent);
|
||||||
|
|
||||||
|
addMouseListener(new MouseAdapter() {
|
||||||
|
@Override
|
||||||
|
public void mouseReleased(MouseEvent e) {
|
||||||
|
super.mouseClicked(e);
|
||||||
|
setForeground(Palette.registerLblBtn_color);
|
||||||
|
try {
|
||||||
|
clickHandler.call();
|
||||||
|
} catch (Exception e1) {
|
||||||
|
e1.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -15,7 +15,7 @@ import java.util.concurrent.Callable;
|
||||||
*/
|
*/
|
||||||
public class TTLabelBtn extends TTLabel{
|
public class TTLabelBtn extends TTLabel{
|
||||||
|
|
||||||
public TTLabelBtn(Point position, Dimension dimension, String caption, Font font, Color fontColor, Callable<Page> clickHandler, JPanel parent) {
|
public TTLabelBtn(Point position, Dimension dimension, String caption, Font font, Color fontColor, Callable<Object> clickHandler, JPanel parent) {
|
||||||
super(position, dimension, caption, font, fontColor, parent);
|
super(position, dimension, caption, font, fontColor, parent);
|
||||||
|
|
||||||
setForeground(Palette.registerLblBtn_color);
|
setForeground(Palette.registerLblBtn_color);
|
||||||
|
|
|
||||||
31
Client/src/com/texttwist/client/ui/TTScrollList.java
Normal file
31
Client/src/com/texttwist/client/ui/TTScrollList.java
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
package com.texttwist.client.ui;
|
||||||
|
|
||||||
|
import com.texttwist.client.constants.Palette;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by loke on 14/06/2017.
|
||||||
|
*/
|
||||||
|
public class TTScrollList extends JList {
|
||||||
|
|
||||||
|
public TTScrollList(Point position, Dimension dimension, ListModel listModel, JPanel parent){
|
||||||
|
super(listModel);
|
||||||
|
setBackground(Palette.scrollPanel_backgroundColor);
|
||||||
|
setFont(Palette.inputBox_font);
|
||||||
|
setBounds(position.x, position.y, dimension.width, dimension.height);
|
||||||
|
// setPreferredSize(dimension);
|
||||||
|
setForeground(Palette.fontColor);
|
||||||
|
|
||||||
|
JScrollPane scrollPane = new JScrollPane();
|
||||||
|
scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
|
||||||
|
scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
|
||||||
|
scrollPane.setBounds(position.x, position.y, dimension.width, dimension.height);
|
||||||
|
// scrollPane.setMinimumSize(dimension);
|
||||||
|
scrollPane.setBackground(Palette.scrollPanel_backgroundColor);
|
||||||
|
scrollPane.setViewportView(this);
|
||||||
|
|
||||||
|
parent.add(scrollPane);
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Home$2.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Home$2.class
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Menu$1.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Menu$1.class
Normal file
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Menu$2.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Menu$2.class
Normal file
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Menu$3.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Menu$3.class
Normal file
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Menu$4.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Menu$4.class
Normal file
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Menu$5.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Menu$5.class
Normal file
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/pages/Menu.class
Normal file
BIN
out/production/Client/com/texttwist/client/pages/Menu.class
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/ui/TTButton$1.class
Normal file
BIN
out/production/Client/com/texttwist/client/ui/TTButton$1.class
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/ui/TTImageBtn$1.class
Normal file
BIN
out/production/Client/com/texttwist/client/ui/TTImageBtn$1.class
Normal file
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/ui/TTImageBtn.class
Normal file
BIN
out/production/Client/com/texttwist/client/ui/TTImageBtn.class
Normal file
Binary file not shown.
Binary file not shown.
BIN
out/production/Client/com/texttwist/client/ui/TTScrollList.class
Normal file
BIN
out/production/Client/com/texttwist/client/ui/TTScrollList.class
Normal file
Binary file not shown.
BIN
out/production/Client/images/back.png
Normal file
BIN
out/production/Client/images/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 860 B |
BIN
out/production/Client/images/logout.png
Normal file
BIN
out/production/Client/images/logout.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
out/production/Client/images/scores.png
Normal file
BIN
out/production/Client/images/scores.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
Loading…
Add table
Add a link
Reference in a new issue