Merge pull request #1 from sagidayan/master

Some Eye Candy for you...
This commit is contained in:
liranbg 2014-06-15 08:44:43 +03:00
commit 373868aed3
4 changed files with 273 additions and 252 deletions

View file

@ -219,9 +219,20 @@ void MainScreen::setLabelConnectionStatus(jceLogin::jceStatus statusDescription)
} }
void MainScreen::on_actionCredits_triggered() void MainScreen::on_actionCredits_triggered()
{ {
QMessageBox credits; QMessageBox::about(this, "About", " A tiny application to calculate your grades average. <br><br>"
credits.setText(" A tiny application to calculate your grades average. \n Made by Liran Ben Gida \n Thanks to: Sagi Dayan, Nadav Luzzato"); "This software is licensed under the <br>GNU LESSER GENERAL PUBLIC LICENSE V2<br>"
credits.exec(); "The source code is available at github:<br>"
"<a href='https://github.com/liranbg/jceAverageCalculator'>jceAverageCalculator Repository</a>"
"<br><br>This front end is Powered by <a href='https://github.com/liranbg/jceConnection'>Jce Connection</a><br><br>"
"Made by:"
"<ul>"
"<li><a href='mailto:liranbg@gmail.com'>Liran Ben Gida</a></li>"
"</ul>"
"Thanks to: "
"<ul>"
"<li><a href='mailto:sagidayan@gmail.com'>Sagi Dayan</a></li>"
"<li><a href='mailto:nadav2051@gmail.com'>Nadav Luzzato</a></li>"
"</ul>");
} }
void MainScreen::on_clearTableButton_clicked() void MainScreen::on_clearTableButton_clicked()

