Skip to content

Commit

Permalink
Renamed project and changed versioning and added icon
Browse files Browse the repository at this point in the history
  • Loading branch information
SerdoSchofield committed Mar 6, 2019
1 parent 37c5526 commit 282feb1
Show file tree
Hide file tree
Showing 71 changed files with 47 additions and 40 deletions.
9 changes: 6 additions & 3 deletions MultiTermTBXMapper.sln → MultiTermTBXConverter.sln
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTermTBXMapper", "MultiTermTBXMapper\MultiTermTBXMapper.csproj", "{AD821F96-2301-4191-AC5D-D02AA7869F5F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTermTBXConverter", "MultiTermTBXConverter\MultiTermTBXConverter.csproj", "{AD821F96-2301-4191-AC5D-D02AA7869F5F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -19,4 +19,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {EDDF91F5-90E6-41C2-BC5C-B727AFD358F1}
EndGlobalSection
EndGlobal
Expand Up @@ -7,12 +7,12 @@
mc:Ignorable="d"
Title="About" Height="300" Width="400" ResizeMode="NoResize">
<Grid>
<TextBlock HorizontalAlignment="Center" Margin="0,22,0,0" TextWrapping="Wrap" Text="MultiTerm Mapping Utility" VerticalAlignment="Top"/>
<Label HorizontalAlignment="Center" Margin="0,38,0,0" Content="v0.01" VerticalAlignment="Top"/>
<TextBlock HorizontalAlignment="Center" Margin="0,22,0,0" TextWrapping="Wrap" Text="MultiTerm to TBX Converter" VerticalAlignment="Top"/>
<Label Name="VersionLabel" HorizontalAlignment="Center" Margin="0,38,0,0" Content="[Version Number]" VerticalAlignment="Top"/>
<Label HorizontalAlignment="Left" Margin="15,70,0,0" Content="Author :" VerticalAlignment="Top" FontSize="10" />
<Label HorizontalAlignment="Left" Margin="70,70,0,0" Content="Brigham Young University Translation Research Group (BYU TRG)" VerticalAlignment="Top" FontSize="10" Width="300px"/>
<Label HorizontalAlignment="Left" Margin="15,90,0,0" Content="Contact :" VerticalAlignment="Top" FontSize="10" />
<Label HorizontalAlignment="Left" Margin="70,90,0,0" Content="byutrg@gmail.com" VerticalAlignment="Top" FontSize="10" Width="300px"/>
<Label HorizontalAlignment="Left" Margin="70,90,0,0" Content="byutrg@gmail.com, ltacglobal.org@gmail.com" VerticalAlignment="Top" FontSize="10" Width="300px"/>
<TextBox Name="aboutText" HorizontalAlignment="Stretch" Margin="5,120,5,35" TextWrapping="Wrap" VerticalAlignment="Stretch" FontSize="9" Text=""/>
<Button Content="OK" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,5" Width="80" Height="25" Click="Button_Click"/>
</Grid>
Expand Down
Expand Up @@ -7,6 +7,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Diagnostics;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
Expand All @@ -24,7 +25,11 @@ public About()
{
InitializeComponent();

System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
FileVersionInfo info = FileVersionInfo.GetVersionInfo(assembly.Location);
VersionLabel.Content = $"v{info.FileVersion.ToString()}";
aboutText.Text = File.ReadAllText("Resources\\AboutInfo.txt");

}

private void Button_Click(object sender, RoutedEventArgs e)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -1627,10 +1627,11 @@ private void prettyPrintFile(string printPath)
XmlWriterSettings settings = new XmlWriterSettings();
settings.Indent = true;
settings.IndentChars = "\t";
XmlWriter writer = XmlWriter.Create(printPath, settings);
multiTermDoc.WriteTo(writer);
writer.Flush();
writer.Close();
using (XmlWriter writer = XmlWriter.Create(printPath, settings))
{
multiTermDoc.WriteTo(writer);
writer.Flush();
}
}

private void addNameSpace(XmlNode currentNode)
Expand Down Expand Up @@ -1726,7 +1727,7 @@ private void convertXML(FileStream xmlData, string outputPath, LevelOneClass ini
SaveFileDialog dlg = new SaveFileDialog();

dlg.DefaultExt = ".tbx";
dlg.Filter = "TBX File *.tbx | *.tbx";
dlg.Filter = "TBX File (*.tbx)|*.tbx";
bool? result = dlg.ShowDialog();

string outputPath = "";
Expand Down
File renamed without changes.
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:MultiTermTBXMapper"
mc:Ignorable="d"
Title="MultiTerm Data Category Mapper" Height="482.353" Width="815.197" ResizeMode="CanResizeWithGrip" Closed="Window_Closed">
Title="MultiTerm to TBX Converter" Height="482.353" Width="815.197" ResizeMode="CanResizeWithGrip" Closed="Window_Closed" Icon="Resources/tbxLogo_asymmetricX_blue.png">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="161*"/>
Expand Down
File renamed without changes.
Expand Up @@ -446,7 +446,7 @@ public TemplateSet()
/// </summary>
public string Serialize()
{
IEnumerable<string> items = from x in this
IEnumerable<string> items = from x in this.AsParallel()
select (x as ISerializable).Serialize();

return SerializationHelper.Serialize("[]", items, x => x);
Expand Down Expand Up @@ -503,7 +503,7 @@ public KeyList()
#region ISerializable members
public string Serialize()
{
IEnumerable<string> items = from item in this
IEnumerable<string> items = from item in this.AsParallel()
select (item as ISerializable).Serialize();

return SerializationHelper.Serialize("[]", items, x => x);
Expand Down
Expand Up @@ -63,7 +63,7 @@ public void UtilizeState<T>(ref T r)
Microsoft.Win32.SaveFileDialog dlg = new Microsoft.Win32.SaveFileDialog();

dlg.DefaultExt = ".json";
dlg.Filter = "JSON Files (*.json)|*.json";
dlg.Filter = "JSON Files (*.json)|*.json|All Files (*.*)|*.*";

bool? result = dlg.ShowDialog();

Expand Down Expand Up @@ -94,7 +94,7 @@ public void UtilizeState<T>(ref T r)
Microsoft.Win32.SaveFileDialog dlg = new Microsoft.Win32.SaveFileDialog();

dlg.DefaultExt = ".json";
dlg.Filter = "JSON Files (*.json)|*.json";
dlg.Filter = "JSON Files (*.json)|*.json|All files (*.*)|*.*";

bool? result = dlg.ShowDialog();

Expand Down
File renamed without changes.
File renamed without changes.
Expand Up @@ -48,8 +48,8 @@ private void btn_import_Click(object sender, RoutedEventArgs e)
{
Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();

dlg.DefaultExt = ".tbx";
dlg.Filter = "XML Files (*.xml)|*.xml | TBX Files (*.tbx)|*.tbx | All files (*.*)|*.*";
dlg.DefaultExt = ".json";
dlg.Filter = "JSON Files (*.json)|*.json|All files (*.*)|*.*";

bool? result = dlg.ShowDialog();

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -66,8 +66,8 @@ private void btn_import_Click(object sender, RoutedEventArgs e)

Microsoft.Win32.OpenFileDialog dlg = new Microsoft.Win32.OpenFileDialog();

dlg.DefaultExt = ".tbx";
dlg.Filter = "XML Files (*.xml)|*.xml | TBX Files (*.tbx)|*.tbx | All files (*.*)|*.*";
dlg.DefaultExt = ".xml";
dlg.Filter = "XML Files (*.xml)|*.xml|TBX Files (*.tbx)|*.tbx|All files (*.*)|*.*";

bool? result = dlg.ShowDialog();

Expand Down
File renamed without changes.
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{AD821F96-2301-4191-AC5D-D02AA7869F5F}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MultiTermTBXMapper</RootNamespace>
<AssemblyName>MultiTermTBXMapper</AssemblyName>
<RootNamespace>MultiTermTBXConverter</RootNamespace>
<AssemblyName>MultiTermTBXConverter</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down Expand Up @@ -294,9 +294,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\arrow_skinny.png" />
<Content Include="Perl\mt2tbx.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Resource Include="Resources\tbxLogo_asymmetricX_blue.png" />
<Content Include="Resources\tbx_data_categories_with_definitions_picklists.sql">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand All @@ -315,9 +313,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="Perl\out\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
<Visible>False</Visible>
Expand Down
Expand Up @@ -7,12 +7,12 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("MultiTermTBXMapper")]
[assembly: AssemblyTitle("MultiTerm to TBX Converter")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("MultiTermTBXMapper")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCompany("Brigham Young University / LTAC Global")]
[assembly: AssemblyProduct("MultiTerm to TBX Converter")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.1.0")]
[assembly: AssemblyFileVersion("2.2.1.0")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

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

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

3 changes: 3 additions & 0 deletions MultiTermTBXConverter/Resources/AboutInfo.txt
@@ -0,0 +1,3 @@
This program is provided as-is and is free to use. This program is not affliated in any way with SDL.

Developers: James Hayes (GitHub: SerdoSchofield), Kaden Carr (GitHub: kadencarr)
File renamed without changes
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file removed MultiTermTBXMapper/Perl/mt2tbx.exe
Binary file not shown.
1 change: 0 additions & 1 deletion MultiTermTBXMapper/Resources/AboutInfo.txt

This file was deleted.

0 comments on commit 282feb1

Please sign in to comment.