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

Merge conflict fix

Browse source
This commit is contained in:
Sagi Dayan 2014-09-11 15:27:00 +03:00
commit a684e59628
15 changed files with 1402 additions and 736 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
jceGrade.pro
View file

@ -9,7 +9,10 @@ TARGET = jceGrade
TEMPLATE = app
RC_FILE = appConfigure.rc
CONFIG += qt c++11
CONFIG += console
CONFIG += console static
TRANSLATIONS = jce_en.ts \
jce_he.ts
FORMS += \

BIN
jce_en.qm
View file

Binary file not shown.

480
jce_en.ts
View file

@ -6,248 +6,380 @@
<message>
<location filename="main/mainscreen.ui" line="20"/>
<source>JCE Avg Calculator</source>
<translation>JCE Manager</translation>
<translation>JCE Avg Calculator</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="86"/>
<location filename="main/mainscreen.ui" line="193"/>
<location filename="main/mainscreen.ui" line="178"/>
<source>Login</source>
<translation>Login</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="177"/>
<location filename="main/mainscreen.ui" line="162"/>
<source>Keep login</source>
<translation>Keep login</translation>
</message>
<message>
<source>&lt;color=#000000&gt;Username</source>
<translation type="vanished">Usernameasdfasdg</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="234"/>
<location filename="main/mainscreen.cpp" line="11"/>
<location filename="main/mainscreen.ui" line="240"/>
<source>Username</source>
<translation>Username</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="260"/>
<location filename="main/mainscreen.ui" line="281"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="306"/>
<source>Courses</source>
<translation>Grade Table</translation>
<location filename="main/mainscreen.ui" line="314"/>
<source>GPA</source>
<translation>GPA</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="343"/>
<location filename="main/mainscreen.ui" line="351"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Get your grades&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>Get Your Grades</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Get your grades&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="346"/>
<location filename="main/mainscreen.ui" line="354"/>
<source>Add</source>
<translation>Add</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="353"/>
<location filename="main/mainscreen.ui" line="361"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Clear table&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>Clear Table</translation>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Clear table&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="356"/>
<location filename="main/mainscreen.ui" line="364"/>
<source>Clear</source>
<translation>Clear</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="380"/>
<location filename="main/mainscreen.ui" line="388"/>
<source>Average:</source>
<translation>Average:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="428"/>
<source>Settings</source>
<translation>Sattings</translation>
<location filename="main/mainscreen.ui" line="426"/>
<source>Only Main Courses</source>
<translation>Only Main Courses</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="474"/>
<source>Semester</source>
<translation>Senester</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="497"/>
<source>Year</source>
<translation>Year</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="530"/>
<location filename="main/mainscreen.ui" line="439"/>
<source>From</source>
<translation>From</translation>
<translation>&lt;b&gt;From&lt;/b&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="549"/>
<location filename="main/mainscreen.ui" line="446"/>
<location filename="main/mainscreen.ui" line="512"/>
<source>Year:</source>
<translation>Year:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="466"/>
<source>Semester:</source>
<translation>Semester:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="505"/>
<source>To</source>
<translation>To</translation>
<translation>&lt;b&gt;To&lt;/b&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="655"/>
<source>Only influence Courses</source>
<translation>Only influence Courses</translation>
<location filename="main/mainscreen.ui" line="532"/>
<source>Semester</source>
<translation>Semester</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="683"/>
<source>&amp;About</source>
<translation>&amp;About</translation>
<location filename="main/mainscreen.ui" line="557"/>
<source>Calendar</source>
<translation>Calendar</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="707"/>
<location filename="main/mainscreen.ui" line="595"/>
<source>Get Calendar</source>
<translation>Get Calendar</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="602"/>
<source>Export to CSV</source>
<translation>Export to .CSV</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="642"/>
<source>&amp;File</source>
<translation>&amp;File</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="646"/>
<source>Language</source>
<translation>Language</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="675"/>
<source>Credits</source>
<translation>Credits</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="712"/>
<location filename="main/mainscreen.ui" line="680"/>
<source>Exit</source>
<translation>Exit</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="717"/>
<source>How-To</source>
<translation>How-To</translation>
<location filename="main/mainscreen.ui" line="688"/>
<source>Hebrew</source>
<translation>עברית</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="79"/>
<location filename="main/mainscreen.ui" line="696"/>
<source>English</source>
<translation>English</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="704"/>
<source>OS Default</source>
<translation>OS Default</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="709"/>
<source>How To</source>
<translation>How To</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="73"/>
<source>Connecting</source>
<translation>Connecting</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="77"/>
<source>Connected</source>
<translation>Connected</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="81"/>
<source>Disconnected</source>
<translation>Disconnected</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="119"/>
<source>&amp;Login</source>
<translation>&amp;Login</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="167"/>
<source>&amp;Logout</source>
<translation>Log&amp;out</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="194"/>
<location filename="main/mainscreen.cpp" line="248"/>
<location filename="main/mainscreen.cpp" line="271"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="79"/>
<location filename="main/mainscreen.cpp" line="194"/>
<location filename="main/mainscreen.cpp" line="271"/>
<source>Not Connected</source>
<translation>Not Connected</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP1</source>
<translation>A tiny Application to calculate your grades average.</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP2</source>
<translation>This software is licensed under Qt5's </translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP3</source>
<translation>The source code is available at github:</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP4</source>
<translation>This front end is Powered by</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>DevBy</source>
<translation>Developed By</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Liran</source>
<translation>Liran Ben Gida</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Sagi</source>
<translation>Sagi Dayan</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Nadav</source>
<translation>Nadav Luzzato</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Tnks</source>
<translation>Thanks to</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Code</source>
<translation>Code</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Name</source>
<translation>Course</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Points</source>
<translation>Points</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Hours</source>
<translation>Weekly Hours</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Grade</source>
<translation>Grade</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Additions</source>
<translation>Additions</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP1</source>
<translation>Insert your username and password correctly</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP2</source>
<translation>Login and wait for the ball in the status (buttom) bar to become Green</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP3</source>
<translation>Check the Settings to select your date Interval</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP4</source>
<translation>Press Courses tab and then press the Add button and wait until courses will be loaded into the table</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP5</source>
<translation>Change the once of the grade cell and see your average is changing.</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP6</source>
<translation>Tip: Need to change Date interval? in Courses tab click Clean, then change the date interval then hit the Add button again! :-)</translation>
</message>
<location filename="main/mainscreen.cpp" line="248"/>
<source>Missmatching data</source>
<translation>Missmatching Data</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="284"/>
<source>CREDITS-ROOL-UP1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="285"/>
<source>CREDITS-ROOL-UP2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="286"/>
<source>CREDITS-ROOL-UP3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="288"/>
<source>CREDITS-ROOL-UP4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="289"/>
<source>DevBy</source>
<translation>Developed By</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="291"/>
<source>Liran</source>
<translation>Liran Ben Gida</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="292"/>
<source>Sagi</source>
<translation>Sagi Dayan</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="304"/>
<source>HELP1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="305"/>
<source>HELP2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="306"/>
<source>HELP3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="307"/>
<source>HELP4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="308"/>
<source>HELP5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="309"/>
<source>HELP6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="322"/>
<location filename="main/mainscreen.cpp" line="351"/>
<source>Settings</source>
<translation>Settings</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="322"/>
<location filename="main/mainscreen.cpp" line="336"/>
<location filename="main/mainscreen.cpp" line="351"/>
<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>
</context>
<context>
<name>QObject</name>
<message>
<location filename="main/CalendarTab/CalendarManager.cpp" line="17"/>
<source>Exported Successfuly!</source>
<translation>Exported Successfuly!</translation>
</message>
<message>
<location filename="main/CalendarTab/CalendarManager.cpp" line="23"/>
<source>&lt;center&gt;Something went wrong...&lt;br&gt;&lt;/center&gt;Maybe: &lt;ul&gt;&lt;li&gt;You Canceled&lt;/li&gt;&lt;li&gt;Unable to save the File - try again&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;&lt;center&gt;In case of a serious problem, please file a bug report.&lt;br&gt;thank you. OpenJCE teem</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Code</source>
<translation>Code</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Type</source>
<translation>Type</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Points</source>
<translation>Points</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Hours</source>
<translation>Hours</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Grade</source>
<translation>Grade</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Additions</source>
<translation>Additions</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="36"/>
<source>Please Check Your Username &amp; Password</source>
<translation>Please Check Your Username &amp; Password</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="47"/>
<source>You have been blocked by JCE, please try in a couple of minutes.</source>
<translation>You have been &lt;b&gt;blocked&lt;/b&gt; by JCE, please try in a couple of minutes.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="53"/>
<source>Please Check Your Internet Connection.</source>
<translation>Please Check Your Internet Connection.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="67"/>
<source>Receive Request Timeout.</source>
<translation>Receive Request Timeout.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="74"/>
<source>Send Request Timeout.</source>
<translation>Send Request Timeout.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="134"/>
<source>
If this message appear without reason, please contact me at liranbg@gmail.com</source>
<translation>
If this message appear without reason, please contact me at liranbg@gmail.com</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="137"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Sunday</source>
<translation>Sunday</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Monday</source>
<translation>Monday</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Tuesday</source>
<translation>Thesday</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Wednesday</source>
<translation>Wednesday</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Thursday</source>
<translation>Thursday</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Friday</source>
<translation>Friday</translation>
</message>
</context>
</TS>

