Skip to content

Commit

Permalink
- Implemented Exceptionless #67
Browse files Browse the repository at this point in the history
- Worked on localization #49
- Reformatted some code and moved some files
- Fixed some bugs with the ProfileEditor
- Replaced some code-behind with Bindings
- Updated Mahapps.Metro
- CHanged autor to author in Mods
  • Loading branch information
JBou committed Aug 30, 2014
1 parent e1d5548 commit 4b1b9bc
Show file tree
Hide file tree
Showing 112 changed files with 34,831 additions and 863 deletions.
8 changes: 0 additions & 8 deletions BindableRichTextBox.xaml

This file was deleted.

35 changes: 0 additions & 35 deletions BindableRichTextBox.xaml.vb

This file was deleted.

Binary file removed McMetroLauncher Banner-white.png
Binary file not shown.
4 changes: 2 additions & 2 deletions McMetroLauncher-Manager/ForgeEditor.xaml.vb
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ Public Class ForgeEditor
'Private Sub btn_save_Click(sender As Object, e As RoutedEventArgs) Handles btn_save.Click
' 'Überprüfen ob es eine gültige Uri ist:

' If tb_description.Text = Nothing Or tb_downloadlink.Text = Nothing Or tb_name.Text = Nothing Or tb_video.Text = Nothing Or tb_website.Text = Nothing Or tb_autor.Text = Nothing Then
' If tb_description.Text = Nothing Or tb_downloadlink.Text = Nothing Or tb_name.Text = Nothing Or tb_video.Text = Nothing Or tb_website.Text = Nothing Or tb_author.Text = Nothing Then
' MessageBox.Show("Bitte fülle alle Felder aus!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Information)
' Else
' Dim frgMod As New ForgeMod(tb_name.Text, tb_autor.Text, cb_versions.SelectedItem.ToString, tb_description.Text, tb_downloadlink.Text, tb_video.Text, tb_website.Text, lb_needed_mods.Items.Cast(Of String)().ToList)
' Dim frgMod As New ForgeMod(tb_name.Text, tb_author.Text, cb_versions.SelectedItem.ToString, tb_description.Text, tb_downloadlink.Text, tb_video.Text, tb_website.Text, lb_needed_mods.Items.Cast(Of String)().ToList)
' If NewMod = True Then
' 'Shauen ob es bereits existiert
' If Mods.Get_Mods(cb_versions.SelectedItem.ToString).Contains(tb_name.Text.ToString) Then
Expand Down
12 changes: 0 additions & 12 deletions McMetroLauncher-Manager/McMetroLauncher-Manager.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@
<PropertyGroup>
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Test|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<OutputPath>bin\Test\</OutputPath>
<DocumentationFile>McMetroLauncher-Manager.xml</DocumentationFile>
<NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="MahApps.Metro">
<HintPath>..\..\MahApps.Metro\MahApps.Metro\bin\Debug\NET45\MahApps.Metro.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion McMetroLauncher-Manager/ModEditor.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</ListBox>
<Label Content="Versionen:" HorizontalAlignment="Left" Margin="564,10,0,0" VerticalAlignment="Top" Width="294" HorizontalContentAlignment="Center" Foreground="#FF00B9FF" FontSize="25" Height="43"/>
<Label Content="Autor:" HorizontalAlignment="Left" Margin="10,54,0,0" VerticalAlignment="Top" Height="26" Width="119" Padding="0" VerticalContentAlignment="Center" FontSize="13"/>
<TextBox x:Name="tb_autor" HorizontalAlignment="Left" Height="33" Margin="134,51,0,0" VerticalAlignment="Top" Width="425" MaxLines="1"/>
<TextBox x:Name="tb_author" HorizontalAlignment="Left" Height="33" Margin="134,51,0,0" VerticalAlignment="Top" Width="425" MaxLines="1"/>
<Label Content="ID:" HorizontalAlignment="Left" Margin="10,0,0,86" VerticalAlignment="Bottom" Width="119" Height="32" VerticalContentAlignment="Center" Padding="0,-1,0,0" FontSize="13"/>
<Label Content="Type:" HorizontalAlignment="Left" Margin="615,0,0,86" VerticalAlignment="Bottom" Width="65" Height="35" VerticalContentAlignment="Center" Padding="0,-1,0,0" FontSize="13"/>
<TextBox x:Name="tb_id" HorizontalAlignment="Left" Height="32" Margin="134,0,0,86" VerticalAlignment="Bottom" Width="351" MaxLines="1"/>
Expand Down
18 changes: 9 additions & 9 deletions McMetroLauncher-Manager/ModEditor.xaml.vb
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Public Class ModEditor
tb_name.Text = Moditem.name
tb_website.Text = Moditem.website
tb_video.Text = Moditem.video
tb_autor.Text = Moditem.autor
tb_author.Text = Moditem.author
tb_id.Text = Moditem.id
cb_extension.SelectedItem = Moditem.extension
cb_type.SelectedItem = Moditem.type
Expand Down Expand Up @@ -103,7 +103,7 @@ Public Class ModEditor
End With
End Sub

