diff --git a/jceGrade.pro b/jceGrade.pro index 6491211..011cfa6 100644 --- a/jceGrade.pro +++ b/jceGrade.pro @@ -1,67 +1,67 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2014-05-31T19:49:42 -# -#------------------------------------------------- - -QT += core gui network widgets -TARGET = jceGrade -TEMPLATE = app -RC_FILE = appConfigure.rc -CONFIG += qt c++11 -CONFIG += console static - -TRANSLATIONS = jce_en.ts \ - jce_he.ts - -FORMS += \ - main/mainscreen.ui \ - src/jceData/Calendar/calendarDialog.ui - -OTHER_FILES += - -RESOURCES += \ - resources/connectionstatus.qrc - -HEADERS += \ - main/CalendarTab/CalendarManager.h \ - main/CourseTab/coursestablemanager.h \ - main/LoginTab/loginhandler.h \ - main/mainscreen.h \ - src/appDatabase/savedata.h \ - src/jceConnection/jcesslclient.h \ - src/jceData/Calendar/calendarPage.h \ - src/jceData/Grades/gradeCourse.h \ - src/jceData/Grades/gradePage.h \ - src/jceData/course.h \ - src/jceData/page.h \ - src/jceSettings/jcelogin.h \ - src/jceSettings/jceLoginHtmlScripts.h \ - src/jceSettings/user.h \ - src/jceData/Calendar/calendarCourse.h \ - src/jceData/Calendar/calendarSchedule.h \ - src/jceData/CSV/csv_exporter.h \ - src/appDatabase/simplecrypt.h \ - src/jceData/Calendar/calendarDialog.h \ - src/jce_logger.h - -SOURCES += \ - main/CalendarTab/CalendarManager.cpp \ - main/CourseTab/coursestablemanager.cpp \ - main/LoginTab/loginhandler.cpp \ - main/main.cpp \ - main/mainscreen.cpp \ - src/appDatabase/savedata.cpp \ - src/jceConnection/jcesslclient.cpp \ - src/jceData/Calendar/calendarPage.cpp \ - src/jceData/Grades/gradeCourse.cpp \ - src/jceData/Grades/gradePage.cpp \ - src/jceData/page.cpp \ - src/jceSettings/jcelogin.cpp \ - src/jceSettings/user.cpp \ - src/jceData/Calendar/calendarCourse.cpp \ - src/jceData/Calendar/calendarSchedule.cpp \ - src/jceData/CSV/csv_exporter.cpp \ - src/appDatabase/simplecrypt.cpp \ - src/jceData/Calendar/calendarDialog.cpp \ - src/jce_logger.cpp +#------------------------------------------------- +# +# Project created by QtCreator 2014-05-31T19:49:42 +# +#------------------------------------------------- + +QT += core gui network widgets +TARGET = jceGrade +TEMPLATE = app +RC_FILE = appConfigure.rc +CONFIG += qt c++11 +CONFIG += console static + +TRANSLATIONS = jce_en.ts \ + jce_he.ts + +FORMS += \ + main/mainscreen.ui \ + src/jceData/Calendar/calendarDialog.ui + +OTHER_FILES += + +RESOURCES += \ + resources/connectionstatus.qrc + +HEADERS += \ + main/CalendarTab/CalendarManager.h \ + main/CourseTab/coursestablemanager.h \ + main/LoginTab/loginhandler.h \ + main/mainscreen.h \ + src/appDatabase/savedata.h \ + src/jceConnection/jcesslclient.h \ + src/jceData/Calendar/calendarPage.h \ + src/jceData/Grades/gradeCourse.h \ + src/jceData/Grades/gradePage.h \ + src/jceData/course.h \ + src/jceData/page.h \ + src/jceSettings/jcelogin.h \ + src/jceSettings/jceLoginHtmlScripts.h \ + src/jceSettings/user.h \ + src/jceData/Calendar/calendarCourse.h \ + src/jceData/Calendar/calendarSchedule.h \ + src/jceData/CSV/csv_exporter.h \ + src/appDatabase/simplecrypt.h \ + src/jceData/Calendar/calendarDialog.h \ + src/jce_logger.h + +SOURCES += \ + main/CalendarTab/CalendarManager.cpp \ + main/CourseTab/coursestablemanager.cpp \ + main/LoginTab/loginhandler.cpp \ + main/main.cpp \ + main/mainscreen.cpp \ + src/appDatabase/savedata.cpp \ + src/jceConnection/jcesslclient.cpp \ + src/jceData/Calendar/calendarPage.cpp \ + src/jceData/Grades/gradeCourse.cpp \ + src/jceData/Grades/gradePage.cpp \ + src/jceData/page.cpp \ + src/jceSettings/jcelogin.cpp \ + src/jceSettings/user.cpp \ + src/jceData/Calendar/calendarCourse.cpp \ + src/jceData/Calendar/calendarSchedule.cpp \ + src/jceData/CSV/csv_exporter.cpp \ + src/appDatabase/simplecrypt.cpp \ + src/jceData/Calendar/calendarDialog.cpp \ + src/jce_logger.cpp diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index c082097..cd0eb14 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -8,7 +8,6 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr //this->setFixedSize(this->size()); //main not resizeable //Login Tab - QPixmap iconPix; iconPix.load(":/icons/iconX.png"); ui->pswdLineEdit->setEchoMode((QLineEdit::Password)); ui->labelUsrInputStatus->setVisible(false); @@ -25,7 +24,7 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr ui->statusBar->addPermanentWidget(statusLabel,1); setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED); - //Course, Setting, Calendar Tab + //Course, Calendar Tab calendarSchedule * calendarSchedulePtr = new calendarSchedule(); ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr); ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue)); @@ -45,11 +44,9 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr ui->keepLogin->setChecked(true); } - //Local Check and ui setting. + //language checkLocale(); - - } MainScreen::~MainScreen() @@ -60,13 +57,12 @@ MainScreen::~MainScreen() delete courseTableMgr; delete userLoginSetting; delete loginHandel; - delete ui; delete data; + delete ui; } //EVENTS ON STATUS BAR void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription) { - QPixmap iconPix; switch (statusDescription) { case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS: diff --git a/main/mainscreen.h b/main/mainscreen.h index 7f15462..02c60ba 100644 --- a/main/mainscreen.h +++ b/main/mainscreen.h @@ -81,14 +81,15 @@ private: QLabel *ButtomStatusLabel; QLabel *statusLabel; + QPixmap iconPix; user *userLoginSetting; SaveData *data; + CalendarManager * calendar; coursesTableManager *courseTableMgr; - loginHandler *loginHandel; - bool calendarLoaded; + loginHandler *loginHandel; }; diff --git a/src/jceData/CSV/csv_exporter.cpp b/src/jceData/CSV/csv_exporter.cpp index d2149fe..2b2bb89 100644 --- a/src/jceData/CSV/csv_exporter.cpp +++ b/src/jceData/CSV/csv_exporter.cpp @@ -152,7 +152,7 @@ QString CSV_Exporter::makeLine(QString name, QDate *date, int startH, int startM description.append("\n"); description.append(" ב"); description.append(room); - description.append("\n Created with JCE Manager. \" "); + description.append("\n Created with JCE Manager.\""); //Create the Fucking Line //Header: Subject,Start Date,Start Time,End Date,End Time,Description,Location diff --git a/src/jce_logger.cpp b/src/jce_logger.cpp index 829b5e2..41e3f6a 100644 --- a/src/jce_logger.cpp +++ b/src/jce_logger.cpp @@ -1,46 +1,46 @@ -#include "jce_logger.h" - -/* - * This Static method will help parsing our debug messages to a readable Log file - * - * timestamp - Message type - message - * - * Message types cam be: - * - * - DEBUG - * - WARNING - * - CRITICAL - * - FATAL - * - * Logs stored in a log file. File name is Stored in the Macro in Header file - */ -void jce_logger::customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) -{ - Q_UNUSED(context); - - QString dt = QDateTime::currentDateTime().toString("dd/MM/yyyy hh:mm:ss"); - QString txt = QString("%1\t").arg(dt); - - switch (type) - { - case QtDebugMsg: - txt += QString("DEBUG \t\t %1").arg(msg); - break; - case QtWarningMsg: - txt += QString("WARNING \t %1").arg(msg); - break; - case QtCriticalMsg: - txt += QString("CRITICAL \t %1").arg(msg); - break; - case QtFatalMsg: - txt += QString("FATAL \t\t %1").arg(msg); - abort(); - break; - } - - QFile outFile(LOG_FILE_NAME); - outFile.open(QIODevice::WriteOnly | QIODevice::Append); - - QTextStream textStream(&outFile); - textStream << txt << endl; -} +#include "jce_logger.h" + +/* + * This Static method will help parsing our debug messages to a readable Log file + * + * timestamp - Message type - message + * + * Message types cam be: + * + * - DEBUG + * - WARNING + * - CRITICAL + * - FATAL + * + * Logs stored in a log file. File name is Stored in the Macro in Header file + */ +void jce_logger::customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) +{ + Q_UNUSED(context); + + QString dt = QDateTime::currentDateTime().toString("dd/MM/yyyy hh:mm:ss"); + QString txt = QString("%1\t").arg(dt); + + switch (type) + { + case QtDebugMsg: + txt += QString("DEBUG \t\t %1").arg(msg); + break; + case QtWarningMsg: + txt += QString("WARNING \t %1").arg(msg); + break; + case QtCriticalMsg: + txt += QString("CRITICAL \t %1").arg(msg); + break; + case QtFatalMsg: + txt += QString("FATAL \t\t %1").arg(msg); + abort(); + break; + } + + QFile outFile(LOG_FILE_NAME); + outFile.open(QIODevice::WriteOnly | QIODevice::Append); + + QTextStream textStream(&outFile); + textStream << txt << endl; +} diff --git a/src/jce_logger.h b/src/jce_logger.h index 2414c04..b13e47d 100644 --- a/src/jce_logger.h +++ b/src/jce_logger.h @@ -1,19 +1,19 @@ -#ifndef JCE_LOGGER_H -#define JCE_LOGGER_H - -#include -#include -#include -#include -#include - -#define LOG_FILE_NAME "J_M_Log.log" - -class jce_logger -{ -public: - static void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg); - -}; - -#endif // JCE_LOGGER_H +#ifndef JCE_LOGGER_H +#define JCE_LOGGER_H + +#include +#include +#include +#include +#include + +#define LOG_FILE_NAME "J_M_Log.log" + +class jce_logger +{ +public: + static void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg); + +}; + +#endif // JCE_LOGGER_H