diff --git a/ico/16x16/edit-rename.png b/ico/16x16/edit-rename.png new file mode 100644 index 000000000..2323757e0 Binary files /dev/null and b/ico/16x16/edit-rename.png differ diff --git a/ico/16x16/list-add.png b/ico/16x16/list-add.png new file mode 100644 index 000000000..1e03be9bc Binary files /dev/null and b/ico/16x16/list-add.png differ diff --git a/ico/16x16/list-remove.png b/ico/16x16/list-remove.png new file mode 100644 index 000000000..5a4d15b7b Binary files /dev/null and b/ico/16x16/list-remove.png differ diff --git a/ico/22x22/edit-rename.png b/ico/22x22/edit-rename.png new file mode 100644 index 000000000..ea8872fea Binary files /dev/null and b/ico/22x22/edit-rename.png differ diff --git a/ico/22x22/list-add.png b/ico/22x22/list-add.png new file mode 100644 index 000000000..e029787c7 Binary files /dev/null and b/ico/22x22/list-add.png differ diff --git a/ico/22x22/list-remove.png b/ico/22x22/list-remove.png new file mode 100644 index 000000000..2bb1a5983 Binary files /dev/null and b/ico/22x22/list-remove.png differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 2dcdc5c6c..6f75580f1 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -35,6 +35,7 @@ ico/16x16/edit-delete.png ico/16x16/edit-paste.png ico/16x16/edit-redo.png + ico/16x16/edit-rename.png ico/16x16/edit-select-all.png ico/16x16/edit-table-insert-row-above.png ico/16x16/edit-table-insert-column-left.png @@ -60,6 +61,8 @@ ico/16x16/item_copy.png ico/16x16/item_move.png ico/16x16/label.png + ico/16x16/list-add.png + ico/16x16/list-remove.png ico/16x16/masquer.png ico/16x16/neutral.png ico/16x16/north.png @@ -119,6 +122,7 @@ ico/22x22/edit-delete.png ico/22x22/edit-paste.png ico/22x22/edit-redo.png + ico/22x22/edit-rename.png ico/22x22/edit-select-all.png ico/22x22/edit-table-insert-row-above.png ico/22x22/edit-table-insert-column-left.png @@ -144,6 +148,8 @@ ico/22x22/label.png ico/22x22/landscape.png ico/22x22/line.png + ico/22x22/list-add.png + ico/22x22/list-remove.png ico/22x22/lower.png ico/22x22/move.png ico/22x22/names.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index 0f41436a0..deb0d3cdc 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -21,6 +21,7 @@ // on redeclare ici les icones namespace QET { namespace Icons { + QIcon Add; QIcon AddColumn; QIcon AddRow; QIcon Allowed; @@ -62,6 +63,7 @@ namespace QET { QIcon EditDelete; QIcon EditPaste; QIcon EditRedo; + QIcon EditRename; QIcon EditSelectAll; QIcon EditTableCellMerge; QIcon EditTableCellSplit; @@ -129,6 +131,7 @@ namespace QET { QIcon QETOxygenLogo; QIcon QtLogo; QIcon Raise; + QIcon Remove; QIcon RemoveColumn; QIcon RemoveRow; QIcon Restore; @@ -162,6 +165,8 @@ void QET::Icons::initIcons() { bool rtl = QApplication::isRightToLeft(); QTransform reverse = QTransform().scale(-1, 1); + Add .addFile(":/ico/16x16/list-add.png"); + Add .addFile(":/ico/22x22/list-add.png"); AddColumn .addFile(":/ico/16x16/add_col.png"); AddRow .addFile(":/ico/16x16/add_row.png"); Allowed .addFile(":/ico/16x16/user-online.png"); @@ -242,6 +247,8 @@ void QET::Icons::initIcons() { EditRedo .addFile(":/ico/16x16/edit-redo.png"); EditRedo .addFile(":/ico/22x22/edit-redo.png"); } + EditRename .addFile(":/ico/16x16/edit-rename.png"); + EditRename .addFile(":/ico/22x22/edit-rename.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png"); @@ -342,6 +349,8 @@ void QET::Icons::initIcons() { QETOxygenLogo .addFile(":/ico/oxygen-icons/64x64/apps/qelectrotech.png"); QtLogo .addFile(":/ico/32x32/qt.png"); Raise .addFile(":/ico/22x22/raise.png"); + Remove .addFile(":/ico/16x16/list-remove.png"); + Remove .addFile(":/ico/22x22/list-remove.png"); RemoveColumn .addFile(":/ico/16x16/remove_col.png"); RemoveRow .addFile(":/ico/16x16/remove_row.png"); Restore .addFile(":/ico/22x22/restaurer.png"); diff --git a/sources/qeticons.h b/sources/qeticons.h index 61a840996..1c224f18a 100644 --- a/sources/qeticons.h +++ b/sources/qeticons.h @@ -28,6 +28,7 @@ namespace QET { // l'utilisation du mot-cle extern permet l'acces aux objets statiques // depuis l'exterieur du namespace + extern QIcon Add; extern QIcon AddColumn; extern QIcon AddRow; extern QIcon Allowed; @@ -69,6 +70,7 @@ namespace QET { extern QIcon EditDelete; extern QIcon EditPaste; extern QIcon EditRedo; + extern QIcon EditRename; extern QIcon EditSelectAll; extern QIcon EditTableCellMerge; extern QIcon EditTableCellSplit; @@ -138,6 +140,7 @@ namespace QET { extern QIcon QETOxygenLogo; extern QIcon QtLogo; extern QIcon Raise; + extern QIcon Remove; extern QIcon RemoveColumn; extern QIcon RemoveRow; extern QIcon Restore; diff --git a/sources/titleblock/templatelogomanager.cpp b/sources/titleblock/templatelogomanager.cpp index 33625b7de..365196f5b 100644 --- a/sources/titleblock/templatelogomanager.cpp +++ b/sources/titleblock/templatelogomanager.cpp @@ -84,12 +84,12 @@ void TitleBlockTemplateLogoManager::initWidgets() { logos_view_ -> setWrapping(true); logos_view_ -> setMovement(QListView::Static); logos_view_ -> setResizeMode(QListView::Adjust); - add_button_ = new QPushButton(tr("Ajouter un logo")); - delete_button_ = new QPushButton(tr("Supprimer ce logo")); + add_button_ = new QPushButton(QET::Icons::Add, tr("Ajouter un logo")); + delete_button_ = new QPushButton(QET::Icons::Remove, tr("Supprimer ce logo")); logo_box_ = new QGroupBox(tr("Propri\351t\351s")); logo_name_label_ = new QLabel(tr("Nom :")); logo_name_ = new QLineEdit(); - rename_button_ = new QPushButton(tr("Renommer")); + rename_button_ = new QPushButton(QET::Icons::EditRename, tr("Renommer")); logo_type_ = new QLabel(tr("Type :")); buttons_ = new QDialogButtonBox(QDialogButtonBox::Ok);