Private Sub tb_autor_TextChanged(sender As Object, e As TextChangedEventArgs) Handles tb_name.TextChanged
Private Sub tb_author_TextChanged(sender As Object, e As TextChangedEventArgs) Handles tb_name.TextChanged
Moditem.name = tb_name.Text
End Sub

Expand All @@ -116,8 +116,8 @@ Public Class ModEditor
End If
End Sub

Private Sub tb_autor_TextChanged_1(sender As Object, e As TextChangedEventArgs) Handles tb_autor.TextChanged
Moditem.autor = tb_autor.Text
Private Sub tb_author_TextChanged_1(sender As Object, e As TextChangedEventArgs) Handles tb_author.TextChanged
Moditem.author = tb_author.Text
End Sub

Private Sub tb_id_TextChanged(sender As Object, e As TextChangedEventArgs) Handles tb_id.TextChanged
Expand Down Expand Up @@ -175,7 +175,7 @@ Public Class ModEditor

Private Async Sub btn_save_Click(sender As Object, e As RoutedEventArgs) Handles btn_save.Click
Dim allinformation As Boolean = True
If tb_name.Text = Nothing Or tb_autor.Text = Nothing Or tb_id.Text = Nothing Or tb_video.Text = Nothing Or tb_website.Text = Nothing Or cb_extension.SelectedIndex = -1 Or cb_type.SelectedIndex = -1 Then
If tb_name.Text = Nothing Or tb_author.Text = Nothing Or tb_id.Text = Nothing Or tb_video.Text = Nothing Or tb_website.Text = Nothing Or cb_extension.SelectedIndex = -1 Or cb_type.SelectedIndex = -1 Then
allinformation = False
End If
If lb_versions.Items.Count = 0 Then
Expand All @@ -187,7 +187,7 @@ Public Class ModEditor
Else
Dim Modification As New Modifications.Mod() With {
.descriptions = Moditem.descriptions,
.autor = tb_autor.Text,
.author = tb_author.Text,
.extension = cb_extension.SelectedItem.ToString,
.id = tb_id.Text,
.name = tb_name.Text,
Expand Down Expand Up @@ -258,7 +258,7 @@ End Class
' tb_video.Text = Mods.videoAt(loadedversion, loadedmodindex)
' tb_downloadlink.Text = Mods.downloadlinkAt(loadedversion, loadedmodindex)
' tb_description.Text = Mods.descriptionAt(loadedversion, loadedmodindex)
' tb_autor.Text = Mods.AutorAt(loadedversion, loadedmodindex)
' tb_author.Text = Mods.authorAt(loadedversion, loadedmodindex)
' tb_filename.Text = Mods.idAt(loadedversion, loadedmodindex)
' For Each item As String In Mods.needed_modsAt(loadedversion, loadedmodindex)
' lb_needed_mods.Items.Add(item)
Expand All @@ -270,10 +270,10 @@ End Class
' Private Sub btn_save_Click(sender As Object, e As RoutedEventArgs) Handles btn_save.Click
' 'Überprüfen ob es eine gültige Uri ist:

' If tb_description.Text = Nothing Or tb_downloadlink.Text = Nothing Or tb_name.Text = Nothing Or tb_video.Text = Nothing Or tb_website.Text = Nothing Or tb_autor.Text = Nothing Then
' If tb_description.Text = Nothing Or tb_downloadlink.Text = Nothing Or tb_name.Text = Nothing Or tb_video.Text = Nothing Or tb_website.Text = Nothing Or tb_author.Text = Nothing Then
' MessageBox.Show("Bitte fülle alle Felder aus!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Information)
' Else
' Dim frgMod As New ForgeMod(tb_name.Text, tb_autor.Text, cb_versions.SelectedItem.ToString, tb_description.Text, tb_downloadlink.Text, tb_video.Text, tb_website.Text, tb_filename.Text, cb_extension.SelectedItem.ToString, cb_type.SelectedItem.ToString, lb_needed_mods.Items.Cast(Of String)().ToList, False)
' Dim frgMod As New ForgeMod(tb_name.Text, tb_author.Text, cb_versions.SelectedItem.ToString, tb_description.Text, tb_downloadlink.Text, tb_video.Text, tb_website.Text, tb_filename.Text, cb_extension.SelectedItem.ToString, cb_type.SelectedItem.ToString, lb_needed_mods.Items.Cast(Of String)().ToList, False)
' If NewMod = True Then
' 'Shauen ob es bereits existiert
' If Mods.Get_Mods(cb_versions.SelectedItem.ToString, modsfolder).Select(Function(p) p.name.ToString).Contains(tb_name.Text.ToString) Then
Expand Down
4 changes: 2 additions & 2 deletions McMetroLauncher-Manager/ModManager.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<Label Content="Name:" HorizontalAlignment="Right" Margin="0,10,690,0" VerticalAlignment="Top"/>
<Label Content="Description:" HorizontalAlignment="Right" Margin="0,45,298,0" VerticalAlignment="Top" Width="78"/>
<ComboBox x:Name="cb_descriptions" DisplayMemberPath="id" HorizontalAlignment="Right" Margin="0,45,214,0" VerticalAlignment="Top" Width="79"/>
<Label Content="Autor:" HorizontalAlignment="Right" Margin="0,45,690,0" VerticalAlignment="Top" Width="44"/>
<Label Content="author:" HorizontalAlignment="Right" Margin="0,45,690,0" VerticalAlignment="Top" Width="44"/>
<ListView x:Name="lb_mods" Margin="10,10,739,10" BorderThickness="0">
<ListView.View>
<!--<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle}" AllowsColumnReorder="False">
Expand Down Expand Up @@ -71,7 +71,7 @@
</ListBox.ItemContainerStyle>
</ListBox>
<Label Content="Versionen:" HorizontalAlignment="Right" Margin="0,4,10,0" VerticalAlignment="Top" Width="199" HorizontalContentAlignment="Center" Foreground="{StaticResource AccentColorBrush}" FontSize="18" Height="35"/>
<Label x:Name="lbl_autor" HorizontalAlignment="Right" Height="27" Margin="0,44,383,0" VerticalAlignment="Top" Width="302" FontSize="14" Padding="5,0" VerticalContentAlignment="Center" RenderTransformOrigin="0.5,0.5" />
<Label x:Name="lbl_author" HorizontalAlignment="Right" Height="27" Margin="0,44,383,0" VerticalAlignment="Top" Width="302" FontSize="14" Padding="5,0" VerticalContentAlignment="Center" RenderTransformOrigin="0.5,0.5" />
<Label Content="Video:" HorizontalAlignment="Right" Margin="0,0,669,117" VerticalAlignment="Bottom" Width="65" Height="31"/>
<Label x:Name="lbl_video" HorizontalAlignment="Right" Height="31" Margin="0,0,10,81" VerticalAlignment="Bottom" Width="654"/>
<Label Content="ID:" HorizontalAlignment="Right" Margin="0,0,669,45" VerticalAlignment="Bottom" Width="65" Height="31"/>
Expand Down
6 changes: 3 additions & 3 deletions McMetroLauncher-Manager/ModManager.xaml.vb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Public Class ModManager
' lbl_website.Content = DirectCast(lb_mods.SelectedItem, ForgeMod).Website
' lbl_video.Content = DirectCast(lb_mods.SelectedItem, ForgeMod).video
' lbl_downloadlink.Content = DirectCast(lb_mods.SelectedItem, ForgeMod).Downloadlink
' lbl_autor.Content = DirectCast(lb_mods.SelectedItem, ForgeMod).autor
' lbl_author.Content = DirectCast(lb_mods.SelectedItem, ForgeMod).author
' lb_needed_mods.Items.Clear()
' For Each item As String In DirectCast(lb_mods.SelectedItem, ForgeMod).needed_mods
' lb_needed_mods.Items.Add(item)
Expand All @@ -89,7 +89,7 @@ Public Class ModManager
' ' lbl_website.Content = Mods.websiteAt(cb_modversions.SelectedItem.ToString, lb_mods.SelectedIndex)
' ' lbl_video.Content = Mods.videoAt(cb_modversions.SelectedItem.ToString, lb_mods.SelectedIndex)
' ' lbl_downloadlink.Content = Mods.downloadlinkAt(cb_modversions.SelectedItem.ToString, lb_mods.SelectedIndex)
' ' lbl_autor.Content = Mods.AutorAt(cb_modversions.SelectedItem.ToString, lb_mods.SelectedIndex)
' ' lbl_author.Content = Mods.authorAt(cb_modversions.SelectedItem.ToString, lb_mods.SelectedIndex)
' ' lb_needed_mods.Items.Clear()
' ' For Each item As String In Mods.needed_modsAt(cb_modversions.SelectedItem.ToString, lb_mods.SelectedIndex)
' ' lb_needed_mods.Items.Add(item)
Expand All @@ -109,7 +109,7 @@ Public Class ModManager
'tb_description.Text = DirectCast(lb_mods.SelectedItem, ForgeMod).description
lbl_website.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).website
lbl_video.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).video
lbl_autor.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).autor
lbl_author.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).author
lbl_ID.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).id
lbl_extension.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).extension
lbl_type.Content = DirectCast(lb_mods.SelectedItem, Modifications.Mod).type
Expand Down
30 changes: 15 additions & 15 deletions McMetroLauncher-Manager/Mods.vb
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ Public Structure Modifications
End Set
End Property
Private m_name As String
Public Property autor() As String
Public Property author() As String
Get
Return m_autor
Return m_author
End Get
Set(value As String)
m_autor = value
m_author = value
End Set
End Property
Private m_autor As String
Private m_author As String
Public Property descriptions() As IList(Of Description)
Get
Return m_description
Expand Down Expand Up @@ -418,7 +418,7 @@ End Structure
' Else
' installed = False
' End If
' list.Add(New ForgeMod(Mods.NameAt(version, i), Mods.AutorAt(version, i), version, Mods.descriptionAt(version, i), Mods.downloadlinkAt(version, i), Mods.videoAt(version, i), Mods.websiteAt(version, i), Mods.idAt(version, i), extension,Mods.typeAt(version, i), Mods.needed_modsAt(version, i), installed))
' list.Add(New ForgeMod(Mods.NameAt(version, i), Mods.authorAt(version, i), version, Mods.descriptionAt(version, i), Mods.downloadlinkAt(version, i), Mods.videoAt(version, i), Mods.websiteAt(version, i), Mods.idAt(version, i), extension,Mods.typeAt(version, i), Mods.needed_modsAt(version, i), installed))
' Next
' list = list.OrderBy(Function(p) p.name).ToList
' Return list
Expand All @@ -433,8 +433,8 @@ End Structure
' Return versionsinfo
' End Function

