Constanta-Design/RRJClient
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJClient.git synced 2026-03-28 05:25:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

hotfix: ui

Browse Source
This commit is contained in:
semenov
2025-08-05 13:27:06 +03:00
parent fc8feee0c6
commit 0ba99d6149
23 changed files with 17650 additions and 8932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/recognizesystem.cpp
View File

@@ -32,7 +32,7 @@ void RecognizeSystem::initialize(UpdateController *updateController,
connect(this,&RecognizeSystem::sigSaveLoginData,dataParser,&DataParser::createAuthData); connect(this,&RecognizeSystem::sigSaveLoginData,dataParser,&DataParser::createAuthData);
connect(this,&RecognizeSystem::sigStartCompare,hashComparer,&HashComparer::CompareDeltas); connect(this,&RecognizeSystem::sigStartCompare,hashComparer,&HashComparer::CompareDeltas);
connect(this,&RecognizeSystem::sigUpdateBytesAvailable,mainWindow,&MainWindow::updateProgress,Qt::QueuedConnection); connect(this,&RecognizeSystem::sigUpdateBytesAvailable,mainWindow,&MainWindow::updateProgress,Qt::AutoConnection); //todo autoConnection?
connect(this,&RecognizeSystem::sigLoadComplete,mainWindow,&MainWindow::loadComplete); connect(this,&RecognizeSystem::sigLoadComplete,mainWindow,&MainWindow::loadComplete);
connect(this,&RecognizeSystem::sigNeedUpdate,mainWindow,&MainWindow::setNeedUpdate); connect(this,&RecognizeSystem::sigNeedUpdate,mainWindow,&MainWindow::setNeedUpdate);
connect(this,&RecognizeSystem::sigSocketDisabled,mainWindow,&MainWindow::lostConnection); connect(this,&RecognizeSystem::sigSocketDisabled,mainWindow,&MainWindow::lostConnection);

2
RRJClient.pro
View File

@@ -89,5 +89,5 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
RESOURCES += \ RESOURCES += \
resources.qrc resources.qrc
win32:RC_ICONS = $$PWD/resource/Icons/planeIcon.ico win32:RC_ICONS = $$PWD/resource/Icons/planeCustomIco.ico

2
RRJClient_resource.rc
View File

@@ -1,6 +1,6 @@
#include <windows.h> #include <windows.h>
IDI_ICON1 ICON DISCARDABLE "D:\\QT\\Projects\\RRJClient\\resource\\Icons\\planeIcon.ico" IDI_ICON1 ICON DISCARDABLE "D:\\QT\\Projects\\RRJClient\\resource\\Icons\\planeCustomIco.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,0,0,0 FILEVERSION 0,0,0,0

2
StaticData/authData.xml
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<AuthData Login="I1" Password="1111" InstructorName="Горинин Г.Г." ClientName="Горинин Г.Г." AccessType="instructor"/> <AuthData Login="O1" Password="1111" InstructorName="" ClientName="Иванов И.И." AccessType="trainee"/>

8871
StaticData/clientHash.xml
View File

File diff suppressed because it is too large Load Diff

8856
StaticData/serverHash.xml
View File

File diff suppressed because it is too large Load Diff

6
StaticData/settings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version='1.0' encoding='UTF-8'?>
<ServerSettingsContainer> <ServerSettingsContainer>
<ServerSettings Address="192.168.100.83" Port="6000" Language="RUS" AutoStart="0" DestPortMath="18003" LocalPortMath="18004" UseMathModel="1"/> <ServerSettings DestPortMath="18003" Port="6000" AutoStart="0" UseMathModel="1" Language="RUS" Address="192.168.100.83" LocalPortMath="18004"/>
<VersionData Version="" isChangable="0"/> <VersionData Version="base" isChangable="0" Created="Пт авг 1 10:37:32 2025"/>
</ServerSettingsContainer> </ServerSettingsContainer>

8675
StaticData/streamingHash.xml
View File

File diff suppressed because it is too large Load Diff

2
StaticData/temp.xml
View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ClientNotify Code="CHECKVERSIONLIST"/> <ClientAutorization Login="O1" Password="1111"/>

25
Widgets/entrywidget.ui
View File

@@ -6,14 +6,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>636</width> <width>800</width>
<height>237</height> <height>250</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
@@ -28,6 +34,9 @@
</property> </property>
<item> <item>
<widget class="QWidget" name="settingsWidget" native="true"> <widget class="QWidget" name="settingsWidget" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@@ -40,6 +49,12 @@
<height>200</height> <height>200</height>
</size> </size>
</property> </property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@@ -200,6 +215,9 @@
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
@@ -326,6 +344,9 @@
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text"> <property name="text">
<string>Связь с сервером не установлена! Проверьте настройки или запустите в автономном режиме</string> <string>Связь с сервером не установлена! Проверьте настройки или запустите в автономном режиме</string>
</property> </property>

2
main.cpp
View File

@@ -11,7 +11,7 @@ int main(int argc, char *argv[])
QFile file(":/style.css"); QFile file(":/style.css");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
a.setStyleSheet(file.readAll()); a.setStyleSheet(file.readAll());
a.setWindowIcon(QIcon(":/resource/Icons/Logo.png")); a.setWindowIcon(QIcon(":/resource/Icons/planeCustom.png"));
MainWindow w; MainWindow w;
w.initialize(); w.initialize();

5
mainwindow.cpp
View File

@@ -12,7 +12,8 @@
MainWindow::MainWindow(QWidget *parent) MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), : QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
bottomRightPosition(QRect(530,505,250,40)) bottomRightPosition(QRect(530,505,250,40)),
offlinePosition(240,340,300,40)
{ {
ui->setupUi(this); ui->setupUi(this);
isRecovery = false; isRecovery = false;
@@ -334,7 +335,7 @@ void MainWindow::showConnectionEmpty()
entryWidget->connectionEmptyState(); entryWidget->connectionEmptyState();
updateWidget->hide(); updateWidget->hide();
ui->offlineStartButton->show(); ui->offlineStartButton->show();
ui->offlineStartButton->setGeometry(280,340,250,40); ui->offlineStartButton->setGeometry(offlinePosition);
ui->offlineStartButton->raise(); ui->offlineStartButton->raise();
ui->settingsButton->show(); ui->settingsButton->show();
ui->unsafeChangingButton->hide(); ui->unsafeChangingButton->hide();

1
mainwindow.h
View File

@@ -137,6 +137,7 @@ private:
QList<FileData> *updateList; QList<FileData> *updateList;
QPixmap _background; QPixmap _background;
QRect bottomRightPosition; QRect bottomRightPosition;
QRect offlinePosition;
int fileCountForUpdate; int fileCountForUpdate;
int filesLoaded; int filesLoaded;

117
mainwindow.ui
View File

@@ -2,6 +2,9 @@
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -417,54 +420,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QLabel" name="notificationLabel">
<property name="geometry">
<rect>
<x>240</x>
<y>410</y>
<width>300</width>
<height>40</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="text">
<string>Какая-то ошибка</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QPushButton" name="offlineStartButton"> <widget class="QPushButton" name="offlineStartButton">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@@ -508,13 +463,17 @@
<widget class="QWidget" name="verticalLayoutWidget_2"> <widget class="QWidget" name="verticalLayoutWidget_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>10</x>
<y>210</y> <y>210</y>
<width>781</width> <width>761</width>
<height>211</height> <height>211</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="interactiveGroup"/> <layout class="QHBoxLayout" name="interactiveGroup">
<property name="spacing">
<number>0</number>
</property>
</layout>
</widget> </widget>
<widget class="QWidget" name="verticalLayoutWidget_3"> <widget class="QWidget" name="verticalLayoutWidget_3">
<property name="geometry"> <property name="geometry">
@@ -585,19 +544,19 @@
</property> </property>
<layout class="QHBoxLayout" name="headerLayout"> <layout class="QHBoxLayout" name="headerLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>5</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>10</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>5</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>5</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="iconWidget" native="true"> <widget class="QWidget" name="iconWidget" native="true">
@@ -673,6 +632,54 @@
</property> </property>
</layout> </layout>
</widget> </widget>
<widget class="QLabel" name="notificationLabel">
<property name="geometry">
<rect>
<x>250</x>
<y>460</y>
<width>300</width>
<height>40</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>300</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="text">
<string>Какая-то ошибка</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>

BIN
resource/Icons/Logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
resource/Icons/plane.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resource/Icons/planeCustom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
resource/Icons/planeCustomIco.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
resource/Icons/planeIcon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
resource/SSJ-100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 799 KiB

BIN
resource/SSJ-100Dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 669 KiB

6
resources.qrc
View File

@@ -6,20 +6,16 @@
<file>resource/Fonts/LiberationSans-Regular.ttf</file> <file>resource/Fonts/LiberationSans-Regular.ttf</file>
<file>resource/Fonts/HelveticaNeue-Medium.ttf</file> <file>resource/Fonts/HelveticaNeue-Medium.ttf</file>
<file>resource/Icons/monitor-display.png</file> <file>resource/Icons/monitor-display.png</file>
<file>resource/Icons/plane.png</file>
<file>resource/Icons/setting.png</file> <file>resource/Icons/setting.png</file>
<file>resource/Icons/settingWhite.png</file> <file>resource/Icons/settingWhite.png</file>
<file>resource/Icons/crossInCircle.png</file> <file>resource/Icons/crossInCircle.png</file>
<file>resource/Icons/whiteCross.png</file> <file>resource/Icons/whiteCross.png</file>
<file>resource/SSJ-100.png</file>
<file>resource/Icons/762.gif</file> <file>resource/Icons/762.gif</file>
<file>resource/SSJ-100Dark.png</file>
<file>resource/Icons/checked.png</file> <file>resource/Icons/checked.png</file>
<file>resource/SSJ_backgroundDark.png</file> <file>resource/SSJ_backgroundDark.png</file>
<file>resource/SSJ_backgroundDarkSM.png</file> <file>resource/SSJ_backgroundDarkSM.png</file>
<file>resource/Icons/caution.png</file> <file>resource/Icons/caution.png</file>
<file>resource/Icons/planeIcon.ico</file>
<file>resource/Icons/Logo.png</file>
<file>resource/Icons/close.png</file> <file>resource/Icons/close.png</file>
<file>resource/Icons/planeCustom.png</file>
</qresource> </qresource>
</RCC> </RCC>

8
style.css
View File

@@ -104,8 +104,14 @@ QCheckBox
QWidget#iconWidget QWidget#iconWidget
{ {
border-image: url(:/resource/Icons/Logo.png) 0 0 0 0 stretch stretch; border-image: url(:/resource/Icons/planeCustom.png);
position: center; position: center;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
height: 80%;
width: 80%;
} }
QLabel QLabel