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

fix before first release

Browse source 
fixed english translation,
changed connectivity checkings
add more debugging functions
This commit is contained in:
liranbg 2014-09-27 01:40:02 +03:00
parent 0f6ffb1223
commit b16fc2b792
10 changed files with 583 additions and 515 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jceGrade.pro
View file

@ -6,7 +6,7 @@
QT += core gui network widgets
CONFIG += qt c++11 static
CONFIG += qt c++11
#CONFIG += console static
TARGET = jceManager

BIN
jce_en.qm
View file

Binary file not shown.

107
jce_en.ts
View file

@ -46,8 +46,8 @@
<name>MainScreen</name>
<message>
<location filename="main/mainscreen.ui" line="20"/>
<source>JCE Avg Calculator</source>
<translation>JCE Avg Calculator</translation>
<source>JCE Manager</source>
<translation>JCE Manager</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="86"/>
@ -148,7 +148,8 @@
</message>
<message>
<location filename="main/mainscreen.ui" line="632"/>
<source>&lt;p align=&quot;right&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</source>
<source>&lt;p align=&quot;center&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</source>
<oldsource>&lt;p align=&quot;right&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</oldsource>
<translation>&lt;p align=&quot;right&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</translation>
</message>
<message>
@ -192,107 +193,107 @@
<translation>How To</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="21"/>
<location filename="main/mainscreen.cpp" line="23"/>
<source>Ready</source>
<translation>Ready</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="132"/>
<location filename="main/mainscreen.cpp" line="151"/>
<location filename="main/mainscreen.cpp" line="206"/>
<location filename="main/mainscreen.cpp" line="234"/>
<location filename="main/mainscreen.cpp" line="136"/>
<location filename="main/mainscreen.cpp" line="157"/>
<location filename="main/mainscreen.cpp" line="212"/>
<location filename="main/mainscreen.cpp" line="242"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="132"/>
<location filename="main/mainscreen.cpp" line="136"/>
<source>Invalid Dates.
Make Sure everything is correct and try again</source>
<translation>Invalid dates. Make sure everything is correct and try again</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="151"/>
<location filename="main/mainscreen.cpp" line="234"/>
<location filename="main/mainscreen.cpp" line="157"/>
<location filename="main/mainscreen.cpp" line="242"/>
<source>Not Connected</source>
<translation>Not Connected</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="206"/>
<location filename="main/mainscreen.cpp" line="212"/>
<source>Missmatching data</source>
<translation>Missmatching Data</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="255"/>
<location filename="main/mainscreen.cpp" line="264"/>
<source>License:</source>
<translation>License:</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="260"/>
<location filename="main/mainscreen.cpp" line="269"/>
<source>Powered By: </source>
<oldsource>powered by: </oldsource>
<translation>Powered By: </translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="262"/>
<location filename="main/mainscreen.cpp" line="271"/>
<source>Developed By</source>
<translation>Developed By</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="278"/>
<location filename="main/mainscreen.cpp" line="287"/>
<source>Help Guide</source>
<oldsource>Guide</oldsource>
<translation>Help Guide</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="264"/>
<location filename="main/mainscreen.cpp" line="273"/>
<source>Liran</source>
<translation>Liran Ben Gida</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="265"/>
<location filename="main/mainscreen.cpp" line="274"/>
<source>Sagi</source>
<translation>Sagi Dayan</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="280"/>
<location filename="main/mainscreen.cpp" line="289"/>
<source>&lt;br&gt;&lt;li&gt;Login: &lt;ul&gt;&lt;li&gt;Type your username and password and click Login.&lt;/li&gt;&lt;li&gt;Once you are connected, you will see a green ball in the right buttom panel.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;Login: &lt;ul&gt;&lt;li&gt;Type your username and password and click Login.&lt;/li&gt;&lt;li&gt;Once you are connected, you will see a green ball in the right buttom panel.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="281"/>
<location filename="main/mainscreen.cpp" line="290"/>
<source>&lt;br&gt;&lt;li&gt;Getting GPA sheet&lt;ul&gt;&lt;li&gt;Click on GPA Tab&lt;/li&gt;&lt;li&gt; Select your dates and click on Add&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;Getting GPA sheet&lt;ul&gt;&lt;li&gt;Click on GPA Tab&lt;/li&gt;&lt;li&gt; Select your dates and click on Add&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="282"/>
<location filename="main/mainscreen.cpp" line="291"/>
<source>&lt;br&gt;&lt;li&gt;Average Changing&lt;ul&gt;&lt;li&gt;Change one of your grade and see the average in the buttom panel changing.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;Average Changing&lt;ul&gt;&lt;li&gt;Change one of your grade and see the average in the buttom panel changing.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="283"/>
<location filename="main/mainscreen.cpp" line="292"/>
<source>&lt;br&gt;&lt;li&gt;Getting Calendar&lt;ul&gt;&lt;li&gt;Click on Calendar Tab&lt;/li&gt;&lt;li&gt; Select your dates and click on Get Calendar&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;Getting Calendar&lt;ul&gt;&lt;li&gt;Click on Calendar Tab&lt;/li&gt;&lt;li&gt; Select your dates and click on Get Calendar&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="284"/>
<location filename="main/mainscreen.cpp" line="293"/>
<source>&lt;br&gt;&lt;li&gt;For exporting your calendar to a .CSV file:&lt;ul&gt;&lt;li&gt;Do previous step and continue to next step&lt;/li&gt;&lt;li&gt; Click on Export to CSV&lt;/li&gt;&lt;li&gt;Select your dates and click OK&lt;/li&gt;&lt;li&gt;Once you&apos;re Done, go on your calendar and import your csv file&lt;/li&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;על מנת לייצא לקובץ CSV&lt;ul&gt;&lt;li&gt;חזור על השלב הקודם ורק אז&lt;/li&gt;&lt;li&gt; לחת על ייצוא לקובץ CSV&lt;/li&gt;&lt;li&gt;בחר את התאריכים המתאימים ולחץ על אישור&lt;/li&gt;&lt;li&gt;ברגע שתסיים תוכל הודעה ולאחר מכן תוכל לייבא את הקובץ היכן שתרצה&lt;/li&gt;&lt;/li&gt;</translation>
<translation>&lt;br&gt;&lt;li&gt;For exporting your calendar to a .CSV file:&lt;ul&gt;&lt;li&gt;Do previous step and continue to next step&lt;/li&gt;&lt;li&gt; Click on Export to CSV&lt;/li&gt;&lt;li&gt;Select your dates and click OK&lt;/li&gt;&lt;li&gt;Once you&apos;re Done, go on your calendar and import your csv file&lt;/li&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="286"/>
<location filename="main/mainscreen.cpp" line="295"/>
<source>&lt;b&gt;For more information, please visit us at: &lt;a href=&apos;http://liranbg.github.io/JceManager/&apos;&gt;Jce Manager site&lt;/a&gt;&lt;/b&gt;</source>
<translation>&lt;b&gt;For more information, please visit us at: &lt;a href=&apos;http://liranbg.github.io/JceManager/&apos;&gt;Jce Manager site&lt;/a&gt;&lt;/b&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="297"/>
<location filename="main/mainscreen.cpp" line="325"/>
<location filename="main/mainscreen.cpp" line="306"/>
<location filename="main/mainscreen.cpp" line="334"/>
<source>Settings</source>
<translation>Settings</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="297"/>
<location filename="main/mainscreen.cpp" line="311"/>
<location filename="main/mainscreen.cpp" line="325"/>
<location filename="main/mainscreen.cpp" line="306"/>
<location filename="main/mainscreen.cpp" line="320"/>
<location filename="main/mainscreen.cpp" line="334"/>
<source>Your settings will take effect next time you start the program</source>
<translation>Your settings will take effect next time you start the program</translation>
</message>
@ -423,117 +424,117 @@ If this message appear without reason, please contact me at liranbg@gmail.com</t
<translation>Friday</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="249"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="263"/>
<source>ConnectionRefusedError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="254"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="268"/>
<source>RemoteHostClosedError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="264"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="278"/>
<source>HostNotFoundError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="269"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="283"/>
<source>SocketAccessError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="273"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="287"/>
<source>SocketTimeoutError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="280"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="294"/>
<source>NetworkError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="289"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="303"/>
<source>SslHandshakeFailedError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="293"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="307"/>
<source>SslInternalError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="297"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="311"/>
<source>SslInvalidUserDataError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="301"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="315"/>
<source>DatagramTooLargeError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="306"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="320"/>
<source>OperationError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="309"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="323"/>
<source>AddressInUseError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="312"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="326"/>
<source>SocketAddressNotAvailableError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="315"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="329"/>
<source>UnsupportedSocketOperationError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="318"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="332"/>
<source>ProxyAuthenticationRequiredError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="321"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="335"/>
<source>ProxyConnectionRefusedError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="324"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="338"/>
<source>UnfinishedSocketOperationError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="327"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="341"/>
<source>ProxyConnectionClosedError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="330"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="344"/>
<source>ProxyConnectionTimeoutError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="333"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="347"/>
<source>ProxyNotFoundError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="336"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="350"/>
<source>ProxyProtocolError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="339"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="353"/>
<source>TemporaryError</source>
<translation>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</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="342"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="356"/>
<source>UnknownSocketError</source>
<translation>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</translation>
</message>