View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>737</width> <width>676</width>
<height>500</height> <height>717</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -94,32 +94,23 @@ border: none;
<attribute name="title"> <attribute name="title">
<string>Login</string> <string>Login</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout"> <widget class="QFrame" name="LoginFrame">
<property name="fieldGrowthPolicy"> <property name="geometry">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <rect>
<x>200</x>
<y>230</y>
<width>301</width>
<height>146</height>
</rect>
</property> </property>
<property name="leftMargin"> <property name="sizePolicy">
<number>200</number> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="topMargin"> <property name="styleSheet">
<number>80</number> <string notr="true">#LoginFrame {
</property>
<property name="rightMargin">
<number>200</number>
</property>
<property name="bottomMargin">
<number>80</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QFrame" name="LoginFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">#LoginFrame {
border: 3px solid rgb(160, 165, 170); border: 3px solid rgb(160, 165, 170);
border-radius: 40px; border-radius: 40px;
@ -152,157 +143,179 @@ font-size: 15px;
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
}</string> }</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint"> <property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum> <enum>QLayout::SetDefaultConstraint</enum>
</property> </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="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>20</number> <number>0</number>
</property> </property>
<property name="topMargin"> <item>
<number>15</number> <layout class="QGridLayout" name="gridLayout_5">
</property> <item row="0" column="0">
<property name="rightMargin"> <widget class="QLabel" name="usrnmLabel">
<number>20</number>
</property>
<property name="bottomMargin">
<number>15</number>
</property>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="usrnmHorizontalLayout" stretch="0,0">
<property name="spacing">
<number>10</number>
</property>
<item>
<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>
</widget>
</item>
<item>
<widget class="QLineEdit" name="usrnmLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<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>
</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>
</widget>
</item>
<item>
<widget class="QLineEdit" name="pswdLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<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>
</layout>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="loginButtonHorizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="loginButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="text">
<string notr="true"/> <string>&lt;color=#000000&gt;Username</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="buddy">
<cstring></cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="usrnmLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<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>
</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>
<property name="text"> <property name="text">
<string>Login</string> <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="Minimum" vsizetype="Minimum">
<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> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
</layout> </layout>
</widget> </item>
</item> <item row="1" column="0">
</layout> <layout class="QHBoxLayout" name="loginButtonHorizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="loginButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>Login</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>650</width>
<height>600</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources/connectionstatus.qrc">:/icons/AVG_LOGO.png</pixmap>
</property>
</widget>
<zorder>label_2</zorder>
<zorder>LoginFrame</zorder>
</widget> </widget>
<widget class="QWidget" name="CoursesTab"> <widget class="QWidget" name="CoursesTab">
<property name="enabled"> <property name="enabled">
@ -314,92 +327,86 @@ font-size: 15px;
<attribute name="title"> <attribute name="title">
<string>Courses</string> <string>Courses</string>
</attribute> </attribute>
<widget class="QWidget" name="layoutWidget"> <layout class="QGridLayout" name="gridLayout_4">
<property name="geometry"> <item row="0" column="0">
<rect> <layout class="QGridLayout" name="courseGrid">
<x>2</x> <property name="leftMargin">
<y>5</y> <number>0</number>
<width>711</width> </property>
<height>371</height> <item row="0" column="0">
</rect> <widget class="QTableWidget" name="coursesTable">
</property> <property name="sizePolicy">
<layout class="QGridLayout" name="courseGrid"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<property name="leftMargin"> <horstretch>0</horstretch>
<number>0</number> <verstretch>0</verstretch>
</property> </sizepolicy>
<item row="0" column="0"> </property>
<widget class="QTableWidget" name="coursesTable"> <property name="layoutDirection">
<property name="sizePolicy"> <enum>Qt::RightToLeft</enum>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> </property>
<horstretch>0</horstretch> <property name="selectionMode">
<verstretch>0</verstretch> <enum>QAbstractItemView::SingleSelection</enum>
</sizepolicy> </property>
</property> <property name="sortingEnabled">
<property name="layoutDirection"> <bool>true</bool>
<enum>Qt::RightToLeft</enum> </property>
</property> </widget>
<property name="selectionMode"> </item>
<enum>QAbstractItemView::SingleSelection</enum> <item row="1" column="0">
</property> <layout class="QHBoxLayout" name="coursesTableControlHorizontalLayout">
<property name="sortingEnabled"> <item>
<bool>true</bool> <layout class="QHBoxLayout" name="coursesButtonLayout">
</property> <item>
</widget> <widget class="QPushButton" name="ratesButton">
</item> <property name="enabled">
<item row="1" column="0"> <bool>false</bool>
<layout class="QHBoxLayout" name="coursesTableControlHorizontalLayout"> </property>
<item> <property name="text">
<layout class="QHBoxLayout" name="coursesButtonLayout"> <string>Add</string>
<item> </property>
<widget class="QPushButton" name="ratesButton"> </widget>
<property name="enabled"> </item>
<bool>false</bool> <item>
</property> <widget class="QPushButton" name="clearTableButton">
<property name="text"> <property name="text">
<string>Add</string> <string>Clear</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<widget class="QPushButton" name="clearTableButton"> </item>
<property name="text"> <item>
<string>Clear</string> <spacer name="coursesAvgSpacer">
</property> <property name="orientation">
</widget> <enum>Qt::Horizontal</enum>
</item> </property>
</layout> <property name="sizeHint" stdset="0">
</item> <size>
<item> <width>378</width>
<spacer name="coursesAvgSpacer"> <height>20</height>
<property name="orientation"> </size>
<enum>Qt::Horizontal</enum> </property>
</property> </spacer>
<property name="sizeHint" stdset="0"> </item>
<size> <item>
<width>378</width> <layout class="QHBoxLayout" name="AvghorizontalLayout">
<height>20</height> <item>
</size> <widget class="QLabel" name="label">
</property> <property name="text">
</spacer> <string>Average:</string>
</item> </property>
<item> </widget>
<layout class="QHBoxLayout" name="AvghorizontalLayout"> </item>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLCDNumber" name="avgLCD"/>
<property name="text"> </item>
<string>Average:</string> </layout>
</property> </item>
</widget> </layout>
</item> </item>
<item> </layout>
<widget class="QLCDNumber" name="avgLCD"/> </item>
</item> </layout>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</widget> </widget>
<widget class="QWidget" name="SettingsTab"> <widget class="QWidget" name="SettingsTab">
<property name="enabled"> <property name="enabled">
@ -645,7 +652,7 @@ font-size: 15px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>737</width> <width>676</width>
<height>29</height> <height>29</height>
</rect> </rect>
</property> </property>

BIN
resources/AVG_LOGO.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 513 KiB

View file

@ -4,5 +4,8 @@
<file>greenStatusIcon.png</file> <file>greenStatusIcon.png</file>
<file>redStatusIcon.png</file> <file>redStatusIcon.png</file>
<file>icon.png</file> <file>icon.png</file>
<file>AVG_LOGO.png</file>
</qresource> </qresource>
</RCC> </RCC>