' Public Shared Function AutorAt(ByVal version As String, index As Integer) As String
' Dim versionsinfo As String = modsjo("mods")(version).ElementAt(index).Value(Of String)("autor").ToString
' Public Shared Function authorAt(ByVal version As String, index As Integer) As String
' Dim versionsinfo As String = modsjo("mods")(version).ElementAt(index).Value(Of String)("author").ToString
' Return versionsinfo
' End Function

Expand Down Expand Up @@ -491,7 +491,7 @@ End Structure
' Dim modproperties As JObject = New JObject

' modproperties.Add(New JProperty("name", ForgeMod.name))
' modproperties.Add(New JProperty("autor", ForgeMod.autor))
' modproperties.Add(New JProperty("author", ForgeMod.author))
' modproperties.Add(New JProperty("description", ForgeMod.description))
' modproperties.Add(New JProperty("downloadlink", ForgeMod.Downloadlink))
' modproperties.Add(New JProperty("video", ForgeMod.video))
Expand Down Expand Up @@ -524,7 +524,7 @@ End Structure
' 'Dim modproperties As JObject = New JObject
' 'Dim modarray As JArray = CType(modsjo("mods")(editedmodversion), JArray)
' 'modproperties.Add(New JProperty("name", ForgeMod.name))
' 'modproperties.Add(New JProperty("autor", ForgeMod.autor))
' 'modproperties.Add(New JProperty("author", ForgeMod.author))
' 'modproperties.Add(New JProperty("description", ForgeMod.description))
' 'modproperties.Add(New JProperty("downloadlink", ForgeMod.Downloadlink))
' 'modproperties.Add(New JProperty("video", ForgeMod.video))
Expand Down Expand Up @@ -615,7 +615,7 @@ End Structure
'End Class

