diff --git a/main/CalendarTab/CalendarManager.h b/main/CalendarTab/CalendarManager.h index f835f65..b8d0e94 100644 --- a/main/CalendarTab/CalendarManager.h +++ b/main/CalendarTab/CalendarManager.h @@ -23,7 +23,9 @@ public: ~CalendarManager() { delete caliSchedPtr; + delete examSchePtr; delete caliDialog; + delete examDialogPtr; } void exportCalendarCSV(); void setCalendar(QString html); diff --git a/src/jceData/Calendar/coursesSchedule/calendarSchedule.cpp b/src/jceData/Calendar/coursesSchedule/calendarSchedule.cpp index 99afda7..4a50607 100644 --- a/src/jceData/Calendar/coursesSchedule/calendarSchedule.cpp +++ b/src/jceData/Calendar/coursesSchedule/calendarSchedule.cpp @@ -47,8 +47,8 @@ void calendarSchedule::clearTableItems() for (j = 0; j < columnCount(); j++) if (this->takeItem(i,j) != NULL) delete this->takeItem(i,j); - horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); - verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); +// horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); +// verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); } void calendarSchedule::insertCourseIntoTable() @@ -94,8 +94,11 @@ void calendarSchedule::insertCourseIntoTable() verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); } - horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); - verticalHeader()->setSectionResizeMode(QHeaderView::Interactive); +// horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive); +// verticalHeader()->setSectionResizeMode(QHeaderView::Interactive); + horizontalHeader()->stretchLastSection(); + verticalHeader()->stretchLastSection(); + }