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

Merge remote-tracking branch 'origin/Staging' into Dev

Browse source 
Conflicts:
	main/CourseTab/coursestablemanager.cpp
This commit is contained in:
liranbg 2014-10-16 10:28:59 +03:00
parent 27764123cc d4a08c7fb7
commit 910372a363
2 changed files with 55 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/CourseTab/coursestablemanager.cpp
View file

@ -66,7 +66,6 @@ void coursesTableManager::setCoursesList(QString &html)
*/ */
bool coursesTableManager::changes(QString change, int row, int col) bool coursesTableManager::changes(QString change, int row, int col)
{ {
bool isNumFlag = true; bool isNumFlag = true;
if (courseTBL->item(row,gradeCourse::CourseScheme::SERIAL) == NULL) if (courseTBL->item(row,gradeCourse::CourseScheme::SERIAL) == NULL)
return true; return true;

2
main/mainscreen.ui
View file

@ -64,7 +64,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<property name="documentMode"> <property name="documentMode">
<bool>false</bool> <bool>false</bool>