BIN
jce_he.qm
View file

Binary file not shown.

635
jce_he.ts
View file

@ -2,261 +2,384 @@
<!DOCTYPE TS>
<TS version="2.1" language="he_IL">
<context>
<name>MainScreen</name>
<message>
<location filename="main/mainscreen.ui" line="20"/>
<source>JCE Avg Calculator</source>
<translation>JCE Manager</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="86"/>
<location filename="main/mainscreen.ui" line="193"/>
<source>Login</source>
<translation>התחבר</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="177"/>
<source>Keep login</source>
<translation>שמור פרטים</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="234"/>
<location filename="main/mainscreen.cpp" line="11"/>
<source>Username</source>
<translation>שם משתמש</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="260"/>
<source>Password</source>
<translation>סיסמה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="306"/>
<source>Courses</source>
<translation>גיליון ציונים</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="343"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Get your grades&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>קבל את הציונים שלך</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="346"/>
<source>Add</source>
<translation>הוספה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="353"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Clear table&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>נקה טבלה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="356"/>
<source>Clear</source>
<translation>נקה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="380"/>
<source>Average:</source>
<translation>ממוצע:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="428"/>
<source>Settings</source>
<translation>הגדרות</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="474"/>
<source>Semester</source>
<translation>סמסטר</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="497"/>
<source>Year</source>
<translation>שנה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="530"/>
<source>From</source>
<translation>מסמסטר</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="549"/>
<source>To</source>
<translation>לסמסטר</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="655"/>
<source>Only influence Courses</source>
<translation>רק קורסים בעלי השפעה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="683"/>
<source>&amp;About</source>
<translation>&amp;אודות</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="707"/>
<source>Credits</source>
<translation>אודות</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="712"/>
<source>Exit</source>
<translation>יציאה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="717"/>
<source>How-To</source>
<translation>עזרה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="79"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="79"/>
<source>Not Connected</source>
<translation>לא התחבר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="218"/>
<source>Connecting</source>
<translation>מנסה להתחבר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="222"/>
<source>Connected</source>
<translation>מחובר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Disconnected</source>
<translation>מנותק</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP1</source>
<translation>אפליקציה קטנה לחישוב ציונים</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP2</source>
<translation>רישיון השימוש בתוכנה ובקוד הפתוח רשום תחת </translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP3</source>
<translation>כל קוד המקור של התוכנה נמצא בגיטהאב:</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>CREDITS-ROOL-UP4</source>
<translation>התוכנה פועלת בעזרת המנוע</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>DevBy</source>
<translation>פותח ע"י</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Liran</source>
<translation>לירן בן גידה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Sagi</source>
<translation>שגיא דיין</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Nadav</source>
<translation>נדב לוצטו</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="226"/>
<source>Tnks</source>
<translation>תודה רבה ל</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Code</source>
<translation>קוד קורס</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Name</source>
<translation>קורס</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Type</source>
<translation>סוג</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Points</source>
<translation>נקודות זכות</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Hours</source>
<translation>שעות שבועיות</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Grade</source>
<translation>ציון</translation>
</message>
<message>
<location filename="main/coursestablemanager.cpp" line="15"/>
<source>Additions</source>
<translation>הערות</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP1</source>
<translation>הכנס את שם המשתמש והסיסמה כמו שצריך</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP2</source>
<translation>לחץ התחבר והמתן על שהתוכנה תתחבר, עיגול ירוק למטה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP3</source>
<translation>הכנס להגדרות כדי לבחור את טווח הגיליון</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP4</source>
<translation>לחץ על העמוד של גיליון הציונים ולחץ הוספהת המתן עד שהציונים יופיעו בטבלה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP5</source>
<translation>שנה ושחק עם הציונים כדי לראות את הממוצע משתנה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="276"/>
<source>HELP6</source>
<translation>טיפ: רוצה לשנות את תקופת הזמן? לחץ על נקה, ולאחר מכן שנה את תקופת הזמן ולחץ על הוספה שוב! :-)</translation>
</message>
<name>MainScreen</name>
<message>
<location filename="main/mainscreen.ui" line="20"/>
<source>JCE Avg Calculator</source>
<translation>JCE Avg Calculator</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="86"/>
<location filename="main/mainscreen.ui" line="178"/>
<source>Login</source>
<translation>כניסה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="162"/>
<source>Keep login</source>
<translation>שמור פרטים</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="240"/>
<source>Username</source>
<translation>שם משתמש</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="281"/>
<source>Password</source>
<translation>סיסמה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="314"/>
<source>GPA</source>
<translation>גליון ציונים</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="351"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Get your grades&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;ציונים הצג&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="354"/>
<source>Add</source>
<translation>הוסף</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="361"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Clear table&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;טבלה נקהe&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="364"/>
<source>Clear</source>
<translation>נקה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="388"/>
<source>Average:</source>
<translation>ממוצע:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="426"/>
<source>Only Main Courses</source>
<translation>הצג קורסים משמעותיים בלבד</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="439"/>
<source>From</source>
<translation>&lt;b&gt;מסמסטר&lt;/b&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="446"/>
<location filename="main/mainscreen.ui" line="512"/>
<source>Year:</source>
<translation>שנה:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="466"/>
<source>Semester:</source>
<translation>סמסטר:</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="505"/>
<source>To</source>
<translation>&lt;b&gt;עד סמסטר&lt;/b&gt;</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="532"/>
<source>Semester</source>
<translation>סמסטר</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="557"/>
<source>Calendar</source>
<translation>מערכת שעות</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="595"/>
<source>Get Calendar</source>
<translation>הצג מערכת</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="602"/>
<source>Export to CSV</source>
<translation type="unfinished">CSV ייצא אל קובץ</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="642"/>
<source>&amp;File</source>
<translation>&amp;קובץ</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="646"/>
<source>Language</source>
<translation>שפה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="675"/>
<source>Credits</source>
<translation>קרדיט</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="680"/>
<source>Exit</source>
<translation>יציאה</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="688"/>
<source>Hebrew</source>
<translation>עברית</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="696"/>
<source>English</source>
<translation>English</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="704"/>
<source>OS Default</source>
<translation>ברירת מחדל</translation>
</message>
<message>
<location filename="main/mainscreen.ui" line="709"/>
<source>How To</source>
<translation>עזרה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="73"/>
<source>Connecting</source>
<translation>מתחבר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="77"/>
<source>Connected</source>
<translation>מחובר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="81"/>
<source>Disconnected</source>
<translation>מנותק</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="119"/>
<source>&amp;Login</source>
<translation>&amp;התחברות</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="167"/>
<source>&amp;Logout</source>
<translation>&amp;התנתקות</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="194"/>
<location filename="main/mainscreen.cpp" line="248"/>
<location filename="main/mainscreen.cpp" line="271"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="194"/>
<location filename="main/mainscreen.cpp" line="271"/>
<source>Not Connected</source>
<translation>לא מחובר</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="248"/>
<source>Missmatching data</source>
<translation>שגיאה בהכנסת נתונים</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="284"/>
<source>CREDITS-ROOL-UP1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="285"/>
<source>CREDITS-ROOL-UP2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="286"/>
<source>CREDITS-ROOL-UP3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="288"/>
<source>CREDITS-ROOL-UP4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="289"/>
<source>DevBy</source>
<translation>פותח על ידי</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="291"/>
<source>Liran</source>
<translation>לירן בן גידה</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="292"/>
<source>Sagi</source>
<translation>שגיא דיין</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="304"/>
<source>HELP1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="305"/>
<source>HELP2</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="306"/>
<source>HELP3</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="307"/>
<source>HELP4</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="308"/>
<source>HELP5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="309"/>
<source>HELP6</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="322"/>
<location filename="main/mainscreen.cpp" line="351"/>
<source>Settings</source>
<translation>הגדרות</translation>
</message>
<message>
<location filename="main/mainscreen.cpp" line="322"/>
<location filename="main/mainscreen.cpp" line="336"/>
<location filename="main/mainscreen.cpp" line="351"/>
<source>Your settings will take effect next time you start the program</source>
<translation>ההגדרות שלך ייכנסו לתוקפן בפעם הבאה שתפעיל את התוכנה</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<location filename="main/CalendarTab/CalendarManager.cpp" line="17"/>
<source>Exported Successfuly!</source>
<translation>הייצוא הושלם!</translation>
</message>
<message>
<location filename="main/CalendarTab/CalendarManager.cpp" line="23"/>
<source>&lt;center&gt;Something went wrong...&lt;br&gt;&lt;/center&gt;Maybe: &lt;ul&gt;&lt;li&gt;You Canceled&lt;/li&gt;&lt;li&gt;Unable to save the File - try again&lt;/li&gt;&lt;/ul&gt;&lt;br&gt;&lt;br&gt;&lt;b&gt;&lt;center&gt;In case of a serious problem, please file a bug report.&lt;br&gt;thank you. OpenJCE teem</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Code</source>
<translation>קוד קורס</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Name</source>
<translation>שם קורס</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Type</source>
<translation>סוג</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Points</source>
<translation>נק&apos; זכות</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Hours</source>
<translation>שעות</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Grade</source>
<translation>ציון</translation>
</message>
<message>
<location filename="main/CourseTab/coursestablemanager.cpp" line="15"/>
<source>Additions</source>
<translation>תוספת</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="36"/>
<source>Please Check Your Username &amp; Password</source>
<translation>אנא בדוק את שם המשתמש והסיסמה שלך</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="47"/>
<source>You have been blocked by JCE, please try in a couple of minutes.</source>
<translation>נחסמת ע&quot;י האתר, אנא נסה מאוחר יותר.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="53"/>
<source>Please Check Your Internet Connection.</source>
<translation>בדוק את החיבור שלך לאינטרנט.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="67"/>
<source>Receive Request Timeout.</source>
<translation>בקשת קבלה נכשלה.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="74"/>
<source>Send Request Timeout.</source>
<translation>בקשת שליחה נכשלה.</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="134"/>
<source>
If this message appear without reason, please contact me at liranbg@gmail.com</source>
<translation>
אם הודעה זו חוזרת על עצמה ללא סיבה. אנא פנה אל המפתח במייל liranbg@gmail.com</translation>
</message>
<message>
<location filename="main/LoginTab/loginhandler.cpp" line="137"/>
<source>Error</source>
<translation>שגיאה</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Sunday</source>
<translation>ראשון</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Monday</source>
<translation>שני</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Tuesday</source>
<translation>שלישי</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Wednesday</source>
<translation>רביעי</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Thursday</source>
<translation>חמישי</translation>
</message>
<message>
<location filename="src/jceData/Calendar/calendarSchedule.cpp" line="22"/>
<source>Friday</source>
<translation>שישי</translation>
</message>
</context>
</TS>

