diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp index 72eacbc..70d7b90 100644 --- a/main/mainscreen.cpp +++ b/main/mainscreen.cpp @@ -219,9 +219,20 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription) } void MainScreen::on_actionCredits_triggered() { - QMessageBox credits; - credits.setText(" A tiny application to calculate your grades average. \n Made by Liran Ben Gida \n Thanks to: Sagi Dayan, Nadav Luzzato"); - credits.exec(); + QMessageBox::about(this, "About", " A tiny application to calculate your grades average.

" + "This software is licensed under the
GNU LESSER GENERAL PUBLIC LICENSE V2
" + "The source code is available at github:
" + "jceAverageCalculator Repository" + "

This front end is Powered by Jce Connection

" + "Made by:" + "" + "Thanks to: " + ""); } void MainScreen::on_clearTableButton_clicked() diff --git a/main/mainscreen.ui b/main/mainscreen.ui index d62519b..4094da2 100644 --- a/main/mainscreen.ui +++ b/main/mainscreen.ui @@ -6,8 +6,8 @@ 0 0 - 737 - 500 + 676 + 717 @@ -94,32 +94,23 @@ border: none; Login - - - QFormLayout::AllNonFixedFieldsGrow + + + + 200 + 230 + 301 + 146 + - - 200 + + + 0 + 0 + - - 80 - - - 200 - - - 80 - - - - - - 0 - 0 - - - - #LoginFrame { + + #LoginFrame { border: 3px solid rgb(160, 165, 170); border-radius: 40px; @@ -152,157 +143,179 @@ font-size: 15px; font-weight: bold; font-size: 15px; } - - - QFrame::StyledPanel - - - QFrame::Raised - - - - QLayout::SetDefaultConstraint - + + + QFrame::StyledPanel + + + QFrame::Raised + + + + QLayout::SetDefaultConstraint + + + 20 + + + 15 + + + 20 + + + 15 + + + - 20 + 0 - - 15 - - - 20 - - - 15 - - - - - 0 - - - - - 10 - - - - - - 0 - 0 - - - - Username - - - - - - - - 0 - 0 - - - - Qt::ImhLatinOnly|Qt::ImhNoPredictiveText - - - 20 - - - true - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Password - - - - - - - - 0 - 0 - - - - Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData - - - 20 - - - QLineEdit::Password - - - true - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + + - + 0 0 - - + + <color=#000000>Username + + + Qt::RichText + + + + + + + + + + + 0 + 0 + + + + Qt::ImhLatinOnly|Qt::ImhNoPredictiveText + + + 20 + + + true + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + - Login + Password + + + Qt::RichText + + + + + + + + 0 + 0 + + + + Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData + + + 20 + + + QLineEdit::Password + + + true - - - + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + + + Login + + + + + + + + + + + 0 + 0 + 650 + 600 + + + + + + + :/icons/AVG_LOGO.png + + + label_2 + LoginFrame @@ -314,92 +327,86 @@ font-size: 15px; Courses - - - - 2 - 5 - 711 - 371 - - - - - 0 - - - - - - 0 - 0 - - - - Qt::RightToLeft - - - QAbstractItemView::SingleSelection - - - true - - - - - - - - - - - false - - - Add - - - - - - - Clear - - - - - - - - - Qt::Horizontal - - - - 378 - 20 - - - - - - - - - - Average: - - - - - - - - - - - - + + + + + 0 + + + + + + 0 + 0 + + + + Qt::RightToLeft + + + QAbstractItemView::SingleSelection + + + true + + + + + + + + + + + false + + + Add + + + + + + + Clear + + + + + + + + + Qt::Horizontal + + + + 378 + 20 + + + + + + + + + + Average: + + + + + + + + + + + + + @@ -645,7 +652,7 @@ font-size: 15px; 0 0 - 737 + 676 29 diff --git a/resources/AVG_LOGO.png b/resources/AVG_LOGO.png new file mode 100644 index 0000000..d315603 Binary files /dev/null and b/resources/AVG_LOGO.png differ diff --git a/resources/connectionstatus.qrc b/resources/connectionstatus.qrc index 61cb0fd..547be37 100644 --- a/resources/connectionstatus.qrc +++ b/resources/connectionstatus.qrc @@ -4,5 +4,8 @@ greenStatusIcon.png redStatusIcon.png icon.png + AVG_LOGO.png + +