Skip to content

Commit

Permalink
minor setting changes, fix save updates
Browse files Browse the repository at this point in the history 
- fix where the 'update saves' button was never visible to update the
related saves when changing graphics. this may be the cause of some of
the weird bug reports.
- changed the title on the background image
- added a button for jodgap's database on the main toolbar
- fixed the furniture button's tooltip
- reverted 'botany' to 'herbalism' as per Meph's request
  • Loading branch information
@splintermind
splintermind committed Jan 2, 2014
1 parent d3329d0 commit a1c653b
Show file tree
Hide file tree
Showing 13 changed files with 1,690 additions and 1,661 deletions.
Binary file modified Masterwork Dwarf Fortress.exe
View file
Binary file not shown.
3,295 changes: 1,655 additions & 1,640 deletions Settings Source/MainForm.Designer.vb
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Settings Source/MainForm.vb
View file
Expand Up @@ -52,7 +52,7 @@ Imports System.ComponentModel
randomCreaturesExistCheck()

If fileWorking.savedGameDirs.Count > 1 Then
btnUpdateSaves.Enabled = True
btnUpdateSaves.Enabled = True : btnUpdateSaves.Visible = True
End If

'cycle through all our tabs to ensure everything is visible immediately
Expand Down Expand Up @@ -154,7 +154,7 @@ Imports System.ComponentModel
#Region "tileset change and preview"

Private Sub btnUpdateSaves_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnUpdateSaves.Click
graphicsSets.updateSavedGames()
graphicsSets.updateSavedGames()
End Sub

Private Sub btnTilesetPreview_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnTilesetPreview.Click
Expand Down
2 changes: 2 additions & 0 deletions Settings Source/Masterwork Dwarf Fortress.vbproj
View file
Expand Up @@ -373,6 +373,8 @@
<ItemGroup>
<Content Include="32.ico" />
<Content Include="64.ico" />
<None Include="Resources\fb-1024x576c.jpg" />
<None Include="Resources\database-cloud.png" />
<None Include="Resources\gear--plus.png" />
<None Include="Resources\ajax-loader.gif" />
<None Include="Resources\color.png" />
Expand Down
4 changes: 2 additions & 2 deletions Settings Source/My Project/AssemblyInfo.vb
View file
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.0.0.5")>
<Assembly: AssemblyFileVersion("2.0.0.5")>
<Assembly: AssemblyVersion("2.0.0.6")>
<Assembly: AssemblyFileVersion("2.0.0.6")>
14 changes: 12 additions & 2 deletions Settings Source/My Project/Resources.Designer.vb
View file

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

27 changes: 15 additions & 12 deletions Settings Source/My Project/Resources.resx
View file
Expand Up @@ -166,21 +166,24 @@
<data name="book_question" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\book-question.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tick_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tick-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wiki" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wiki.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="globe_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\globe-green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ajax-loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ajax-loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="isoworld" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\isoworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="books_stack" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\books-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="gear__plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DF" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\DF.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand All @@ -190,18 +193,21 @@
<data name="soundsense" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\soundsense.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="tick_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tick-small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="LAA" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\LAA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fb_1024x576" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fb-1024x576.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="database-cloud" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\database-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="transp_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\transp-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="application" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\application.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="perfect_world" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\perfect world.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
Expand All @@ -214,10 +220,7 @@
<data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ajax-loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ajax-loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="gear__plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\gear--plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="fb-1024x576c" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fb-1024x576c.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added Settings Source/Resources/database-cloud.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Settings Source/Resources/fb-1024x576.jpg
View file
Binary file not shown.
Binary file removed Settings Source/Resources/fb-1024x576.jpg.old
View file
Binary file not shown.
Binary file added Settings Source/Resources/fb-1024x576c.jpg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions Settings Source/management classes/fileWorking.vb
View file
Expand Up @@ -174,8 +174,7 @@ Public Class fileWorking

Public Shared Function savedGameDirs() As List(Of IO.DirectoryInfo)
Dim saveDirs As New List(Of IO.DirectoryInfo)
Try
Dim dfRawPath As String = IO.Path.Combine(globals.m_dwarfFortressRootDir, "raw")
Try
Dim savePath As String = IO.Path.Combine(globals.m_dwarfFortressRootDir, "data", "save")

If IO.Directory.Exists(savePath) Then
Expand Down
2 changes: 1 addition & 1 deletion Settings Source/management classes/graphicsSets.vb
View file
Expand Up @@ -140,8 +140,8 @@ Public Class graphicsSets
If fsp.DirectoryExists(saveGraphicsPath) Then fsp.DeleteDirectory(saveGraphicsPath, FileIO.DeleteDirectoryOption.DeleteAllContents)
'copy all the raws
fsp.CopyDirectory(dfRawPath, saveRawPath, True)
MsgBox("Saved games have been updated successfully!", MsgBoxStyle.Information + MsgBoxStyle.OkOnly)
Next
MsgBox("Saved games have been updated successfully!", MsgBoxStyle.Information + MsgBoxStyle.OkOnly)
Else
MsgBox("No saved games found to update.", MsgBoxStyle.Information + MsgBoxStyle.OkOnly)
End If
Expand Down

0 comments on commit a1c653b

Please sign in to comment.