6
main/CalendarTab/CalendarManager.cpp
View file

@ -14,14 +14,14 @@ void CalendarManager::exportCalendarCSV(CalendarDialog *calDialog)
if(CSV_Exporter::exportCalendar(this->caliSchedPtr, calDialog))
{
QMessageBox msgBox;
msgBox.setText("<center>Exported Successfuly!<br><b>HaazZaA!!");
msgBox.setText(QObject::tr("Exported Successfuly!"));
msgBox.exec();
}else
{
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Critical);
msgBox.setText("<center>Something went wrong...<br></center>Maybe: <ul><li>You Canceled</li><li>Unable to save the File - try again</li></ul><br><br>"
"<b><center>In case of a serious problem, please file a bug report.<br>thank you. OpenJCE teem");
msgBox.setText(QObject::tr("<center>Something went wrong...<br></center>Maybe: <ul><li>You Canceled</li><li>Unable to save the File - try again</li></ul><br><br>"
"<b><center>In case of a serious problem, please file a bug report.<br>thank you. OpenJCE teem"));
msgBox.exec();
}

15
main/LoginTab/loginhandler.cpp
View file

@ -6,7 +6,6 @@ loginHandler::loginHandler(user *ptr): logggedInFlag(false)
}
void loginHandler::setPointers(QLabel *statusLabelPtr,QLineEdit *pswdEditPtr,QLineEdit *usrnmEditPtr)
{
this->statusLabelPtr = statusLabelPtr;
this->pswdEditPtr = pswdEditPtr;
this->usrnmEditPtr = usrnmEditPtr;
@ -34,7 +33,7 @@ bool loginHandler::makeConnection()
}
case jceLogin::ERROR_ON_VALIDATION:
{
popMessage("Please Check Your Username & Password",false);
popMessage(QObject::tr("Please Check Your Username & Password"),false);
usrnmEditPtr->setDisabled(false);
pswdEditPtr->setDisabled(false);
@ -45,13 +44,13 @@ bool loginHandler::makeConnection()
}
case jceLogin::ERROR_ON_VALIDATION_USER_BLOCKED:
{
popMessage("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."));
jceLog->closeAll();
return false;
}
case jceLogin::ERROR_ON_OPEN_SOCKET:
{
popMessage("Please Check Your Internet Connection.");
popMessage(QObject::tr("Please Check Your Internet Connection."));
jceLog->closeAll();
return false;
}
@ -65,14 +64,14 @@ bool loginHandler::makeConnection()
}
case jceLogin::ERROR_ON_GETTING_INFO:
{
popMessage("Recieve Request Time Out.");
popMessage(QObject::tr("Receive Request Timeout."));
jceLog->closeAll();
return false;
break;
}
case jceLogin::ERROR_ON_SEND_REQUEST:
{
popMessage("Send Request Time Out.");
popMessage(QObject::tr("Send Request Timeout."));
jceLog->closeAll();
return false;
break;
@ -132,10 +131,10 @@ int loginHandler::makeCalendarRequest(int year, int semester)
void loginHandler::popMessage(QString message,bool addInfo)
{
if (addInfo)
message.append("\nIf this message appear without reason, please contact me at liranbg@gmail.com");
message.append(QObject::tr("\nIf this message appear without reason, please contact me at liranbg@gmail.com"));
QMessageBox msgBox;
msgBox.setWindowTitle("Error");
msgBox.setWindowTitle(QObject::tr("Error"));
msgBox.setText(message);
msgBox.exec();
msgBox.setFocus();

1
main/LoginTab/loginhandler.h
View file

@ -1,5 +1,6 @@
#ifndef LOGINHANDLER_H
#define LOGINHANDLER_H
#include <QObject>
#include <QString>
#include <QLabel>
#include <QLineEdit>

315
main/mainscreen.cpp
View file

@ -5,15 +5,18 @@
MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScreen)
{
ui->setupUi(this);
//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);
ui->labelPswInputStatus->setVisible(false);
ui->labelUsrInputStatus->setPixmap(iconPix);
ui->labelPswInputStatus->setPixmap(iconPix);
//Status Bar
ui->actionEnglish->setChecked(true);
ui->statusBar->setStyleSheet("QStatusBar::item { border: 0px solid black };");
ButtomStatusLabel = new QLabel(this);
statusLabel = new QLabel(this);
@ -28,10 +31,7 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
ui->CoursesTab->setDisabled(true);
ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue));
//Pointer allocating
this->userLoginSetting = new user("","");
this->courseTableMgr = new coursesTableManager(ui->coursesTable,userLoginSetting);
this->loginHandel = new loginHandler(userLoginSetting);
@ -39,7 +39,6 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
this->data = new SaveData();
//check login File
//SaveData::init(); --> No need. constructor dose everything.
if (data->isSaved())
{
ui->usrnmLineEdit->setText(data->getUsername());
@ -48,61 +47,136 @@ MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScr
}
//Local Check and ui setting.
if(data->getLocal() == "en")
{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(false);
ui->actionEnglish->setChecked(true);
}else if(data->getLocal() == "he"){
ui->actionHebrew->setChecked(true);
ui->actionOS_Default->setChecked(false);
ui->actionEnglish->setChecked(false);
}else{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(true);
ui->actionEnglish->setChecked(false);
}
checkLocale();
}
MainScreen::~MainScreen()
{
delete ButtomStatusLabel;
delete statusLabel;
delete calendar;
delete courseTableMgr;
delete userLoginSetting;
delete loginHandel;
delete ui;
//Delete save data
delete data;
}
//EVENTS ON STATUS BAR
void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
{
QPixmap iconPix;
switch (statusDescription)
{
case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:
iconPix.load(":/icons/blueStatusIcon.png");
statusLabel->setText(tr("Connecting"));
break;
case jceLogin::jceStatus::JCE_YOU_ARE_IN:
iconPix.load(":/icons/greenStatusIcon.png");
statusLabel->setText(tr("Connected"));
break;
default:
iconPix.load(":/icons/redStatusIcon.png");
statusLabel->setText(tr("Disconnected"));
break;
}
ButtomStatusLabel->setPixmap(iconPix);
this->repaint();
}
//EVENTS ON LOGIN TAB
void MainScreen::on_loginButton_clicked()
{
if (loginHandel->isLoggedInFlag())
uiSetDisconnectMode();
else
uiSetConnectMode();
}
void MainScreen::on_getCalendarBtn_clicked()
void MainScreen::on_keepLogin_clicked()
{
int status = 0;
if (loginHandel->isLoggedInFlag())
if (ui->keepLogin->isChecked())
{
if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_GRADE_PAGE_PASSED)
{
//Use it for debug. add plain text and change the object name to 'plainTextEdit' so you will get the html request
//ui->plainTextEdit->setPlainText(loginHandel->getCurrentPageContect());
calendar->resetTable();
calendar->setCalendar(loginHandel->getCurrentPageContect().toStdString());
}
data->setUsername(ui->usrnmLineEdit->text());
data->setPassword(ui->pswdLineEdit->text());
}
else
data->reset();
}
void MainScreen::on_usrnmLineEdit_editingFinished()
{
ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower());
}
void MainScreen::uiSetDisconnectMode()
{
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
ui->usrnmLineEdit->setText("");
ui->pswdLineEdit->setText("");
ui->usrnmLineEdit->setEnabled(true);
ui->pswdLineEdit->setEnabled(true);
else if (status == jceLogin::JCE_NOT_CONNECTED)
loginHandel->makeDisconnectionRequest();
ui->loginButton->setText(tr("&Login"));
ui->getCalendarBtn->setDisabled(true);
ui->exportToCVSBtn->setDisabled(true);
ui->ratesButton->setDisabled(true);
return;
}
void MainScreen::uiSetConnectMode()
{
string username;
string password;
if ((ui->usrnmLineEdit->text().isEmpty()) || (ui->pswdLineEdit->text().isEmpty()))
{
if (ui->usrnmLineEdit->text().isEmpty())
{
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
ui->labelUsrInputStatus->setVisible(true);
qDebug() << "error, username input is empty";
}
else
ui->labelUsrInputStatus->setVisible(false);
if (ui->pswdLineEdit->text().isEmpty())
{
ui->labelPswInputStatus->setVisible(true);
qDebug() << "error, password input is empty";
}
else
ui->labelPswInputStatus->setVisible(false);
return;
}
else
{
ui->labelUsrInputStatus->setVisible(false);
ui->labelPswInputStatus->setVisible(false);
}
setLabelConnectionStatus(jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS);
username = ui->usrnmLineEdit->text().toStdString();
password = ui->pswdLineEdit->text().toStdString();
ui->usrnmLineEdit->setDisabled(true);
ui->pswdLineEdit->setDisabled(true);
userLoginSetting->setUsername(username);
userLoginSetting->setPassword(password);
this->loginHandel->setPointers(statusLabel,ui->pswdLineEdit,ui->usrnmLineEdit);
if (loginHandel->makeConnection() == true)
{
setLabelConnectionStatus(jceLogin::jceStatus::JCE_YOU_ARE_IN);
ui->loginButton->setText(tr("&Logout"));
ui->ratesButton->setEnabled(true);
ui->CoursesTab->setEnabled(true);
ui->exportToCVSBtn->setEnabled(true);
ui->getCalendarBtn->setEnabled(true);
}
else
{
uiSetDisconnectMode();
}
}
//EVENTS ON GPA TAB
void MainScreen::on_ratesButton_clicked()
{
std::string pageString;
@ -120,9 +194,6 @@ void MainScreen::on_ratesButton_clicked()
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
}
}
}
void MainScreen::on_checkBoxCoursesInfluence_toggled(bool checked)
{
@ -169,101 +240,45 @@ void MainScreen::on_spinBoxCoursesToSemester_editingFinished()
}
}
}
void MainScreen::on_coursesTable_itemChanged(QTableWidgetItem *item)
{
if (this->courseTableMgr->changes(item->text(),item->row(),item->column()))
ui->avgLCD->display(courseTableMgr->getAvg());
else
QMessageBox::critical(this,"Error","Missmatching data");
QMessageBox::critical(this,tr("Error"),tr("Missmatching data"));
}
void MainScreen::on_usrnmLineEdit_editingFinished()
void MainScreen::on_clearTableButton_clicked()
{
ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower());
courseTableMgr->clearTable();
ui->avgLCD->display(courseTableMgr->getAvg());
}
void MainScreen::uiSetDisconnectMode()
//EVENTS ON CALENDAR TAB
void MainScreen::on_getCalendarBtn_clicked()
{
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
ui->usrnmLineEdit->setText("");
ui->pswdLineEdit->setText("");
ui->usrnmLineEdit->setEnabled(true);
ui->pswdLineEdit->setEnabled(true);
loginHandel->makeDisconnectionRequest();
ui->loginButton->setText("&Login");
ui->getCalendarBtn->setDisabled(true);
ui->exportToCVSBtn->setDisabled(true);
ui->ratesButton->setDisabled(true);
return;
}
void MainScreen::uiSetConnectMode() //fix before distrbute
{
string username;
string password;
if ((ui->usrnmLineEdit->text().isEmpty()) || (ui->pswdLineEdit->text().isEmpty()))
int status = 0;
if (loginHandel->isLoggedInFlag())
{
//add icon near to username and password to mark it
return;
}
setLabelConnectionStatus(jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS);
if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_GRADE_PAGE_PASSED)
{
//Use it for debug. add plain text and change the object name to 'plainTextEdit' so you will get the html request
//ui->plainTextEdit->setPlainText(loginHandel->getCurrentPageContect());
calendar->resetTable();
calendar->setCalendar(loginHandel->getCurrentPageContect().toStdString());
}
username = ui->usrnmLineEdit->text().toStdString();
password = ui->pswdLineEdit->text().toStdString();
ui->usrnmLineEdit->setDisabled(true);
ui->pswdLineEdit->setDisabled(true);
userLoginSetting->setUsername(username);
userLoginSetting->setPassword(password);
this->loginHandel->setPointers(statusLabel,ui->pswdLineEdit,ui->usrnmLineEdit);
if (loginHandel->makeConnection() == true)
{
setLabelConnectionStatus(jceLogin::jceStatus::JCE_YOU_ARE_IN);
ui->loginButton->setText("&Logout");
ui->ratesButton->setEnabled(true);
ui->CoursesTab->setEnabled(true);
ui->exportToCVSBtn->setEnabled(true);
ui->getCalendarBtn->setEnabled(true);
}
else
{
uiSetDisconnectMode();
else if (status == jceLogin::JCE_NOT_CONNECTED)
{
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
}
}
}
void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
void MainScreen::on_exportToCVSBtn_clicked()
{
QPixmap iconPix;
switch (statusDescription)
{
case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:
iconPix.load(":/icons/blueStatusIcon.png");
statusLabel->setText(tr("Connecting"));
break;
case jceLogin::jceStatus::JCE_YOU_ARE_IN:
iconPix.load(":/icons/greenStatusIcon.png");
statusLabel->setText(tr("Connected"));
break;
default:
iconPix.load(":/icons/redStatusIcon.png");
statusLabel->setText(tr("Disconnected"));
break;
}
ButtomStatusLabel->setPixmap(iconPix);
this->repaint();
if (loginHandel->isLoggedInFlag())
this->calendar->exportCalendarCSV();
}
void MainScreen::showMSG(QString msg)
{
QMessageBox msgBox;
msgBox.setText(msg);
msgBox.exec();
}
//EVENTS ON MENU BAR
void MainScreen::on_actionCredits_triggered()
{
QMessageBox::about(this, "About", tr("CREDITS-ROOL-UP1") + " v1.0<br><br>"
@ -277,31 +292,10 @@ void MainScreen::on_actionCredits_triggered()
"<li><a href='mailto:sagidayan@gmail.com'>"+tr("Sagi")+"</a></li>"
"</ul>");
}
void MainScreen::on_clearTableButton_clicked()
{
courseTableMgr->clearTable();
ui->avgLCD->display(courseTableMgr->getAvg());
}
void MainScreen::on_actionExit_triggered()
{
exit(0);
}
void MainScreen::on_keepLogin_clicked()
{
if (ui->keepLogin->isChecked())
{
data->setUsername(ui->usrnmLineEdit->text());
data->setPassword(ui->pswdLineEdit->text());
}
else
data->reset();
}
void MainScreen::on_actionHow_To_triggered()
{
QMessageBox::information(this,"How To",
@ -317,22 +311,6 @@ void MainScreen::on_actionHow_To_triggered()
}
//void MainScreen::on_pushButton_2_clicked()
//{
// if(CSV_Exporter::exportCalendar(this->calendar->getSch()))
// {
// QMessageBox msgBox;
// msgBox.setText("<center>Exported Successfuly!<br><b>HaazZaA!!");
// msgBox.exec();
// }else
// {
// QMessageBox msgBox;
// msgBox.setIcon(QMessageBox::Critical);
// msgBox.setText("<center>Something went wrong...<br></center>Maybe: <ul><li>You Canceled</li><li>Unable to save the File - try again</li></ul><br><br>"
// "<b><center>In case of a serious problem, please file a bug report.<br>thank you. OpenJCE teem");
// msgBox.exec();
// }
//}
void MainScreen::on_exportToCVSBtn_clicked()
{
@ -358,7 +336,7 @@ void MainScreen::on_actionHebrew_triggered()
ui->actionOS_Default->setChecked(false);
qDebug() << "Changed Language to hebrew";
data->setLocal("he");
showMSG("ההגדרות שלך יכנסו לתוקף בהפעלה הבאה של התוכנית");
QMessageBox::information(this,tr("Settings"),tr("Your settings will take effect next time you start the program"),QMessageBox::Ok);
}
else
ui->actionHebrew->setChecked(true);
@ -372,7 +350,7 @@ void MainScreen::on_actionEnglish_triggered()
ui->actionOS_Default->setChecked(false);
qDebug() << "Changed Language to English";
data->setLocal("en");
showMSG("Your settings will take effect next time you start the program");
QMessageBox::information(this,"Settings",tr("Your settings will take effect next time you start the program"),QMessageBox::Ok);
}
else
ui->actionEnglish->setChecked(true);
@ -387,8 +365,25 @@ void MainScreen::on_actionOS_Default_triggered()
ui->actionEnglish->setChecked(false);
qDebug() << "Changed Language to OS Default";
data->setLocal("default");
showMSG("Your settings will take effect next time you start the program");
QMessageBox::information(this,tr("Settings"),tr("Your settings will take effect next time you start the program"),QMessageBox::Ok);
}
else
ui->actionOS_Default->setChecked(true);
}
void MainScreen::checkLocale()
{
if(data->getLocal() == "en")
{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(false);
ui->actionEnglish->setChecked(true);
}else if(data->getLocal() == "he"){
ui->actionHebrew->setChecked(true);
ui->actionOS_Default->setChecked(false);
ui->actionEnglish->setChecked(false);
}else{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(true);
ui->actionEnglish->setChecked(false);
}
}