BIN
jce_he.qm
View file

Binary file not shown.

107
jce_he.ts
View file

@ -46,8 +46,8 @@
<name>MainScreen</name>
<message>
<location filename="main/mainscreen.ui" line="20"/>
<source>JCE Avg Calculator</source>
<translation>JCE Avg Calculator</translation>
<source>JCE Manager</source>
<translation>JCE Manager</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="86"/>
@ -148,8 +148,9 @@
</message>
<message>
<location filename="main/mainscreen.ui" line="632"/>
<source>&lt;p align=&quot;right&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</source>
<translation>&lt;p align=&quot;right&quot;&gt;נוצר ע&quot;י: &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</translation>
<source>&lt;p align=&quot;center&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</source>
<oldsource>&lt;p align=&quot;right&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</oldsource>
<translation>&lt;p align=&quot;center&quot;&gt;נוצר ע&quot;י: &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="649"/>
@ -192,107 +193,107 @@
<translation>עזרה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="21"/>
<location filename="main/mainscreen.cpp" line="23"/>
<source>Ready</source>
<translation>מוכן</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="132"/>
<location filename="main/mainscreen.cpp" line="151"/>
<location filename="main/mainscreen.cpp" line="206"/>
<location filename="main/mainscreen.cpp" line="234"/>
<location filename="main/mainscreen.cpp" line="136"/>
<location filename="main/mainscreen.cpp" line="157"/>
<location filename="main/mainscreen.cpp" line="212"/>
<location filename="main/mainscreen.cpp" line="242"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="132"/>
<location filename="main/mainscreen.cpp" line="136"/>
<source>Invalid Dates.
Make Sure everything is correct and try again</source>
<translation>תאריכים לא חוקיים. אנא בדוק שהנתונים שהוזנו נכונים ונסה מחדשה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="151"/>
<location filename="main/mainscreen.cpp" line="234"/>
<location filename="main/mainscreen.cpp" line="157"/>
<location filename="main/mainscreen.cpp" line="242"/>
<source>Not Connected</source>
<translation>לא מחובר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="206"/>
<location filename="main/mainscreen.cpp" line="212"/>
<source>Missmatching data</source>
<translation>שגיאה בהכנסת נתונים</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="255"/>
<location filename="main/mainscreen.cpp" line="264"/>
<source>License:</source>
<translation>רישיון:</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="260"/>
<location filename="main/mainscreen.cpp" line="269"/>
<source>Powered By: </source>
<oldsource>powered by: </oldsource>
<translation>מנוע:</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="262"/>
<location filename="main/mainscreen.cpp" line="271"/>
<source>Developed By</source>
<translation></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="278"/>
<location filename="main/mainscreen.cpp" line="287"/>
<source>Help Guide</source>
<oldsource>Guide</oldsource>
<translation>תפריט עזרה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="264"/>
<location filename="main/mainscreen.cpp" line="273"/>
<source>Liran</source>
<translation>לירן בן גידה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="265"/>
<location filename="main/mainscreen.cpp" line="274"/>
<source>Sagi</source>
<translation>שגיא דיין</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="280"/>
<location filename="main/mainscreen.cpp" line="289"/>
<source>&lt;br&gt;&lt;li&gt;Login: &lt;ul&gt;&lt;li&gt;Type your username and password and click Login.&lt;/li&gt;&lt;li&gt;Once you are connected, you will see a green ball in the right buttom panel.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;התחברות: &lt;ul&gt;&lt;li&gt;הזן את שם המשתמש והסיסמה ולחץ על התחבר&lt;/li&gt;&lt;li&gt;בגמר ההתחברות תראה בכדור ירוק בשורת המצב. המשמעות שהינך מחובר לאתר&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="281"/>
<location filename="main/mainscreen.cpp" line="290"/>
<source>&lt;br&gt;&lt;li&gt;Getting GPA sheet&lt;ul&gt;&lt;li&gt;Click on GPA Tab&lt;/li&gt;&lt;li&gt; Select your dates and click on Add&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;קבלת גליון ציונים&lt;ul&gt;&lt;li&gt;לחץ על לשונית הציונים&lt;/li&gt;&lt;li&gt;בחר את טווח התאריכים הרצויים ולחץ על הוספה&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="282"/>
<location filename="main/mainscreen.cpp" line="291"/>
<source>&lt;br&gt;&lt;li&gt;Average Changing&lt;ul&gt;&lt;li&gt;Change one of your grade and see the average in the buttom panel changing.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;שינוי ממוצע&lt;ul&gt;&lt;li&gt;שנה את אחד הציונים שלך בקורס והממוצע ישתנה בהתאם.&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="283"/>
<location filename="main/mainscreen.cpp" line="292"/>
<source>&lt;br&gt;&lt;li&gt;Getting Calendar&lt;ul&gt;&lt;li&gt;Click on Calendar Tab&lt;/li&gt;&lt;li&gt; Select your dates and click on Get Calendar&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;קבלת שעות מערכת&lt;ul&gt;&lt;li&gt;לחץ על לשונית שעות מערכת&lt;/li&gt;&lt;li&gt;בחר את השנה והסמסטר ולחץ על הצג מערכת&lt;/li&gt;&lt;/ul&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="284"/>
<location filename="main/mainscreen.cpp" line="293"/>
<source>&lt;br&gt;&lt;li&gt;For exporting your calendar to a .CSV file:&lt;ul&gt;&lt;li&gt;Do previous step and continue to next step&lt;/li&gt;&lt;li&gt; Click on Export to CSV&lt;/li&gt;&lt;li&gt;Select your dates and click OK&lt;/li&gt;&lt;li&gt;Once you&apos;re Done, go on your calendar and import your csv file&lt;/li&gt;&lt;/li&gt;</source>
<translation>&lt;br&gt;&lt;li&gt;על מנת לייצא לקובץ CSV&lt;ul&gt;&lt;li&gt;בצע את השלב הקודם ואז&lt;/li&gt;&lt;li&gt; לחץ על ייצוא לCSV&lt;/li&gt;&lt;li&gt;בחר את התאריכים המתאימים ולחץ אישור&lt;/li&gt;&lt;li&gt;לאחר השלמת הפעולה תוכל לייבא את המערכת שעות&lt;/li&gt;&lt;/li&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="286"/>
<location filename="main/mainscreen.cpp" line="295"/>
<source>&lt;b&gt;For more information, please visit us at: &lt;a href=&apos;http://liranbg.github.io/JceManager/&apos;&gt;Jce Manager site&lt;/a&gt;&lt;/b&gt;</source>
<translation>&lt;b&gt;לעוד מידע: &lt;a href=&apos;http://liranbg.github.io/JceManager/&apos;&gt;Jce Manager site&lt;/a&gt;&lt;/b&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="297"/>
<location filename="main/mainscreen.cpp" line="325"/>
<location filename="main/mainscreen.cpp" line="306"/>
<location filename="main/mainscreen.cpp" line="334"/>
<source>Settings</source>
<translation>הגדרות</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="297"/>
<location filename="main/mainscreen.cpp" line="311"/>
<location filename="main/mainscreen.cpp" line="325"/>
<location filename="main/mainscreen.cpp" line="306"/>
<location filename="main/mainscreen.cpp" line="320"/>
<location filename="main/mainscreen.cpp" line="334"/>
<source>Your settings will take effect next time you start the program</source>
<translation>ההגדרות שלך ייכנסו לתוקפן בפעם הבאה שתפעיל את התוכנה</translation>
</message>
@ -423,117 +424,117 @@ If this message appear without reason, please contact me at liranbg@gmail.com</s
<translation>שישי</translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="249"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="263"/>
<source>ConnectionRefusedError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="254"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="268"/>
<source>RemoteHostClosedError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="264"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="278"/>
<source>HostNotFoundError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="269"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="283"/>
<source>SocketAccessError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="273"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="287"/>
<source>SocketTimeoutError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="280"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="294"/>
<source>NetworkError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="289"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="303"/>
<source>SslHandshakeFailedError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="293"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="307"/>
<source>SslInternalError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="297"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="311"/>
<source>SslInvalidUserDataError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="301"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="315"/>
<source>DatagramTooLargeError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="306"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="320"/>
<source>OperationError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="309"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="323"/>
<source>AddressInUseError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="312"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="326"/>
<source>SocketAddressNotAvailableError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="315"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="329"/>
<source>UnsupportedSocketOperationError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="318"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="332"/>
<source>ProxyAuthenticationRequiredError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="321"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="335"/>
<source>ProxyConnectionRefusedError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="324"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="338"/>
<source>UnfinishedSocketOperationError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="327"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="341"/>
<source>ProxyConnectionClosedError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="330"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="344"/>
<source>ProxyConnectionTimeoutError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="333"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="347"/>
<source>ProxyNotFoundError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="336"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="350"/>
<source>ProxyProtocolError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="339"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="353"/>
<source>TemporaryError</source>
<translation></translation>
</message>
<message>
<location filename="src/jceConnection/jcesslclient.cpp" line="342"/>
<location filename="src/jceConnection/jcesslclient.cpp" line="356"/>
<source>UnknownSocketError</source>
<translation></translation>
</message>

