Skip to content

Commit dc0322a

Browse files
authoredSep 20, 2021
Merge pull request #2 from firefly-cpp/main
First steps
2 parents 66283cd + b5e8099 commit dc0322a

35 files changed

+98
-2556
lines changed
 

‎.gitignore

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# C++ objects and libs
2+
*.slo
3+
*.lo
4+
*.o
5+
*.a
6+
*.la
7+
*.lai
8+
*.so
9+
*.so.*
10+
*.dll
11+
*.dylib
12+
13+
# Qt-es
14+
object_script.*.Release
15+
object_script.*.Debug
16+
*_plugin_import.cpp
17+
/.qmake.cache
18+
/.qmake.stash
19+
*.pro.user
20+
*.pro.user.*
21+
*.qbs.user
22+
*.qbs.user.*
23+
*.moc
24+
moc_*.cpp
25+
moc_*.h
26+
qrc_*.cpp
27+
ui_*.h
28+
*.qmlc
29+
*.jsc
30+
Makefile*
31+
*build-*
32+
*.qm
33+
*.prl
34+
35+
# Qt unit tests
36+
target_wrapper.*
37+
38+
# QtCreator
39+
*.autosave
40+
41+
# QtCreator Qml
42+
*.qmlproject.user
43+
*.qmlproject.user.*
44+
45+
# QtCreator CMake
46+
CMakeLists.txt.user*
47+
48+
# QtCreator 4.8< compilation database
49+
compile_commands.json
50+
51+
# QtCreator local machine specific files for imported projects
52+
*creator.user*
53+
54+
*_qmlcache.qrc
55+

‎LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
MIT License
2+
3+
Copyright (c) 2021 rhododendrom
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.
22+

‎README.md

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
# Bezalec
22

3-
Reference:
3+
## Description
4+
This is a simple software application for managing competitors registration, editing, exporting and generating their standings and printing certificates.
45

5-
FISTER, Dušan, MLAKAR, Uroš. Bežalec: the sport competition management software. V: FISTER, Iztok (ur.), BRODNIK, Andrej (ur.). Proceedings of the 2017 4th Student Computer Science Research Conference - StuCoSReC. Koper: University of Primorska Press, 2017. Str. 31-34. ISBN 978-961-7023-40-4, ISBN 978-961-7023-41-1. http://www.hippocampus.si/ISBN/978-961-7023-41-1/mobile/index.html. [COBISS.SI-ID 20913942]
66

7-
Available at: https://www.hippocampus.si/ISBN/978-961-7023-41-1/mobile/index.html
7+
## Licence
8+
9+
This package is distributed under the MIT License. This license can be found online at <http://www.opensource.org/licenses/MIT>.
10+
11+
## Disclaimer
12+
13+
This software is provided as-is, and there are no guarantees that it fits your purposes or that it is bug-free. Use it at your own risk!
14+
15+
16+
## Reference paper
17+
18+
FISTER, Dušan, MLAKAR, Uroš. Bežalec: the sport competition management software. V: FISTER, Iztok (ur.), BRODNIK, Andrej (ur.). Proceedings of the 2017 4th Student Computer Science Research Conference - StuCoSReC. Koper: University of Primorska Press, 2017. Str. 31-34. ISBN 978-961-7023-40-4, ISBN 978-961-7023-41-1. http://www.hippocampus.si/ISBN/978-961-7023-41-1/mobile/index.html.
19+

‎testTable/testTable.pro ‎bezalec/bezalec.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ QT += core gui
88

99
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1010

11-
TARGET = testTable
11+
TARGET = bezalec
1212
TEMPLATE = app
1313

1414

‎testTable/izpispodatkov.cpp ‎bezalec/izpispodatkov.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Izpispodatkov::Izpispodatkov(QWidget *parent) : QDialog(parent), ui(new Ui::izpi
1212
//std::sort(kategorijeItems.begin(),kategorijeItems.end());
1313

1414
QString data;
15-
QFile importedCSV("kategorije.txt");
15+
QFile importedCSV("../data/kategorije.txt");
1616
QStringList rowOfData;
1717
QStringList rowDataFull;
1818
if (importedCSV.open(QFile::ReadOnly)){
@@ -89,7 +89,7 @@ void Izpispodatkov::on_pushButton_clicked()
8989

9090
QString htmlCode = "<html> <head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"><style>th,td{text-align: center;} table {width:100%;} </style> </head> <body>";
9191

92-
QFile file("sample1.html");
92+
QFile file("../output/sample1.html");
9393

9494
QTextStream data( &file );
9595

@@ -170,6 +170,6 @@ void Izpispodatkov::on_pushButton_clicked()
170170
file.close();
171171
qDebug() << htmlCode;
172172

173-
ui->textBrowser->setSource(QUrl("sample1.html"));
173+
ui->textBrowser->setSource(QUrl("../output/sample1.html"));
174174

175175
}
File renamed without changes.
File renamed without changes.

‎testTable/kategorijaedit.cpp ‎bezalec/kategorijaedit.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ KategorijaEdit::~KategorijaEdit()
1818
void KategorijaEdit::loadKategorije()
1919
{
2020
QString data;
21-
QFile importedCSV("kategorije.txt");
21+
QFile importedCSV("../data/kategorije.txt");
2222
QStringList rowOfData;
2323
QStringList rowDataFull;
2424
if (importedCSV.open(QFile::ReadOnly)){
@@ -50,7 +50,7 @@ void KategorijaEdit::on_buttonBox_accepted()
5050
{
5151
//napolni prejšnje podatke
5252
qDebug() << "Shrani textedit v file, Bom probal napolnit";
53-
QFile file("kategorije.txt");
53+
QFile file("../data/kategorije.txt");
5454
QTextStream data( &file );
5555
QString plainTextEditContents = ui->textEdit->toPlainText();
5656
lines = plainTextEditContents.split("\n");
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

‎build-testTable-Desktop-Debug/Makefile

-1,396
This file was deleted.
-898 KB
Binary file not shown.
-591 KB
Binary file not shown.

‎build-testTable-Desktop-Debug/main.o

-292 KB
Binary file not shown.
-914 KB
Binary file not shown.

‎build-testTable-Desktop-Debug/moc_izpispodatkov.cpp

-110
This file was deleted.
Binary file not shown.

‎build-testTable-Desktop-Debug/moc_kategorijaedit.cpp

-110
This file was deleted.
Binary file not shown.

‎build-testTable-Desktop-Debug/moc_mainwindow.cpp

-137
This file was deleted.
-513 KB
Binary file not shown.

‎build-testTable-Desktop-Debug/sample.html

-21
This file was deleted.

‎build-testTable-Desktop-Debug/sample1.html

-1
This file was deleted.

‎build-testTable-Desktop-Debug/test.html

-3
This file was deleted.
-1.48 MB
Binary file not shown.

‎build-testTable-Desktop-Debug/ui_izpispodatkov.h

-77
This file was deleted.

‎build-testTable-Desktop-Debug/ui_kategorijaedit.h

-63
This file was deleted.

‎build-testTable-Desktop-Debug/ui_mainwindow.h

-366
This file was deleted.
File renamed without changes.
File renamed without changes.

‎testTable/testTable.pro.user

-263
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.