Merge branch 'master' of https://github.com/liranbg/JceManager
This commit is contained in:
commit
4f18421506
5 changed files with 48 additions and 7 deletions
|
@ -25,7 +25,7 @@ The next part of the program…okay, this part we will leave open for the future
|
||||||
Our team consists of two Software Engineering students from the Jerusalem College of Engineering.
|
Our team consists of two Software Engineering students from the Jerusalem College of Engineering.
|
||||||
|
|
||||||
Project Manager: [Liran Ben Gida][liran]
|
Project Manager: [Liran Ben Gida][liran]
|
||||||
<br/>
|
<br>
|
||||||
Co-developer: [Sagi Dayan][sagi]
|
Co-developer: [Sagi Dayan][sagi]
|
||||||
|
|
||||||
This open source application was developed in our spare time and is available for and meant to be shared with other students attending our college.
|
This open source application was developed in our spare time and is available for and meant to be shared with other students attending our college.
|
||||||
|
@ -38,9 +38,9 @@ Have you used the application? Do you think there is room for improvement?
|
||||||
Do you have ideas on how we can improve? We would love to hear them!
|
Do you have ideas on how we can improve? We would love to hear them!
|
||||||
|
|
||||||
For all issues, suggestions and ideas, please contact us at:
|
For all issues, suggestions and ideas, please contact us at:
|
||||||
<br/>
|
<br>
|
||||||
[Liran Ben-Gida][liran]
|
[Liran Ben-Gida][liran]
|
||||||
<br/>
|
<br>
|
||||||
[Sagi Dayan][sagi]
|
[Sagi Dayan][sagi]
|
||||||
|
|
||||||
If you have some spare time, you know how to code (C++ / QT),
|
If you have some spare time, you know how to code (C++ / QT),
|
||||||
|
|
11
jceGrade.pro
11
jceGrade.pro
|
@ -9,10 +9,17 @@ QT += core gui network widgets
|
||||||
CONFIG += qt c++11
|
CONFIG += qt c++11
|
||||||
|
|
||||||
TARGET = jceManager
|
TARGET = jceManager
|
||||||
TEMPLATE = app
|
|
||||||
VERSION = 1.0.0
|
VERSION = 1.0.0
|
||||||
|
TEMPLATE = app
|
||||||
|
DEFINES += APP_VERSION=\\\"$$VERSION\\\"
|
||||||
|
|
||||||
|
win32 {
|
||||||
|
RC_FILE += winConf.rc
|
||||||
|
}
|
||||||
|
unix {
|
||||||
|
RC_FILE += appConfigure.rc
|
||||||
|
}
|
||||||
|
|
||||||
RC_FILE = appConfigure.rc
|
|
||||||
TRANSLATIONS = jce_en.ts \
|
TRANSLATIONS = jce_en.ts \
|
||||||
jce_he.ts
|
jce_he.ts
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
#include "../src/appDatabase/savedata.h"
|
#include "../src/appDatabase/savedata.h"
|
||||||
#include "../src/appDatabase/jce_logger.h"
|
#include "../src/appDatabase/jce_logger.h"
|
||||||
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
#ifdef QT_DEBUG // Incase QtCreator is in Debug mode all qDebug messages will go to terminal
|
#ifdef QT_DEBUG // Incase QtCreator is in Debug mode all qDebug messages will go to terminal
|
||||||
|
@ -36,6 +35,7 @@ int main(int argc, char *argv[])
|
||||||
qDebug() << Q_FUNC_INFO << "Local : English Local Loaded";
|
qDebug() << Q_FUNC_INFO << "Local : English Local Loaded";
|
||||||
}
|
}
|
||||||
a.installTranslator(&translator); //Setting local
|
a.installTranslator(&translator); //Setting local
|
||||||
|
a.setApplicationVersion(APP_VERSION);
|
||||||
MainScreen w;
|
MainScreen w;
|
||||||
w.show();
|
w.show();
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 rgba(195, 231, 224, 218), stop:1 rgba(255, 255, 255, 255));
|
background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 rgba(195, 231, 224, 218), stop:1 rgba(255, 255, 255, 255));
|
||||||
}</string>
|
}</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="locale">
|
||||||
|
<locale language="English" country="UnitedStates"/>
|
||||||
|
</property>
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
<size>
|
<size>
|
||||||
<width>48</width>
|
<width>48</width>
|
||||||
|
@ -680,7 +683,7 @@ background: qlineargradient(x1: 0, y1: 0.5, x2: 1, y2: 0.5, stop: 0 green, stop:
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>855</width>
|
<width>855</width>
|
||||||
<height>22</height>
|
<height>21</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuA_about">
|
<widget class="QMenu" name="menuA_about">
|
||||||
|
|
31
winConf.rc
Normal file
31
winConf.rc
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
IDI_ICON1 ICON DISCARDABLE "./resources/icon.ico"
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
|
VS_VERSION_INFO VERSIONINFO
|
||||||
|
FILEVERSION 1, 0, 0
|
||||||
|
PRODUCTVERSION 1, 0, 0
|
||||||
|
FILEFLAGSMASK 0x3fL
|
||||||
|
FILEFLAGS 0
|
||||||
|
FILEOS VOS_NT_WINDOWS32
|
||||||
|
FILETYPE VFT_APP
|
||||||
|
FILESUBTYPE VFT2_UNKNOWN
|
||||||
|
BEGIN
|
||||||
|
BLOCK "VarFileInfo"
|
||||||
|
BEGIN
|
||||||
|
VALUE "Translation", 0x409, 1200
|
||||||
|
END
|
||||||
|
BLOCK "StringFileInfo"
|
||||||
|
BEGIN
|
||||||
|
BLOCK "040904b0"
|
||||||
|
BEGIN
|
||||||
|
VALUE "CompanyName", "Jce Manager\0"
|
||||||
|
VALUE "FileDescription", "\0"
|
||||||
|
VALUE "FileVersion", "1.0.0\0"
|
||||||
|
VALUE "InternalName", "jceManager\0"
|
||||||
|
VALUE "LegalCopyright", "Jce Manager Team, liranbg@gmail.com\0"
|
||||||
|
VALUE "OriginalFilename", "jceManager\0"
|
||||||
|
VALUE "ProductName", "Jce Manager\0"
|
||||||
|
VALUE "ProductVersion", "1.0.0\0"
|
||||||
|
END
|
||||||
|
END
|
||||||
|
END
|
Loading…
Reference in a new issue