18
main/mainscreen.cpp
View file

@ -7,6 +7,8 @@ MainScreen::MainScreen(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainSc
ui->setupUi(this);
//this->setFixedSize(this->size()); //main not resizeable
ui->labelMadeBy->setOpenExternalLinks(true);
//Login Tab
iconPix.load(":/icons/iconX.png");
ui->pswdLineEdit->setEchoMode((QLineEdit::Password));
@ -84,6 +86,7 @@ void MainScreen::on_loginButton_clicked()
ui->labelPswInputStatus->setVisible(false);
}
qDebug() << Q_FUNC_INFO << "login session start";
QApplication::setOverrideCursor(Qt::WaitCursor);
if (this->loginHandel->login(ui->usrnmLineEdit->text(),ui->pswdLineEdit->text()) == true)
{
qDebug() << Q_FUNC_INFO << "login session end with true";
@ -103,6 +106,7 @@ void MainScreen::on_loginButton_clicked()
ui->usrnmLineEdit->setDisabled(false);
}
QApplication::restoreOverrideCursor();
}
void MainScreen::on_keepLogin_clicked()
{
@ -134,6 +138,7 @@ void MainScreen::on_ratesButton_clicked()
}
QString pageString;
int status = 0;
QApplication::setOverrideCursor(Qt::WaitCursor);
if (loginHandel->isLoggedInFlag())
{
if ((status = loginHandel->makeGradeRequest(ui->spinBoxCoursesFromYear->value(),
@ -148,6 +153,7 @@ void MainScreen::on_ratesButton_clicked()
else if (status == jceLogin::JCE_NOT_CONNECTED)
{
qWarning() << Q_FUNC_INFO << "not connected";
QApplication::restoreOverrideCursor();
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
}
else
@ -155,6 +161,7 @@ void MainScreen::on_ratesButton_clicked()
qCritical() << Q_FUNC_INFO << "grade get ended with" << status;
}
}
QApplication::restoreOverrideCursor();
}
bool MainScreen::checkIfValidDates()
{
@ -197,7 +204,6 @@ void MainScreen::on_spinBoxCoursesToSemester_valueChanged(int arg1)
}
void MainScreen::on_coursesTable_itemChanged(QTableWidgetItem *item)
{
qDebug() << Q_FUNC_INFO << "item at row:" << item->row() << " colum:" << item->column() << " text: " << item->text();
if (this->courseTableMgr->changes(item->text(),item->row(),item->column()))
ui->avgLCD->display(courseTableMgr->getAvg());
else
@ -217,6 +223,7 @@ void MainScreen::on_getCalendarBtn_clicked()
{
qDebug() << Q_FUNC_INFO << "in: " << ui->tabWidget->currentWidget()->objectName();
int status = 0;
QApplication::setOverrideCursor(Qt::WaitCursor);
if (loginHandel->isLoggedInFlag())
{
if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_PAGE_PASSED)
@ -231,11 +238,13 @@ void MainScreen::on_getCalendarBtn_clicked()
else if (status == jceLogin::JCE_NOT_CONNECTED)
{
qWarning() << Q_FUNC_INFO << "not connected";
QApplication::restoreOverrideCursor();
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
}
else
qCritical() << Q_FUNC_INFO << "calendar get ended with" << status;
}
QApplication::restoreOverrideCursor();
}
void MainScreen::on_exportToCVSBtn_clicked()
{
@ -344,3 +353,10 @@ void MainScreen::checkLocale()
ui->actionEnglish->setChecked(false);
}
}
void MainScreen::on_labelMadeBy_linkActivated(const QString &link)
{
qDebug() << Q_FUNC_INFO << "link: " << link;
}

