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

ref: segregate animation screen

Browse Source
This commit is contained in:
semenov
2024-12-28 10:50:26 +03:00
parent f444b48892
commit 43d0a48593
28 changed files with 1012 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

357
Makefile.Debug
View File

File diff suppressed because one or more lines are too long

357
Makefile.Release
View File

File diff suppressed because one or more lines are too long

3
RRJClient.pro
View File

@@ -29,6 +29,7 @@ SOURCES += \
Core\tools.cpp\
Core\hashcomparer.cpp \
UI/resourcemanager.cpp \
Widgets/waitanimationwidget.cpp \
Widgets\commonbuttongroupwidget.cpp \
Widgets\entrywidget.cpp \
Widgets\instructorbuttongroupwidget.cpp \
@@ -54,6 +55,7 @@ HEADERS += \
Data\FileData.h\
Data\Datas.h \
UI/resourcemanager.h \
Widgets/waitanimationwidget.h \
Widgets\commonbuttongroupwidget.h \
Widgets\entrywidget.h \
Widgets\instructorbuttongroupwidget.h \
@@ -64,6 +66,7 @@ HEADERS += \
Widgets\versionselectwidget.h
FORMS += \
Widgets/waitanimationwidget.ui \
Widgets\commonbuttongroupwidget.ui \
Widgets\entrywidget.ui \
Widgets\instructorbuttongroupwidget.ui \

4
RRJClient.pro.user
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.1, 2024-12-27T11:37:44. -->
<!-- Written by QtCreator 4.11.1, 2024-12-27T17:58:30. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -78,7 +78,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">true</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>

2
StaticData/settings.xml
View File

@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<ServerSettingsContainer>
<ServerSettings Address="192.168.100.241" Language="RUS" Port="6000" AutoStart="0"/>
<ServerSettings Language="RUS" Address="192.168.100.241" AutoStart="0" Port="6000"/>
<VersionData Version="base"/>
</ServerSettingsContainer>

11
UI/resourcemanager.cpp
View File

@@ -53,17 +53,6 @@ void ResourceManager::painting()
//loading
movie = new QMovie(":/resource/Icons/762.gif");
startLoadingAnim();
}
void ResourceManager::startLoadingAnim()
{
movie->start();
}
void ResourceManager::stopLoadingMovie()
{
movie->stop();
}
QMovie *ResourceManager::getMovie() const

2
UI/resourcemanager.h
View File

@@ -12,8 +12,6 @@ public:
explicit ResourceManager(QObject *parent = nullptr);
void painting();
void startLoadingAnim();
void stopLoadingMovie();
QMovie *getMovie() const;
QIcon *getSettingsIcon() const;

33
Widgets/waitanimationwidget.cpp Normal file
View File

@@ -0,0 +1,33 @@
#include "waitanimationwidget.h"
#include "ui_waitanimationwidget.h"
WaitAnimationWidget::WaitAnimationWidget(QWidget *parent) :
QWidget(parent),
ui(new Ui::WaitAnimationWidget),
loadingMovie(nullptr)
{
ui->setupUi(this);
}
void WaitAnimationWidget::setMovie(QMovie *movie)
{
ui->MovieLabel->setMovie(movie);
loadingMovie = movie;
}
void WaitAnimationWidget::showWithPlay()
{
show();
loadingMovie->start();
}
void WaitAnimationWidget::hideWithStop()
{
hide();
loadingMovie->stop();
}
WaitAnimationWidget::~WaitAnimationWidget()
{
delete ui;
}

27
Widgets/waitanimationwidget.h Normal file
View File

@@ -0,0 +1,27 @@
#ifndef WAITANIMATIONWIDGET_H
#define WAITANIMATIONWIDGET_H
#include <QMovie>
#include <QWidget>
namespace Ui {
class WaitAnimationWidget;
}
class WaitAnimationWidget : public QWidget
{
Q_OBJECT
public:
explicit WaitAnimationWidget(QWidget *parent = nullptr);
void setMovie(QMovie *movie);
void showWithPlay();
void hideWithStop();
~WaitAnimationWidget();
private:
Ui::WaitAnimationWidget *ui;
QMovie *loadingMovie;
};
#endif // WAITANIMATIONWIDGET_H

58
Widgets/waitanimationwidget.ui Normal file
View File

@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>WaitAnimationWidget</class>
<widget class="QWidget" name="WaitAnimationWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>600</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<widget class="QWidget" name="horizontalLayoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>40</y>
<width>801</width>
<height>561</height>
</rect>
</property>
<layout class="QHBoxLayout" name="mainLayout">
<item>
<widget class="QLabel" name="MovieLabel">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../resources.qrc">:/resource/Icons/762.gif</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
<resources>
<include location="../resources.qrc"/>
</resources>
<connections/>
</ui>

