diff --git a/jceGrade.pro b/jceGrade.pro index 85eecfd..3da80c6 100644 --- a/jceGrade.pro +++ b/jceGrade.pro @@ -7,6 +7,7 @@ QT += core gui network widgets printsupport CONFIG += qt c++11 +#CONFIG-=app_bundle TARGET = jceManager VERSION = 1.0.0 @@ -51,7 +52,6 @@ HEADERS += \ src/appDatabase/jce_logger.h \ src/jceData/Grades/graph/qcustomplot.h \ src/jceData/Grades/graph/gradegraph.h \ - src/jceData/Calendar/calendarPageCourse.h \ src/jceData/Calendar/Exams/examDialog.h \ src/jceData/Calendar/Exams/calendarExam.h \ src/jceData/Calendar/Exams/calendarExamCourse.h \ diff --git a/main/jceWidgets/jcestatusbar.cpp b/main/jceWidgets/jcestatusbar.cpp index 4c7a741..26dddf3 100644 --- a/main/jceWidgets/jcestatusbar.cpp +++ b/main/jceWidgets/jcestatusbar.cpp @@ -3,13 +3,32 @@ jceStatusBar::jceStatusBar(QWidget *parent) : QStatusBar(parent) { - this->setStyleSheet("QStatusBar { border: 0px solid black };"); - this->setFixedHeight(STATUS_ICON_HEIGH+5); + this->setFixedHeight(STATUS_ICON_HEIGH+30); this->showMessage(tr("Ready")); - - + this->setStyleSheet("QStatusBar {" + "border: 0px solid black;" + "background: rgba(255, 255, 255, 255);" + "padding: 3px;" + "padding-left: 1px;" + "padding-right: 1px;" + "min-height: 50px;" + "max-height: 50px;" + "}"); //Icon iconButtomStatusLabel = new QLabel(this); + iconButtomStatusLabel->setStyleSheet("QLabel {" + "border: 0px solid black" + "border-radius: 16px;" + "padding: 1px;" + "padding-left: 1px;" + "padding-right: 1px;" + "min-width: 48px;" + "max-width: 48px;" + "min-height: 48px;" + "max-height: 48px;" + "}"); + iconButtomStatusLabel->setMaximumHeight(STATUS_ICON_HEIGH+2); + iconButtomStatusLabel->setMinimumHeight(STATUS_ICON_HEIGH+2); iconButtomStatusLabel->setAlignment(Qt::AlignHCenter); //ProgressBar @@ -48,54 +67,54 @@ void jceStatusBar::setIconConnectionStatus(jceProgressStatus update) { case jceProgressStatus::Error: setProgressValue(0); - iconPix.load(":/icons/redStatusIcon.png"); + iconPix.load(":/icons/disconnected.png"); showMessage(tr("Error")); break; case jceProgressStatus::Disconnected: setProgressValue(0); - iconPix.load(":/icons/redStatusIcon.png"); + iconPix.load(":/icons/disconnected.png"); showMessage(tr("Disconnected")); break; case jceProgressStatus::Ready: setProgressValue(0); - iconPix.load(":/icons/redStatusIcon.png"); + iconPix.load(":/icons/disconnected.png"); showMessage(tr("Ready")); break; case jceProgressStatus::Connecting: setProgressValue(5); - iconPix.load(":/icons/blueStatusIcon.png"); + iconPix.load(":/icons/busy.png"); showMessage(tr("Connecting...")); break; case jceProgressStatus::Sending: if (progressBar->value() < 10) setProgressValue(10); - iconPix.load(":/icons/blueStatusIcon.png"); + iconPix.load(":/icons/busy.png"); showMessage(tr("Sending...")); break; case jceProgressStatus::Recieving: if (progressBar->value() < 15) setProgressValue(15); - iconPix.load(":/icons/blueStatusIcon.png"); + iconPix.load(":/icons/busy.png"); showMessage(tr("Recieving...")); break; case jceProgressStatus::Connected: setProgressValue(30); - iconPix.load(":/icons/blueStatusIcon.png"); + iconPix.load(":/icons/busy.png"); showMessage(tr("Connected")); break; case jceProgressStatus::Inserting: setProgressValue(80); - iconPix.load(":/icons/blueStatusIcon.png"); + iconPix.load(":/icons/busy.png"); showMessage(tr("Inserting")); break; case jceProgressStatus::LoggedIn: setProgressValue(100); - iconPix.load(":/icons/greenStatusIcon.png"); + iconPix.load(":/icons/connected.png"); showMessage(tr("Logged In.")); break; case jceProgressStatus::Done: setProgressValue(100); - iconPix.load(":/icons/greenStatusIcon.png"); + iconPix.load(":/icons/connected.png"); showMessage(tr("Done")); break; diff --git a/main/jceWidgets/jcestatusbar.h b/main/jceWidgets/jcestatusbar.h index 226980c..78d1051 100644 --- a/main/jceWidgets/jcestatusbar.h +++ b/main/jceWidgets/jcestatusbar.h @@ -3,11 +3,12 @@ #include +#include #include #include #include -#define STATUS_ICON_HEIGH 35 +#define STATUS_ICON_HEIGH 48 class jceStatusBar : public QStatusBar { diff --git a/resources/blueStatusIcon.png b/resources/blueStatusIcon.png deleted file mode 100644 index 1f70d90..0000000 Binary files a/resources/blueStatusIcon.png and /dev/null differ diff --git a/resources/busy.png b/resources/busy.png new file mode 100644 index 0000000..a542419 Binary files /dev/null and b/resources/busy.png differ diff --git a/resources/connected.png b/resources/connected.png new file mode 100644 index 0000000..ae7e8c0 Binary files /dev/null and b/resources/connected.png differ diff --git a/resources/connectionstatus.qrc b/resources/connectionstatus.qrc index ee4dc40..7f92be0 100644 --- a/resources/connectionstatus.qrc +++ b/resources/connectionstatus.qrc @@ -1,8 +1,5 @@ - blueStatusIcon.png - greenStatusIcon.png - redStatusIcon.png icon.ico iconX.png iconV.png @@ -10,5 +7,8 @@ us.png help.png team.png + busy.png + connected.png + disconnected.png diff --git a/resources/disconnected.png b/resources/disconnected.png new file mode 100644 index 0000000..c8817f9 Binary files /dev/null and b/resources/disconnected.png differ diff --git a/resources/greenStatusIcon.png b/resources/greenStatusIcon.png deleted file mode 100644 index fcb16a4..0000000 Binary files a/resources/greenStatusIcon.png and /dev/null differ diff --git a/resources/redStatusIcon.png b/resources/redStatusIcon.png deleted file mode 100644 index 5be6f08..0000000 Binary files a/resources/redStatusIcon.png and /dev/null differ