2
main/mainscreen.h
View file

@ -65,6 +65,8 @@ private slots:
void on_spinBoxCoursesToSemester_valueChanged(int arg1);
void on_labelMadeBy_linkActivated(const QString &link);
private:
void checkLocale();

6
main/mainscreen.ui
View file

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>JCE Avg Calculator</string>
<string>JCE Manager</string>
</property>
<property name="windowIcon">
<iconset resource="../resources/connectionstatus.qrc">
@ -61,7 +61,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<property name="documentMode">
<bool>false</bool>
@ -627,7 +627,7 @@ font-size: 15px;
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="labelMadeBy">
<property name="text">
<string>&lt;p align=&quot;center&quot;&gt;Made By &lt;a href=&quot;http://liranbg.github.io/JceManager/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;JceManager&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;</string>
</property>

64
src/jceConnection/jcesslclient.cpp
View file

@ -11,7 +11,6 @@ jceSSLClient::jceSSLClient() : flag(false), packet(""), networkConf(), reConnect
connect(this,SIGNAL(encrypted()),this,SLOT(setEncrypted()));
connect(this,SIGNAL(disconnected()),this,SLOT(setDisconnected()));
connect(&networkConf,SIGNAL(onlineStateChanged(bool)),this,SLOT(setOnlineState(bool)));
//loop event will connect the server, and when it is connected, it will quit - but connection will be open
connect(this, SIGNAL(encrypted()), &loop, SLOT(quit()));
connect(this, SIGNAL(error(QAbstractSocket::SocketError)),&loop,SLOT(quit()));
@ -25,8 +24,22 @@ jceSSLClient::jceSSLClient() : flag(false), packet(""), networkConf(), reConnect
*/
bool jceSSLClient::makeConnect(QString server, int port)
{
if (this->networkConf.isOnline() == false)
if (this->supportsSsl() == false)
{
qCritical() << Q_FUNC_INFO << "Couldnt load ssl package. ERROR";
return false;
}
else
qDebug() << Q_FUNC_INFO << "ssl loaded.";
if (isConnectedToNetwork() == false)
{
qDebug() << Q_FUNC_INFO << "return false. not online";
return false;
}
else
qDebug() << Q_FUNC_INFO << "we're online";
if (reConnection) //reset reconnectiong flag
{
@ -79,7 +92,7 @@ bool jceSSLClient::makeDiconnect()
*/
bool jceSSLClient::isConnected()
{
bool tempFlag;
bool tempFlag = false;
//checking state before returning flag!
if (state() == QAbstractSocket::SocketState::UnconnectedState)
{
@ -91,7 +104,7 @@ bool jceSSLClient::isConnected()
}
else if (state() == QAbstractSocket::SocketState::ConnectedState)
{
if (this->networkConf.isOnline())
if (isConnectedToNetwork())
tempFlag = true;
else
{
@ -100,7 +113,7 @@ bool jceSSLClient::isConnected()
}
}
if (!this->networkConf.isOnline()) //no link, ethernet\wifi
if (!isConnectedToNetwork()) //no link, ethernet\wifi
tempFlag = false;
return ((flag) && (tempFlag));
}
@ -112,6 +125,7 @@ bool jceSSLClient::isConnected()
bool jceSSLClient::sendData(QString str)
{
bool sendDataFlag = false;
if (isConnected()) //if connected
{
write(str.toStdString().c_str(),str.length());
@ -253,7 +267,7 @@ void jceSSLClient::showIfErrorMsg()
case QAbstractSocket::SocketError::RemoteHostClosedError: /**/
errorString = QObject::tr("RemoteHostClosedError");
//The remote host closed the connection
if (networkConf.isOnline()) //we can reconnect
if (isConnectedToNetwork()) //we can reconnect
{
reConnection = true;
}
@ -279,7 +293,7 @@ void jceSSLClient::showIfErrorMsg()
case QAbstractSocket::SocketError::NetworkError: /**/
errorString = QObject::tr("NetworkError");
//An error occurred with the network (e.g., the network cable was accidentally plugged out).
if (networkConf.isOnline()) //we can reconnect
if (isConnectedToNetwork()) //we can reconnect
{
}
else
@ -358,9 +372,18 @@ void jceSSLClient::showIfErrorMsg()
void jceSSLClient::checkErrors(QAbstractSocket::SocketError a)
{
//ignore this stupid error
if (!((isConnected()) && (a == QAbstractSocket::SocketError::SocketTimeoutError)))
bool timeout = (a == QAbstractSocket::SocketError::SocketTimeoutError);
if (!((isConnected()) && (timeout)))
{
qWarning() << Q_FUNC_INFO << "isOnline?: " << this->networkConf.isOnline();
qWarning() << Q_FUNC_INFO << "isOnline?: " << isConnectedToNetwork();
qWarning() << Q_FUNC_INFO << "state is: " << state();
qWarning() << Q_FUNC_INFO << "Var Error: " << a;
qWarning() << Q_FUNC_INFO << "Error: " << errorString();
}
else
{
qDebug() << Q_FUNC_INFO << "isConnected?: " << isConnected() << "is timeout?" << timeout;
qWarning() << Q_FUNC_INFO << "isOnline?: " << isConnectedToNetwork();
qWarning() << Q_FUNC_INFO << "state is: " << state();
qWarning() << Q_FUNC_INFO << "Var Error: " << a;
qWarning() << Q_FUNC_INFO << "Error: " << errorString();
@ -368,3 +391,26 @@ void jceSSLClient::checkErrors(QAbstractSocket::SocketError a)
showIfErrorMsg();
}
/** written by KARAN BALKAR
* @brief jceSSLClient::isConnectedToNetwork
* @return
*/
bool jceSSLClient::isConnectedToNetwork(){
QList<QNetworkInterface> ifaces = QNetworkInterface::allInterfaces();
bool result = false;
for (int i = 0; i < ifaces.count(); ++i)
{
QNetworkInterface iface = ifaces.at(i);
if ( iface.flags().testFlag(QNetworkInterface::IsUp) && !iface.flags().testFlag(QNetworkInterface::IsLoopBack))
for (int j=0; j < iface.addressEntries().count(); ++j)
// got an interface which is up, and has an ip address
if (result == false)
result = true;
}
return result;
}

2
src/jceConnection/jcesslclient.h
View file

@ -7,6 +7,7 @@
#include <QEventLoop>
#include <QMessageBox>
#include <QNetworkConfigurationManager>
#include <QtNetwork/QNetworkInterface>
#define milisTimeOut 4000
@ -37,6 +38,7 @@ private slots:
void setOnlineState(bool isOnline);
private:
bool isConnectedToNetwork(); //checking if online
bool flag;
QString packet;
QEventLoop loop; //handle the connection as thread