chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on windows reloading day out of thread

Browse Source
This commit is contained in:
Mark Watkins 2014-08-08 08:47:34 +10:00
parent fdc2acc21d
commit be13ad98ba
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleepyhead/daily.cpp
View File

@ -776,8 +776,12 @@ void Daily::LoadDate(QDate date)
ui->calendar->blockSignals(false);
on_calendar_selectionChanged();
}
void Daily::on_calendar_selectionChanged()
{
QTimer::singleShot(0, this, SLOT(on_ReloadDay()));
}
void Daily::on_ReloadDay()
{
graphView()->releaseKeyboard();
QTime time;
@ -1763,6 +1767,7 @@ void Daily::Unload(QDate date)
return;
}
}
webView->setHtml("");
Session *journal=GetJournalSession(date);

1
sleepyhead/daily.h
View File

@ -145,6 +145,7 @@ public:
void addBookmark(qint64 st, qint64 et, QString text);
private slots:
void on_ReloadDay();
/*! \fn on_calendar_currentPageChanged(int year, int month);
\brief Scans through all days for this month, updating the day colors for the calendar object

16
sleepyhead/mainwindow.ui
View File

@ -1498,7 +1498,7 @@ QToolBox::tab:selected {
<x>0</x>
<y>0</y>
<width>180</width>
<height>596</height>
<height>598</height>
</rect>
</property>
<property name="palette">
@ -1603,7 +1603,7 @@ QToolBox::tab:selected {
<normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
</attribute>
<attribute name="label">
<string>&amp;Navigation</string>
<string>Navigation</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
@ -1912,7 +1912,7 @@ border: 2px solid #56789a; border-radius: 30px;
<x>0</x>
<y>0</y>
<width>180</width>
<height>596</height>
<height>598</height>
</rect>
</property>
<property name="palette">
@ -1990,7 +1990,7 @@ border: 2px solid #56789a; border-radius: 30px;
<normaloff>:/icons/bookmark.png</normaloff>:/icons/bookmark.png</iconset>
</attribute>
<attribute name="label">
<string>&amp;Bookmarks</string>
<string>Bookmarks</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
@ -3060,7 +3060,7 @@ border-radius: 10px;
<x>0</x>
<y>0</y>
<width>180</width>
<height>596</height>
<height>598</height>
</rect>
</property>
<property name="mouseTracking">
@ -3074,7 +3074,7 @@ border-radius: 10px;
<normaloff>:/icons/trophy.png</normaloff>:/icons/trophy.png</iconset>
</attribute>
<attribute name="label">
<string>&amp;Records</string>
<string>Records</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing">
@ -3122,7 +3122,7 @@ border-radius: 10px;
<x>0</x>
<y>0</y>
<width>975</width>
<height>22</height>
<height>21</height>
</rect>
</property>
<property name="sizePolicy">
@ -3480,7 +3480,7 @@ border-radius: 10px;
</action>
<action name="action">
<property name="text">
<string> </string>
<string/>
</property>
</action>
<action name="actionLeft_Daily_Sidebar">