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

Disabled transitions as it's too slow, updated summary title message

Browse Source
This commit is contained in:
Mark Watkins 2011-12-26 02:38:37 +10:00
parent 6d921bbbe3
commit 00f8afafb3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daily.cpp
View File

@ -538,15 +538,16 @@ void Daily::LoadDate(QDate date)
void Daily::on_calendar_selectionChanged() void Daily::on_calendar_selectionChanged()
{ {
this->setCursor(Qt::BusyCursor);
if (previous_date.isValid()) { if (previous_date.isValid()) {
GraphView->fadeOut(); // GraphView->fadeOut();
Unload(previous_date); Unload(previous_date);
} }
bool fadedir=previous_date < ui->calendar->selectedDate(); bool fadedir=previous_date < ui->calendar->selectedDate();
ZombieMeterMoved=false; ZombieMeterMoved=false;
Load(ui->calendar->selectedDate()); Load(ui->calendar->selectedDate());
GraphView->fadeIn(fadedir); //GraphView->fadeIn(fadedir);
ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate)); ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
ui->calendar->setFocus(Qt::ActiveWindowFocusReason); ui->calendar->setFocus(Qt::ActiveWindowFocusReason);
@ -560,6 +561,7 @@ void Daily::on_calendar_selectionChanged()
ui->weightSpinBox->setDecimals(3); ui->weightSpinBox->setDecimals(3);
ui->weightSpinBox->setSuffix(STR_UNIT_KG); ui->weightSpinBox->setSuffix(STR_UNIT_KG);
} }
this->setCursor(Qt::ArrowCursor);
} }
void Daily::ResetGraphLayout() void Daily::ResetGraphLayout()
{ {

5
mainwindow.cpp
View File

@ -340,6 +340,7 @@ void MainWindow::on_action_Import_Data_triggered()
} }
file.close(); file.close();
} }
on_summaryButton_clicked();
} else { } else {
mainwin->Notify("Import Problem\n\nCouldn't find any new Machine Data at the locations given"); mainwin->Notify("Import Problem\n\nCouldn't find any new Machine Data at the locations given");
} }
@ -372,9 +373,7 @@ QString htmlHeader()
"</head>" "</head>"
"<body leftmargin=0 topmargin=0 rightmargin=0>" "<body leftmargin=0 topmargin=0 rightmargin=0>"
"<div align=center><table cellpadding=3 cellspacing=0 border=0>" "<div align=center><table cellpadding=3 cellspacing=0 border=0>"
"<tr><td><img src='qrc:/docs/sheep.png' width=100px height=100px><td valign=center align=center><h1>SleepyHead v"+VersionString+" "+ReleaseStatus+"</h1></td></tr></table>" "<tr><td><img src='qrc:/docs/sheep.png' width=100px height=100px><td valign=center align=center><h1>SleepyHead v"+VersionString+"</h1><i>This is a beta software and some functionality may not work as intended yet.<br/>Please report any bugs you find to SleepyHead's SourceForge page.</i></td></tr></table>"
"<p><i>This page is being redesigned to be more useful... Please send me your ideas on what you'd like to see here :)</i></p>"
"<p>The plan is to get the content happening first, then make the layout pretty...</p>"
"</div>" "</div>"
"<hr/>"); "<hr/>");
} }