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

icon fix

Browse source
This commit is contained in:
liranbg 2014-09-18 01:59:42 +03:00
parent b092ca5ec2
commit 090dc28137
6 changed files with 139 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
jceGrade.pro
View file

@ -1,67 +1,67 @@
#------------------------------------------------- #-------------------------------------------------
# #
# Project created by QtCreator 2014-05-31T19:49:42 # Project created by QtCreator 2014-05-31T19:49:42
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui network widgets QT += core gui network widgets
TARGET = jceGrade TARGET = jceGrade
TEMPLATE = app TEMPLATE = app
RC_FILE = appConfigure.rc RC_FILE = appConfigure.rc
CONFIG += qt c++11 CONFIG += qt c++11
CONFIG += console static CONFIG += console static
TRANSLATIONS = jce_en.ts \ TRANSLATIONS = jce_en.ts \
jce_he.ts jce_he.ts
FORMS += \ FORMS += \
main/mainscreen.ui \ main/mainscreen.ui \
src/jceData/Calendar/calendarDialog.ui src/jceData/Calendar/calendarDialog.ui
OTHER_FILES += OTHER_FILES +=
RESOURCES += \ RESOURCES += \
resources/connectionstatus.qrc resources/connectionstatus.qrc
HEADERS += \ HEADERS += \
main/CalendarTab/CalendarManager.h \ main/CalendarTab/CalendarManager.h \
main/CourseTab/coursestablemanager.h \ main/CourseTab/coursestablemanager.h \
main/LoginTab/loginhandler.h \ main/LoginTab/loginhandler.h \
main/mainscreen.h \ main/mainscreen.h \
src/appDatabase/savedata.h \ src/appDatabase/savedata.h \
src/jceConnection/jcesslclient.h \ src/jceConnection/jcesslclient.h \
src/jceData/Calendar/calendarPage.h \ src/jceData/Calendar/calendarPage.h \
src/jceData/Grades/gradeCourse.h \ src/jceData/Grades/gradeCourse.h \
src/jceData/Grades/gradePage.h \ src/jceData/Grades/gradePage.h \
src/jceData/course.h \ src/jceData/course.h \
src/jceData/page.h \ src/jceData/page.h \
src/jceSettings/jcelogin.h \ src/jceSettings/jcelogin.h \
src/jceSettings/jceLoginHtmlScripts.h \ src/jceSettings/jceLoginHtmlScripts.h \
src/jceSettings/user.h \ src/jceSettings/user.h \
src/jceData/Calendar/calendarCourse.h \ src/jceData/Calendar/calendarCourse.h \
src/jceData/Calendar/calendarSchedule.h \ src/jceData/Calendar/calendarSchedule.h \
src/jceData/CSV/csv_exporter.h \ src/jceData/CSV/csv_exporter.h \
src/appDatabase/simplecrypt.h \ src/appDatabase/simplecrypt.h \
src/jceData/Calendar/calendarDialog.h \ src/jceData/Calendar/calendarDialog.h \
src/jce_logger.h src/jce_logger.h
SOURCES += \ SOURCES += \
main/CalendarTab/CalendarManager.cpp \ main/CalendarTab/CalendarManager.cpp \
main/CourseTab/coursestablemanager.cpp \ main/CourseTab/coursestablemanager.cpp \
main/LoginTab/loginhandler.cpp \ main/LoginTab/loginhandler.cpp \
main/main.cpp \ main/main.cpp \
main/mainscreen.cpp \ main/mainscreen.cpp \
src/appDatabase/savedata.cpp \ src/appDatabase/savedata.cpp \
src/jceConnection/jcesslclient.cpp \ src/jceConnection/jcesslclient.cpp \
src/jceData/Calendar/calendarPage.cpp \ src/jceData/Calendar/calendarPage.cpp \
src/jceData/Grades/gradeCourse.cpp \ src/jceData/Grades/gradeCourse.cpp \
src/jceData/Grades/gradePage.cpp \ src/jceData/Grades/gradePage.cpp \
src/jceData/page.cpp \ src/jceData/page.cpp \
src/jceSettings/jcelogin.cpp \ src/jceSettings/jcelogin.cpp \
src/jceSettings/user.cpp \ src/jceSettings/user.cpp \
src/jceData/Calendar/calendarCourse.cpp \ src/jceData/Calendar/calendarCourse.cpp \
src/jceData/Calendar/calendarSchedule.cpp \ src/jceData/Calendar/calendarSchedule.cpp \
src/jceData/CSV/csv_exporter.cpp \ src/jceData/CSV/csv_exporter.cpp \
src/appDatabase/simplecrypt.cpp \ src/appDatabase/simplecrypt.cpp \
src/jceData/Calendar/calendarDialog.cpp \ src/jceData/Calendar/calendarDialog.cpp \
src/jce_logger.cpp src/jce_logger.cpp

10
main/mainscreen.cpp
View file

