diff --git a/FILES/CSS/styleSheetMain.css b/FILES/CSS/styleSheetMain.css index a9ba9c4..dbea2bc 100644 --- a/FILES/CSS/styleSheetMain.css +++ b/FILES/CSS/styleSheetMain.css @@ -117,7 +117,8 @@ QPushButton:flat, QToolButton:flat { border: none; /* no border for a flat push button */ } QPushButton:disabled, QToolButton:disabled { - background-color: #777777; + /*background-color: #777777;*/ + background-color: #bbbbbb; /*border-color: gray;*/ } QPushButton:default, QToolButton:default { @@ -261,7 +262,7 @@ QTabBar::tab:selected { } QTabBar::tab:!selected { border-style: inset; - background: #aaaaaa; + background: #bbbbbb; } QTabBar::tab:hover { diff --git a/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp b/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp index 0f69afc..41e02fb 100644 --- a/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp +++ b/LibInstructorsAndTrainees/instructors/viewerinstructors.cpp @@ -10,7 +10,7 @@ ViewerInstructors::ViewerInstructors(ConnectorToServer* connectorToServer, QWidg { ui->setupUi(this); - connect(treeWidget, &QTreeWidget::itemClicked, this, &ViewerInstructors::on_treeWidgetItemClicked); + connect(treeWidget, &QTreeWidget::currentItemChanged, this, &ViewerInstructors::on_treeWidgetCurrentItemChanged); ui->horizontalLayout_1->addWidget(treeWidget); @@ -94,14 +94,14 @@ void ViewerInstructors::on_btnEditorInstructors_clicked() 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; //if(current->childCount() == 0) {//Выбран обучаемый - QString login = item->text(ColumnsTreeUsers::clmn_Login); + QString login = current->text(ColumnsTreeUsers::clmn_Login); //if(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++) { - item->setBackground(i, QBrush(Qt::GlobalColor::white)); + current->setBackground(i, QBrush(Qt::GlobalColor::white)); } mapNewMsg.take(newCurrentID); - item->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon()); - item->setText(ColumnsTreeUsers::clmn_Messages, ""); + current->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon()); + current->setText(ColumnsTreeUsers::clmn_Messages, ""); } } mtxmapNewMsg.unlock(); diff --git a/LibInstructorsAndTrainees/instructors/viewerinstructors.h b/LibInstructorsAndTrainees/instructors/viewerinstructors.h index bfe947f..cc65ca1 100644 --- a/LibInstructorsAndTrainees/instructors/viewerinstructors.h +++ b/LibInstructorsAndTrainees/instructors/viewerinstructors.h @@ -32,7 +32,7 @@ public slots: public Q_SLOTS: void on_btnEditorInstructors_clicked(); - void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column); + void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); Q_SIGNALS: //сигнал о выборе инструктора diff --git a/LibInstructorsAndTrainees/resources/icons/exchange.png b/LibInstructorsAndTrainees/resources/icons/exchange.png index fcaec47..072e765 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/exchange.png and b/LibInstructorsAndTrainees/resources/icons/exchange.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/exchange.png b/LibInstructorsAndTrainees/resources/icons/old/exchange.png index 013dad5..fcaec47 100644 Binary files a/LibInstructorsAndTrainees/resources/icons/old/exchange.png and b/LibInstructorsAndTrainees/resources/icons/old/exchange.png differ diff --git a/LibInstructorsAndTrainees/resources/icons/old/exchange__.png b/LibInstructorsAndTrainees/resources/icons/old/exchange__.png new file mode 100644 index 0000000..013dad5 Binary files /dev/null and b/LibInstructorsAndTrainees/resources/icons/old/exchange__.png differ diff --git a/LibInstructorsAndTrainees/trainees/viewertrainees.cpp b/LibInstructorsAndTrainees/trainees/viewertrainees.cpp index 4cb2ff5..e36b748 100644 --- a/LibInstructorsAndTrainees/trainees/viewertrainees.cpp +++ b/LibInstructorsAndTrainees/trainees/viewertrainees.cpp @@ -16,7 +16,7 @@ ViewerTrainees::ViewerTrainees(ConnectorToServer* connectorToServer, MessangerCo ui->setupUi(this); 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); @@ -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; - if(item->childCount() == 0) + if(current->childCount() == 0) {//Выбран обучаемый typeObject = TypeObject::objTrainee; - QString login = item->text(ColumnsTreeUsers::clmn_Login); + QString login = current->text(ColumnsTreeUsers::clmn_Login); //if(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++) { - item->setBackground(i, QBrush(Qt::GlobalColor::white)); + current->setBackground(i, QBrush(Qt::GlobalColor::white)); } mapNewMsg.take(newCurrentID); - item->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon()); - item->setText(ColumnsTreeUsers::clmn_Messages, ""); + current->setIcon(ColumnsTreeUsers::clmn_Messages, QIcon()); + current->setText(ColumnsTreeUsers::clmn_Messages, ""); } } mtxmapNewMsg.unlock(); @@ -215,7 +215,7 @@ void ViewerTrainees::on_treeWidgetItemClicked(QTreeWidgetItem *item, int column) {//Выбрана группа typeObject = TypeObject::objGroup; - int id_group = item->text(ColumnsTreeUsers::clmn_ID).toInt(); + int id_group = current->text(ColumnsTreeUsers::clmn_ID).toInt(); lastCurrentID = id_group; typeObject = TypeObject::objGroup; diff --git a/LibInstructorsAndTrainees/trainees/viewertrainees.h b/LibInstructorsAndTrainees/trainees/viewertrainees.h index cc010a3..742060f 100644 --- a/LibInstructorsAndTrainees/trainees/viewertrainees.h +++ b/LibInstructorsAndTrainees/trainees/viewertrainees.h @@ -41,7 +41,7 @@ public Q_SLOTS: void on_btnPersonalCard_clicked(); private Q_SLOTS: void on_itemDoubleClicked(QTreeWidgetItem *item, int column); - void on_treeWidgetItemClicked(QTreeWidgetItem *item, int column); + void on_treeWidgetCurrentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous); Q_SIGNALS: //сигнал о выборе обучаемого