Skip to content

Commit

Permalink
Merge branch 'develop' and move to version 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@flinco
flinco committed Oct 2, 2023
2 parents 9544730 + b546704 commit 2657c22
Show file tree
Hide file tree
Showing 23 changed files with 1,650 additions and 681 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
installer/packages/pro.buzzi.lbchronorace/meta/*.ts
CMakeLists.txt.user
sonar*
7 changes: 5 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

cmake_minimum_required(VERSION 3.20)
project(LBChronoRace
VERSION 3.1.1
DESCRIPTION "Timings for Races"
VERSION 4.0.0
DESCRIPTION "Timings and Rankings for Races"
HOMEPAGE_URL "http://github.com/flinco/LBChronoRace"
LANGUAGES CXX)

Expand Down Expand Up @@ -57,6 +57,9 @@ set(PROJECT_SOURCES
chronoracetable.cpp
chronoracetable.h
chronoracetable.ui
chronoracetimings.cpp
chronoracetimings.h
chronoracetimings.ui
classentry.cpp
classentry.h
competitor.cpp
Expand Down
233 changes: 133 additions & 100 deletions chronorace.ui
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Lorenzo Buzzi</author>
<class>LBChronoRace</class>
<widget class="QMainWindow" name="LBChronoRace">
<property name="geometry">
Expand All @@ -20,7 +21,7 @@
<string notr="true">LBChronoRace</string>
</property>
<property name="windowIcon">
<iconset resource="icons.qrc">
<iconset>
<normaloff>:/LBChronoRace.ico</normaloff>:/LBChronoRace.ico</iconset>
</property>
<widget class="QWidget" name="mainLayoutWidget">
Expand Down Expand Up @@ -217,110 +218,149 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1">
<item>
<widget class="QLabel" name="labelEncoding">
<property name="text">
<string>Encoding</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="selectorEncoding">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>File Encoding: ISO-8859-1 (Latin1) or UTF-8</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<property name="text">
<string>Latin1</string>
</property>
<widget class="QLabel" name="labelEncoding">
<property name="text">
<string>Encoding</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<property name="text">
<string>UTF-8</string>
</property>
<widget class="QComboBox" name="selectorEncoding">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>File Encoding: ISO-8859-1 (Latin1) or UTF-8</string>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text">
<string>Latin1</string>
</property>
</item>
<item>
<property name="text">
<string>UTF-8</string>
</property>
</item>
</widget>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="labelFormat">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="selectorFormat">
<property name="toolTip">
<string>Start List and Rankings file format: PDF, CSV or Plain Text</string>
</property>
<item>
<property name="text">
<string>PDF</string>
</property>
<widget class="QLabel" name="labelFormat">
<property name="text">
<string>Format</string>
</property>
</widget>
</item>
<item>
<property name="text">
<string>Text</string>
</property>
<widget class="QComboBox" name="selectorFormat">
<property name="toolTip">
<string>Start List and Rankings file format: PDF, CSV or Plain Text</string>
</property>
<item>
<property name="text">
<string>PDF</string>
</property>
</item>
<item>
<property name="text">
<string>Text</string>
</property>
</item>
<item>
<property name="text">
<string>CSV</string>
</property>
</item>
</widget>
</item>
<item>
<property name="text">
<string>CSV</string>
</property>
<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>
</widget>
</item>
<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="makeStartList">
<property name="enabled">
<bool>true</bool>
</property>
<property name="toolTip">
<string>Generate start list in the selected format</string>
</property>
<property name="text">
<string>Make Start List</string>
</property>
</widget>
</layout>
</item>
<item>
<widget class="QPushButton" name="makeRankings">
<property name="enabled">
<bool>true</bool>
</property>
<property name="toolTip">
<string>Generate results in the selected format</string>
</property>
<property name="text">
<string>Make Results</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="1,1,1">
<item>
<widget class="QPushButton" name="makeStartList">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Generate start list in the selected format</string>
</property>
<property name="text">
<string>Make Start List</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="collectTimings">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Collect timings and bibs</string>
</property>
<property name="text">
<string>Collect Timings</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="makeRankings">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Generate results in the selected format</string>
</property>
<property name="text">
<string>Make Results</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
Expand Down Expand Up @@ -469,14 +509,7 @@
<tabstop>editTeamsList</tabstop>
<tabstop>editCategories</tabstop>
<tabstop>editTimings</tabstop>
<tabstop>selectorEncoding</tabstop>
<tabstop>selectorFormat</tabstop>
<tabstop>makeStartList</tabstop>
<tabstop>makeRankings</tabstop>
</tabstops>
<resources>
<include location="icons.qrc"/>
<include location="icons.qrc"/>
</resources>
<resources/>
<connections/>
</ui>
3 changes: 3 additions & 0 deletions chronoracedata.ui
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Lorenzo Buzzi</author>
<comment/>
<exportmacro/>
<class>ChronoRaceData</class>
<widget class="QDialog" name="ChronoRaceData">
<property name="geometry">
Expand Down
3 changes: 3 additions & 0 deletions chronoracetable.ui
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>Lorenzo Buzzi</author>
<comment/>
<exportmacro/>
<class>ChronoRaceTable</class>
<widget class="QDialog" name="ChronoRaceTable">
<property name="enabled">
Expand Down
Loading

0 comments on commit 2657c22

Please sign in to comment.