@ -8,7 +8,6 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
//this->setFixedSize(this->size()); //main not resizeable //this->setFixedSize(this->size()); //main not resizeable
//Login Tab //Login Tab
QPixmap iconPix;
iconPix.load(":/icons/iconX.png"); iconPix.load(":/icons/iconX.png");
ui->pswdLineEdit->setEchoMode((QLineEdit::Password)); ui->pswdLineEdit->setEchoMode((QLineEdit::Password));
ui->labelUsrInputStatus->setVisible(false); ui->labelUsrInputStatus->setVisible(false);
@ -25,7 +24,7 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
ui->statusBar->addPermanentWidget(statusLabel,1); ui->statusBar->addPermanentWidget(statusLabel,1);
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED); setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
//Course, Setting, Calendar Tab //Course, Calendar Tab
calendarSchedule * calendarSchedulePtr = new calendarSchedule(); calendarSchedule * calendarSchedulePtr = new calendarSchedule();
ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr); ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr);
ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue)); 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); ui->keepLogin->setChecked(true);
} }
//Local Check and ui setting. //language
checkLocale(); checkLocale();
} }
MainScreen::~MainScreen() MainScreen::~MainScreen()
@ -60,13 +57,12 @@ MainScreen::~MainScreen()
delete courseTableMgr; delete courseTableMgr;
delete userLoginSetting; delete userLoginSetting;
delete loginHandel; delete loginHandel;
delete ui;
delete data; delete data;
delete ui;
} }
//EVENTS ON STATUS BAR //EVENTS ON STATUS BAR
void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription) void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
{ {
QPixmap iconPix;
switch (statusDescription) switch (statusDescription)
{ {
case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS: case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:

5
main/mainscreen.h
View file

@ -81,14 +81,15 @@ private:
QLabel *ButtomStatusLabel; QLabel *ButtomStatusLabel;
QLabel *statusLabel; QLabel *statusLabel;
QPixmap iconPix;
user *userLoginSetting; user *userLoginSetting;
SaveData *data; SaveData *data;
CalendarManager * calendar; CalendarManager * calendar;
coursesTableManager *courseTableMgr; coursesTableManager *courseTableMgr;
loginHandler *loginHandel;
bool calendarLoaded; loginHandler *loginHandel;
}; };

2
src/jceData/CSV/csv_exporter.cpp
View file

@ -152,7 +152,7 @@ QString CSV_Exporter::makeLine(QString name, QDate *date, int startH, int startM
description.append("\n"); description.append("\n");
description.append(" ב"); description.append(" ב");
description.append(room); description.append(room);
description.append("\n Created with JCE Manager. \" "); description.append("\n Created with JCE Manager.\"");
//Create the Fucking Line //Create the Fucking Line
//Header: Subject,Start Date,Start Time,End Date,End Time,Description,Location //Header: Subject,Start Date,Start Time,End Date,End Time,Description,Location

92
src/jce_logger.cpp
View file

@ -1,46 +1,46 @@
#include "jce_logger.h" #include "jce_logger.h"
/* /*
* This Static method will help parsing our debug messages to a readable Log file * This Static method will help parsing our debug messages to a readable Log file
* *
* timestamp - Message type - message * timestamp - Message type - message
* *
* Message types cam be: * Message types cam be:
* *
* - DEBUG * - DEBUG
* - WARNING * - WARNING
* - CRITICAL * - CRITICAL
* - FATAL * - FATAL
* *
* Logs stored in a log file. File name is Stored in the Macro in Header file * 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) void jce_logger::customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{ {
Q_UNUSED(context); Q_UNUSED(context);
QString dt = QDateTime::currentDateTime().toString("dd/MM/yyyy hh:mm:ss"); QString dt = QDateTime::currentDateTime().toString("dd/MM/yyyy hh:mm:ss");
QString txt = QString("%1\t").arg(dt); QString txt = QString("%1\t").arg(dt);
switch (type) switch (type)
{ {
case QtDebugMsg: case QtDebugMsg:
txt += QString("DEBUG \t\t %1").arg(msg); txt += QString("DEBUG \t\t %1").arg(msg);
break; break;
case QtWarningMsg: case QtWarningMsg:
txt += QString("WARNING \t %1").arg(msg); txt += QString("WARNING \t %1").arg(msg);
break; break;
case QtCriticalMsg: case QtCriticalMsg:
txt += QString("CRITICAL \t %1").arg(msg); txt += QString("CRITICAL \t %1").arg(msg);
break; break;
case QtFatalMsg: case QtFatalMsg:
txt += QString("FATAL \t\t %1").arg(msg); txt += QString("FATAL \t\t %1").arg(msg);
abort(); abort();
break; break;
} }
QFile outFile(LOG_FILE_NAME); QFile outFile(LOG_FILE_NAME);
outFile.open(QIODevice::WriteOnly | QIODevice::Append); outFile.open(QIODevice::WriteOnly | QIODevice::Append);
QTextStream textStream(&outFile); QTextStream textStream(&outFile);
textStream << txt << endl; textStream << txt << endl;
} }

38
src/jce_logger.h
View file

@ -1,19 +1,19 @@
#ifndef JCE_LOGGER_H #ifndef JCE_LOGGER_H
#define JCE_LOGGER_H #define JCE_LOGGER_H
#include <QMessageLogContext> #include <QMessageLogContext>
#include <QString> #include <QString>
#include <QDateTime> #include <QDateTime>
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#define LOG_FILE_NAME "J_M_Log.log" #define LOG_FILE_NAME "J_M_Log.log"
class jce_logger class jce_logger
{ {
public: public:
static void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg); static void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
}; };
#endif // JCE_LOGGER_H #endif // JCE_LOGGER_H