From d2d6495030b4391c9a246f69c460517496ff793a Mon Sep 17 00:00:00 2001 From: liranbg Date: Tue, 14 Oct 2014 02:45:11 +0300 Subject: [PATCH] dockwidget instead of menu --- jceGrade.pro | 1 + main/main.cpp | 10 +- main/mainscreen.cpp | 218 +++++++++++--------- main/mainscreen.h | 18 +- main/mainscreen.ui | 363 ++++++++++++++++++++++++++++++--- resources/connectionstatus.qrc | 4 + resources/flags/il.png | Bin 0 -> 3506 bytes resources/flags/us.png | Bin 0 -> 4202 bytes resources/help.png | Bin 0 -> 4700 bytes resources/il.png | Bin 0 -> 3506 bytes resources/team.png | Bin 0 -> 2350 bytes resources/us.png | Bin 0 -> 4202 bytes src/appDatabase/savedata.cpp | 12 +- src/appDatabase/savedata.h | 6 +- 14 files changed, 481 insertions(+), 151 deletions(-) create mode 100644 resources/flags/il.png create mode 100644 resources/flags/us.png create mode 100644 resources/help.png create mode 100644 resources/il.png create mode 100644 resources/team.png create mode 100644 resources/us.png diff --git a/jceGrade.pro b/jceGrade.pro index 43f07ed..85eecfd 100644 --- a/jceGrade.pro +++ b/jceGrade.pro @@ -87,3 +87,4 @@ SOURCES += \ src/jceData/Calendar/coursesSchedule/calendarPageCourse.cpp \ src/jceData/Calendar/coursesSchedule/calendarSchedule.cpp \ main/jceWidgets/jcestatusbar.cpp + diff --git a/main/main.cpp b/main/main.cpp index 3af9c9e..e1f2b01 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -20,16 +20,14 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); QTranslator translator; - QString loco; SaveData data; - loco = data.getLocal(); //Loading Local (From Settings file (SaveData.cpp) - if(loco == "en") + if(data.getLocale() == "en") { - translator.load("jce_" + loco , a.applicationDirPath()); + translator.load("jce_" + data.getLocale() , a.applicationDirPath()); qDebug() << Q_FUNC_INFO << "Locale : English Local Loaded"; - }else if(loco == "he"){ - translator.load("jce_" + loco , a.applicationDirPath()); + }else if(data.getLocale() == "he"){ + translator.load("jce_" + data.getLocale() , a.applicationDirPath()); qDebug() << Q_FUNC_INFO << "Local : Hebrew Local Loaded"; }else{ translator.load("jce_en" , a.applicationDirPath()); diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 6a98d5b..884d9b5 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -45,6 +45,7 @@ MainScreen::MainScreen(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainSc } MainScreen::~MainScreen() { + delete statusBar; delete calendar; delete courseTableMgr; delete userLoginSetting; @@ -122,7 +123,6 @@ void MainScreen::on_keepLogin_clicked() } void MainScreen::on_usrnmLineEdit_editingFinished() { - qDebug() << Q_FUNC_INFO << "in: " << ui->tabWidget->currentWidget()->objectName(); ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower()); } @@ -244,7 +244,6 @@ void MainScreen::on_revertBtn_clicked() } } - //EVENTS ON CALENDAR TAB void MainScreen::on_examsBtn_clicked() { @@ -314,104 +313,48 @@ void MainScreen::on_exportToCVSBtn_clicked() } } //EVENTS ON MENU BAR -void MainScreen::on_actionCredits_triggered() -{ - qDebug() << Q_FUNC_INFO; - QMessageBox::about(this, "About", - "Jce Manager v1.0.0

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

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

" - +tr("Developed By")+ - ":" - ); -} -void MainScreen::on_actionExit_triggered() -{ - qDebug() << Q_FUNC_INFO; - exit(0); -} -void MainScreen::on_actionHow_To_triggered() -{ - qDebug() << Q_FUNC_INFO; - QMessageBox::information(this,"How To", - "" - +tr("Help Guide")+ - "