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

ПКМ tree

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-16 14:31:13 +03:00
parent 83d6d66172
commit 3ce889524b
8 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
FILES/CSS/styleSheetMain.css
View File

@@ -117,7 +117,8 @@ QPushButton:flat, QToolButton:flat {
border: none; /* no border for a flat push button */ border: none; /* no border for a flat push button */
} }
QPushButton:disabled, QToolButton:disabled { QPushButton:disabled, QToolButton:disabled {
background-color: #777777; /*background-color: #777777;*/
background-color: #bbbbbb;
/*border-color: gray;*/ /*border-color: gray;*/
} }
QPushButton:default, QToolButton:default { QPushButton:default, QToolButton:default {
@@ -261,7 +262,7 @@ QTabBar::tab:selected {
} }
QTabBar::tab:!selected { QTabBar::tab:!selected {
border-style: inset; border-style: inset;
background: #aaaaaa; background: #bbbbbb;
} }
QTabBar::tab:hover { QTabBar::tab:hover {

14
LibInstructorsAndTrainees/instructors/viewerinstructors.cpp
View File

@@ -10,7 +10,7 @@ ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidg
{ {
ui->setupUi(this); ui->setupUi(this);
connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerInstructors::on_treeWidgetItemClicked); connect(treeWidget, &QTreeWidget::currentItemChanged, this, &ViewerInstructors::on_treeWidgetCurrentItemChanged);
ui->horizontalLayout_1->addWidget(treeWidget); ui->horizontalLayout_1->addWidget(treeWidget);
@@ -94,14 +94,14 @@ void ViewerInstructors::on_btnEditorInstructors_clicked()
connectorToServer->sendQueryBlockAuth(false); connectorToServer->sendQueryBlockAuth(false);
} }
void ViewerInstructors::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column) void ViewerInstructors::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{ {
if(item == nullptr) if(current == nullptr)
return; return;
//if(current->childCount() == 0) //if(current->childCount() == 0)
{//Выбран обучаемый {//Выбран обучаемый
QString login = item->text(ColumnsTreeUsers::clmn_Login); QString login = current->text(ColumnsTreeUsers::clmn_Login);
//if(login != "") //if(login != "")
{ {
int newCurrentID = connectorToServer->getIdInstructorByLogin(login); int newCurrentID = connectorToServer->getIdInstructorByLogin(login);
@@ -118,11 +118,11 @@ void ViewerInstructors::on_treeWidgetItemClicked(QTreeWidgetItem *item, int colu
{ {
for (int i = 0; i < ColumnsTreeUsers::clmn_count; i++) for (int i = 0; i < ColumnsTreeUsers::clmn_count; i++)
{ {
item->setBackground(i, QBrush(Qt::GlobalColor::white)); current->setBackground(i, QBrush(Qt::GlobalColor::white));
} }
mapNewMsg.take(newCurrentID); mapNewMsg.take(newCurrentID);
item->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon()); current->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon());
item->setText(ColumnsTreeUsers::clmn_Messages, ""); current->setText(ColumnsTreeUsers::clmn_Messages, "");
} }
} }
mtxmapNewMsg.unlock(); mtxmapNewMsg.unlock();

2
LibInstructorsAndTrainees/instructors/viewerinstructors.h
View File

@@ -32,7 +32,7 @@ public slots:
public Q_SLOTS: public Q_SLOTS:
void on_btnEditorInstructors_clicked(); void on_btnEditorInstructors_clicked();
void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column); void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
Q_SIGNALS: Q_SIGNALS:
//сигнал о выборе инструктора //сигнал о выборе инструктора

BIN
LibInstructorsAndTrainees/resources/icons/exchange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
LibInstructorsAndTrainees/resources/icons/old/exchange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
LibInstructorsAndTrainees/resources/icons/old/exchange__.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

18
LibInstructorsAndTrainees/trainees/viewertrainees.cpp
View File

@@ -16,7 +16,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo
ui->setupUi(this); ui->setupUi(this);
connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &ViewerTrainees::on_itemDoubleClicked); connect(treeWidget, &QTreeWidget::itemDoubleClicked, this, &ViewerTrainees::on_itemDoubleClicked);
connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerTrainees::on_treeWidgetItemClicked); connect(treeWidget, &QTreeWidget::currentItemChanged, this, &ViewerTrainees::on_treeWidgetCurrentItemChanged);
ui->horizontalLayout_1->addWidget(treeWidget); ui->horizontalLayout_1->addWidget(treeWidget);
@@ -173,16 +173,16 @@ void ViewerTrainees::on_itemDoubleClicked(QTreeWidgetItem *item, int column)
} }
} }
void ViewerTrainees::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column) void ViewerTrainees::on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous)
{ {
if(item == nullptr) if(current == nullptr)
return; return;
if(item->childCount() == 0) if(current->childCount() == 0)
{//Выбран обучаемый {//Выбран обучаемый
typeObject = TypeObject::objTrainee; typeObject = TypeObject::objTrainee;
QString login = item->text(ColumnsTreeUsers::clmn_Login); QString login = current->text(ColumnsTreeUsers::clmn_Login);
//if(login != "") //if(login != "")
{ {
int newCurrentID = connectorToServer->getIdTraineeByLogin(login); int newCurrentID = connectorToServer->getIdTraineeByLogin(login);
@@ -199,11 +199,11 @@ void ViewerTrainees::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
{ {
for (int i = 0; i < ColumnsTreeUsers::clmn_count; i++) for (int i = 0; i < ColumnsTreeUsers::clmn_count; i++)
{ {
item->setBackground(i, QBrush(Qt::GlobalColor::white)); current->setBackground(i, QBrush(Qt::GlobalColor::white));
} }
mapNewMsg.take(newCurrentID); mapNewMsg.take(newCurrentID);
item->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon()); current->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon());
item->setText(ColumnsTreeUsers::clmn_Messages, ""); current->setText(ColumnsTreeUsers::clmn_Messages, "");
} }
} }
mtxmapNewMsg.unlock(); mtxmapNewMsg.unlock();
@@ -215,7 +215,7 @@ void ViewerTrainees::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column)
{//Выбрана группа {//Выбрана группа
typeObject = TypeObject::objGroup; typeObject = TypeObject::objGroup;
int id_group = item->text(ColumnsTreeUsers::clmn_ID).toInt(); int id_group = current->text(ColumnsTreeUsers::clmn_ID).toInt();
lastCurrentID = id_group; lastCurrentID = id_group;
typeObject = TypeObject::objGroup; typeObject = TypeObject::objGroup;

2
LibInstructorsAndTrainees/trainees/viewertrainees.h
View File

@@ -41,7 +41,7 @@ public Q_SLOTS:
void on_btnPersonalCard_clicked(); void on_btnPersonalCard_clicked();
private Q_SLOTS: private Q_SLOTS:
void on_itemDoubleClicked(QTreeWidgetItem *item, int column); void on_itemDoubleClicked(QTreeWidgetItem *item, int column);
void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column); void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
Q_SIGNALS: Q_SIGNALS:
//сигнал о выборе обучаемого //сигнал о выборе обучаемого