408
main/mainscreen.cpp~ Normal file
View file

@ -0,0 +1,408 @@
#include "mainscreen.h"
#include "ui_mainscreen.h"
MainScreen::MainScreen(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainScreen)
{
ui->setupUi(this);
//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);
ui->labelPswInputStatus->setVisible(false);
ui->labelUsrInputStatus->setPixmap(iconPix);
ui->labelPswInputStatus->setPixmap(iconPix);
//Status Bar
ui->statusBar->setStyleSheet("QStatusBar::item { border: 0px solid black };");
ButtomStatusLabel = new QLabel(this);
statusLabel = new QLabel(this);
ui->statusBar->setMaximumSize(this->geometry().width(),StatusIconHeight);
ui->statusBar->addPermanentWidget(ButtomStatusLabel,0);
ui->statusBar->addPermanentWidget(statusLabel,1);
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
//Course, Setting, Calendar Tab
calendarSchedule * calendarSchedulePtr = new calendarSchedule();
ui->calendarGridLayoutMain->addWidget(calendarSchedulePtr);
ui->CoursesTab->setDisabled(true);
ui->avgLCD->setPalette(QPalette(QPalette::WindowText,Qt::blue));
//Pointer allocating
this->userLoginSetting = new user("","");
this->courseTableMgr = new coursesTableManager(ui->coursesTable,userLoginSetting);
this->loginHandel = new loginHandler(userLoginSetting);
this->calendar = new CalendarManager(calendarSchedulePtr);
this->data = new SaveData();
//check login File
if (data->isSaved())
{
ui->usrnmLineEdit->setText(data->getUsername());
ui->pswdLineEdit->setText(data->getPassword());
ui->keepLogin->setChecked(true);
}
//Local Check and ui setting.
checkLocale();
}
MainScreen::~MainScreen()
{
delete ButtomStatusLabel;
delete statusLabel;
delete calendar;
delete courseTableMgr;
delete userLoginSetting;
delete loginHandel;
delete ui;
delete data;
}
//EVENTS ON STATUS BAR
void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
{
QPixmap iconPix;
switch (statusDescription)
{
case jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS:
iconPix.load(":/icons/blueStatusIcon.png");
statusLabel->setText(tr("Connecting"));
break;
case jceLogin::jceStatus::JCE_YOU_ARE_IN:
iconPix.load(":/icons/greenStatusIcon.png");
statusLabel->setText(tr("Connected"));
break;
default:
iconPix.load(":/icons/redStatusIcon.png");
statusLabel->setText(tr("Disconnected"));
break;
}
ButtomStatusLabel->setPixmap(iconPix);
this->repaint();
}
//EVENTS ON LOGIN TAB
void MainScreen::on_loginButton_clicked()
{
if (loginHandel->isLoggedInFlag())
uiSetDisconnectMode();
else
uiSetConnectMode();
}
void MainScreen::on_keepLogin_clicked()
{
if (ui->keepLogin->isChecked())
{
data->setUsername(ui->usrnmLineEdit->text());
data->setPassword(ui->pswdLineEdit->text());
}
else
data->reset();
}
void MainScreen::on_usrnmLineEdit_editingFinished()
{
ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower());
}
void MainScreen::uiSetDisconnectMode()
{
setLabelConnectionStatus(jceLogin::jceStatus::JCE_NOT_CONNECTED);
ui->usrnmLineEdit->setText("");
ui->pswdLineEdit->setText("");
ui->usrnmLineEdit->setEnabled(true);
ui->pswdLineEdit->setEnabled(true);
loginHandel->makeDisconnectionRequest();
ui->loginButton->setText(tr("&Login"));
ui->getCalendarBtn->setDisabled(true);
ui->exportToCVSBtn->setDisabled(true);
ui->ratesButton->setDisabled(true);
return;
}
void MainScreen::uiSetConnectMode()
{
string username;
string password;
if ((ui->usrnmLineEdit->text().isEmpty()) || (ui->pswdLineEdit->text().isEmpty()))
{
if (ui->usrnmLineEdit->text().isEmpty())
{
ui->labelUsrInputStatus->setVisible(true);
qDebug() << "error, username input is empty";
}
else
ui->labelUsrInputStatus->setVisible(false);
if (ui->pswdLineEdit->text().isEmpty())
{
ui->labelPswInputStatus->setVisible(true);
qDebug() << "error, password input is empty";
}
else
ui->labelPswInputStatus->setVisible(false);
return;
}
else
{
ui->labelUsrInputStatus->setVisible(false);
ui->labelPswInputStatus->setVisible(false);
}
setLabelConnectionStatus(jceLogin::jceStatus::JCE_START_VALIDATING_PROGRESS);
username = ui->usrnmLineEdit->text().toStdString();
password = ui->pswdLineEdit->text().toStdString();
ui->usrnmLineEdit->setDisabled(true);
ui->pswdLineEdit->setDisabled(true);
userLoginSetting->setUsername(username);
userLoginSetting->setPassword(password);
this->loginHandel->setPointers(statusLabel,ui->pswdLineEdit,ui->usrnmLineEdit);
if (loginHandel->makeConnection() == true)
{
setLabelConnectionStatus(jceLogin::jceStatus::JCE_YOU_ARE_IN);
ui->loginButton->setText(tr("&Logout"));
ui->ratesButton->setEnabled(true);
ui->CoursesTab->setEnabled(true);
ui->exportToCVSBtn->setEnabled(true);
ui->getCalendarBtn->setEnabled(true);
}
else
{
uiSetDisconnectMode();
}
}
//EVENTS ON GPA TAB
void MainScreen::on_ratesButton_clicked()
{
std::string pageString;
int status = 0;
if (loginHandel->isLoggedInFlag())
{
if ((status = loginHandel->makeGradeRequest(ui->spinBoxCoursesFromYear->value(),ui->spinBoxCoursesToYear->value(),ui->spinBoxCoursesFromSemester->value(),ui->spinBoxCoursesToSemester->value())) == jceLogin::JCE_GRADE_PAGE_PASSED)
{
pageString = loginHandel->getCurrentPageContect().toStdString();
courseTableMgr->setCoursesList(pageString);
courseTableMgr->insertJceCoursesIntoTable();
}
else if (status == jceLogin::JCE_NOT_CONNECTED)
{
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
}
}
}
void MainScreen::on_checkBoxCoursesInfluence_toggled(bool checked)
{
this->userLoginSetting->setInfluenceCourseOnly(checked);
this->courseTableMgr->influnceCourseChanged(checked);
}
void MainScreen::on_spinBoxCoursesFromYear_editingFinished()
{
if (ui->spinBoxCoursesFromYear->value() > ui->spinBoxCoursesToYear->value())
{
ui->spinBoxCoursesFromYear->setValue(ui->spinBoxCoursesToYear->value());
ui->spinBoxCoursesFromYear->setFocus();
}
}
void MainScreen::on_spinBoxCoursesToYear_editingFinished()
{
if (ui->spinBoxCoursesFromYear->value() > ui->spinBoxCoursesToYear->value())
{
ui->spinBoxCoursesToYear->setValue(ui->spinBoxCoursesFromYear->value());
ui->spinBoxCoursesToYear->setFocus();
}
}
void MainScreen::on_spinBoxCoursesFromSemester_editingFinished()
{
if (ui->spinBoxCoursesFromYear->value() == ui->spinBoxCoursesToYear->value())
{
if (ui->spinBoxCoursesFromSemester->value() > ui->spinBoxCoursesToSemester->value())
{
ui->spinBoxCoursesFromSemester->setValue(ui->spinBoxCoursesToSemester->value());
ui->spinBoxCoursesFromSemester->setFocus();
}
}
}
void MainScreen::on_spinBoxCoursesToSemester_editingFinished()
{
if (ui->spinBoxCoursesFromYear->value() == ui->spinBoxCoursesToYear->value())
{
if (ui->spinBoxCoursesFromSemester->value() > ui->spinBoxCoursesToSemester->value())
{
ui->spinBoxCoursesToSemester->setValue(ui->spinBoxCoursesFromSemester->value());
ui->spinBoxCoursesToSemester->setFocus();
}
}
}
void MainScreen::on_coursesTable_itemChanged(QTableWidgetItem *item)
{
if (this->courseTableMgr->changes(item->text(),item->row(),item->column()))
ui->avgLCD->display(courseTableMgr->getAvg());
else
QMessageBox::critical(this,tr("Error"),tr("Missmatching data"));
}
void MainScreen::on_clearTableButton_clicked()
{
courseTableMgr->clearTable();
ui->avgLCD->display(courseTableMgr->getAvg());
}
//EVENTS ON CALENDAR TAB
void MainScreen::on_getCalendarBtn_clicked()
{
int status = 0;
if (loginHandel->isLoggedInFlag())
{
if ((status = loginHandel->makeCalendarRequest(ui->spinBoxYear->value(),ui->spinBoxSemester->value())) == jceLogin::JCE_GRADE_PAGE_PASSED)
{
//Use it for debug. add plain text and change the object name to 'plainTextEdit' so you will get the html request
//ui->plainTextEdit->setPlainText(loginHandel->getCurrentPageContect());
calendar->resetTable();
calendar->setCalendar(loginHandel->getCurrentPageContect().toStdString());
}
else if (status == jceLogin::JCE_NOT_CONNECTED)
{
QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
}
}
}
void MainScreen::on_exportToCVSBtn_clicked()
{
if (loginHandel->isLoggedInFlag())
this->calendar->exportCalendarCSV();
}
//EVENTS ON MENU BAR
void MainScreen::on_actionCredits_triggered()
{
QMessageBox::about(this, "About", tr("CREDITS-ROOL-UP1") + " v1.0<br><br>"
+ tr("CREDITS-ROOL-UP2")+"<br>GNU LESSER GENERAL PUBLIC LICENSE V2<br>"
+ tr("CREDITS-ROOL-UP3")+"<br>"
"<a href='https://github.com/liranbg/jceAverageCalculator'>jceAverageCalculator Repository</a>"
"<br><br>"+tr("CREDITS-ROOL-UP4")+"<a href='https://github.com/liranbg/jceConnection'> Jce Connection</a><br><br>"
+tr("DevBy")+":"
"<ul>"
"<li><a href='mailto:liranbg@gmail.com'>"+tr("Liran")+"</a></li>"
"<li><a href='mailto:sagidayan@gmail.com'>"+tr("Sagi")+"</a></li>"
"</ul>");
}
void MainScreen::on_actionExit_triggered()
{
exit(0);
}
void MainScreen::on_actionHow_To_triggered()
{
QMessageBox::information(this,"How To",
"<b>How To..</b>"
"<ul>"
"<br><li>"+tr("HELP1")+"</li>"
"<br><li>"+tr("HELP2")+"</li>"
"<br><li>"+tr("HELP3")+"</li>"
"<br><li>"+tr("HELP4")+"</li>"
"<br><li>"+tr("HELP5")+"</li>"
"<br><br>"+tr("HELP6")+
"</ul>");
}
<<<<<<< HEAD
//void MainScreen::on_pushButton_2_clicked()
//{
// if(CSV_Exporter::exportCalendar(this->calendar->getSch()))
// {
// QMessageBox msgBox;
// msgBox.setText("<center>Exported Successfuly!<br><b>HaazZaA!!");
// msgBox.exec();
// }else
// {
// QMessageBox msgBox;
// msgBox.setIcon(QMessageBox::Critical);
// msgBox.setText("<center>Something went wrong...<br></center>Maybe: <ul><li>You Canceled</li><li>Unable to save the File - try again</li></ul><br><br>"
// "<b><center>In case of a serious problem, please file a bug report.<br>thank you. OpenJCE teem");
// msgBox.exec();
// }
//}
void MainScreen::on_exportToCVSBtn_clicked()
{
if (loginHandel->isLoggedInFlag())
{
CalendarDialog calDialog;
int buttonClicked = calDialog.exec();
if(buttonClicked == 0)
return;
//calDialog.getStartDate(),calDialog.getEndDate()
if(calDialog.ok())
this->calendar->exportCalendarCSV(&calDialog);
else
showMSG("Somthig was not right with the dates you have chosen... try again");
}
}
=======
>>>>>>> 834ee3469ee46960c2484d38ba86a00793de84cc
void MainScreen::on_actionHebrew_triggered()
{
if (ui->actionEnglish->isChecked() || ui->actionOS_Default->isChecked())
{
ui->actionEnglish->setChecked(false);
ui->actionOS_Default->setChecked(false);
qDebug() << "Changed Language to hebrew";
data->setLocal("he");
QMessageBox::information(this,tr("Settings"),tr("Your settings will take effect next time you start the program"),QMessageBox::Ok);
}
else
ui->actionHebrew->setChecked(true);
}
void MainScreen::on_actionEnglish_triggered()
{
if (ui->actionHebrew->isChecked() || ui->actionOS_Default->isChecked())
{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(false);
qDebug() << "Changed Language to English";
data->setLocal("en");
QMessageBox::information(this,"Settings",tr("Your settings will take effect next time you start the program"),QMessageBox::Ok);
}
else
ui->actionEnglish->setChecked(true);
}
void MainScreen::on_actionOS_Default_triggered()
{
if (ui->actionHebrew->isChecked() || ui->actionEnglish->isChecked())
{
ui->actionHebrew->setChecked(false);
ui->actionEnglish->setChecked(false);
qDebug() << "Changed Language to OS Default";
data->setLocal("default");
QMessageBox::information(this,tr("Settings"),tr("Your settings will take effect next time you start the program"),QMessageBox::Ok);
}
else
ui->actionOS_Default->setChecked(true);
}
void MainScreen::checkLocale()
{
if(data->getLocal() == "en")
{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(false);
ui->actionEnglish->setChecked(true);
}else if(data->getLocal() == "he"){
ui->actionHebrew->setChecked(true);
ui->actionOS_Default->setChecked(false);
ui->actionEnglish->setChecked(false);
}else{
ui->actionHebrew->setChecked(false);
ui->actionOS_Default->setChecked(true);
ui->actionEnglish->setChecked(false);
}
}

