Merge remote-tracking branch 'origin/Staging' into Dev
Conflicts: main/CourseTab/coursestablemanager.cpp
This commit is contained in:
commit
910372a363
2 changed files with 55 additions and 56 deletions
|
@ -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;
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in a new issue