diff --git a/ico/16x16/folder-only-this.png b/ico/16x16/folder-only-this.png new file mode 100644 index 000000000..0927f3b08 Binary files /dev/null and b/ico/16x16/folder-only-this.png differ diff --git a/ico/16x16/folder-show-all.png b/ico/16x16/folder-show-all.png new file mode 100644 index 000000000..9651020c8 Binary files /dev/null and b/ico/16x16/folder-show-all.png differ diff --git a/ico/16x16/view-refresh.png b/ico/16x16/view-refresh.png index 6486ddd31..7527ee00d 100644 Binary files a/ico/16x16/view-refresh.png and b/ico/16x16/view-refresh.png differ diff --git a/ico/22x22/view-refresh.png b/ico/22x22/view-refresh.png index 89233f567..273307b35 100644 Binary files a/ico/22x22/view-refresh.png and b/ico/22x22/view-refresh.png differ diff --git a/ico/copyright b/ico/copyright index 1be0868f9..9b776e63e 100644 --- a/ico/copyright +++ b/ico/copyright @@ -148,6 +148,8 @@ Clarification: ico/16x16/endline-triangle.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/export-csv.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/folio-new.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/folder-only-this.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) + ico/16x16/folder-show-all.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/ground.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/label.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) ico/16x16/list-remove.png by Nuri from the QElectroTech team (License CC BY-ND 3.0) diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 77a64edc2..1fb6921c1 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -554,5 +554,7 @@ ico/windows_icon/qelectrotech.ico ico/windows_icon/qelectrotech.rc ico/copyright + ico/16x16/folder-only-this.png + ico/16x16/folder-show-all.png diff --git a/sources/ElementsCollection/elementscollectionwidget.cpp b/sources/ElementsCollection/elementscollectionwidget.cpp index a724c36b6..7f586ec2b 100644 --- a/sources/ElementsCollection/elementscollectionwidget.cpp +++ b/sources/ElementsCollection/elementscollectionwidget.cpp @@ -146,8 +146,8 @@ void ElementsCollectionWidget::setUpAction() m_edit_dir = new QAction(QET::Icons::FolderEdit, tr("Éditer le dossier"), this); m_new_directory = new QAction(QET::Icons::FolderNew, tr("Nouveau dossier"), this); m_new_element = new QAction(QET::Icons::ElementNew, tr("Nouvel élément"), this); - m_show_this_dir = new QAction(QET::Icons::ZoomDraw, tr("Afficher uniquement ce dossier"), this); - m_show_all_dir = new QAction(QET::Icons::ZoomOriginal, tr("Afficher tous les dossiers"), this); + m_show_this_dir = new QAction(QET::Icons::FolderOnlyThis,tr("Afficher uniquement ce dossier"), this); + m_show_all_dir = new QAction(QET::Icons::FolderShowAll, tr("Afficher tous les dossiers"), this); m_dir_propertie = new QAction(QET::Icons::Folder, tr("Propriété du dossier"), this); } @@ -479,7 +479,7 @@ void ElementsCollectionWidget::showThisDir() showAndExpandItem(m_showed_index, true, true); ElementCollectionItem *eci = elementCollectionItemForIndex(m_showed_index); if (eci) - eci->setBackground(QBrush(Qt::yellow)); + eci->setBackground(QBrush(QColor(255, 204, 0, 255))); search(); } else diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 6781bbdca..ab15d8f2e 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -91,6 +91,8 @@ namespace QET { QIcon FolderDelete; QIcon FolderEdit; QIcon FolderNew; + QIcon FolderOnlyThis; + QIcon FolderShowAll; QIcon Forbidden; QIcon FullScreenEnter; QIcon FullScreenExit; @@ -331,6 +333,8 @@ void QET::Icons::initIcons() { FolderEdit .addFile(":/ico/22x22/folder-edit.png"); FolderNew .addFile(":/ico/16x16/folder-new.png"); FolderNew .addFile(":/ico/22x22/folder-new.png"); + FolderOnlyThis .addFile(":/ico/16x16/folder-only-this.png"); + FolderShowAll .addFile(":/ico/16x16/folder-show-all.png"); Forbidden .addFile(":/ico/16x16/user-busy.png"); FullScreenEnter .addFile(":/ico/16x16/view-fullscreen.png"); FullScreenEnter .addFile(":/ico/22x22/view-fullscreen.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 5c7b3e0b5..9864688d0 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -98,6 +98,8 @@ namespace QET { extern QIcon FolderDelete; extern QIcon FolderEdit; extern QIcon FolderNew; + extern QIcon FolderOnlyThis; + extern QIcon FolderShowAll; extern QIcon Forbidden; extern QIcon FullScreenEnter; extern QIcon FullScreenExit;