chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/sleepyhead/code

Browse Source
This commit is contained in:
Mark Watkins 2014-04-18 16:10:32 +10:00
commit 780368c2e8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -654,6 +654,11 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp,
offset += 12; offset += 12;
} }
// on some 60 series it's one off. or was the original 60 series patch wrong?
// I verified this comment below against several data samples compared with encore reports.
//duration=data[0x1B] | data[0x1C] << 8) // Session length in seconds
duration = data[offset + 0x14] | (data[offset + 0x15] << 8); duration = data[offset + 0x14] | (data[offset + 0x15] << 8);
if (!duration) { if (!duration) {

8
sleepyhead/preferencesdialog.ui
View File

@ -51,7 +51,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="importTab"> <widget class="QWidget" name="importTab">
<attribute name="title"> <attribute name="title">
@ -2229,11 +2229,7 @@ this application to be unstable with this feature enabled.</string>
<item> <item>
<widget class="QCheckBox" name="usePixmapCaching"> <widget class="QCheckBox" name="usePixmapCaching">
<property name="toolTip"> <property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Use Pixmap Caching</string> <string>Use Pixmap Caching</string>