BIN
debug/RRJClient.exe
View File

Binary file not shown.

BIN
debug/mainwindow.o
View File

Binary file not shown.

BIN
debug/moc_mainwindow.o
View File

Binary file not shown.

BIN
debug/moc_resourcemanager.o
View File

Binary file not shown.

95
debug/moc_waitanimationwidget.cpp Normal file
View File

@@ -0,0 +1,95 @@
/****************************************************************************
** Meta object code from reading C++ file 'waitanimationwidget.h'
**
** Created by: The Qt Meta Object Compiler version 67 (Qt 5.14.2)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include <memory>
#include "../Widgets/waitanimationwidget.h"
#include <QtCore/qbytearray.h>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'waitanimationwidget.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 67
#error "This file was generated using the moc from 5.14.2. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_WaitAnimationWidget_t {
QByteArrayData data[1];
char stringdata0[20];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
qptrdiff(offsetof(qt_meta_stringdata_WaitAnimationWidget_t, stringdata0) + ofs \
- idx * sizeof(QByteArrayData)) \
)
static const qt_meta_stringdata_WaitAnimationWidget_t qt_meta_stringdata_WaitAnimationWidget = {
{
QT_MOC_LITERAL(0, 0, 19) // "WaitAnimationWidget"
},
"WaitAnimationWidget"
};
#undef QT_MOC_LITERAL
static const uint qt_meta_data_WaitAnimationWidget[] = {
// content:
8, // revision
0, // classname
0, 0, // classinfo
0, 0, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
0 // eod
};
void WaitAnimationWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
Q_UNUSED(_o);
Q_UNUSED(_id);
Q_UNUSED(_c);
Q_UNUSED(_a);
}
QT_INIT_METAOBJECT const QMetaObject WaitAnimationWidget::staticMetaObject = { {
QMetaObject::SuperData::link<QWidget::staticMetaObject>(),
qt_meta_stringdata_WaitAnimationWidget.data,
qt_meta_data_WaitAnimationWidget,
qt_static_metacall,
nullptr,
nullptr
} };
const QMetaObject *WaitAnimationWidget::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *WaitAnimationWidget::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_WaitAnimationWidget.stringdata0))
return static_cast<void*>(this);
return QWidget::qt_metacast(_clname);
}
int WaitAnimationWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QWidget::qt_metacall(_c, _id, _a);
return _id;
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE

BIN
debug/moc_waitanimationwidget.o Normal file
View File

Binary file not shown.

128
debug/qrc_resources.cpp
View File

@@ -8,54 +8,54 @@
static const unsigned char qt_resource_data[] = {
// D:/QT/Projects/RRJClient/style.css
0x0,0x0,0x2,0xd4,
0x0,0x0,0x2,0xdd,
0x0,
0x0,0xc,0x68,0x78,0x9c,0xd5,0x56,0x6b,0x6f,0xda,0x30,0x14,0xfd,0x8e,0xc4,0x7f,
0xb0,0x8a,0x26,0xb5,0x12,0xb4,0x49,0x28,0x2d,0xcb,0xbe,0xd1,0xee,0xd1,0xa9,0x54,
0xab,0xda,0xb5,0x1f,0x27,0x27,0xbe,0x4d,0x2c,0x8c,0x8d,0x6c,0x47,0x14,0x4d,0xfb,
0xef,0x33,0x79,0x91,0x17,0x90,0x3e,0x34,0x69,0x4,0xf1,0x88,0x9d,0x73,0x8f,0x7d,
0xcf,0x3d,0xd7,0xdd,0xce,0xed,0x14,0x53,0xfe,0x48,0x39,0x11,0xcb,0x6e,0xe7,0x77,
0xb7,0x83,0xcc,0xcb,0xc3,0xfe,0x2c,0x90,0x22,0xe2,0x64,0x40,0xe7,0x38,0x0,0x17,
0x45,0x92,0x1d,0xba,0x27,0x12,0x94,0x88,0xa4,0xf,0x27,0x77,0x77,0xdf,0x7f,0x6d,
0x26,0x5d,0x62,0x39,0xbb,0x9b,0x1e,0x2f,0x78,0x70,0xf4,0xa9,0x6,0xb0,0x10,0x8a,
0x6a,0x2a,0xb8,0x8b,0x7c,0xe0,0x1a,0xa4,0x99,0xf1,0xa7,0xdb,0xe9,0x76,0x6e,0xbf,
0x48,0x3c,0x87,0xde,0x66,0xe6,0xcf,0x5,0xc1,0x1a,0xfe,0x2d,0x87,0x6b,0xaa,0xf4,
0x23,0x25,0x1,0xe8,0x5e,0x14,0x87,0xdf,0xdc,0x68,0x22,0xe2,0xb,0x26,0xa4,0x8b,
0x64,0xe0,0xe1,0xc3,0xb1,0xdd,0x4f,0xde,0xf6,0xd8,0xca,0x42,0x26,0xe3,0xcb,0x90,
0x6a,0xa8,0x2c,0xf3,0x6,0x96,0xf,0x20,0x27,0x39,0x54,0x86,0x5e,0x3,0x8f,0xb1,
0xad,0xfe,0xfa,0xfa,0x68,0x7d,0x38,0xca,0x61,0x2e,0xc4,0xdc,0x13,0x13,0xf1,0xbc,
0x9b,0xd6,0xa1,0x63,0xd,0xfb,0x8e,0x33,0xee,0x3b,0xa3,0x51,0xbe,0xf,0x42,0x12,
0x90,0x3,0xa5,0x57,0xcc,0x6c,0xa2,0x88,0xb4,0x2,0x5d,0x1e,0x92,0x98,0xd0,0x48,
0xb9,0x68,0xb8,0x78,0x4e,0x7,0x9e,0x4,0xd7,0x83,0x27,0x3c,0xa7,0x6c,0xe5,0xa2,
0x83,0xb,0xcc,0xa8,0x27,0xe9,0x41,0x61,0xd0,0x45,0xf6,0x59,0x3e,0xbb,0x10,0xff,
0x74,0xd4,0x1f,0x9f,0xf6,0xed,0xa1,0xb5,0x61,0xfe,0x23,0x52,0xe1,0x24,0xd2,0x5a,
0xf0,0xff,0x99,0xbb,0x4b,0xa8,0xc2,0x1e,0x3,0xb2,0x63,0x11,0x8c,0x6,0xa1,0xfe,
0x2a,0xf1,0xaa,0x8c,0x1d,0x98,0x3b,0x19,0xe0,0x14,0x94,0x32,0x62,0xde,0x9d,0xc8,
0xb2,0x80,0x36,0x8f,0xa0,0xdb,0x6b,0xec,0x1,0xcb,0x9f,0x6c,0xb1,0x52,0xc7,0xaa,
0xae,0xd4,0x63,0x26,0x5e,0x23,0x78,0x53,0xa2,0xca,0x9b,0xec,0xe4,0x60,0xb,0x4c,
0x8,0xe5,0x81,0x8b,0xac,0x63,0x7,0xe6,0xf9,0xe7,0x30,0xfb,0x9d,0x4e,0x9b,0x53,
0x3e,0x58,0x52,0xa2,0x43,0x17,0x9d,0x27,0x4c,0xb2,0xba,0xe3,0xf0,0x99,0x50,0x5d,
0xd,0xd4,0x3a,0xd1,0x69,0x7a,0xa4,0x8,0x8c,0x1f,0xa8,0x9,0x96,0x15,0xa4,0x98,
0x2b,0x52,0x82,0x51,0x52,0xcf,0x6d,0x3,0xea,0x68,0xdb,0x36,0xb5,0x55,0x94,0x1,
0x30,0x98,0x8c,0xa4,0x77,0x35,0x3c,0xeb,0x81,0x99,0x18,0xd4,0x3c,0xa7,0x4c,0xdb,
0x75,0xfd,0x30,0xe2,0xb3,0x6d,0x1b,0xbe,0xa1,0xd5,0xaa,0x64,0x52,0xab,0x8,0xc1,
0x9f,0x15,0x15,0x56,0xe4,0xbf,0x85,0xfe,0xb8,0xba,0xfe,0xb2,0x6,0x53,0x8f,0xa4,
0xbe,0xe0,0x55,0x77,0x4c,0x8,0x37,0x5b,0xf4,0x95,0x99,0xaf,0x4e,0x16,0xc,0x73,
0x88,0x9d,0x19,0x59,0xe9,0xa5,0xb4,0x4,0xed,0x87,0xd9,0x77,0x26,0xaa,0xad,0x36,
0xfd,0x76,0xd9,0x97,0xd7,0x73,0x6f,0xd2,0xb3,0xd6,0x5f,0x8f,0x72,0x66,0xa4,0xb8,
0xfe,0x7b,0x9,0x5e,0x14,0xec,0x33,0xfd,0xc4,0x98,0x73,0x11,0xb5,0x11,0x46,0xbb,
0x9d,0xd,0x1,0x9b,0x6d,0xdc,0xd7,0x79,0xb6,0xa6,0xbc,0xd4,0xc3,0xda,0xf5,0xaf,
0x2,0xce,0xeb,0x1c,0xd7,0x2e,0x16,0x74,0x12,0x13,0xbd,0x9e,0x81,0x55,0xad,0xcc,
0xf7,0x60,0xf0,0x2e,0x86,0xd9,0xdc,0x1a,0xa6,0x2b,0x73,0x66,0xfa,0x16,0x67,0x2d,
0x4d,0xde,0x8b,0x43,0xd5,0xa5,0xb1,0xa5,0xb,0xc5,0xc8,0x3d,0x53,0x45,0x41,0x64,
0xaa,0xec,0x9e,0x6a,0x6,0xed,0xe2,0x34,0x2a,0x2e,0x41,0xbb,0x11,0x9a,0x3e,0x51,
0x1f,0xaf,0xeb,0xed,0x5,0xcc,0x9b,0x10,0xd7,0xf5,0x24,0x4,0x4b,0x5a,0x47,0xcf,
0xf4,0x49,0x53,0xf0,0xab,0x7,0xa,0xcb,0x9a,0x27,0x9f,0xbe,0xc9,0x93,0x9b,0x9f,
0xd9,0xd3,0x3d,0x9b,0x99,0x19,0xd7,0x35,0x1e,0xb9,0xb3,0x99,0xaf,0xa3,0xd9,0x23,
0x73,0xbc,0x3b,0x3f,0x33,0xea,0xb4,0x8f,0xf6,0xae,0xb6,0xcd,0x9,0xa1,0x1,0x74,
0xc7,0xfa,0xea,0xa7,0x90,0x5e,0xca,0x3b,0xce,0x58,0x9b,0x43,0x55,0xc9,0xb2,0x6a,
0x68,0xc6,0xfb,0x66,0x2f,0x46,0x69,0xa9,0x11,0x8f,0x45,0x5,0x85,0xfc,0x5,0x8f,
0x9b,0x9c,0x64,
0x0,0xc,0xab,0x78,0x9c,0xd5,0x56,0x6b,0x6f,0xda,0x30,0x14,0xfd,0x8e,0xc4,0x7f,
0xb0,0x8a,0x26,0xb5,0x12,0xb4,0x49,0x28,0x2d,0xcb,0xbe,0xd1,0xee,0xa9,0x51,0xad,
0x6a,0xd7,0x7e,0x9c,0x9c,0xf8,0x36,0xb1,0x30,0x36,0xb2,0x9d,0x52,0x34,0xed,0xbf,
0xcf,0x24,0x81,0xbc,0x21,0x7d,0x68,0xd2,0x8,0xe2,0x11,0x3b,0xe7,0x1e,0xfb,0x9e,
0x7b,0xae,0xbb,0x9d,0xeb,0x29,0xa6,0xfc,0x9e,0x72,0x22,0x96,0xdd,0xce,0xef,0x6e,
0x7,0x99,0x97,0x87,0xfd,0x59,0x20,0x45,0xc4,0xc9,0x80,0xce,0x71,0x0,0x2e,0x8a,
0x24,0x3b,0x74,0x4f,0x24,0x28,0x11,0x49,0x1f,0x4e,0x6e,0x6e,0xbe,0xfd,0xca,0x26,
0x5d,0x62,0x39,0xbb,0x99,0x1e,0x2f,0x78,0x70,0xf4,0xa1,0x2,0xb0,0x10,0x8a,0x6a,
0x2a,0xb8,0x8b,0x7c,0xe0,0x1a,0xa4,0x99,0xf1,0xa7,0xdb,0xe9,0x76,0xae,0x3f,0x49,
0x3c,0x87,0x5e,0x36,0xf3,0xe7,0x82,0x60,0xd,0xff,0x96,0xc3,0x77,0xaa,0xf4,0x3d,
0x25,0x1,0xe8,0x5e,0x14,0x87,0xcf,0x6e,0xd4,0x11,0xf1,0x5,0x13,0xd2,0x45,0x32,
0xf0,0xf0,0xe1,0xd8,0xee,0x27,0x6f,0x7b,0x6c,0x6d,0x42,0x26,0xe3,0xcb,0x90,0x6a,
0x28,0x2d,0xf3,0xa,0x96,0x77,0x20,0x27,0x5b,0xa8,0x66,0xf4,0x18,0xdc,0xea,0xaf,
0xaf,0xf7,0xd6,0xbb,0xa3,0x8c,0x2a,0xf6,0x80,0xf5,0xa6,0xe2,0x91,0x42,0xfc,0xb3,
0x15,0xc2,0x28,0x8f,0x70,0x21,0xe6,0x9e,0x98,0x88,0xa7,0xdd,0x2b,0x3b,0x74,0xac,
0x61,0xdf,0x71,0xc6,0x7d,0x67,0x34,0xda,0x6e,0xa5,0x90,0x4,0xe4,0x40,0xe9,0x15,
0x33,0x79,0x10,0x91,0x56,0xa0,0x8b,0x43,0x12,0x13,0x1a,0x29,0x17,0xd,0x17,0x4f,
0xe9,0xc0,0x83,0xe0,0x7a,0xf0,0x80,0xe7,0x94,0xad,0x5c,0x74,0x70,0x81,0x19,0xf5,
0x24,0x3d,0xc8,0xd,0xba,0xc8,0x3e,0xdb,0xce,0xce,0xc5,0x3f,0x1d,0xf5,0xc7,0xa7,
0x7d,0x7b,0x68,0x65,0xcc,0x7f,0x44,0x2a,0x9c,0x44,0x5a,0xb,0xfe,0x3f,0x73,0x77,
0x9,0x55,0xd8,0x63,0xb0,0x23,0xf9,0x88,0xd1,0x20,0xd4,0x9f,0x25,0x5e,0x15,0xb1,
0x3,0x73,0x67,0x3,0x38,0x5,0xa5,0x4c,0x3d,0xec,0x4e,0x64,0x51,0x83,0xd9,0x23,
0xe8,0xba,0x28,0x9e,0x16,0x2b,0x75,0xac,0xf2,0x4a,0x3d,0x66,0xe2,0xd5,0x82,0xd7,
0x25,0xaa,0xb8,0xc9,0xce,0x16,0x6c,0x81,0x9,0xa1,0x3c,0x70,0x91,0x75,0xec,0xc0,
0x7c,0xfb,0x39,0xdc,0xfc,0x4e,0xa7,0xcd,0x29,0x1f,0x2c,0x29,0xd1,0xa1,0x8b,0xce,
0x13,0x26,0x9b,0xd2,0xe5,0xf0,0x91,0x50,0x5d,0xe,0xd4,0x3a,0xd1,0x69,0x7a,0xa4,
0x8,0x8c,0xa5,0xa8,0x9,0x96,0x25,0xa4,0x98,0x2b,0x52,0x82,0x51,0x52,0xcd,0x6d,
0xd,0xea,0xa8,0x69,0x9b,0xda,0x2a,0xca,0x0,0x18,0x4c,0x46,0xd2,0xbb,0x1a,0x9e,
0xf4,0xc0,0x4c,0xc,0x2a,0xb6,0x55,0xa4,0xed,0xba,0x7e,0x18,0xf1,0x59,0xd3,0x86,
0x67,0xb4,0x5a,0x95,0x4c,0x6a,0x15,0x21,0xf8,0xb3,0xbc,0xc2,0xf2,0xfc,0x1b,0xe8,
0x8f,0xcb,0xeb,0x2f,0x6a,0x30,0xb5,0x59,0xea,0xb,0x5e,0x36,0xd8,0x84,0x70,0xbd,
0xcb,0x7f,0x35,0xf3,0xd5,0xc9,0x82,0x61,0xe,0xb1,0xb9,0x23,0x2b,0xbd,0x94,0x96,
0xa0,0xfd,0x70,0xf3,0xbd,0x11,0x55,0xa3,0xd3,0xbf,0x5e,0xf6,0xc5,0xf5,0xdc,0x9a,
0xf4,0xac,0xf5,0xd7,0xa3,0x9c,0x19,0x29,0xae,0xff,0x5e,0x82,0x17,0x5,0xfb,0xfa,
0x46,0x62,0xcc,0x5b,0x11,0xb5,0x11,0x46,0xbb,0x9d,0xd,0x1,0x9b,0x6d,0xdc,0xd7,
0xbc,0x1a,0x53,0x5e,0x68,0x83,0xed,0x5a,0x60,0xe,0xe7,0x65,0x8e,0x6b,0xe7,0xb,
0x3a,0x89,0x89,0x5e,0xce,0xc0,0x2a,0x57,0xe6,0x5b,0x30,0x78,0x13,0xc3,0xac,0x6f,
0xd,0xd3,0x95,0x39,0x76,0x7d,0x89,0xb3,0x96,0x26,0xef,0xd9,0xa1,0xaa,0xd2,0x68,
0xe8,0x42,0xc9,0xe9,0xc1,0x54,0x51,0x10,0x99,0x2a,0xbb,0xa5,0x9a,0x41,0xbb,0x38,
0xb5,0x8a,0x4b,0xd0,0xae,0x84,0xa6,0xf,0xd4,0xc7,0xeb,0x7a,0x7b,0x6,0xf3,0x3a,
0xc4,0x75,0x3d,0x9,0xc1,0x92,0xd6,0xd1,0x33,0x7d,0xd2,0x14,0xfc,0xea,0x8e,0xc2,
0xb2,0xe2,0xc9,0xa7,0xaf,0xf2,0xe4,0xfa,0x67,0xf6,0x74,0xcf,0x7a,0x66,0xc6,0x75,
0x8d,0x47,0xee,0x6c,0xe6,0xeb,0x68,0xf6,0xc8,0x9c,0x10,0xcf,0xcf,0x8c,0x3a,0xed,
0xa3,0xbd,0xab,0x6d,0x73,0x42,0xa8,0x1,0xdd,0xb1,0xbe,0xea,0x29,0xa4,0x97,0xf2,
0x8e,0x33,0xd6,0xe6,0x50,0x55,0xb0,0xac,0xa,0x9a,0xf1,0xbe,0xd9,0xb3,0x51,0x5a,
0x6a,0xc4,0x63,0x51,0x4e,0x21,0x7f,0x1,0xf0,0x87,0xaf,0xf,
// D:/QT/Projects/RRJClient/resource/SSJ_backgroundDark.png
0x0,0x22,0x2a,0x2f,
0x89,
@@ -328140,7 +328140,7 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/style.css
0x0,0x0,0x0,0x16,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
0x0,0x0,0x1,0x94,0x8,0x1a,0xbc,0x65,
0x0,0x0,0x1,0x94,0x8,0x4d,0x2c,0x6b,
// :/resource
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x6,0x0,0x0,0x0,0x3,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
@@ -328151,52 +328151,52 @@ static const unsigned char qt_resource_struct[] = {
0x0,0x0,0x0,0xd6,0x0,0x2,0x0,0x0,0x0,0x9,0x0,0x0,0x0,0x9,
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
// :/resource/SSJ-100Dark.png
0x0,0x0,0x0,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3c,0x49,0x58,
0x0,0x0,0x0,0xb2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x3c,0x49,0x61,
0x0,0x0,0x1,0x92,0x4d,0x8e,0xd2,0xb0,
// :/resource/SSJ-100.png
0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcc,0xaa,
0x0,0x0,0x0,0x96,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2f,0xcc,0xb3,
0x0,0x0,0x1,0x92,0x4d,0x0,0xce,0xbb,
// :/resource/SSJ_backgroundDarkSM.png
0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0xb,
0x0,0x0,0x0,0x60,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x22,0x2d,0x14,
0x0,0x0,0x1,0x93,0xf7,0x6c,0xa6,0xcf,
// :/resource/SSJ_backgroundDark.png
0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0xd8,
0x0,0x0,0x0,0x2e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0xe1,
0x0,0x0,0x1,0x93,0xf7,0x67,0xfd,0xc6,
// :/resource/Icons/caution.png
0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x4,0xe5,
0x0,0x0,0x1,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x4,0xee,
0x0,0x0,0x1,0x93,0xf8,0xc4,0xe,0x70,
// :/resource/Icons/setting.png
0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa5,0xe8,
0x0,0x0,0x2,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa5,0xf1,
0x0,0x0,0x1,0x92,0x47,0x9,0xdd,0xaa,
// :/resource/Icons/checked.png
0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0x55,
0x0,0x0,0x2,0x90,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x50,0x3,0x5e,
0x0,0x0,0x1,0x92,0x51,0xaa,0xfa,0x67,
// :/resource/Icons/settingWhite.png
0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x59,0xe1,
0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x59,0xea,
0x0,0x0,0x1,0x92,0x47,0xc,0xaf,0x4c,
// :/resource/Icons/plane.png
0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd0,0xfa,
0x0,0x0,0x2,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd1,0x3,
0x0,0x0,0x1,0x91,0xb3,0xf,0xc0,0x1f,
// :/resource/Icons/crossInCircle.png
0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0x47,
0x0,0x0,0x2,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xd5,0x50,
0x0,0x0,0x1,0x92,0x4c,0x9f,0x4d,0xc4,
// :/resource/Icons/whiteCross.png
0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0x6c,
0x0,0x0,0x1,0xc0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x43,0x75,
0x0,0x0,0x1,0x92,0x4c,0x9e,0xfa,0x44,
// :/resource/Icons/monitor-display.png
0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0x19,
0x0,0x0,0x2,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0xa0,0x22,
0x0,0x0,0x1,0x92,0x42,0xfe,0x89,0x26,
// :/resource/Icons/762.gif
0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1c,0xf6,
0x0,0x0,0x1,0xac,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x4f,0x1c,0xff,
0x0,0x0,0x1,0x92,0x4d,0xb,0xea,0x71,
// :/resource/Fonts/HelveticaNeue-Medium.ttf
0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbb,0xb5,
0x0,0x0,0x0,0xf6,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x46,0xbb,0xbe,
0x0,0x0,0x1,0x92,0x42,0xb4,0xbd,0xcd,
// :/resource/Fonts/LiberationSans-Regular.ttf
0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xac,0xe9,
0x0,0x0,0x1,0x56,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0xac,0xf2,
0x0,0x0,0x1,0x92,0x42,0x25,0xa7,0xdc,
// :/resource/Fonts/Kanit Cyrillic.ttf
0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0x29,
0x0,0x0,0x1,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x49,0x25,0x32,
0x0,0x0,0x1,0x92,0x42,0x14,0x94,0xcc,
};

BIN
debug/qrc_resources.o
View File

Binary file not shown.

BIN
debug/resourcemanager.o
View File

Binary file not shown.

BIN
debug/waitanimationwidget.o Normal file
View File

Binary file not shown.

20
mainwindow.cpp
View File

@@ -60,6 +60,8 @@ void MainWindow::createObjects()
commonButtonGroupWidget = new CommonButtonGroupWidget;
entryWidget = new EntryWidget;
versionSelectWidget = new VersionSelectWidget;
waitAnimationWidget = new WaitAnimationWidget;
waitAnimationWidget->setParent(this);
ui->changButtonGroup->addWidget(commonButtonGroupWidget);
ui->interactiveGroup->addWidget(entryWidget);
@@ -95,14 +97,6 @@ void MainWindow::createObjects()
workerThread->start();
workerThread->setPriority(QThread::HighestPriority);
QVBoxLayout *layout = new QVBoxLayout();
layout->setParent(this);
movieLabel = new QLabel("MovieLabel");
layout->addWidget(movieLabel);
setLayout(layout);
movieLabel->setStyleSheet("background-color:rgba(0,0,0,90)");
timer = new QTimer;
}
@@ -532,9 +526,7 @@ void MainWindow::setUpUi()
ui->unsafeChangingButton->setIcon(*resourceManager->getUnsavedIcon());
ui->unsafeChangingButton->setIconSize(cautionIconSize);
movieLabel->setGeometry(367,300,70,70);
movieLabel->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum);
movieLabel->setMovie(resourceManager->getMovie());
waitAnimationWidget->setMovie(resourceManager->getMovie());
QSize iconSize(30,30);
ui->exitButton->setIcon(*resourceManager->getCloseIcon());
@@ -559,13 +551,11 @@ void MainWindow::activateLoadingAnimation(bool flag)
{
if (flag)
{
movieLabel->show();
resourceManager->startLoadingAnim();
waitAnimationWidget->showWithPlay();
}
else
{
movieLabel->hide();
resourceManager->stopLoadingMovie();
waitAnimationWidget->hideWithStop();
}
}

3
mainwindow.h
View File

@@ -18,6 +18,7 @@
#include <Widgets/instructorbuttongroupwidget.h>
#include <Widgets/updatenotifywidget.h>
#include <Widgets/versionselectwidget.h>
#include <Widgets/waitanimationwidget.h>
#include <UI/resourcemanager.h>
#include "mywinheader.h"
@@ -108,6 +109,7 @@ private:
CommonButtonGroupWidget *commonButtonGroupWidget;
EntryWidget *entryWidget;
VersionSelectWidget *versionSelectWidget;
WaitAnimationWidget *waitAnimationWidget;
QTranslator translator;
TCPClient *client;
@@ -123,7 +125,6 @@ private:
QThread *workerThread;
QThread *animationThread;
QTimer *timer;
QLabel *movieLabel;
QList<FileData> *updateList;
int fileCountForUpdate;

2
mainwindow.ui
View File

@@ -514,7 +514,7 @@
<rect>
<x>740</x>
<y>50</y>
<width>88</width>
<width>41</width>
<height>42</height>
</rect>
</property>

2
object_script.RRJClient.Debug
View File

@@ -9,6 +9,7 @@ debug/tcpclient.o
debug/tools.o
debug/hashcomparer.o
debug/resourcemanager.o
debug/waitanimationwidget.o
debug/commonbuttongroupwidget.o
debug/entrywidget.o
debug/instructorbuttongroupwidget.o
@@ -29,6 +30,7 @@ debug/moc_screenchecker.o
debug/moc_tcpclient.o
debug/moc_hashcomparer.o
debug/moc_resourcemanager.o
debug/moc_waitanimationwidget.o
debug/moc_commonbuttongroupwidget.o
debug/moc_entrywidget.o
debug/moc_instructorbuttongroupwidget.o

2
object_script.RRJClient.Release
View File

@@ -9,6 +9,7 @@ release/tcpclient.o
release/tools.o
release/hashcomparer.o
release/resourcemanager.o
release/waitanimationwidget.o
release/commonbuttongroupwidget.o
release/entrywidget.o
release/instructorbuttongroupwidget.o
@@ -29,6 +30,7 @@ release/moc_screenchecker.o
release/moc_tcpclient.o
release/moc_hashcomparer.o
release/moc_resourcemanager.o
release/moc_waitanimationwidget.o
release/moc_commonbuttongroupwidget.o
release/moc_entrywidget.o
release/moc_instructorbuttongroupwidget.o

7
style.css
View File

@@ -19,7 +19,12 @@ QListWidget#updateListWidget
QFrame#NewVerBackground
{
background-color:rgba(0,0,0,90%);
background-color:rgba(0,0,0,90%);
}
QLabel#MovieLabel
{
background-color:rgba(0,0,0,50%);
}
QComboBox

2
ui_mainwindow.h
View File

@@ -258,7 +258,7 @@ public:
horizontalLayoutWidget = new QWidget(centralwidget);
horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget"));
horizontalLayoutWidget->setGeometry(QRect(740, 50, 88, 42));
horizontalLayoutWidget->setGeometry(QRect(740, 50, 41, 42));
additionalButtonLayout = new QHBoxLayout(horizontalLayoutWidget);
additionalButtonLayout->setObjectName(QString::fromUtf8("additionalButtonLayout"));
additionalButtonLayout->setContentsMargins(0, 0, 0, 0);

72
ui_waitanimationwidget.h Normal file
View File

@@ -0,0 +1,72 @@
/********************************************************************************
** Form generated from reading UI file 'waitanimationwidget.ui'
**
** Created by: Qt User Interface Compiler version 5.14.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UI_WAITANIMATIONWIDGET_H
#define UI_WAITANIMATIONWIDGET_H
#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE
class Ui_WaitAnimationWidget
{
public:
QWidget *horizontalLayoutWidget;
QHBoxLayout *mainLayout;
QLabel *MovieLabel;
void setupUi(QWidget *WaitAnimationWidget)
{
if (WaitAnimationWidget->objectName().isEmpty())
WaitAnimationWidget->setObjectName(QString::fromUtf8("WaitAnimationWidget"));
WaitAnimationWidget->resize(800, 600);
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(WaitAnimationWidget->sizePolicy().hasHeightForWidth());
WaitAnimationWidget->setSizePolicy(sizePolicy);
WaitAnimationWidget->setAutoFillBackground(false);
WaitAnimationWidget->setStyleSheet(QString::fromUtf8(""));
horizontalLayoutWidget = new QWidget(WaitAnimationWidget);
horizontalLayoutWidget->setObjectName(QString::fromUtf8("horizontalLayoutWidget"));
horizontalLayoutWidget->setGeometry(QRect(0, 40, 801, 561));
mainLayout = new QHBoxLayout(horizontalLayoutWidget);
mainLayout->setObjectName(QString::fromUtf8("mainLayout"));
mainLayout->setContentsMargins(0, 0, 0, 0);
MovieLabel = new QLabel(horizontalLayoutWidget);
MovieLabel->setObjectName(QString::fromUtf8("MovieLabel"));
MovieLabel->setPixmap(QPixmap(QString::fromUtf8(":/resource/Icons/762.gif")));
MovieLabel->setAlignment(Qt::AlignCenter);
mainLayout->addWidget(MovieLabel);
retranslateUi(WaitAnimationWidget);
QMetaObject::connectSlotsByName(WaitAnimationWidget);
} // setupUi
void retranslateUi(QWidget *WaitAnimationWidget)
{
WaitAnimationWidget->setWindowTitle(QCoreApplication::translate("WaitAnimationWidget", "Form", nullptr));
MovieLabel->setText(QString());
} // retranslateUi
};
namespace Ui {
class WaitAnimationWidget: public Ui_WaitAnimationWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UI_WAITANIMATIONWIDGET_H