9
main/mainscreen.h
View file

@ -73,20 +73,19 @@ private:
void uiSetDisconnectMode();
void uiSetConnectMode();
void setLabelConnectionStatus(jceLogin::jceStatus statusDescription);
void checkLocale();
Ui::MainScreen *ui;
QLabel *ButtomStatusLabel;
QLabel *statusLabel;
user *userLoginSetting;
SaveData *data;
CalendarManager * calendar;
coursesTableManager *courseTableMgr;
loginHandler *loginHandel;
QLabel *ButtomStatusLabel;
QLabel *statusLabel;
void showMSG(QString msg);
};
#endif // MAINSCREEN_H

243
main/mainscreen.ui
View file

@ -45,7 +45,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="enabled">
@ -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>0</number>
<number>2</number>
</property>
<property name="documentMode">
<bool>false</bool>
@ -153,23 +153,8 @@ font-size: 15px;
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="leftMargin">
<number>20</number>
</property>
<property name="topMargin">
<number>15</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<property name="bottomMargin">
<number>15</number>
</property>
<item row="2" column="0">
<layout class="QGridLayout" name="gridLayout_7">
<item row="1" column="0">
<layout class="QHBoxLayout" name="loginButtonHorizontalLayout">
<item>
<widget class="QCheckBox" name="keepLogin">
@ -197,94 +182,117 @@ font-size: 15px;
</layout>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="1">
<widget class="QLineEdit" name="usrnmLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="inputMethodHints">
<set>Qt::ImhLatinOnly|Qt::ImhNoPredictiveText</set>
</property>
<property name="maxLength">
<number>20</number>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0" rowspan="3" colspan="2">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="usrnmLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Username</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="pswdHorizontalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="pswdLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Password</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="pswdLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="inputMethodHints">
<set>Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData</set>
</property>
<property name="maxLength">
<number>20</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelUsrInputStatus">
<property name="maximumSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLineEdit" name="pswdLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="inputMethodHints">
<set>Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData</set>
</property>
<property name="maxLength">
<number>20</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="usrnmLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>81</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Username</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="usrnmLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="inputMethodHints">
<set>Qt::ImhLatinOnly|Qt::ImhNoPredictiveText</set>
</property>
<property name="maxLength">
<number>20</number>
</property>
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="pswdLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>81</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Password</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelPswInputStatus">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
@ -626,12 +634,12 @@ font-size: 15px;
<x>0</x>
<y>0</y>
<width>855</width>
<height>29</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuA_about">
<property name="title">
<string>&amp;About</string>
<string>&amp;File</string>
</property>
<widget class="QMenu" name="menuLanguage">
<property name="title">
@ -642,6 +650,7 @@ font-size: 15px;
<addaction name="actionEnglish"/>
</widget>
<addaction name="menuLanguage"/>
<addaction name="actionHow_To"/>
<addaction name="actionCredits"/>
<addaction name="actionExit"/>
</widget>
@ -695,15 +704,31 @@ font-size: 15px;
<string>OS Default</string>
</property>
</action>
<action name="actionHow_To">
<property name="text">
<string>How To</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>usrnmLineEdit</tabstop>
<tabstop>pswdLineEdit</tabstop>
<tabstop>keepLogin</tabstop>
<tabstop>loginButton</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>checkBoxCoursesInfluence</tabstop>
<tabstop>spinBoxCoursesFromYear</tabstop>
<tabstop>spinBoxCoursesFromSemester</tabstop>
<tabstop>spinBoxCoursesToYear</tabstop>
<tabstop>spinBoxCoursesToSemester</tabstop>
<tabstop>ratesButton</tabstop>
<tabstop>clearTableButton</tabstop>
<tabstop>coursesTable</tabstop>
<tabstop>spinBoxYear</tabstop>
<tabstop>spinBoxSemester</tabstop>
<tabstop>getCalendarBtn</tabstop>
<tabstop>clearTableButton</tabstop>
<tabstop>exportToCVSBtn</tabstop>
</tabstops>
<resources>
<include location="../resources/connectionstatus.qrc"/>

1
resources/connectionstatus.qrc
View file

@ -4,5 +4,6 @@
<file>greenStatusIcon.png</file>
<file>redStatusIcon.png</file>
<file>icon.ico</file>
<file>iconX.png</file>
</qresource>
</RCC>

BIN
resources/iconX.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 379 B

20
src/jceData/page.cpp
View file

@ -27,26 +27,6 @@ int Page::runToActualText(std::string& from, int index)
}
index++;
}
// while(index < (int)from.length())
// {
// if(from[index] == '<')
// {
// index++;
// if(from[index] == '!')
// {
// //!--FileName
// std::string bodyTag = from.substr(index, 11); //!--FileName
// if(bodyTag == "!--FileName") //check if the tag is body tag
// {
// while(from[index] != '>')
// index++;
// return index;
// }
// }
// }
// index++;
//}
return -1;
}