'Public Class ForgeMod
' Private _name As String, _autor As String, _version As String, _video As String, _description As String, _downloadlink As String, _website As String, _id As String, _extension As String, _type As String, _needed_mods As IList(Of String), _installed As Boolean
' Private _name As String, _author As String, _version As String, _video As String, _description As String, _downloadlink As String, _website As String, _id As String, _extension As String, _type As String, _needed_mods As IList(Of String), _installed As Boolean

' Public Property name As String
' Get
Expand All @@ -635,12 +635,12 @@ End Structure
' End Set
' End Property

' Public Property autor As String
' Public Property author As String
' Get
' Return _autor
' Return _author
' End Get
' Set(value As String)
' _autor = value
' _author = value
' End Set
' End Property

Expand Down Expand Up @@ -726,7 +726,7 @@ End Structure
' End Set
' End Property

' Public Sub New(name As String, autor As String, version As String, description As String, downloadlink As String, video As String, website As String, id As String, extension As String, type As String, needed_mods As IList(Of String), installed As Boolean)
' Public Sub New(name As String, author As String, version As String, description As String, downloadlink As String, video As String, website As String, id As String, extension As String, type As String, needed_mods As IList(Of String), installed As Boolean)
' Me.name = name
' Me.description = description
' Me.downloadlink = downloadlink
Expand All @@ -737,7 +737,7 @@ End Structure
' Me.extension = extension
' Me.type = type
' Me.needed_mods = needed_mods
' Me.autor = autor
' Me.author = author
' Me.installed = installed
' End Sub
'End Class
Loading

1 comment on commit 4b1b9bc

@JBou
Copy link
Owner Author

@JBou JBou commented on 4b1b9bc Sep 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closes #68

Please sign in to comment.