diff --git a/CREDIT b/CREDIT index 4141b981b..f9932a7d3 100644 --- a/CREDIT +++ b/CREDIT @@ -1,28 +1,30 @@ [en] -Thanks to Trolltech for their Qt library ( http://trolltech.com/ ), licensed -under GNU/GPL. +Thanks to Qt Software for their Qt library ( http://www.qtsoftware.com/ ), +licensed under GNU/GPL. Thanks to Everaldo Coelho for the Crystal SVG icons theme ( -http://www.everaldo.com/crystal/ ) licensed under LGPL, and to the KDE -project ( http://www.kde.org/ ). +http://www.everaldo.com/crystal/ ) licensed under LGPL, to Nuno Pinheiro for the +Oxygen icons theme ( http://www.oxygen-icons.org/ ) licensed under LGPL, and to +the KDE project ( http://www.kde.org/ ). Thanks to Loic for his mathematics-related explanations. Thanks to Nicolas for the Mac OS X experimentations. Thanks to Remi Collet for the Fedora packaging. -Thanks to Piotr SQLek Skólski for the Debian packaging. +Thanks to Laurent Trinques for the Debian packaging. Thanks to `trem' for the Mandriva packaging. Thanks to TuxFamily ( http://tuxfamily.org ) for hosting the project. Thanks to `Nishiki' for his elements and his support. Thanks to qtcentre.org for their SingleApplication class. [fr] -Merci à Trolltech pour la bibliothèque Qt ( http://trolltech.com/ ), sous +Merci à Qt Software pour la bibliothèque Qt ( http://www.qtsoftware.com/ ), sous licence GNU/GPL. Merci à Everaldo Coelho pour le thème d'icônes Crystal SVG ( -http://www.everaldo.com/crystal/ ) sous licence LGPL, ainsi qu'au projet KDE ( +http://www.everaldo.com/crystal/ ) sous licence LGPL, à Nuno Pinheiro pour le +thème d'icônes Oxygen ( http://www.oxygen-icons.org/ ) ainsi qu'au projet KDE ( http://www.kde.org/ ). Merci à Loic pour ses explications d'ordre mathématique. Merci à Nicolas pour les expérimentations Mac OS X. Merci à Remi Collet pour les paquets Fedora. -Merci à Piotr SQLek Skólski pour les paquets Debian. +Merci à Laurent Trinques pour les paquets Debian. Merci à `trem' pour les paquets Mandriva. Merci à TuxFamily ( http://tuxfamily.org ) pour l'hébergement du projet. Merci à `Nishiki' pour ses éléments et son soutien. diff --git a/ico/1leftarrow.png b/ico/1leftarrow.png deleted file mode 100644 index a6c46680e..000000000 Binary files a/ico/1leftarrow.png and /dev/null differ diff --git a/ico/1rightarrow.png b/ico/1rightarrow.png deleted file mode 100644 index 8356b71e9..000000000 Binary files a/ico/1rightarrow.png and /dev/null differ diff --git a/ico/2leftarrow.png b/ico/2leftarrow.png deleted file mode 100644 index c4162fe3c..000000000 Binary files a/ico/2leftarrow.png and /dev/null differ diff --git a/ico/2rightarrow.png b/ico/2rightarrow.png deleted file mode 100644 index f57b483cb..000000000 Binary files a/ico/2rightarrow.png and /dev/null differ diff --git a/ico/allowed.png b/ico/allowed.png deleted file mode 100644 index 0e107887f..000000000 Binary files a/ico/allowed.png and /dev/null differ diff --git a/ico/application-exit.png b/ico/application-exit.png new file mode 100644 index 000000000..ed5f8b251 Binary files /dev/null and b/ico/application-exit.png differ diff --git a/ico/application-pdf.png b/ico/application-pdf.png new file mode 100644 index 000000000..c78b86c56 Binary files /dev/null and b/ico/application-pdf.png differ diff --git a/ico/arrow-left-double.png b/ico/arrow-left-double.png new file mode 100644 index 000000000..1422338f7 Binary files /dev/null and b/ico/arrow-left-double.png differ diff --git a/ico/arrow-left.png b/ico/arrow-left.png new file mode 100644 index 000000000..9988dd35a Binary files /dev/null and b/ico/arrow-left.png differ diff --git a/ico/arrow-right-double.png b/ico/arrow-right-double.png new file mode 100644 index 000000000..80386e7a9 Binary files /dev/null and b/ico/arrow-right-double.png differ diff --git a/ico/arrow-right.png b/ico/arrow-right.png new file mode 100644 index 000000000..83870eea8 Binary files /dev/null and b/ico/arrow-right.png differ diff --git a/ico/button_cancel.png b/ico/button_cancel.png deleted file mode 100644 index 96919575a..000000000 Binary files a/ico/button_cancel.png and /dev/null differ diff --git a/ico/button_ok.png b/ico/button_ok.png deleted file mode 100644 index 31c064ba9..000000000 Binary files a/ico/button_ok.png and /dev/null differ diff --git a/ico/category_delete.png b/ico/category_delete.png deleted file mode 100644 index cebff9233..000000000 Binary files a/ico/category_delete.png and /dev/null differ diff --git a/ico/category_edit.png b/ico/category_edit.png deleted file mode 100644 index a204425da..000000000 Binary files a/ico/category_edit.png and /dev/null differ diff --git a/ico/category_new.png b/ico/category_new.png deleted file mode 100644 index 1277281fc..000000000 Binary files a/ico/category_new.png and /dev/null differ diff --git a/ico/configure-toolbars.png b/ico/configure-toolbars.png new file mode 100644 index 000000000..2eedefa53 Binary files /dev/null and b/ico/configure-toolbars.png differ diff --git a/ico/configure.png b/ico/configure.png index 96ba4338f..2a8323794 100644 Binary files a/ico/configure.png and b/ico/configure.png differ diff --git a/ico/confprint.png b/ico/confprint.png deleted file mode 100644 index 1132b4062..000000000 Binary files a/ico/confprint.png and /dev/null differ diff --git a/ico/copy.png b/ico/copy.png deleted file mode 100644 index ae1cd9fff..000000000 Binary files a/ico/copy.png and /dev/null differ diff --git a/ico/cut.png b/ico/cut.png deleted file mode 100644 index 192b5757a..000000000 Binary files a/ico/cut.png and /dev/null differ diff --git a/ico/delete.png b/ico/delete.png deleted file mode 100644 index 6fb193f06..000000000 Binary files a/ico/delete.png and /dev/null differ diff --git a/ico/dialog-cancel.png b/ico/dialog-cancel.png new file mode 100644 index 000000000..b72e1a3ac Binary files /dev/null and b/ico/dialog-cancel.png differ diff --git a/ico/dialog-information.png b/ico/dialog-information.png new file mode 100644 index 000000000..a5607bc72 Binary files /dev/null and b/ico/dialog-information.png differ diff --git a/ico/dialog-ok.png b/ico/dialog-ok.png new file mode 100644 index 000000000..c57c68537 Binary files /dev/null and b/ico/dialog-ok.png differ diff --git a/ico/document-close.png b/ico/document-close.png new file mode 100644 index 000000000..d90483ee9 Binary files /dev/null and b/ico/document-close.png differ diff --git a/ico/document-delete.png b/ico/document-delete.png new file mode 100644 index 000000000..3a47f0d74 Binary files /dev/null and b/ico/document-delete.png differ diff --git a/ico/document-delete.svgz b/ico/document-delete.svgz new file mode 100644 index 000000000..b61fb83e9 Binary files /dev/null and b/ico/document-delete.svgz differ diff --git a/ico/document-edit.png b/ico/document-edit.png new file mode 100644 index 000000000..3d8f3a319 Binary files /dev/null and b/ico/document-edit.png differ diff --git a/ico/document-export.png b/ico/document-export.png new file mode 100644 index 000000000..9f740e3e9 Binary files /dev/null and b/ico/document-export.png differ diff --git a/ico/document-import.png b/ico/document-import.png new file mode 100644 index 000000000..fb21f2a24 Binary files /dev/null and b/ico/document-import.png differ diff --git a/ico/document-new.png b/ico/document-new.png new file mode 100644 index 000000000..fbb4ce058 Binary files /dev/null and b/ico/document-new.png differ diff --git a/ico/document-open-recent.png b/ico/document-open-recent.png new file mode 100644 index 000000000..eb07bb20b Binary files /dev/null and b/ico/document-open-recent.png differ diff --git a/ico/document-open.png b/ico/document-open.png new file mode 100644 index 000000000..bc8cface2 Binary files /dev/null and b/ico/document-open.png differ diff --git a/ico/document-print-frame.png b/ico/document-print-frame.png new file mode 100644 index 000000000..f159af61b Binary files /dev/null and b/ico/document-print-frame.png differ diff --git a/ico/document-print.png b/ico/document-print.png new file mode 100644 index 000000000..8eb1c6741 Binary files /dev/null and b/ico/document-print.png differ diff --git a/ico/document-save-all.png b/ico/document-save-all.png new file mode 100644 index 000000000..159857f50 Binary files /dev/null and b/ico/document-save-all.png differ diff --git a/ico/document-save-as.png b/ico/document-save-as.png new file mode 100644 index 000000000..0ecb79e8c Binary files /dev/null and b/ico/document-save-as.png differ diff --git a/ico/document-save.png b/ico/document-save.png new file mode 100644 index 000000000..a81e70d47 Binary files /dev/null and b/ico/document-save.png differ diff --git a/ico/edit-clear-locationbar-ltr.png b/ico/edit-clear-locationbar-ltr.png new file mode 100644 index 000000000..8d902d57c Binary files /dev/null and b/ico/edit-clear-locationbar-ltr.png differ diff --git a/ico/edit-clear.png b/ico/edit-clear.png new file mode 100644 index 000000000..4f5cf4aaa Binary files /dev/null and b/ico/edit-clear.png differ diff --git a/ico/edit-copy.png b/ico/edit-copy.png new file mode 100644 index 000000000..d34cdcd32 Binary files /dev/null and b/ico/edit-copy.png differ diff --git a/ico/edit-cut.png b/ico/edit-cut.png new file mode 100644 index 000000000..472b48847 Binary files /dev/null and b/ico/edit-cut.png differ diff --git a/ico/edit-delete.png b/ico/edit-delete.png new file mode 100644 index 000000000..b0de61d22 Binary files /dev/null and b/ico/edit-delete.png differ diff --git a/ico/edit-paste.png b/ico/edit-paste.png new file mode 100644 index 000000000..df468cef4 Binary files /dev/null and b/ico/edit-paste.png differ diff --git a/ico/edit-redo.png b/ico/edit-redo.png new file mode 100644 index 000000000..45f045028 Binary files /dev/null and b/ico/edit-redo.png differ diff --git a/ico/edit-select-all.png b/ico/edit-select-all.png new file mode 100644 index 000000000..995f46828 Binary files /dev/null and b/ico/edit-select-all.png differ diff --git a/ico/edit-undo.png b/ico/edit-undo.png new file mode 100644 index 000000000..57abbe17d Binary files /dev/null and b/ico/edit-undo.png differ diff --git a/ico/edit.png b/ico/edit.png deleted file mode 100644 index ce8b22671..000000000 Binary files a/ico/edit.png and /dev/null differ diff --git a/ico/entrer_fs.png b/ico/entrer_fs.png deleted file mode 100644 index 4242f9787..000000000 Binary files a/ico/entrer_fs.png and /dev/null differ diff --git a/ico/erase.png b/ico/erase.png deleted file mode 100644 index 90ad31279..000000000 Binary files a/ico/erase.png and /dev/null differ diff --git a/ico/exit.png b/ico/exit.png deleted file mode 100644 index b266020f5..000000000 Binary files a/ico/exit.png and /dev/null differ diff --git a/ico/export.png b/ico/export.png deleted file mode 100644 index 3bc2a37a2..000000000 Binary files a/ico/export.png and /dev/null differ diff --git a/ico/fileclose.png b/ico/fileclose.png deleted file mode 100644 index 7cb985935..000000000 Binary files a/ico/fileclose.png and /dev/null differ diff --git a/ico/folder-delete.png b/ico/folder-delete.png new file mode 100644 index 000000000..9440500b6 Binary files /dev/null and b/ico/folder-delete.png differ diff --git a/ico/folder-delete.svgz b/ico/folder-delete.svgz new file mode 100644 index 000000000..8cd21a6f3 Binary files /dev/null and b/ico/folder-delete.svgz differ diff --git a/ico/folder-edit.png b/ico/folder-edit.png new file mode 100644 index 000000000..0a66e28dc Binary files /dev/null and b/ico/folder-edit.png differ diff --git a/ico/folder-edit.svgz b/ico/folder-edit.svgz new file mode 100644 index 000000000..2dd537422 Binary files /dev/null and b/ico/folder-edit.svgz differ diff --git a/ico/folder-new.png b/ico/folder-new.png new file mode 100644 index 000000000..bd34174a3 Binary files /dev/null and b/ico/folder-new.png differ diff --git a/ico/folder.png b/ico/folder.png index 7b6f0a738..536da3d1c 100644 Binary files a/ico/folder.png and b/ico/folder.png differ diff --git a/ico/folder_home.png b/ico/folder_home.png deleted file mode 100644 index 3d26af552..000000000 Binary files a/ico/folder_home.png and /dev/null differ diff --git a/ico/forbidden.png b/ico/forbidden.png deleted file mode 100644 index 98674ef54..000000000 Binary files a/ico/forbidden.png and /dev/null differ diff --git a/ico/go-home.png b/ico/go-home.png new file mode 100644 index 000000000..aab6a883e Binary files /dev/null and b/ico/go-home.png differ diff --git a/ico/image-x-eps.png b/ico/image-x-eps.png new file mode 100644 index 000000000..54a4ea2fb Binary files /dev/null and b/ico/image-x-eps.png differ diff --git a/ico/import.png b/ico/import.png deleted file mode 100644 index 35723278c..000000000 Binary files a/ico/import.png and /dev/null differ diff --git a/ico/info.png b/ico/info.png deleted file mode 100644 index 3626ba7ee..000000000 Binary files a/ico/info.png and /dev/null differ diff --git a/ico/lock.png b/ico/lock.png deleted file mode 100644 index 9406b274d..000000000 Binary files a/ico/lock.png and /dev/null differ diff --git a/ico/new.png b/ico/new.png deleted file mode 100644 index 004ca033e..000000000 Binary files a/ico/new.png and /dev/null differ diff --git a/ico/object-locked.png b/ico/object-locked.png new file mode 100644 index 000000000..0f2c9b7b5 Binary files /dev/null and b/ico/object-locked.png differ diff --git a/ico/object-rotate-right.png b/ico/object-rotate-right.png new file mode 100644 index 000000000..84c01c779 Binary files /dev/null and b/ico/object-rotate-right.png differ diff --git a/ico/object-unlocked.png b/ico/object-unlocked.png new file mode 100644 index 000000000..791deb716 Binary files /dev/null and b/ico/object-unlocked.png differ diff --git a/ico/open.png b/ico/open.png deleted file mode 100644 index a79982ea1..000000000 Binary files a/ico/open.png and /dev/null differ diff --git a/ico/paste.png b/ico/paste.png deleted file mode 100644 index b8454f91d..000000000 Binary files a/ico/paste.png and /dev/null differ diff --git a/ico/pivoter.png b/ico/pivoter.png deleted file mode 100644 index 129aba3ac..000000000 Binary files a/ico/pivoter.png and /dev/null differ diff --git a/ico/print.png b/ico/print.png deleted file mode 100644 index a71ee2817..000000000 Binary files a/ico/print.png and /dev/null differ diff --git a/ico/printer.png b/ico/printer.png new file mode 100644 index 000000000..43f79847b Binary files /dev/null and b/ico/printer.png differ diff --git a/ico/printtype_pdf.png b/ico/printtype_pdf.png deleted file mode 100644 index fca2c672e..000000000 Binary files a/ico/printtype_pdf.png and /dev/null differ diff --git a/ico/printtype_printer.png b/ico/printtype_printer.png deleted file mode 100644 index 61d164598..000000000 Binary files a/ico/printtype_printer.png and /dev/null differ diff --git a/ico/printtype_ps.png b/ico/printtype_ps.png deleted file mode 100644 index 3576b8dbc..000000000 Binary files a/ico/printtype_ps.png and /dev/null differ diff --git a/ico/project.png b/ico/project.png index de27140f1..615db7d85 100644 Binary files a/ico/project.png and b/ico/project.png differ diff --git a/ico/redo.png b/ico/redo.png deleted file mode 100644 index 6aacd4f85..000000000 Binary files a/ico/redo.png and /dev/null differ diff --git a/ico/reload.png b/ico/reload.png deleted file mode 100644 index 3fa8db769..000000000 Binary files a/ico/reload.png and /dev/null differ diff --git a/ico/remove.png b/ico/remove.png deleted file mode 100644 index 9c4837d26..000000000 Binary files a/ico/remove.png and /dev/null differ diff --git a/ico/save.png b/ico/save.png deleted file mode 100644 index 3bc2a37a2..000000000 Binary files a/ico/save.png and /dev/null differ diff --git a/ico/save_all.png b/ico/save_all.png deleted file mode 100644 index af29975e1..000000000 Binary files a/ico/save_all.png and /dev/null differ diff --git a/ico/saveas.png b/ico/saveas.png deleted file mode 100644 index c8d4816ee..000000000 Binary files a/ico/saveas.png and /dev/null differ diff --git a/ico/settings.png b/ico/settings.png index 7f537fd6a..507444ef1 100644 Binary files a/ico/settings.png and b/ico/settings.png differ diff --git a/ico/sortir_fs.png b/ico/sortir_fs.png deleted file mode 100644 index b934ff2d5..000000000 Binary files a/ico/sortir_fs.png and /dev/null differ diff --git a/ico/start.png b/ico/start.png index 7fa9bf7cb..2bc48d860 100644 Binary files a/ico/start.png and b/ico/start.png differ diff --git a/ico/toolbars.png b/ico/toolbars.png deleted file mode 100644 index 653479bf0..000000000 Binary files a/ico/toolbars.png and /dev/null differ diff --git a/ico/undo.png b/ico/undo.png deleted file mode 100644 index d4b682bb2..000000000 Binary files a/ico/undo.png and /dev/null differ diff --git a/ico/unlock.png b/ico/unlock.png deleted file mode 100644 index 222863945..000000000 Binary files a/ico/unlock.png and /dev/null differ diff --git a/ico/user-busy.png b/ico/user-busy.png new file mode 100644 index 000000000..cdcf944ee Binary files /dev/null and b/ico/user-busy.png differ diff --git a/ico/user-online.png b/ico/user-online.png new file mode 100644 index 000000000..1221e1310 Binary files /dev/null and b/ico/user-online.png differ diff --git a/ico/view-fullscreen.png b/ico/view-fullscreen.png new file mode 100644 index 000000000..77ccfcc0b Binary files /dev/null and b/ico/view-fullscreen.png differ diff --git a/ico/view-refresh.png b/ico/view-refresh.png new file mode 100644 index 000000000..45b5535ce Binary files /dev/null and b/ico/view-refresh.png differ diff --git a/ico/view-restore.png b/ico/view-restore.png new file mode 100644 index 000000000..16d939204 Binary files /dev/null and b/ico/view-restore.png differ diff --git a/ico/viewmag+.png b/ico/viewmag+.png deleted file mode 100644 index a424b6196..000000000 Binary files a/ico/viewmag+.png and /dev/null differ diff --git a/ico/viewmag-.png b/ico/viewmag-.png deleted file mode 100644 index fc5364a62..000000000 Binary files a/ico/viewmag-.png and /dev/null differ diff --git a/ico/viewmag.png b/ico/viewmag.png deleted file mode 100644 index ffed3b501..000000000 Binary files a/ico/viewmag.png and /dev/null differ diff --git a/ico/viewmagfit.png b/ico/viewmagfit.png deleted file mode 100644 index f34f459a5..000000000 Binary files a/ico/viewmagfit.png and /dev/null differ diff --git a/ico/window-new.png b/ico/window-new.png new file mode 100644 index 000000000..54ad48c2d Binary files /dev/null and b/ico/window-new.png differ diff --git a/ico/window_new.png b/ico/window_new.png deleted file mode 100644 index 4d0a40a0b..000000000 Binary files a/ico/window_new.png and /dev/null differ diff --git a/ico/zoom-fit-best.png b/ico/zoom-fit-best.png new file mode 100644 index 000000000..890133da8 Binary files /dev/null and b/ico/zoom-fit-best.png differ diff --git a/ico/zoom-in.png b/ico/zoom-in.png new file mode 100644 index 000000000..8393e281a Binary files /dev/null and b/ico/zoom-in.png differ diff --git a/ico/zoom-original.png b/ico/zoom-original.png new file mode 100644 index 000000000..a268a9984 Binary files /dev/null and b/ico/zoom-original.png differ diff --git a/ico/zoom-out.png b/ico/zoom-out.png new file mode 100644 index 000000000..f66575efd Binary files /dev/null and b/ico/zoom-out.png differ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 1192afdf2..c0b21982a 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -1,78 +1,86 @@ - ico/1leftarrow.png - ico/1rightarrow.png - ico/2leftarrow.png - ico/2rightarrow.png ico/add_col.png ico/add_row.png - ico/allowed.png ico/all_pages.png + ico/application-exit.png + ico/application-pdf.png ico/arc.png + ico/arrow-left-double.png + ico/arrow-left.png + ico/arrow-right-double.png + ico/arrow-right.png ico/bring_forward.png - ico/button_cancel.png - ico/button_ok.png - ico/category_delete.png - ico/category_edit.png - ico/category_new.png + ico/folder-delete.png + ico/folder-edit.png + ico/folder-new.png ico/circle.png ico/conductor2.png ico/conductor3.png ico/conductor.png ico/configure.png + ico/configure-toolbars.png ico/conf_new_diagram_110.png - ico/confprint.png - ico/copy.png - ico/cut.png - ico/delete.png ico/diagram_add.png ico/diagram_del.png ico/diagram.png + ico/dialog-cancel.png + ico/dialog-information.png + ico/dialog-ok.png + ico/document-close.png + ico/document-delete.png + ico/document-edit.png + ico/document-export.png + ico/document-new.png + ico/document-open.png + ico/document-open-recent.png + ico/document-print-frame.png + ico/document-print.png + ico/document-save-all.png + ico/document-save-as.png + ico/document-save.png ico/east.png - ico/edit.png + ico/edit-clear.png + ico/edit-clear-locationbar-ltr.png + ico/edit-copy.png + ico/edit-cut.png + ico/edit-delete.png + ico/edit-paste.png + ico/edit-redo.png + ico/edit-select-all.png + ico/edit-undo.png ico/ellipse.png ico/endline-circle.png ico/endline-diamond.png ico/endline-none.png ico/endline-simple.png ico/endline-triangle.png - ico/entrer_fs.png - ico/erase.png - ico/exit.png - ico/export.png - ico/fileclose.png - ico/folder_home.png ico/folder.png - ico/forbidden.png + ico/go-home.png ico/ground.png ico/hotspot.png - ico/import.png - ico/info.png + ico/image-x-eps.png + ico/document-import.png ico/item_cancel.png ico/item_copy.png ico/item_move.png ico/landscape.png ico/line.png - ico/lock.png ico/lower.png ico/masquer.png ico/mdiarea_bg.png ico/move.png ico/names.png ico/neutral.png - ico/new.png ico/north.png - ico/open.png + ico/object-locked.png + ico/object-rotate-right.png + ico/object-unlocked.png ico/orientations.png - ico/paste.png ico/phase.png - ico/pivoter.png ico/polygon.png ico/portrait.png - ico/print.png - ico/printtype_pdf.png - ico/printtype_printer.png - ico/printtype_ps.png + ico/printer.png ico/project.png ico/qelectrotech.png ico/qet-16.png @@ -80,37 +88,33 @@ ico/qt.png ico/raise.png ico/rectangle.png - ico/redo.png - ico/reload.png ico/remove_col.png ico/remove_row.png ico/restaurer.png - ico/save_all.png - ico/saveas.png - ico/save.png ico/select.png ico/send_backward.png ico/settings.png ico/single_page.png - ico/sortir_fs.png ico/south.png ico/splash.png ico/start.png ico/terminal.png ico/textfield.png ico/text.png - ico/toolbars.png ico/two_pages.png - ico/undo.png - ico/unlock.png + ico/user-busy.png + ico/user-online.png ico/view_fit_width.png ico/view_fit_window.png - ico/viewmagfit.png - ico/viewmag-.png - ico/viewmag.png - ico/viewmag+.png + ico/view-fullscreen.png + ico/view-refresh.png + ico/view-restore.png ico/west.png - ico/window_new.png + ico/window-new.png + ico/zoom-fit-best.png + ico/zoom-in.png + ico/zoom-original.png + ico/zoom-out.png LICENSE diff --git a/sources/diagramprintdialog.cpp b/sources/diagramprintdialog.cpp index 7d43ef54e..397fce87c 100644 --- a/sources/diagramprintdialog.cpp +++ b/sources/diagramprintdialog.cpp @@ -170,9 +170,9 @@ void DiagramPrintDialog::buildPrintTypeDialog() { buttons_ = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); dialog_ -> setWindowTitle(tr("Choix du type d'impression")); - printer_icon_ -> setPixmap(QPixmap(":/ico/printtype_printer.png")); - pdf_icon_ -> setPixmap(QPixmap(":/ico/printtype_pdf.png")); - ps_icon_ -> setPixmap(QPixmap(":/ico/printtype_ps.png")); + printer_icon_ -> setPixmap(QPixmap(":/ico/printer.png")); + pdf_icon_ -> setPixmap(QPixmap(":/ico/application-pdf.png")); + ps_icon_ -> setPixmap(QPixmap(":/ico/image-x-eps.png")); printtype_choice_ -> addButton(printer_choice_); printtype_choice_ -> addButton(pdf_choice_); printtype_choice_ -> addButton(ps_choice_); diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp index 13e8498a8..dd2125ab8 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -54,7 +54,7 @@ DiagramView::DiagramView(Diagram *diagram, QWidget *parent) : QGraphicsView(pare updateWindowTitle(); context_menu = new QMenu(this); - paste_here = new QAction(QIcon(":/ico/paste.png"), tr("Coller ici", "context menu action"), this); + paste_here = new QAction(QIcon(":/ico/edit-paste.png"), tr("Coller ici", "context menu action"), this); connect(paste_here, SIGNAL(triggered()), this, SLOT(pasteHere())); connect(scene, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged())); diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index 120bbbd6d..283f4ca6c 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -69,43 +69,43 @@ QETElementEditor::~QETElementEditor() { Met en place les actions */ void QETElementEditor::setupActions() { - new_element = new QAction(QIcon(":/ico/new.png"), tr("&Nouveau"), this); - open = new QAction(QIcon(":/ico/open.png"), tr("&Ouvrir"), this); - open_file = new QAction(QIcon(":/ico/open.png"), tr("&Ouvrir depuis un fichier"), this); - save = new QAction(QIcon(":/ico/save.png"), tr("&Enregistrer"), this); - save_as = new QAction(QIcon(":/ico/saveas.png"), tr("Enregistrer sous"), this); - save_as_file = new QAction(QIcon(":/ico/saveas.png"), tr("Enregistrer dans un fichier"), this); - reload = new QAction(QIcon(":/ico/reload.png"), tr("Recharger"), this); - quit = new QAction(QIcon(":/ico/exit.png"), tr("&Quitter"), this); - selectall = new QAction( tr("Tout s\351lectionner"), this); - deselectall = new QAction( tr("D\351s\351lectionner tout"), this); - cut = new QAction(QIcon(":/ico/cut.png"), tr("Co&uper"), this); - copy = new QAction(QIcon(":/ico/copy.png"), tr("Cop&ier"), this); - paste = new QAction(QIcon(":/ico/paste.png"), tr("C&oller"), this); - paste_in_area = new QAction(QIcon(":/ico/paste.png"), tr("C&oller dans la zone..."), this); - inv_select = new QAction( tr("Inverser la s\351lection"), this); - edit_delete = new QAction(QIcon(":/ico/delete.png"), tr("&Supprimer"), this); - zoom_in = new QAction(QIcon(":/ico/viewmag+.png"), tr("Zoom avant"), this); - zoom_out = new QAction(QIcon(":/ico/viewmag-.png"), tr("Zoom arri\350re"), this); - zoom_fit = new QAction(QIcon(":/ico/viewmagfit.png"), tr("Zoom adapt\351"), this); - zoom_reset = new QAction(QIcon(":/ico/viewmag.png"), tr("Pas de zoom"), this); - edit_size_hs = new QAction(QIcon(":/ico/hotspot.png"), tr("\311diter la taille et le point de saisie"), this); - edit_names = new QAction(QIcon(":/ico/names.png"), tr("\311diter les noms"), this); - edit_ori = new QAction(QIcon(":/ico/orientations.png"), tr("\311diter les orientations"), this); - edit_raise = new QAction(QIcon(":/ico/raise.png"), tr("Rapprocher"), this); - edit_lower = new QAction(QIcon(":/ico/lower.png"), tr("\311loigner"), this); - edit_backward = new QAction(QIcon(":/ico/send_backward.png"),tr("Envoyer au fond"), this); - edit_forward = new QAction(QIcon(":/ico/bring_forward.png"),tr("Amener au premier plan"), this); - move = new QAction(QIcon(":/ico/select.png"), tr("D\351placer un objet"), this); - add_line = new QAction(QIcon(":/ico/line.png"), tr("Ajouter une ligne"), this); - add_rectangle = new QAction(QIcon(":/ico/rectangle.png"), tr("Ajouter un rectangle"), this); - add_ellipse = new QAction(QIcon(":/ico/ellipse.png"), tr("Ajouter une ellipse"), this); - add_circle = new QAction(QIcon(":/ico/circle.png"), tr("Ajouter un cercle"), this); - add_polygon = new QAction(QIcon(":/ico/polygon.png"), tr("Ajouter un polygone"), this); - add_text = new QAction(QIcon(":/ico/text.png"), tr("Ajouter du texte"), this); - add_arc = new QAction(QIcon(":/ico/arc.png"), tr("Ajouter un arc de cercle"), this); - add_terminal = new QAction(QIcon(":/ico/terminal.png"), tr("Ajouter une borne"), this); - add_textfield = new QAction(QIcon(":/ico/textfield.png"), tr("Ajouter un champ de texte"), this); + new_element = new QAction(QIcon(":/ico/document-new.png"), tr("&Nouveau"), this); + open = new QAction(QIcon(":/ico/document-open.png"), tr("&Ouvrir"), this); + open_file = new QAction(QIcon(":/ico/document-open.png"), tr("&Ouvrir depuis un fichier"), this); + save = new QAction(QIcon(":/ico/document-save.png"), tr("&Enregistrer"), this); + save_as = new QAction(QIcon(":/ico/document-save-as.png"), tr("Enregistrer sous"), this); + save_as_file = new QAction(QIcon(":/ico/document-save-as.png"), tr("Enregistrer dans un fichier"), this); + reload = new QAction(QIcon(":/ico/view-refresh.png"), tr("Recharger"), this); + quit = new QAction(QIcon(":/ico/application-exit.png"), tr("&Quitter"), this); + selectall = new QAction(QIcon(":/ico/edit-select-all.png"), tr("Tout s\351lectionner"), this); + deselectall = new QAction( tr("D\351s\351lectionner tout"), this); + cut = new QAction(QIcon(":/ico/edit-cut.png"), tr("Co&uper"), this); + copy = new QAction(QIcon(":/ico/edit-copy.png"), tr("Cop&ier"), this); + paste = new QAction(QIcon(":/ico/edit-paste.png"), tr("C&oller"), this); + paste_in_area = new QAction(QIcon(":/ico/edit-paste.png"), tr("C&oller dans la zone..."), this); + inv_select = new QAction( tr("Inverser la s\351lection"), this); + edit_delete = new QAction(QIcon(":/ico/edit-delete.png"), tr("&Supprimer"), this); + zoom_in = new QAction(QIcon(":/ico/zoom-in.png"), tr("Zoom avant"), this); + zoom_out = new QAction(QIcon(":/ico/zoom-out.png"), tr("Zoom arri\350re"), this); + zoom_fit = new QAction(QIcon(":/ico/zoom-fit-best.png"), tr("Zoom adapt\351"), this); + zoom_reset = new QAction(QIcon(":/ico/zoom-original.png"), tr("Pas de zoom"), this); + edit_size_hs = new QAction(QIcon(":/ico/hotspot.png"), tr("\311diter la taille et le point de saisie"), this); + edit_names = new QAction(QIcon(":/ico/names.png"), tr("\311diter les noms"), this); + edit_ori = new QAction(QIcon(":/ico/orientations.png"), tr("\311diter les orientations"), this); + edit_raise = new QAction(QIcon(":/ico/raise.png"), tr("Rapprocher"), this); + edit_lower = new QAction(QIcon(":/ico/lower.png"), tr("\311loigner"), this); + edit_backward = new QAction(QIcon(":/ico/send_backward.png"), tr("Envoyer au fond"), this); + edit_forward = new QAction(QIcon(":/ico/bring_forward.png"), tr("Amener au premier plan"), this); + move = new QAction(QIcon(":/ico/select.png"), tr("D\351placer un objet"), this); + add_line = new QAction(QIcon(":/ico/line.png"), tr("Ajouter une ligne"), this); + add_rectangle = new QAction(QIcon(":/ico/rectangle.png"), tr("Ajouter un rectangle"), this); + add_ellipse = new QAction(QIcon(":/ico/ellipse.png"), tr("Ajouter une ellipse"), this); + add_circle = new QAction(QIcon(":/ico/circle.png"), tr("Ajouter un cercle"), this); + add_polygon = new QAction(QIcon(":/ico/polygon.png"), tr("Ajouter un polygone"), this); + add_text = new QAction(QIcon(":/ico/text.png"), tr("Ajouter du texte"), this); + add_arc = new QAction(QIcon(":/ico/arc.png"), tr("Ajouter un arc de cercle"), this); + add_terminal = new QAction(QIcon(":/ico/terminal.png"), tr("Ajouter une borne"), this); + add_textfield = new QAction(QIcon(":/ico/textfield.png"), tr("Ajouter un champ de texte"), this); QString add_status_tip = tr("Maintenez la touche Shift enfonc\351e pour effectuer plusieurs ajouts d'affil\351e"); add_line -> setStatusTip(add_status_tip); @@ -120,8 +120,8 @@ void QETElementEditor::setupActions() { undo = ce_scene -> undoStack().createUndoAction(this, tr("Annuler")); redo = ce_scene -> undoStack().createRedoAction(this, tr("Refaire")); - undo -> setIcon(QIcon(":/ico/undo.png")); - redo -> setIcon(QIcon(":/ico/redo.png")); + undo -> setIcon(QIcon(":/ico/edit-undo.png")); + redo -> setIcon(QIcon(":/ico/edit-redo.png")); undo -> setShortcuts(QKeySequence::Undo); redo -> setShortcuts(QKeySequence::Redo); @@ -237,7 +237,7 @@ void QETElementEditor::setupActions() { parts_toolbar -> setAllowedAreas(Qt::AllToolBarAreas); /* - QAction *xml_preview = new QAction(QIcon(":/ico/info.png"), tr("XML"), this); + QAction *xml_preview = new QAction(QIcon(":/ico/dialog-information.png"), tr("XML"), this); connect(xml_preview, SIGNAL(triggered()), this, SLOT(xmlPreview())); parts_toolbar -> addAction(xml_preview); */ diff --git a/sources/elementscategorieslist.cpp b/sources/elementscategorieslist.cpp index edd47dae3..cc46c01dc 100644 --- a/sources/elementscategorieslist.cpp +++ b/sources/elementscategorieslist.cpp @@ -73,7 +73,7 @@ void ElementsCategoriesList::reload() { // chargement des elements de la collection utilisateur if (!first_load) QETApp::customElementsCollection() -> reload(); - addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QIcon(":/ico/folder_home.png")); + addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QIcon(":/ico/go-home.png")); if (first_load) first_load = false; } diff --git a/sources/elementscategorieswidget.cpp b/sources/elementscategorieswidget.cpp index 64da99124..d58b65388 100644 --- a/sources/elementscategorieswidget.cpp +++ b/sources/elementscategorieswidget.cpp @@ -30,10 +30,10 @@ ElementsCategoriesWidget::ElementsCategoriesWidget(QWidget *parent) : QWidget(pa elementscategorieslist = new ElementsCategoriesList(false, QET::All, this); // actions - action_reload = new QAction(QIcon(":/ico/reload.png"), tr("Recharger les cat\351gories"), this); - action_new = new QAction(QIcon(":/ico/category_new.png"), tr("Nouvelle cat\351gorie"), this); - action_open = new QAction(QIcon(":/ico/category_edit.png"), tr("\311diter la cat\351gorie"), this); - action_delete = new QAction(QIcon(":/ico/category_delete.png"), tr("Supprimer la cat\351gorie"), this); + action_reload = new QAction(QIcon(":/ico/view-refresh.png"), tr("Recharger les cat\351gories"), this); + action_new = new QAction(QIcon(":/ico/folder-new.png"), tr("Nouvelle cat\351gorie"), this); + action_open = new QAction(QIcon(":/ico/folder-edit.png"), tr("\311diter la cat\351gorie"), this); + action_delete = new QAction(QIcon(":/ico/folder-delete.png"), tr("Supprimer la cat\351gorie"), this); // initialise la barre d'outils toolbar = new QToolBar(this); diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp index e1e9187fd..695680d82 100644 --- a/sources/elementspanel.cpp +++ b/sources/elementspanel.cpp @@ -651,7 +651,7 @@ void ElementsPanel::reload(bool reload_collections) { common_collection_item_ = addCollection(invisibleRootItem(), QETApp::commonElementsCollection(), tr("Collection QET"), QIcon(":/ico/qet-16.png")); // chargement des elements de la collection utilisateur - custom_collection_item_ = addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QIcon(":/ico/folder_home.png")); + custom_collection_item_ = addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QIcon(":/ico/go-home.png")); // chargement des projets foreach(QETProject *project, projects_to_display_.values()) { diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index be8e1a5de..8214e3047 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -47,23 +47,23 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) { elements_panel = new ElementsPanel(this); // initialise les actions - reload = new QAction(QIcon(":/ico/reload.png"), tr("Recharger les collections"), this); - new_category = new QAction(QIcon(":/ico/category_new.png"), tr("Nouvelle cat\351gorie"), this); - edit_category = new QAction(QIcon(":/ico/category_edit.png"), tr("\311diter la cat\351gorie"), this); - delete_category = new QAction(QIcon(":/ico/category_delete.png"), tr("Supprimer la cat\351gorie"), this); - delete_collection = new QAction(QIcon(":/ico/category_delete.png"), tr("Vider la collection"), this); - new_element = new QAction(QIcon(":/ico/new.png"), tr("Nouvel \351l\351ment"), this); - edit_element = new QAction(QIcon(":/ico/edit.png"), tr("\311diter l'\351l\351ment"), this); - delete_element = new QAction(QIcon(":/ico/delete.png"), tr("Supprimer l'\351l\351ment"), this); - prj_close = new QAction(QIcon(":/ico/fileclose.png"), tr("Fermer ce projet"), this); - prj_edit_prop = new QAction(QIcon(":/ico/info.png"), tr("Propri\351t\351s du projet"), this); - prj_prop_diagram = new QAction(QIcon(":/ico/info.png"), tr("Propri\351t\351s du sch\351ma"), this); - prj_add_diagram = new QAction(QIcon(":/ico/diagram_add.png"), tr("Ajouter un sch\351ma"), this); - prj_del_diagram = new QAction(QIcon(":/ico/diagram_del.png"), tr("Supprimer ce sch\351ma"), this); - move_elements_ = new QAction(QIcon(":/ico/item_move.png"), tr("D\351placer dans cette cat\351gorie"), this); - copy_elements_ = new QAction(QIcon(":/ico/item_copy.png"), tr("Copier dans cette cat\351gorie"), this); - cancel_elements_ = new QAction(QIcon(":/ico/item_cancel.png"), tr("Annuler"), this); - erase_textfield = new QAction(QIcon(":/ico/erase.png"), tr("Effacer le filtre"), this); + reload = new QAction(QIcon(":/ico/view-refresh.png"), tr("Recharger les collections"), this); + new_category = new QAction(QIcon(":/ico/folder-new.png"), tr("Nouvelle cat\351gorie"), this); + edit_category = new QAction(QIcon(":/ico/folder-edit.png"), tr("\311diter la cat\351gorie"), this); + delete_category = new QAction(QIcon(":/ico/folder-delete.png"), tr("Supprimer la cat\351gorie"), this); + delete_collection = new QAction(QIcon(":/ico/folder-delete.png"), tr("Vider la collection"), this); + new_element = new QAction(QIcon(":/ico/document-new.png"), tr("Nouvel \351l\351ment"), this); + edit_element = new QAction(QIcon(":/ico/document-edit.png"), tr("\311diter l'\351l\351ment"), this); + delete_element = new QAction(QIcon(":/ico/document-delete.png"), tr("Supprimer l'\351l\351ment"), this); + prj_close = new QAction(QIcon(":/ico/document-close.png"), tr("Fermer ce projet"), this); + prj_edit_prop = new QAction(QIcon(":/ico/dialog-information.png"), tr("Propri\351t\351s du projet"), this); + prj_prop_diagram = new QAction(QIcon(":/ico/dialog-information.png"), tr("Propri\351t\351s du sch\351ma"), this); + prj_add_diagram = new QAction(QIcon(":/ico/diagram_add.png"), tr("Ajouter un sch\351ma"), this); + prj_del_diagram = new QAction(QIcon(":/ico/diagram_del.png"), tr("Supprimer ce sch\351ma"), this); + move_elements_ = new QAction(QIcon(":/ico/item_move.png"), tr("D\351placer dans cette cat\351gorie"), this); + copy_elements_ = new QAction(QIcon(":/ico/item_copy.png"), tr("Copier dans cette cat\351gorie"), this); + cancel_elements_ = new QAction(QIcon(":/ico/item_cancel.png"), tr("Annuler"), this); + erase_textfield = new QAction(QIcon(":/ico/edit-clear-locationbar-ltr.png"), tr("Effacer le filtre"), this); // initialise le champ de texte pour filtrer avec une disposition horizontale QLabel *filter_label = new QLabel(tr("Filtrer : "), this); diff --git a/sources/exportdialog.cpp b/sources/exportdialog.cpp index d941bc36a..c449fac34 100644 --- a/sources/exportdialog.cpp +++ b/sources/exportdialog.cpp @@ -317,9 +317,9 @@ void ExportDialog::slot_keepRatioChanged(int diagram_id) { // gere l'icone du bouton "Conserver les proportions" if (current_diagram -> keep_ratio -> isChecked()) { - current_diagram -> keep_ratio -> setIcon(QIcon(":/ico/lock.png")); + current_diagram -> keep_ratio -> setIcon(QIcon(":/ico/object-locked.png")); } else { - current_diagram -> keep_ratio -> setIcon(QIcon(":/ico/unlock.png")); + current_diagram -> keep_ratio -> setIcon(QIcon(":/ico/object-unlocked.png")); } // ne fait rien si l'option "Conserver les proportions" n'est pas activee @@ -717,7 +717,7 @@ ExportDialog::ExportDiagramLine::ExportDiagramLine(Diagram *dia) { keep_ratio = new QPushButton(); keep_ratio -> setCheckable(true); keep_ratio -> setChecked(true); - keep_ratio -> setIcon(QIcon(":/ico/lock.png")); + keep_ratio -> setIcon(QIcon(":/ico/object-locked.png")); keep_ratio -> setToolTip(QObject::tr("Conserver les proportions")); reset_size = new QPushButton(); @@ -725,7 +725,7 @@ ExportDialog::ExportDiagramLine::ExportDiagramLine(Diagram *dia) { reset_size -> setToolTip(QObject::tr("R\351initialiser les dimensions")); preview = new QPushButton(); - preview -> setIcon(QIcon(":/ico/viewmag.png")); + preview -> setIcon(QIcon(":/ico/zoom-original.png")); preview -> setToolTip(QObject::tr("Aper\347u")); } diff --git a/sources/orientationsetwidget.cpp b/sources/orientationsetwidget.cpp index c42fbc6db..b5f8d48fe 100644 --- a/sources/orientationsetwidget.cpp +++ b/sources/orientationsetwidget.cpp @@ -26,8 +26,8 @@ OrientationSetWidget::OrientationSetWidget(QWidget *parent) : QWidget(parent) { default_radios = new QButtonGroup(this); #define MK_COMBO_BOX(a) a##_orientation = new QComboBox();\ - a##_orientation -> addItem(QIcon(":/ico/allowed.png"), tr("Possible"), "y");\ - a##_orientation -> addItem(QIcon(":/ico/forbidden.png"),tr("Impossible"), "n");\ + a##_orientation -> addItem(QIcon(":/ico/user-online.png"), tr("Possible"), "y");\ + a##_orientation -> addItem(QIcon(":/ico/user-busy.png"),tr("Impossible"), "n");\ connect(a##_orientation, SIGNAL(activated(int)), this, SLOT(updateOrientationSet()));\ a##_default = new QRadioButton(); diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index e1cb5011a..db21b4e4d 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -828,15 +828,15 @@ void QETApp::initSystemTray() { // initialisation des menus de l'icone dans le systray menu_systray = new QMenu(tr("QElectroTech", "systray menu title")); - quitter_qet = new QAction(QIcon(":/ico/exit.png"), tr("&Quitter"), this); + quitter_qet = new QAction(QIcon(":/ico/application-exit.png"), tr("&Quitter"), this); reduce_appli = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer"), this); restore_appli = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer"), this); reduce_diagrams = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer tous les \351diteurs de sch\351ma"), this); restore_diagrams = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer tous les \351diteurs de sch\351ma"), this); reduce_elements = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer tous les \351diteurs d'\351l\351ment"), this); restore_elements = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer tous les \351diteurs d'\351l\351ment"), this); - new_diagram = new QAction(QIcon(":/ico/window_new.png"), tr("&Nouvel \351diteur de sch\351ma"), this); - new_element = new QAction(QIcon(":/ico/window_new.png"), tr("&Nouvel \351diteur d'\351l\351ment"), this); + new_diagram = new QAction(QIcon(":/ico/window-new.png"), tr("&Nouvel \351diteur de sch\351ma"), this); + new_element = new QAction(QIcon(":/ico/window-new.png"), tr("&Nouvel \351diteur d'\351l\351ment"), this); quitter_qet -> setStatusTip(tr("Ferme l'application QElectroTech")); reduce_appli -> setToolTip(tr("R\351duire QElectroTech dans le systray")); @@ -1002,22 +1002,22 @@ int QETStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidge QIcon QETStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, const QWidget* widget) const { switch(standardIcon) { case QStyle::SP_DialogSaveButton: - return(QIcon(":/ico/save.png")); + return(QIcon(":/ico/document-save.png")); case QStyle::SP_DialogOpenButton: - return(QIcon(":/ico/open.png")); + return(QIcon(":/ico/document-open.png")); case QStyle::SP_DialogCancelButton: - return(QIcon(":/ico/button_cancel.png")); + return(QIcon(":/ico/dialog-cancel.png")); case QStyle::SP_DialogOkButton: case QStyle::SP_DialogApplyButton: - return(QIcon(":/ico/button_ok.png")); + return(QIcon(":/ico/dialog-ok.png")); case QStyle::SP_DialogCloseButton: - return(QIcon(":/ico/fileclose.png")); + return(QIcon(":/ico/document-close.png")); case QStyle::SP_DialogYesButton: - return(QIcon(":/ico/allowed.png")); + return(QIcon(":/ico/user-online.png")); case QStyle::SP_DialogNoButton: - return(QIcon(":/ico/forbidden.png")); + return(QIcon(":/ico/user-busy.png")); case QStyle::SP_DialogResetButton: - return(QIcon(":/ico/undo.png")); + return(QIcon(":/ico/edit-undo.png")); case QStyle::SP_DialogHelpButton: case QStyle::SP_DialogDiscardButton: return(QIcon()); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index c5356b31f..3686edb10 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -190,66 +190,66 @@ void QETDiagramEditor::aboutQET() { */ void QETDiagramEditor::actions() { // icones et labels - new_file = new QAction(QIcon(":/ico/new.png"), tr("&Nouveau"), this); - open_file = new QAction(QIcon(":/ico/open.png"), tr("&Ouvrir"), this); - close_file = new QAction(QIcon(":/ico/fileclose.png"), tr("&Fermer"), this); - save_file = new QAction(QIcon(":/ico/save.png"), tr("&Enregistrer"), this); - save_file_sous = new QAction(QIcon(":/ico/saveas.png"), tr("Enregistrer sous"), this); - save_all = new QAction(QIcon(":/ico/save_all.png"), tr("&Enregistrer tous les sch\351mas"), this); - import_diagram = new QAction(QIcon(":/ico/import.png"), tr("&Importer"), this); - export_diagram = new QAction(QIcon(":/ico/export.png"), tr("E&xporter"), this); - print = new QAction(QIcon(":/ico/print.png"), tr("Imprimer"), this); - quit_editor = new QAction(QIcon(":/ico/exit.png"), tr("&Quitter"), this); + new_file = new QAction(QIcon(":/ico/document-new.png"), tr("&Nouveau"), this); + open_file = new QAction(QIcon(":/ico/document-open.png"), tr("&Ouvrir"), this); + close_file = new QAction(QIcon(":/ico/document-close.png"), tr("&Fermer"), this); + save_file = new QAction(QIcon(":/ico/document-save.png"), tr("&Enregistrer"), this); + save_file_sous = new QAction(QIcon(":/ico/document-save-as.png"), tr("Enregistrer sous"), this); + save_all = new QAction(QIcon(":/ico/document-save-all.png"), tr("&Enregistrer tous les sch\351mas"), this); + import_diagram = new QAction(QIcon(":/ico/document-import.png"), tr("&Importer"), this); + export_diagram = new QAction(QIcon(":/ico/document-export.png"), tr("E&xporter"), this); + print = new QAction(QIcon(":/ico/document-print.png"), tr("Imprimer"), this); + quit_editor = new QAction(QIcon(":/ico/application-exit.png"), tr("&Quitter"), this); undo = undo_group.createUndoAction(this, tr("Annuler")); - undo -> setIcon(QIcon(":/ico/undo.png")); + undo -> setIcon(QIcon(":/ico/edit-undo.png")); redo = undo_group.createRedoAction(this, tr("Refaire")); - redo -> setIcon(QIcon(":/ico/redo.png")); - cut = new QAction(QIcon(":/ico/cut.png"), tr("Co&uper"), this); - copy = new QAction(QIcon(":/ico/copy.png"), tr("Cop&ier"), this); - paste = new QAction(QIcon(":/ico/paste.png"), tr("C&oller"), this); - select_all = new QAction( tr("Tout s\351lectionner"), this); - select_nothing = new QAction( tr("D\351s\351lectionner tout"), this); - select_invert = new QAction( tr("Inverser la s\351lection"), this); - delete_selection = new QAction(QIcon(":/ico/delete.png"), tr("Supprimer"), this); - rotate_selection = new QAction(QIcon(":/ico/pivoter.png"), tr("Pivoter"), this); - conductor_prop = new QAction(QIcon(":/ico/conductor.png"), tr("Propri\351t\351s du conducteur"), this); - conductor_reset = new QAction(QIcon(":/ico/conductor2.png"), tr("R\351initialiser les conducteurs"), this); - conductor_default = new QAction(QIcon(":/ico/conductor3.png"), tr("Conducteurs par d\351faut"), this); - infos_diagram = new QAction(QIcon(":/ico/info.png"), tr("Propri\351t\351s du sch\351ma"), this); - add_text = new QAction(QIcon(":/ico/textfield.png"), tr("Ajouter un champ de texte"), this); - add_column = new QAction(QIcon(":/ico/add_col.png"), tr("Ajouter une colonne"), this); - remove_column = new QAction(QIcon(":/ico/remove_col.png"), tr("Enlever une colonne"), this); - add_row = new QAction(QIcon(":/ico/add_row.png"), tr("Ajouter une ligne"), this); - remove_row = new QAction(QIcon(":/ico/remove_row.png"), tr("Enlever une ligne"), this); + redo -> setIcon(QIcon(":/ico/edit-redo.png")); + cut = new QAction(QIcon(":/ico/edit-cut.png"), tr("Co&uper"), this); + copy = new QAction(QIcon(":/ico/edit-copy.png"), tr("Cop&ier"), this); + paste = new QAction(QIcon(":/ico/edit-paste.png"), tr("C&oller"), this); + select_all = new QAction(QIcon(":/ico/edit-select-all.png"), tr("Tout s\351lectionner"), this); + select_nothing = new QAction( tr("D\351s\351lectionner tout"), this); + select_invert = new QAction( tr("Inverser la s\351lection"), this); + delete_selection = new QAction(QIcon(":/ico/edit-delete.png"), tr("Supprimer"), this); + rotate_selection = new QAction(QIcon(":/ico/object-rotate-right.png"), tr("Pivoter"), this); + conductor_prop = new QAction(QIcon(":/ico/conductor.png"), tr("Propri\351t\351s du conducteur"), this); + conductor_reset = new QAction(QIcon(":/ico/conductor2.png"), tr("R\351initialiser les conducteurs"), this); + conductor_default = new QAction(QIcon(":/ico/conductor3.png"), tr("Conducteurs par d\351faut"), this); + infos_diagram = new QAction(QIcon(":/ico/dialog-information.png"), tr("Propri\351t\351s du sch\351ma"), this); + add_text = new QAction(QIcon(":/ico/textfield.png"), tr("Ajouter un champ de texte"), this); + add_column = new QAction(QIcon(":/ico/add_col.png"), tr("Ajouter une colonne"), this); + remove_column = new QAction(QIcon(":/ico/remove_col.png"), tr("Enlever une colonne"), this); + add_row = new QAction(QIcon(":/ico/add_row.png"), tr("Ajouter une ligne"), this); + remove_row = new QAction(QIcon(":/ico/remove_row.png"), tr("Enlever une ligne"), this); - prj_edit_prop = new QAction(QIcon(":/ico/info.png"), tr("Propri\351t\351s du projet"), this); - prj_add_diagram = new QAction(QIcon(":/ico/diagram_add.png"),tr("Ajouter un sch\351ma"), this); - prj_del_diagram = new QAction(QIcon(":/ico/diagram_del.png"),tr("Supprimer le sch\351ma"), this); - prj_clean = new QAction( tr("Nettoyer le projet"), this); + prj_edit_prop = new QAction(QIcon(":/ico/dialog-information.png"), tr("Propri\351t\351s du projet"), this); + prj_add_diagram = new QAction(QIcon(":/ico/diagram_add.png"), tr("Ajouter un sch\351ma"), this); + prj_del_diagram = new QAction(QIcon(":/ico/diagram_del.png"), tr("Supprimer le sch\351ma"), this); + prj_clean = new QAction(QIcon(":/ico/edit-clear.png"), tr("Nettoyer le projet"), this); - zoom_in = new QAction(QIcon(":/ico/viewmag+.png"), tr("Zoom avant"), this); - zoom_out = new QAction(QIcon(":/ico/viewmag-.png"), tr("Zoom arri\350re"), this); - zoom_fit = new QAction(QIcon(":/ico/viewmagfit.png"), tr("Zoom adapt\351"), this); - zoom_reset = new QAction(QIcon(":/ico/viewmag.png"), tr("Pas de zoom"), this); + zoom_in = new QAction(QIcon(":/ico/zoom-in.png"), tr("Zoom avant"), this); + zoom_out = new QAction(QIcon(":/ico/zoom-out.png"), tr("Zoom arri\350re"), this); + zoom_fit = new QAction(QIcon(":/ico/zoom-fit-best.png"), tr("Zoom adapt\351"), this); + zoom_reset = new QAction(QIcon(":/ico/zoom-original.png"), tr("Pas de zoom"), this); - tabbed_view_mode = new QAction( tr("en utilisant des onglets"), this); - windowed_view_mode= new QAction( tr("en utilisant des fen\352tres"), this); + tabbed_view_mode = new QAction( tr("en utilisant des onglets"), this); + windowed_view_mode= new QAction( tr("en utilisant des fen\352tres"), this); - mode_selection = new QAction(QIcon(":/ico/select.png"), tr("Mode Selection"), this); - mode_visualise = new QAction(QIcon(":/ico/move.png"), tr("Mode Visualisation"), this); + mode_selection = new QAction(QIcon(":/ico/select.png"), tr("Mode Selection"), this); + mode_visualise = new QAction(QIcon(":/ico/move.png"), tr("Mode Visualisation"), this); fullscreen = new QAction(this); slot_updateFullScreenAction(); - configure = new QAction(QIcon(":/ico/configure.png"), tr("&Configurer QElectroTech"), this); + configure = new QAction(QIcon(":/ico/configure.png"), tr("&Configurer QElectroTech"), this); - tile_window = new QAction( tr("&Mosa\357que"), this); - cascade_window = new QAction( tr("&Cascade"), this); - next_window = new QAction( tr("Projet suivant"), this); - prev_window = new QAction( tr("Projet pr\351c\351dent"), this); + tile_window = new QAction( tr("&Mosa\357que"), this); + cascade_window = new QAction( tr("&Cascade"), this); + next_window = new QAction( tr("Projet suivant"), this); + prev_window = new QAction( tr("Projet pr\351c\351dent"), this); - about_qet = new QAction(QIcon(":/ico/qet.png"), tr("\300 &propos de QElectroTech"), this); - about_qt = new QAction(QIcon(":/ico/qt.png"), tr("\300 propos de &Qt"), this); + about_qet = new QAction(QIcon(":/ico/qet.png"), tr("\300 &propos de QElectroTech"), this); + about_qt = new QAction(QIcon(":/ico/qt.png"), tr("\300 propos de &Qt"), this); // raccourcis clavier new_file -> setShortcut(QKeySequence::New); @@ -503,7 +503,7 @@ void QETDiagramEditor::menus() { QMenu *display_toolbars = createPopupMenu(); display_toolbars -> setTearOffEnabled(true); display_toolbars -> setTitle(tr("Afficher")); - display_toolbars -> setIcon(QIcon(":/ico/toolbars.png")); + display_toolbars -> setIcon(QIcon(":/ico/configure-toolbars.png")); main_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils principale")); view_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils Affichage")); diagram_bar -> toggleViewAction() -> setStatusTip(tr("Affiche ou non la barre d'outils Sch\351ma")); @@ -1162,11 +1162,11 @@ void QETDiagramEditor::slot_updateComplexActions() { void QETDiagramEditor::slot_updateFullScreenAction() { if (windowState() & Qt::WindowFullScreen) { fullscreen -> setText(tr("Sortir du &mode plein \351cran")); - fullscreen -> setIcon(QIcon(":/ico/sortir_fs.png")); + fullscreen -> setIcon(QIcon(":/ico/view-restore.png")); fullscreen -> setStatusTip(tr("Affiche QElectroTech en mode fen\352tr\351", "status bar tip")); } else { fullscreen -> setText(tr("Passer en &mode plein \351cran")); - fullscreen -> setIcon(QIcon(":/ico/entrer_fs.png")); + fullscreen -> setIcon(QIcon(":/ico/view-fullscreen.png")); fullscreen -> setStatusTip(tr("Affiche QElectroTech en mode plein \351cran", "status bar tip")); } } diff --git a/sources/qetprintpreviewdialog.cpp b/sources/qetprintpreviewdialog.cpp index dd831161e..5b297808f 100644 --- a/sources/qetprintpreviewdialog.cpp +++ b/sources/qetprintpreviewdialog.cpp @@ -124,23 +124,23 @@ void QETPrintPreviewDialog::build() { preview_ = new QPrintPreviewWidget(printer_); diagrams_label_ = new QLabel(tr("Sch\351mas \340 imprimer\240:")); diagrams_list_ = new DiagramsChooser(project_); - toggle_diagrams_list_ = new QAction(QIcon(":/ico/diagram.png"), tr("Cacher la liste des sch\351mas"), this); - toggle_print_options_ = new QAction(QIcon(":/ico/configure.png"), tr("Cacher les options d'impression"), this); - adjust_width_ = new QAction(QIcon(":/ico/view_fit_width.png"), tr("Ajuster la largeur"), this); - adjust_page_ = new QAction(QIcon(":/ico/view_fit_window.png"), tr("Ajuster la page"), this); - zoom_out_ = new QAction(QIcon(":/ico/viewmag-.png"), tr("Zoom arri\350re"), this); + toggle_diagrams_list_ = new QAction(QIcon(":/ico/diagram.png"), tr("Cacher la liste des sch\351mas"), this); + toggle_print_options_ = new QAction(QIcon(":/ico/configure.png"), tr("Cacher les options d'impression"), this); + adjust_width_ = new QAction(QIcon(":/ico/view_fit_width.png"), tr("Ajuster la largeur"), this); + adjust_page_ = new QAction(QIcon(":/ico/view_fit_window.png"), tr("Ajuster la page"), this); + zoom_out_ = new QAction(QIcon(":/ico/zoom-out.png"), tr("Zoom arri\350re"), this); zoom_box_ = new QComboBox(this); - zoom_in_ = new QAction(QIcon(":/ico/viewmag+.png"), tr("Zoom avant"), this); - landscape_ = new QAction(QIcon(":/ico/landscape.png"), tr("Paysage"), this); - portrait_ = new QAction(QIcon(":/ico/portrait.png"), tr("Portrait"), this); - first_page_ = new QAction(QIcon(":/ico/2leftarrow.png"), tr("Premi\350re page"), this); - previous_page_ = new QAction(QIcon(":/ico/1leftarrow.png"), tr("Page pr\351c\351dente"), this); - next_page_ = new QAction(QIcon(":/ico/1rightarrow.png"), tr("Page suivante"), this); - last_page_ = new QAction(QIcon(":/ico/2rightarrow.png"), tr("Derni\350re page"), this); - single_page_view_ = new QAction(QIcon(":/ico/single_page.png"), tr("Afficher une seule page"), this); - facing_pages_view_ = new QAction(QIcon(":/ico/two_pages.png"), tr("Afficher deux pages"), this); - all_pages_view_ = new QAction(QIcon(":/ico/all_pages.png"), tr("Afficher un aper\347u de toutes les pages"), this); - page_setup_ = new QAction(QIcon(":/ico/confprint.png"), tr("Mise en page"), this); + zoom_in_ = new QAction(QIcon(":/ico/zoom-in.png"), tr("Zoom avant"), this); + landscape_ = new QAction(QIcon(":/ico/landscape.png"), tr("Paysage"), this); + portrait_ = new QAction(QIcon(":/ico/portrait.png"), tr("Portrait"), this); + first_page_ = new QAction(QIcon(":/ico/arrow-left-double.png"), tr("Premi\350re page"), this); + previous_page_ = new QAction(QIcon(":/ico/arrow-left.png"), tr("Page pr\351c\351dente"), this); + next_page_ = new QAction(QIcon(":/ico/arrow-right.png"), tr("Page suivante"), this); + last_page_ = new QAction(QIcon(":/ico/arrow-right-double.png"), tr("Derni\350re page"), this); + single_page_view_ = new QAction(QIcon(":/ico/single_page.png"), tr("Afficher une seule page"), this); + facing_pages_view_ = new QAction(QIcon(":/ico/two_pages.png"), tr("Afficher deux pages"), this); + all_pages_view_ = new QAction(QIcon(":/ico/all_pages.png"), tr("Afficher un aper\347u de toutes les pages"), this); + page_setup_ = new QAction(QIcon(":/ico/document-print-frame.png"), tr("Mise en page"), this); toggle_diagrams_list_ -> setCheckable(true); toggle_diagrams_list_ -> setChecked(true); @@ -205,7 +205,7 @@ void QETPrintPreviewDialog::build() { fit_diagram_to_page_ -> setChecked(true); buttons_ = new QDialogButtonBox(); - buttons_ -> addButton(new QPushButton(QIcon(":/ico/print.png"), tr("Imprimer")), QDialogButtonBox::AcceptRole); + buttons_ -> addButton(new QPushButton(QIcon(":/ico/document-print.png"), tr("Imprimer")), QDialogButtonBox::AcceptRole); buttons_ -> addButton(QDialogButtonBox::Cancel); connect(toggle_diagrams_list_, SIGNAL(toggled(bool)), this, SLOT(setDiagramsListVisible(bool))); diff --git a/sources/recentfiles.cpp b/sources/recentfiles.cpp index 44c23d661..a2c8c01ab 100644 --- a/sources/recentfiles.cpp +++ b/sources/recentfiles.cpp @@ -141,7 +141,7 @@ void RecentFiles::buildMenu() { // reinitialise le menu if (!menu_) { menu_ = new QMenu(tr("&R\351cemment ouvert(s)")); - menu_ -> setIcon(QIcon(":/ico/open.png")); + menu_ -> setIcon(QIcon(":/ico/document-open-recent.png")); } else { menu_ -> clear(); }