diff --git a/jceGrade.pro b/jceGrade.pro index ad64892..5283ecb 100644 --- a/jceGrade.pro +++ b/jceGrade.pro @@ -6,8 +6,8 @@ QT += core gui network widgets -CONFIG += qt c++11 -CONFIG += console static +CONFIG += qt c++11 static +#CONFIG += console static TARGET = jceManager TEMPLATE = app diff --git a/jce_en.qm b/jce_en.qm index c62920a..9408f16 100644 Binary files a/jce_en.qm and b/jce_en.qm differ diff --git a/jce_en.ts b/jce_en.ts index 87fc04c..08621ff 100644 --- a/jce_en.ts +++ b/jce_en.ts @@ -1,42 +1,43 @@ - + CalendarDialog - - Dialog - Dates + + Dates Dialog + Dialog + Dates Dialog - - <h1><b>For The Best CSV Export, Please Enter Correctly - <h1><b>For The Best CSV Export, Please Enter Correctly + + <body><p><span style=" font-size:9pt; font-weight:600;">The dates were chosen according to JCE General Academic Calendar for the first semester</span></p> + <body><p><span style=" font-size:9pt; font-weight:600;">The dates were chosen according to JCE General Academic Calendar for the first semester</span></p> - + Semester Starts At: <b>Semester Starts At: - + Semester Ends At: <b>Semester Ends At: - - [ ! ] Start & End cannot be the same - [ ! ] Start & End cannot be set at the same day + + <b>Please chose your dates correctly</b> + <b>Please chose your dates correctly</b> - - - The End of the semester can NOT be equal or before semester begins. - The End of the semester can NOT be equal or before semester begins. + + + The end of the semester can NOT be equal or before the semester begin. + The end of the semester can NOT be equal or before the semester begin. - - + + Looks ok, Press OK Looks ok, Press OK @@ -146,163 +147,152 @@ Export to .CSV - + + <p align="right">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + <p align="right">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + + + &File &File - + Language Language - + Credits Credits - + Exit Exit - + Hebrew עברית - + English English - + OS Default OS Default - + How To How To - - Connecting - Connecting + + Ready + Ready - - Connected - Connected - - - - Disconnected - Disconnected - - - - &Login - &Login - - - - &Logout - Log&out - - - - - + + + + Error Error - - + + Invalid Dates. +Make Sure everything is correct and try again + Invalid dates. Make sure everything is correct and try again + + + + Not Connected Not Connected - + Missmatching data Missmatching Data - - CREDITS-ROOL-UP1 - + + License: + License: - - CREDITS-ROOL-UP2 - + + Powered By: + powered by: + Powered By: - - CREDITS-ROOL-UP3 - - - - - CREDITS-ROOL-UP4 - - - - - DevBy + + Developed By Developed By - + + Help Guide + Guide + Help Guide + + + Liran Liran Ben Gida - + Sagi Sagi Dayan - - HELP1 - + + <br><li>Login: <ul><li>Type your username and password and click Login.</li><li>Once you are connected, you will see a green ball in the right buttom panel.</li></ul></li> + <br><li>Login: <ul><li>Type your username and password and click Login.</li><li>Once you are connected, you will see a green ball in the right buttom panel.</li></ul></li> - - HELP2 - + + <br><li>Getting GPA sheet<ul><li>Click on GPA Tab</li><li> Select your dates and click on Add</li></ul></li> + <br><li>Getting GPA sheet<ul><li>Click on GPA Tab</li><li> Select your dates and click on Add</li></ul></li> - - HELP3 - + + <br><li>Average Changing<ul><li>Change one of your grade and see the average in the buttom panel changing.</li></ul></li> + <br><li>Average Changing<ul><li>Change one of your grade and see the average in the buttom panel changing.</li></ul></li> - - HELP4 - + + <br><li>Getting Calendar<ul><li>Click on Calendar Tab</li><li> Select your dates and click on Get Calendar</li></ul></li> + <br><li>Getting Calendar<ul><li>Click on Calendar Tab</li><li> Select your dates and click on Get Calendar</li></ul></li> - - HELP5 - + + <br><li>For exporting your calendar to a .CSV file:<ul><li>Do previous step and continue to next step</li><li> Click on Export to CSV</li><li>Select your dates and click OK</li><li>Once you're Done, go on your calendar and import your csv file</li></li> + <br><li>על מנת לייצא לקובץ CSV<ul><li>חזור על השלב הקודם ורק אז</li><li> לחת על ייצוא לקובץ CSV</li><li>בחר את התאריכים המתאימים ולחץ על אישור</li><li>ברגע שתסיים תוכל הודעה ולאחר מכן תוכל לייבא את הקובץ היכן שתרצה</li></li> - - HELP6 - + + <b>For more information, please visit us at: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> + <b>For more information, please visit us at: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> - - + + Settings Settings - - - + + + Your settings will take effect next time you start the program Your settings will take effect next time you start the program @@ -310,17 +300,12 @@ QObject - + Exported Successfuly! Exported Successfuly! - - Error on exporting. please check your file system. - Error on exporting. Please check your file system. - - - + Dates not valid Invalid Dates @@ -360,39 +345,50 @@ Additions - + + Logout + Logout + + + + Login + Login + + + Please Check Your Username & Password Please Check Your Username & Password - - You have been blocked by JCE, please try in a couple of minutes. + + You have been <b>BLOCKED</b> by JCE, please try in a couple of minutes. + You have been blocked by JCE, please try in a couple of minutes. You have been <b>blocked</b> by JCE, please try in a couple of minutes. - + Please Check Your Internet Connection. Please Check Your Internet Connection. - + Receive Request Timeout. Receive Request Timeout. - + Send Request Timeout. Send Request Timeout. - + If this message appear without reason, please contact me at liranbg@gmail.com If this message appear without reason, please contact me at liranbg@gmail.com - + Error Error @@ -426,5 +422,150 @@ If this message appear without reason, please contact me at liranbg@gmail.comFriday Friday + + + ConnectionRefusedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + RemoteHostClosedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + HostNotFoundError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SocketAccessError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SocketTimeoutError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + NetworkError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SslHandshakeFailedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SslInternalError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SslInvalidUserDataError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + DatagramTooLargeError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + OperationError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + AddressInUseError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + SocketAddressNotAvailableError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + UnsupportedSocketOperationError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyAuthenticationRequiredError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyConnectionRefusedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + UnfinishedSocketOperationError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyConnectionClosedError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyConnectionTimeoutError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyNotFoundError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + ProxyProtocolError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + TemporaryError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + UnknownSocketError + Your error is critical. Our team need your help, please send your log file named J_M_Log.log to us. see link in About. The file DOES NOT CONTAIN YOUR PASSWORD + + + + Unable to open or create the file. +Exporting Failed + Unable to open or create the file. +Exporting Failed + + + + loginHandler + + + Connecting... + Connecting... + + + + Connected + Connected + + + + Disconnected + Disconnected + + + + Ready. + Ready. + diff --git a/jce_he.qm b/jce_he.qm index 7181de7..036e7ac 100644 Binary files a/jce_he.qm and b/jce_he.qm differ diff --git a/jce_he.ts b/jce_he.ts index d66194d..6b131b2 100644 --- a/jce_he.ts +++ b/jce_he.ts @@ -1,42 +1,43 @@ - + CalendarDialog - - Dialog + + Dates Dialog + Dialog בחירת תאריכים - - <h1><b>For The Best CSV Export, Please Enter Correctly - <h1><b>על מנת לקבל קובץ נכון, הקפד על התאריכים + + <body><p><span style=" font-size:9pt; font-weight:600;">The dates were chosen according to JCE General Academic Calendar for the first semester</span></p> + <body><p><span style=" font-size:9pt; font-weight:600;">התאריכים הנל נלקחו מהאתר של המכללה. הם תואמים את סמסטר א לשנת 2015.</span></p> - + Semester Starts At: <b> הסמסטר מתחיל ב: - + Semester Ends At: <b>הסמסטר נגמר ב: - - [ ! ] Start & End cannot be the same - [!] התחלה וסוף לא יכולים להיות באותו היום + + <b>Please chose your dates correctly</b> + <b>אנא בחר את הנתונים המתאימים</b> - - - The End of the semester can NOT be equal or before semester begins. - סוף סמסטר לא יכול להיות לפני או באותו היום בו הסמסטר מתחיל. + + + The end of the semester can NOT be equal or before the semester begin. + סוף הסמסטר לא יכול להיות שווה או קודם לתחילתו. - - + + Looks ok, Press OK נראה טוב, לחץ על המשך @@ -52,7 +53,7 @@ Login - כניסה + התחבר @@ -82,7 +83,7 @@ Add - הוסף + הוספה @@ -146,163 +147,152 @@ .CSV ייצא אל קובץ - + + <p align="right">Made By <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + <p align="right">נוצר ע"י: <a href="http://liranbg.github.io/JceManager/"><span style=" text-decoration: underline; color:#0000ff;">JceManager</span></a></p> + + + &File &קובץ - + Language שפה - + Credits קרדיט - + Exit יציאה - + Hebrew עברית - + English English - + OS Default ברירת מחדל - + How To עזרה - - Connecting - מתחבר + + Ready + מוכן - - Connected - מחובר - - - - Disconnected - מנותק - - - - &Login - &התחברות - - - - &Logout - &התנתקות - - - - - + + + + Error שגיאה - - + + Invalid Dates. +Make Sure everything is correct and try again + תאריכים לא חוקיים. אנא בדוק שהנתונים שהוזנו נכונים ונסה מחדשה + + + + Not Connected לא מחובר - + Missmatching data שגיאה בהכנסת נתונים - - CREDITS-ROOL-UP1 - + + License: + רישיון: - - CREDITS-ROOL-UP2 - + + Powered By: + powered by: + מנוע: - - CREDITS-ROOL-UP3 - + + Developed By + - - CREDITS-ROOL-UP4 - + + Help Guide + Guide + תפריט עזרה - - DevBy - פותח על ידי - - - + Liran לירן בן גידה - + Sagi שגיא דיין - - HELP1 - + + <br><li>Login: <ul><li>Type your username and password and click Login.</li><li>Once you are connected, you will see a green ball in the right buttom panel.</li></ul></li> + <br><li>התחברות: <ul><li>הזן את שם המשתמש והסיסמה ולחץ על התחבר</li><li>בגמר ההתחברות תראה בכדור ירוק בשורת המצב. המשמעות שהינך מחובר לאתר</li></ul></li> - - HELP2 - + + <br><li>Getting GPA sheet<ul><li>Click on GPA Tab</li><li> Select your dates and click on Add</li></ul></li> + <br><li>קבלת גליון ציונים<ul><li>לחץ על לשונית הציונים</li><li>בחר את טווח התאריכים הרצויים ולחץ על הוספה</li></ul></li> - - HELP3 - + + <br><li>Average Changing<ul><li>Change one of your grade and see the average in the buttom panel changing.</li></ul></li> + <br><li>שינוי ממוצע<ul><li>שנה את אחד הציונים שלך בקורס והממוצע ישתנה בהתאם.</li></ul></li> - - HELP4 - + + <br><li>Getting Calendar<ul><li>Click on Calendar Tab</li><li> Select your dates and click on Get Calendar</li></ul></li> + <br><li>קבלת שעות מערכת<ul><li>לחץ על לשונית שעות מערכת</li><li>בחר את השנה והסמסטר ולחץ על הצג מערכת</li></ul></li> - - HELP5 - + + <br><li>For exporting your calendar to a .CSV file:<ul><li>Do previous step and continue to next step</li><li> Click on Export to CSV</li><li>Select your dates and click OK</li><li>Once you're Done, go on your calendar and import your csv file</li></li> + <br><li>על מנת לייצא לקובץ CSV<ul><li>בצע את השלב הקודם ואז</li><li> לחץ על ייצוא לCSV</li><li>בחר את התאריכים המתאימים ולחץ אישור</li><li>לאחר השלמת הפעולה תוכל לייבא את המערכת שעות</li></li> - - HELP6 - + + <b>For more information, please visit us at: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> + <b>לעוד מידע: <a href='http://liranbg.github.io/JceManager/'>Jce Manager site</a></b> - - + + Settings הגדרות - - - + + + Your settings will take effect next time you start the program ההגדרות שלך ייכנסו לתוקפן בפעם הבאה שתפעיל את התוכנה @@ -310,17 +300,12 @@ QObject - + Exported Successfuly! הייצוא הושלם! - - Error on exporting. please check your file system. - טעות בעת ייצוא הקובץ. אנא בדוק אם הקובץ פתוח. - - - + Dates not valid תאריכים לא חוקיים @@ -360,39 +345,50 @@ תוספת - + + Logout + התנתק + + + + Login + התחבר + + + Please Check Your Username & Password אנא בדוק את שם המשתמש והסיסמה שלך - - You have been blocked by JCE, please try in a couple of minutes. - נחסמת ע"י האתר, אנא נסה מאוחר יותר. + + You have been <b>BLOCKED</b> by JCE, please try in a couple of minutes. + You have been blocked by JCE, please try in a couple of minutes. + אתה <b>נחסמת</b> על ידי האתר. אנא נסה מאוחר יותר. - + Please Check Your Internet Connection. בדוק את החיבור שלך לאינטרנט. - + Receive Request Timeout. בקשת קבלה נכשלה. - + Send Request Timeout. בקשת שליחה נכשלה. - + If this message appear without reason, please contact me at liranbg@gmail.com אם הודעה זו חוזרת על עצמה ללא סיבה. אנא פנה אל המפתח במייל liranbg@gmail.com - + Error שגיאה @@ -426,5 +422,150 @@ If this message appear without reason, please contact me at liranbg@gmail.comFriday שישי + + + ConnectionRefusedError + + + + + RemoteHostClosedError + + + + + HostNotFoundError + + + + + SocketAccessError + + + + + SocketTimeoutError + + + + + NetworkError + + + + + SslHandshakeFailedError + + + + + SslInternalError + + + + + SslInvalidUserDataError + + + + + DatagramTooLargeError + + + + + OperationError + + + + + AddressInUseError + + + + + SocketAddressNotAvailableError + + + + + UnsupportedSocketOperationError + + + + + ProxyAuthenticationRequiredError + + + + + ProxyConnectionRefusedError + + + + + UnfinishedSocketOperationError + + + + + ProxyConnectionClosedError + + + + + ProxyConnectionTimeoutError + + + + + ProxyNotFoundError + + + + + ProxyProtocolError + + + + + TemporaryError + + + + + UnknownSocketError + + + + + Unable to open or create the file. +Exporting Failed + לא ניתן ליצור את הקובץ. +היצוא נכשל + + + + loginHandler + + + Connecting... + מתחבר... + + + + Connected + מחובר + + + + Disconnected + מנותק + + + + Ready. + מוכן. + diff --git a/main/LoginTab/loginhandler.cpp b/main/LoginTab/loginhandler.cpp index 1a46f7e..50d75fa 100644 --- a/main/LoginTab/loginhandler.cpp +++ b/main/LoginTab/loginhandler.cpp @@ -70,7 +70,7 @@ bool loginHandler::makeConnection() } case jceLogin::ERROR_ON_VALIDATION_USER_BLOCKED: { - popMessage(QObject::tr("You have been blocked by JCE, please try in a couple of minutes.")); + popMessage(QObject::tr("You have been BLOCKED by JCE, please try in a couple of minutes.")); return false; } case jceLogin::ERROR_ON_OPEN_SOCKET: diff --git a/main/main.cpp b/main/main.cpp index 86349e5..ef2dd6d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) #ifdef QT_DEBUG // Incase QtCreator is in Debug mode all qDebug messages will go to terminal qDebug() << "Running a debug build"; #else // If QtCreator is on Release mode , qDebug messages will be logged in a log file. - qDebug() << "Running a release build"; +// qDebug() << "Running a release build"; qInstallMessageHandler(jce_logger::customMessageHandler); #endif diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 6962b0a..93fae86 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -251,16 +251,15 @@ void MainScreen::on_actionCredits_triggered() { qDebug() << Q_FUNC_INFO; QMessageBox::about(this, "About", - tr("Jce Manager")+ - "v1.0.0

" + "Jce Manager v1.0.0

" +tr("License:")+ "
GNU LESSER GENERAL PUBLIC LICENSE V2.1
" +"
"+ "JceManager Repository"+ "

" - +tr("powered by: ")+ - "Jce Connection

" - +tr("DevBy")+ + +tr("Powered By: ")+ + " Jce Connection

" + +tr("Developed By")+ ":" @@ -276,18 +275,15 @@ void MainScreen::on_actionHow_To_triggered() qDebug() << Q_FUNC_INFO; QMessageBox::information(this,"How To", "" - +tr("Guide")+ - ""); + +tr("Help Guide")+ + "