sagi/jce-manager
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'Dev' of https://github.com/liranbg/JceManager into Dev

Browse source 
Conflicts:
	main/CourseTab/coursestablemanager.cpp
This commit is contained in:
liranbg 2014-10-08 07:16:14 +03:00
commit cabe5eb7d3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/CourseTab/coursestablemanager.cpp
View file

@ -230,7 +230,7 @@ void coursesTableManager::addRow(const gradeCourse *courseToAdd)
} }
else else
{ {
qCritical() << Q_FUNC_INFO << "no course to load!"; qCritical() << Q_FUNC_INFO << " no course to load!";
} }
courseTBL->resizeColumnsToContents(); courseTBL->resizeColumnsToContents();
@ -246,7 +246,7 @@ void coursesTableManager::showGraph()
{ {
if (gp != NULL) if (gp != NULL)
{ {
qDebug() << "Graph Dialog Opened. gp != NULL"; qDebug() << Q_FUNC_INFO << " Graph Dialog Opened. gp != NULL";
this->graph->showGraph(gp); this->graph->showGraph(gp);
} }
} }

2
src/jceData/Grades/graph/gradegraph.cpp
View file

@ -152,6 +152,6 @@ void gradegraph::setVisualization()
void gradegraph::on_pushButton_clicked() void gradegraph::on_pushButton_clicked()
{ {
qDebug() << "Closed Graph Dialog"; qDebug() << Q_FUNC_INFO << " Closed Graph Dialog";
this->done(0); this->done(0);
} }