Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

TMP MERGE #7

Merged
merged 5 commits into from
Jan 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added .vs/QuakeFocus Pro/v17/.suo
Binary file not shown.
6 changes: 6 additions & 0 deletions QuakeFocus Pro/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
<setting name="lmsPrefAutoAlertThreshold" serializeAs="String">
<value>1</value>
</setting>
<setting name="usrLong" serializeAs="String">
<value>139.839478</value>
</setting>
<setting name="usrLat" serializeAs="String">
<value>35.652832</value>
</setting>
</QuakeFocus_Pro.My.MySettings>
</userSettings>
</configuration>

Large diffs are not rendered by default.

416 changes: 208 additions & 208 deletions QuakeFocus Pro/eewBanner.resx → QuakeFocus Pro/Controls/eewBanner.resx

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

154 changes: 154 additions & 0 deletions QuakeFocus Pro/Controls/localPane.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema

Version 2.0

The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.

Example:

... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>

There are any number of "resheader" rows that contain simple
name/value pairs.

Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.

The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:

Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.

mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.

mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="settingsBTN.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAACnSURBVDhP7ZG9DYMwFIQtJQULhBlgglBEMAwZID9dsk5QFgmrMAOdufM7CltKgWj9SZ9knfzO
GLtMZgfe+xq+4RUWipmX8CFLxcwLyL0vWCs2EDRwhis/eIAsmxgIrpkd4chAcLZRXSj8hjimhU9bRvBL
O1tGDKoLhYNlERfI4ZQb5GEpH9VtvvIJ8srcs8LZs+oMBBXkD+5h+ih3+e9RKsWZzHacWwDta1pEgMdR
7AAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="ctxHlp.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="ReplayToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAESSURBVDhP1ZRLTgJREABHE1l6B7fy2bvyHMYYEW/AHQA3ioGtJ/AKegs/XAOQnRipmhkSPvNm
mISFVlKh5wU60/26if4dx+mnVHGAHzhLfcdHrOFOPOE5DvEHTdbBa2xiNz2bo9+pYC7P+ItjvMQD3MSz
C/Q7r5ibdJlwgmce5FBHk9qWIG00qVr+ak+zsArLt997wfI/8SF+2hM9fEvCde7xJAlL0cJpEq7j4U0S
luIWvcQtljNXlmDJfTRp1uyFOMQR2q4tvHpHwKHdlSv0N6fxUwauk8Pq0BbRQHvnbgdxjVynotXzzUz2
gkeYi0ldJ0txaO/QPwY1tmff6JsVJlvFnroB3uBXqrEXEOzZXyeKFv6XPQVXgIB7AAAAAElFTkSuQmCC
</value>
</data>
<data name="SettingsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAE+SURBVDhPxZQxTgNBDEW3JBItNEAVWjqgCPQcAKWB9FBSAAfgCjSEhoLkHBwFJOoEOECA96QZ
aXYygYRFypeeZHltr63xTLUMHUM3oN1IW/CVsQl/1glY5DagrW9uncMdHMEQPsEiuwFtfQMwxlhzilqH
NzAp8gSHEKWtL415B3On1AcDLuAGzkC14CCwogP5zRhjzbmHmlZhDI7T0xG0Dy8Qu3mGPYg6BXPMtUZN
O/AKBmyDnVnsAy7hKtgWtdM2GGuOuUU9gJ34N0fUtljUNejzmzHa5sxUqaCdRS1UMB/ZsRzPMS1qsXRk
Y2aO7N9Kh+IB/HQoxpozAmvU5NGblK+N3ThiJ9gqXxtXbkoup0sau5F5FtvLsAZFpVfP6+U4JqVXbwKP
8OvVK6nx45DLp8oiKRvQSP/6wC6oqvoGcPN07m2yHI8AAAAASUVORK5CYII=
</value>
</data>
</root>
56 changes: 56 additions & 0 deletions QuakeFocus Pro/Controls/localPane.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
Public Class localPane
Private Sub localPane_Load(sender As Object, e As EventArgs) Handles MyBase.Load
'Localize Control

If My.Settings.prefixLang = "en" Then
Label1.Text = "Local" & vbCrLf & "PGA:"
Label3.Text = "Local" & vbCrLf & "Int:"
ReplayToolStripMenuItem.Text = "リプレイ"
SettingsToolStripMenuItem.Text = "設定"
Else
Label1.Text = "ローカル" & vbCrLf & "PGA:"
Label3.Text = "ローカル" & vbCrLf & "Int:"
ReplayToolStripMenuItem.Text = "Replay"
SettingsToolStripMenuItem.Text = "Settings"
End If

End Sub

Private Sub Panel5_Paint(sender As Object, e As PaintEventArgs)

End Sub

Public Function requestLocalizeRefresh()

If My.Settings.prefixLang = "en" Then
Label1.Text = "Local" & vbCrLf & "PGA:"
Label3.Text = "Local" & vbCrLf & "Int:"
ReplayToolStripMenuItem.Text = "Replay"
SettingsToolStripMenuItem.Text = "Settings"

Else
Label1.Text = "ローカル" & vbCrLf & "PGA:"
Label3.Text = "ローカル" & vbCrLf & "Int:"
ReplayToolStripMenuItem.Text = "リプレイ"
SettingsToolStripMenuItem.Text = "設定"

End If
End Function

Private Sub settingsBTN_Click(sender As Object, e As EventArgs) Handles settingsBTN.Click
' MessageBox.Show("申し訳ありませんが、この機能はINDEV-V0.15ではまだ利用できません。" & vbCrLf & vbCrLf & "We're sorry, but this feature is not available in INDEV-V0.15", "設定/SETTINGS", MessageBoxButtons.OK, MessageBoxIcon.Warning)
Dim btnSender As Button = CType(sender, Button)
Dim ptLowerLeft As Point = New Point(0, btnSender.Height)
ptLowerLeft = btnSender.PointToScreen(ptLowerLeft)
ctxHlp.Show(ptLowerLeft)

End Sub

Private Sub ReplayToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ReplayToolStripMenuItem.Click
frmReplay.Show()
End Sub

Private Sub SettingsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SettingsToolStripMenuItem.Click

End Sub
End Class
2 changes: 1 addition & 1 deletion QuakeFocus Pro/My Project/Application.myapp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<MyApplicationData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<MySubMain>true</MySubMain>
<MainForm>viewPage</MainForm>
<SingleInstance>false</SingleInstance>
Expand Down
2 changes: 1 addition & 1 deletion QuakeFocus Pro/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("")>
<Assembly: AssemblyProduct("QuakeFocus Pro")>
<Assembly: AssemblyCopyright("Copyright © 2021")>
<Assembly: AssemblyCopyright("Compiled by Wriar (c) 2022. Code is licensed under appropriate license listed in repository")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>
Expand Down
Loading