Skip to content

Commit 27e02f2

Browse files
valdavalda
committed
rebase to WryeBash 294.2+.
1 parent e75feab commit 27e02f2

14 files changed

Lines changed: 299 additions & 100 deletions

‎Mopy/DebugLog(Python2.7).bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C:/Python27/Python.exe "Wrye Bash Debug.py" -d > BashBugDump.log
1+
C:/Python27/Python.exe "Wrye Bash Debug.py" -d 1>BashBugDump.log 2>&1

‎Mopy/Wrye Bash.html‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ <h3><a id='Contents'>Contents</a></h3>
103103
<p class="list-2">&bull;&nbsp; <a href="#ExportImportSpellStats">Export/Import Spell Stats</a></p>
104104
<p class="list-2">&bull;&nbsp; <a href="#Details">Details</a></p>
105105
<p class="list-2">&bull;&nbsp; <a href="#ListMastersMod">List Masters (Mod)</a></p>
106+
<p class="list-2">&bull;&nbsp; <a href="#CreateBOSSReport">Create BOSS Report</a></p>
106107
<p class="list-2">&bull;&nbsp; <a href="#MarkLevelers">Mark Levelers</a></p>
107108
<p class="list-2">&bull;&nbsp; <a href="#MarkMergeable">Mark Mergeable</a></p>
108109
<p class="list-2">&bull;&nbsp; <a href="#NvidiaFogFix">Nvidia Fog Fix</a></p>
@@ -1302,6 +1303,9 @@ <h3><a id='Details'>Details</a></h3>
13021303
<h3><a id='ListMastersMod'>List Masters (Mod)</a></h3>
13031304
<p class="list-1">&bull;&nbsp; Displays list of masters for mod, and copies same list to the clipboard.</p>
13041305
<p class="empty">&nbsp;</p>
1306+
<h3><a id='CreateBOSSReport'>Create BOSS Report</a></h3>
1307+
<p class="list-1">&bull;&nbsp; Generates a report on the selected mods, for posting in the latest BOSS thread. The report includes the plugin name, a link to the download (if it can be determined from the installer), the plugin version, plugin CRC, and ITM and UDR counts (as determined by Wrye Bash, so the ITM count may be less than what TES4Edit reports).</p>
1308+
<p class="empty">&nbsp;</p>
13051309
<h3><a id='MarkLevelers'>Mark Levelers</a></h3>
13061310
<p class="list-1">&bull;&nbsp; Obsolete. Replaced by automatic tagging (see <a href="#BashTags">Bash Tags</a>).</p>
13071311
<p class="empty">&nbsp;</p>
@@ -2612,7 +2616,15 @@ <h2><a id='Versions'>Versions</a></h2>
26122616
<p><i><b>All versions by Wrye unless otherwise noted.</b></i>
26132617
</p>
26142618
<p class="empty">&nbsp;</p>
2615-
<h3><a id='_2942572011DJ_KovrikLojackMetallicowmyk002PacificMorrowindvalda'>294 [25/7/2011] [DJ_Kovrik,Lojack,Metallicow,myk002,PacificMorrowind,valda]</a></h3>
2619+
<p class="empty">&nbsp;</p>
2620+
<h3><a id='_29512122011valdaLojack'>295 [12/12/2011] [valda,Lojack]</a></h3>
2621+
<p class="list-1">&bull;&nbsp; Unicode Mode:</p>
2622+
<p class="list-2">&bull;&nbsp; More bugfixes from valda</p>
2623+
<p class="list-1">&bull;&nbsp; Added activation status as a new mods column/sort option.</p>
2624+
<p class="list-1">&bull;&nbsp; New mod command <a href="#CreateBOSSReport">Create BOSS Report</a> will automatically gather the information you need to report a mod to the BOSS thread.</p>
2625+
<p class="list-1">&bull;&nbsp; BAIN Wizards: Updated the <a href="wizards.html#EditINI"><span style="color:purple;">EditINI</span></a> function to allow comments.</p>
2626+
<p class="empty">&nbsp;</p>
2627+
<h3><a id='_29412572011DJ_KovrikLojackMetallicowmyk002PacificMorrowindvalda'>294.1 [25/7/2011] [DJ_Kovrik,Lojack,Metallicow,myk002,PacificMorrowind,valda]</a></h3>
26162628
<p class="list-1">&bull;&nbsp; Program-wide Changes:</p>
26172629
<p class="list-2">&bull;&nbsp; Wrye Bash has a new directory layout! Now the Mopy directory just contains important files that you can run. All other files have been moved into subdirectories.</p>
26182630
<p class="list-2">&bull;&nbsp; If manually updating, please delete the old Mopy directory before copying the new one in to get rid of the old files</p>
@@ -2671,6 +2683,13 @@ <h3><a id='_2942572011DJ_KovrikLojackMetallicowmyk002PacificMorrowindvalda'>294
26712683
<p class="list-2">&bull;&nbsp; New start menu icon.</p>
26722684
<p class="list-2">&bull;&nbsp; OBSE is now enabled by default if detected.</p>
26732685
<p class="list-2">&bull;&nbsp; Updated Russian Translation (contributed by DJ_Kovrik).</p>
2686+
<p class="list-1">&bull;&nbsp; Additional bugfixes in 294.1:</p>
2687+
<p class="list-2">&bull;&nbsp; Fixed a bug in the Race Patcher that would fail on some Dremora records.</p>
2688+
<p class="list-2">&bull;&nbsp; Fixed a bug when selecting 'Cancel' after trying to export a screenshot from a saved game.</p>
2689+
<p class="list-2">&bull;&nbsp; More Unicode fixes from valda.</p>
2690+
<p class="list-2">&bull;&nbsp; If custom icon extraction fails for a Cutsom Launcher button, Wrye Bash will attempt to fall back to the 16x16 one.</p>
2691+
<p class="list-2">&bull;&nbsp; Fixed a bug where line endings weren't correctly stripped in the INI Edits Tab, resulting in 'boxes' showing in the UI.</p>
2692+
<p class="list-2">&bull;&nbsp; Fixed a bug when Wrye Bash tries to activate a newly built Bashed Patch, and 255 mods are active.</p>
26742693
<p class="empty">&nbsp;</p>
26752694
<h3><a id='_2932762011PacificMorrowindLojackmyk002valdarev1280'>293 [27/6/2011] [PacificMorrowind,Lojack,myk002,valda] [rev 1280]</a></h3>
26762695
<p class="list-1">&bull;&nbsp; <a href="#BashedPatches">Bashed Patch</a>:</p>

