Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Отделил Дебаг паки от проекта и вынес их из гита

Browse Source
This commit is contained in:
krivoshein
2024-12-25 14:32:18 +03:00
parent bf7b0ac741
commit fc1b58e743
603 changed files with 165 additions and 259874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DB_IaT/InstructorsAndTrainees/instructors/dialogeditinstructor.ui
View File

@@ -100,8 +100,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/admin.png</normaloff>
<disabledoff>:/icons/admin.png</disabledoff>:/icons/admin.png</iconset>
<normaloff>:/resources/icons/admin.png</normaloff>
<disabledoff>:/resources/icons/admin.png</disabledoff>:/resources/icons/admin.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
@@ -127,8 +127,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/archive.png</normaloff>
<disabledoff>:/icons/archive.png</disabledoff>:/icons/archive.png</iconset>
<normaloff>:/resources/icons/archive.png</normaloff>
<disabledoff>:/resources/icons/archive.png</disabledoff>:/resources/icons/archive.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
@@ -154,8 +154,8 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/circleGreen.png</normaloff>
<disabledoff>:/icons/circleGreen.png</disabledoff>:/icons/circleGreen.png</iconset>
<normaloff>:/resources/icons/circleGreen.png</normaloff>
<disabledoff>:/resources/icons/circleGreen.png</disabledoff>:/resources/icons/circleGreen.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>

4
DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.cpp
View File

@@ -222,12 +222,12 @@ void EditorInstructors::on_treeWidget_currentItemChanged(QTreeWidgetItem *curren
if(connectorToServer->isArchivedInstructor(id))
{//Архивный
ui->btnToOrFromArchive->setText(tr("From archive"));
ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/icons/instructorFromArchive.png")));
ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/resources/icons/instructorFromArchive.png")));
}
else
{//Не Архивный
ui->btnToOrFromArchive->setText(tr("To archive"));
ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/icons/instructorArchive.png")));
ui->btnToOrFromArchive->setIcon(QIcon(QStringLiteral(":/resources/icons/instructorArchive.png")));
}
ui->btnNewInstructor->setEnabled(true);

10
DB_IaT/InstructorsAndTrainees/instructors/editorinstructors.ui
View File

@@ -52,7 +52,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/addInstructor.png</normaloff>:/icons/addInstructor.png</iconset>
<normaloff>:/resources/icons/addInstructor.png</normaloff>:/resources/icons/addInstructor.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -90,7 +90,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/deleteInstructor.png</normaloff>:/icons/deleteInstructor.png</iconset>
<normaloff>:/resources/icons/deleteInstructor.png</normaloff>:/resources/icons/deleteInstructor.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -122,7 +122,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/instructorArchive.png</normaloff>:/icons/instructorArchive.png</iconset>
<normaloff>:/resources/icons/instructorArchive.png</normaloff>:/resources/icons/instructorArchive.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -160,7 +160,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/edit.png</normaloff>:/icons/edit.png</iconset>
<normaloff>:/resources/icons/edit.png</normaloff>:/resources/icons/edit.png</iconset>
</property>
<property name="iconSize">
<size>
@@ -211,7 +211,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/archive.png</normaloff>:/icons/archive.png</iconset>
<normaloff>:/resources/icons/archive.png</normaloff>:/resources/icons/archive.png</iconset>
</property>
<property name="iconSize">
<size>

10
DB_IaT/InstructorsAndTrainees/instructors/instructorsview.cpp
View File

@@ -120,20 +120,20 @@ void InstructorsView::loadInstructorsFromDB()
if(instructor.getArchived())
{//Архивный
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Archived, tr("yes"));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/archive.png")));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/resources/icons/archive.png")));
setItemColorArchive(ItemInstructor);
}
else
{//Не Архивный
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Archived, tr("no"));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/instructor.png")));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/resources/icons/instructor.png")));
setItemColorNoArchive(ItemInstructor);
}
if(instructor.getIsAdmin())
{//Админ
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Administrator, tr("yes"));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/icons/admin.png")));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Instructor, QIcon(QStringLiteral(":/resources/icons/admin.png")));
}
else
{//Не Админ
@@ -143,12 +143,12 @@ void InstructorsView::loadInstructorsFromDB()
if(instructor.getLoggedIn())
{//Залогинен
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Logged, tr("yes"));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGreen.png")));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGreen.png")));
}
else
{//Не Залогинен
ItemInstructor->setText(ColumnsTreeInsructors::clmn_Logged, tr("no"));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/icons/circleGray.png")));
ItemInstructor->setIcon(ColumnsTreeInsructors::clmn_Logged, QIcon(QStringLiteral(":/resources/icons/circleGray.png")));
}
//Скрываем архивных (при необходимости)

2
DB_IaT/InstructorsAndTrainees/instructors/viewerinstructors.ui
View File

@@ -69,7 +69,7 @@
</property>
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/icons/DB-instructors.png</normaloff>:/icons/DB-instructors.png</iconset>
<normaloff>:/resources/icons/DB-instructors.png</normaloff>:/resources/icons/DB-instructors.png</iconset>
</property>
<property name="iconSize">
<size>