‎Mopy/Wrye Bash.txt‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1063,6 +1063,9 @@ These are the commands found on context menu for mods...
10631063
=== List Masters (Mod)
10641064
* Displays list of masters for mod, and copies same list to the clipboard.
10651065

1066+
=== Create BOSS Report
1067+
* Generates a report on the selected mods, for posting in the latest BOSS thread. The report includes the plugin name, a link to the download (if it can be determined from the installer), the plugin version, plugin CRC, and ITM and UDR counts (as determined by Wrye Bash, so the ITM count may be less than what TES4Edit reports).
1068+
10661069
=== Mark Levelers
10671070
* Obsolete. Replaced by automatic tagging (see [[#|Bash Tags]]).
10681071

@@ -2332,7 +2335,19 @@ DELETE PROFILE %s AND THE %d SAVE FILES IT CONTAINS?
23322335
{{CONTENTS=0}}
23332336
**All versions by Wrye unless otherwise noted.**
23342337

2335-
=== 294 [25/7/2011] [DJ_Kovrik,Lojack,Metallicow,myk002,PacificMorrowind,valda]
2338+
2339+
=== 295 [12/12/2011] [valda,Lojack]
2340+
* Unicode Mode:
2341+
* More bugfixes from valda
2342+
* Added activation status as a new mods column/sort option.
2343+
* New mod command [[#|Create BOSS Report]] will automatically gather the information you need to report a mod to the BOSS thread.
2344+
* BAIN Wizards: Updated the [[wizards.html#EditINI|[color=purple]EditINI[/color]]] function to allow comments.
2345+
2346+
=== 294.2 [1/8/2011] [Lojack,myk002,PacificMorrowind]
2347+
* Small fix to the Python race patcher for dremora records
2348+
* Lots of installer fixes
2349+
2350+
=== 294.1 [25/7/2011] [DJ_Kovrik,Lojack,Metallicow,myk002,PacificMorrowind,valda]
23362351
* Program-wide Changes:
23372352
* Wrye Bash has a new directory layout! Now the Mopy directory just contains important files that you can run. All other files have been moved into subdirectories.
23382353
* If manually updating, please delete the old Mopy directory before copying the new one in to get rid of the old files
@@ -2391,6 +2406,13 @@ DELETE PROFILE %s AND THE %d SAVE FILES IT CONTAINS?
23912406
* New start menu icon.
23922407
* OBSE is now enabled by default if detected.
23932408
* Updated Russian Translation (contributed by DJ_Kovrik).
2409+
* Additional bugfixes in 294.1:
2410+
* Fixed a bug in the Race Patcher that would fail on some Dremora records.
2411+
* Fixed a bug when selecting 'Cancel' after trying to export a screenshot from a saved game.
2412+
* More Unicode fixes from valda.
2413+
* If custom icon extraction fails for a Cutsom Launcher button, Wrye Bash will attempt to fall back to the 16x16 one.
2414+
* Fixed a bug where line endings weren't correctly stripped in the INI Edits Tab, resulting in 'boxes' showing in the UI.
2415+
* Fixed a bug when Wrye Bash tries to activate a newly built Bashed Patch, and 255 mods are active.
23942416

23952417
=== 293 [27/6/2011] [PacificMorrowind,Lojack,myk002,valda] [rev 1280]
23962418
* [[#BashedPatches|Bashed Patch]]:

‎Mopy/bash/balt.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ def GetIcon(self):
138138
if not self.icon:
139139
if self.type == wx.BITMAP_TYPE_ICO:
140140
self.icon = wx.Icon(self.file.s,wx.BITMAP_TYPE_ICO,self.iconSize,self.iconSize)
141+
w,h = self.icon.GetWidth(),self.icon.GetHeight()
142+
if (w > self.iconSize or w == 0 or
143+
h > self.iconSize or h == 0):
144+
self.iconSize = 16
145+
self.icon = wx.Icon(self.file.s,wx.BITMAP_TYPE_ICO,self.iconSize,self.iconSize)
141146
else:
142147
self.icon = wx.EmptyIcon()
143148
self.icon.CopyFromBitmap(self.GetBitmap())

‎Mopy/bash/barb.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __init__(self, parent=None, path=None, quit=False):
6363
#end if
6464
self.parent = parent
6565
self.verDat = basher.settings['bash.version']
66-
self.verApp = basher.GetBashVersion()[1]
66+
self.verApp = basher.settings['bash.readme'][1].split('.')[0]
6767
self.files = {}
6868
self.tmp = None
6969

@@ -95,7 +95,8 @@ def CmpDataVersion(self):
9595
return cmp(self.verDat, basher.settings['bash.version'])
9696

9797
def CmpAppVersion(self):
98-
return cmp(self.verApp, basher.settings['bash.readme'][1])
98+
return cmp(self.verApp.split('.')[0], basher.settings['bash.readme'][1].split('.')[0])
99+
#return cmp(self.verApp, basher.settings['bash.readme'][1])
99100

100101
def SameDataVersion(self):
101102
return not self.CmpDataVersion()
@@ -196,7 +197,7 @@ def Apply(self):
196197
# dump the version info and file listing
197198
out = self.tmp.join('backup.dat').open('wb')
198199
cPickle.dump(self.verDat, out, -1) #data version, if this doesn't match the installed data version, do not allow restore
199-
cPickle.dump(self.verApp, out, -1) #app version, if this doesn't match the installer app version, warn the use on restore
200+
cPickle.dump(self.verApp, out, -1) #app version, if this doesn't match the installer app version, warn the user on restore
200201
out.close()
201202

202203
# create the backup archive
@@ -214,7 +215,7 @@ def PromptFile(self):
214215
#returns False if user cancels
215216
if self.archive == None or self.dir.join(self.archive).exists():
216217
dt = datetime.datetime.now()
217-
file = 'Backup Bash Settings v%s (%s).7z' % (self.verDat,dt.strftime('%d-%m-%Y %H%M.%S'))
218+
file = 'Backup Bash Settings v%s (%s).7z' % (self.verApp,dt.strftime('%d-%m-%Y %H%M.%S'))
218219
if not self.quit:
219220
path = askSave(self.parent,_('Backup Bash Settings'),self.dir,file,'*.7z')
220221
if not path: return False

0 commit comments

Comments
 (0)