diff --git a/ico/add_col.png b/ico/16x16/add_col.png similarity index 100% rename from ico/add_col.png rename to ico/16x16/add_col.png diff --git a/ico/add_row.png b/ico/16x16/add_row.png similarity index 100% rename from ico/add_row.png rename to ico/16x16/add_row.png diff --git a/ico/circle.png b/ico/16x16/circle.png similarity index 100% rename from ico/circle.png rename to ico/16x16/circle.png diff --git a/ico/east.png b/ico/16x16/east.png similarity index 100% rename from ico/east.png rename to ico/16x16/east.png diff --git a/ico/endline-circle.png b/ico/16x16/endline-circle.png similarity index 100% rename from ico/endline-circle.png rename to ico/16x16/endline-circle.png diff --git a/ico/endline-diamond.png b/ico/16x16/endline-diamond.png similarity index 100% rename from ico/endline-diamond.png rename to ico/16x16/endline-diamond.png diff --git a/ico/endline-none.png b/ico/16x16/endline-none.png similarity index 100% rename from ico/endline-none.png rename to ico/16x16/endline-none.png diff --git a/ico/endline-simple.png b/ico/16x16/endline-simple.png similarity index 100% rename from ico/endline-simple.png rename to ico/16x16/endline-simple.png diff --git a/ico/endline-triangle.png b/ico/16x16/endline-triangle.png similarity index 100% rename from ico/endline-triangle.png rename to ico/16x16/endline-triangle.png diff --git a/ico/folder.png b/ico/16x16/folder.png similarity index 100% rename from ico/folder.png rename to ico/16x16/folder.png diff --git a/ico/ground.png b/ico/16x16/ground.png similarity index 100% rename from ico/ground.png rename to ico/16x16/ground.png diff --git a/ico/item_cancel.png b/ico/16x16/item_cancel.png similarity index 100% rename from ico/item_cancel.png rename to ico/16x16/item_cancel.png diff --git a/ico/item_copy.png b/ico/16x16/item_copy.png similarity index 100% rename from ico/item_copy.png rename to ico/16x16/item_copy.png diff --git a/ico/item_move.png b/ico/16x16/item_move.png similarity index 100% rename from ico/item_move.png rename to ico/16x16/item_move.png diff --git a/ico/masquer.png b/ico/16x16/masquer.png similarity index 100% rename from ico/masquer.png rename to ico/16x16/masquer.png diff --git a/ico/neutral.png b/ico/16x16/neutral.png similarity index 100% rename from ico/neutral.png rename to ico/16x16/neutral.png diff --git a/ico/north.png b/ico/16x16/north.png similarity index 100% rename from ico/north.png rename to ico/16x16/north.png diff --git a/ico/orientations.png b/ico/16x16/orientations.png similarity index 100% rename from ico/orientations.png rename to ico/16x16/orientations.png diff --git a/ico/phase.png b/ico/16x16/phase.png similarity index 100% rename from ico/phase.png rename to ico/16x16/phase.png diff --git a/ico/project.png b/ico/16x16/project.png similarity index 100% rename from ico/project.png rename to ico/16x16/project.png diff --git a/ico/qet-16.png b/ico/16x16/qet-16.png similarity index 100% rename from ico/qet-16.png rename to ico/16x16/qet-16.png diff --git a/ico/remove_col.png b/ico/16x16/remove_col.png similarity index 100% rename from ico/remove_col.png rename to ico/16x16/remove_col.png diff --git a/ico/remove_row.png b/ico/16x16/remove_row.png similarity index 100% rename from ico/remove_row.png rename to ico/16x16/remove_row.png diff --git a/ico/south.png b/ico/16x16/south.png similarity index 100% rename from ico/south.png rename to ico/16x16/south.png diff --git a/ico/user-busy.png b/ico/16x16/user-busy.png similarity index 100% rename from ico/user-busy.png rename to ico/16x16/user-busy.png diff --git a/ico/user-online.png b/ico/16x16/user-online.png similarity index 100% rename from ico/user-online.png rename to ico/16x16/user-online.png diff --git a/ico/west.png b/ico/16x16/west.png similarity index 100% rename from ico/west.png rename to ico/16x16/west.png diff --git a/ico/all_pages.png b/ico/22x22/all_pages.png similarity index 100% rename from ico/all_pages.png rename to ico/22x22/all_pages.png diff --git a/ico/application-exit.png b/ico/22x22/application-exit.png similarity index 100% rename from ico/application-exit.png rename to ico/22x22/application-exit.png diff --git a/ico/arc.png b/ico/22x22/arc.png similarity index 100% rename from ico/arc.png rename to ico/22x22/arc.png diff --git a/ico/arrow-left-double.png b/ico/22x22/arrow-left-double.png similarity index 100% rename from ico/arrow-left-double.png rename to ico/22x22/arrow-left-double.png diff --git a/ico/arrow-left.png b/ico/22x22/arrow-left.png similarity index 100% rename from ico/arrow-left.png rename to ico/22x22/arrow-left.png diff --git a/ico/arrow-right-double.png b/ico/22x22/arrow-right-double.png similarity index 100% rename from ico/arrow-right-double.png rename to ico/22x22/arrow-right-double.png diff --git a/ico/arrow-right.png b/ico/22x22/arrow-right.png similarity index 100% rename from ico/arrow-right.png rename to ico/22x22/arrow-right.png diff --git a/ico/bring_forward.png b/ico/22x22/bring_forward.png similarity index 100% rename from ico/bring_forward.png rename to ico/22x22/bring_forward.png diff --git a/ico/conductor.png b/ico/22x22/conductor.png similarity index 100% rename from ico/conductor.png rename to ico/22x22/conductor.png diff --git a/ico/conductor2.png b/ico/22x22/conductor2.png similarity index 100% rename from ico/conductor2.png rename to ico/22x22/conductor2.png diff --git a/ico/conductor3.png b/ico/22x22/conductor3.png similarity index 100% rename from ico/conductor3.png rename to ico/22x22/conductor3.png diff --git a/ico/configure-toolbars.png b/ico/22x22/configure-toolbars.png similarity index 100% rename from ico/configure-toolbars.png rename to ico/22x22/configure-toolbars.png diff --git a/ico/configure.png b/ico/22x22/configure.png similarity index 100% rename from ico/configure.png rename to ico/22x22/configure.png diff --git a/ico/diagram_add.png b/ico/22x22/diagram_add.png similarity index 100% rename from ico/diagram_add.png rename to ico/22x22/diagram_add.png diff --git a/ico/diagram_del.png b/ico/22x22/diagram_del.png similarity index 100% rename from ico/diagram_del.png rename to ico/22x22/diagram_del.png diff --git a/ico/dialog-cancel.png b/ico/22x22/dialog-cancel.png similarity index 100% rename from ico/dialog-cancel.png rename to ico/22x22/dialog-cancel.png diff --git a/ico/dialog-information.png b/ico/22x22/dialog-information.png similarity index 100% rename from ico/dialog-information.png rename to ico/22x22/dialog-information.png diff --git a/ico/dialog-ok.png b/ico/22x22/dialog-ok.png similarity index 100% rename from ico/dialog-ok.png rename to ico/22x22/dialog-ok.png diff --git a/ico/document-close.png b/ico/22x22/document-close.png similarity index 100% rename from ico/document-close.png rename to ico/22x22/document-close.png diff --git a/ico/document-delete.png b/ico/22x22/document-delete.png similarity index 100% rename from ico/document-delete.png rename to ico/22x22/document-delete.png diff --git a/ico/document-edit.png b/ico/22x22/document-edit.png similarity index 100% rename from ico/document-edit.png rename to ico/22x22/document-edit.png diff --git a/ico/document-export.png b/ico/22x22/document-export.png similarity index 100% rename from ico/document-export.png rename to ico/22x22/document-export.png diff --git a/ico/document-import.png b/ico/22x22/document-import.png similarity index 100% rename from ico/document-import.png rename to ico/22x22/document-import.png diff --git a/ico/document-new.png b/ico/22x22/document-new.png similarity index 100% rename from ico/document-new.png rename to ico/22x22/document-new.png diff --git a/ico/document-open-recent.png b/ico/22x22/document-open-recent.png similarity index 100% rename from ico/document-open-recent.png rename to ico/22x22/document-open-recent.png diff --git a/ico/document-open.png b/ico/22x22/document-open.png similarity index 100% rename from ico/document-open.png rename to ico/22x22/document-open.png diff --git a/ico/document-print-frame.png b/ico/22x22/document-print-frame.png similarity index 100% rename from ico/document-print-frame.png rename to ico/22x22/document-print-frame.png diff --git a/ico/document-print.png b/ico/22x22/document-print.png similarity index 100% rename from ico/document-print.png rename to ico/22x22/document-print.png diff --git a/ico/document-save-all.png b/ico/22x22/document-save-all.png similarity index 100% rename from ico/document-save-all.png rename to ico/22x22/document-save-all.png diff --git a/ico/document-save-as.png b/ico/22x22/document-save-as.png similarity index 100% rename from ico/document-save-as.png rename to ico/22x22/document-save-as.png diff --git a/ico/document-save.png b/ico/22x22/document-save.png similarity index 100% rename from ico/document-save.png rename to ico/22x22/document-save.png diff --git a/ico/edit-clear-locationbar-ltr.png b/ico/22x22/edit-clear-locationbar-ltr.png similarity index 100% rename from ico/edit-clear-locationbar-ltr.png rename to ico/22x22/edit-clear-locationbar-ltr.png diff --git a/ico/edit-clear.png b/ico/22x22/edit-clear.png similarity index 100% rename from ico/edit-clear.png rename to ico/22x22/edit-clear.png diff --git a/ico/edit-copy.png b/ico/22x22/edit-copy.png similarity index 100% rename from ico/edit-copy.png rename to ico/22x22/edit-copy.png diff --git a/ico/edit-cut.png b/ico/22x22/edit-cut.png similarity index 100% rename from ico/edit-cut.png rename to ico/22x22/edit-cut.png diff --git a/ico/edit-delete.png b/ico/22x22/edit-delete.png similarity index 100% rename from ico/edit-delete.png rename to ico/22x22/edit-delete.png diff --git a/ico/edit-paste.png b/ico/22x22/edit-paste.png similarity index 100% rename from ico/edit-paste.png rename to ico/22x22/edit-paste.png diff --git a/ico/edit-redo.png b/ico/22x22/edit-redo.png similarity index 100% rename from ico/edit-redo.png rename to ico/22x22/edit-redo.png diff --git a/ico/edit-select-all.png b/ico/22x22/edit-select-all.png similarity index 100% rename from ico/edit-select-all.png rename to ico/22x22/edit-select-all.png diff --git a/ico/edit-undo.png b/ico/22x22/edit-undo.png similarity index 100% rename from ico/edit-undo.png rename to ico/22x22/edit-undo.png diff --git a/ico/ellipse.png b/ico/22x22/ellipse.png similarity index 100% rename from ico/ellipse.png rename to ico/22x22/ellipse.png diff --git a/ico/folder-delete.png b/ico/22x22/folder-delete.png similarity index 100% rename from ico/folder-delete.png rename to ico/22x22/folder-delete.png diff --git a/ico/folder-edit.png b/ico/22x22/folder-edit.png similarity index 100% rename from ico/folder-edit.png rename to ico/22x22/folder-edit.png diff --git a/ico/folder-new.png b/ico/22x22/folder-new.png similarity index 100% rename from ico/folder-new.png rename to ico/22x22/folder-new.png diff --git a/ico/go-home.png b/ico/22x22/go-home.png similarity index 100% rename from ico/go-home.png rename to ico/22x22/go-home.png diff --git a/ico/hotspot.png b/ico/22x22/hotspot.png similarity index 100% rename from ico/hotspot.png rename to ico/22x22/hotspot.png diff --git a/ico/landscape.png b/ico/22x22/landscape.png similarity index 100% rename from ico/landscape.png rename to ico/22x22/landscape.png diff --git a/ico/line.png b/ico/22x22/line.png similarity index 100% rename from ico/line.png rename to ico/22x22/line.png diff --git a/ico/lower.png b/ico/22x22/lower.png similarity index 100% rename from ico/lower.png rename to ico/22x22/lower.png diff --git a/ico/move.png b/ico/22x22/move.png similarity index 100% rename from ico/move.png rename to ico/22x22/move.png diff --git a/ico/names.png b/ico/22x22/names.png similarity index 100% rename from ico/names.png rename to ico/22x22/names.png diff --git a/ico/object-locked.png b/ico/22x22/object-locked.png similarity index 100% rename from ico/object-locked.png rename to ico/22x22/object-locked.png diff --git a/ico/object-rotate-right.png b/ico/22x22/object-rotate-right.png similarity index 100% rename from ico/object-rotate-right.png rename to ico/22x22/object-rotate-right.png diff --git a/ico/object-unlocked.png b/ico/22x22/object-unlocked.png similarity index 100% rename from ico/object-unlocked.png rename to ico/22x22/object-unlocked.png diff --git a/ico/polygon.png b/ico/22x22/polygon.png similarity index 100% rename from ico/polygon.png rename to ico/22x22/polygon.png diff --git a/ico/portrait.png b/ico/22x22/portrait.png similarity index 100% rename from ico/portrait.png rename to ico/22x22/portrait.png diff --git a/ico/raise.png b/ico/22x22/raise.png similarity index 100% rename from ico/raise.png rename to ico/22x22/raise.png diff --git a/ico/rectangle.png b/ico/22x22/rectangle.png similarity index 100% rename from ico/rectangle.png rename to ico/22x22/rectangle.png diff --git a/ico/restaurer.png b/ico/22x22/restaurer.png similarity index 100% rename from ico/restaurer.png rename to ico/22x22/restaurer.png diff --git a/ico/select.png b/ico/22x22/select.png similarity index 100% rename from ico/select.png rename to ico/22x22/select.png diff --git a/ico/send_backward.png b/ico/22x22/send_backward.png similarity index 100% rename from ico/send_backward.png rename to ico/22x22/send_backward.png diff --git a/ico/single_page.png b/ico/22x22/single_page.png similarity index 100% rename from ico/single_page.png rename to ico/22x22/single_page.png diff --git a/ico/start.png b/ico/22x22/start.png similarity index 100% rename from ico/start.png rename to ico/22x22/start.png diff --git a/ico/terminal.png b/ico/22x22/terminal.png similarity index 100% rename from ico/terminal.png rename to ico/22x22/terminal.png diff --git a/ico/text.png b/ico/22x22/text.png similarity index 100% rename from ico/text.png rename to ico/22x22/text.png diff --git a/ico/textfield.png b/ico/22x22/textfield.png similarity index 100% rename from ico/textfield.png rename to ico/22x22/textfield.png diff --git a/ico/two_pages.png b/ico/22x22/two_pages.png similarity index 100% rename from ico/two_pages.png rename to ico/22x22/two_pages.png diff --git a/ico/view-fullscreen.png b/ico/22x22/view-fullscreen.png similarity index 100% rename from ico/view-fullscreen.png rename to ico/22x22/view-fullscreen.png diff --git a/ico/view-refresh.png b/ico/22x22/view-refresh.png similarity index 100% rename from ico/view-refresh.png rename to ico/22x22/view-refresh.png diff --git a/ico/view-restore.png b/ico/22x22/view-restore.png similarity index 100% rename from ico/view-restore.png rename to ico/22x22/view-restore.png diff --git a/ico/view_fit_width.png b/ico/22x22/view_fit_width.png similarity index 100% rename from ico/view_fit_width.png rename to ico/22x22/view_fit_width.png diff --git a/ico/view_fit_window.png b/ico/22x22/view_fit_window.png similarity index 100% rename from ico/view_fit_window.png rename to ico/22x22/view_fit_window.png diff --git a/ico/window-new.png b/ico/22x22/window-new.png similarity index 100% rename from ico/window-new.png rename to ico/22x22/window-new.png diff --git a/ico/zoom-fit-best.png b/ico/22x22/zoom-fit-best.png similarity index 100% rename from ico/zoom-fit-best.png rename to ico/22x22/zoom-fit-best.png diff --git a/ico/zoom-in.png b/ico/22x22/zoom-in.png similarity index 100% rename from ico/zoom-in.png rename to ico/22x22/zoom-in.png diff --git a/ico/zoom-original.png b/ico/22x22/zoom-original.png similarity index 100% rename from ico/zoom-original.png rename to ico/22x22/zoom-original.png diff --git a/ico/zoom-out.png b/ico/22x22/zoom-out.png similarity index 100% rename from ico/zoom-out.png rename to ico/22x22/zoom-out.png diff --git a/ico/application-pdf.png b/ico/32x32/application-pdf.png similarity index 100% rename from ico/application-pdf.png rename to ico/32x32/application-pdf.png diff --git a/ico/image-x-eps.png b/ico/32x32/image-x-eps.png similarity index 100% rename from ico/image-x-eps.png rename to ico/32x32/image-x-eps.png diff --git a/ico/printer.png b/ico/32x32/printer.png similarity index 100% rename from ico/printer.png rename to ico/32x32/printer.png diff --git a/ico/qt.png b/ico/32x32/qt.png similarity index 100% rename from ico/qt.png rename to ico/32x32/qt.png diff --git a/ico/document-delete.svgz b/ico/scalable/document-delete.svgz similarity index 100% rename from ico/document-delete.svgz rename to ico/scalable/document-delete.svgz diff --git a/ico/folder-delete.svgz b/ico/scalable/folder-delete.svgz similarity index 100% rename from ico/folder-delete.svgz rename to ico/scalable/folder-delete.svgz diff --git a/ico/folder-edit.svgz b/ico/scalable/folder-edit.svgz similarity index 100% rename from ico/folder-edit.svgz rename to ico/scalable/folder-edit.svgz diff --git a/ico/qelectrotech.svg b/ico/scalable/qelectrotech.svg similarity index 100% rename from ico/qelectrotech.svg rename to ico/scalable/qelectrotech.svg diff --git a/ico/qet.svg b/ico/scalable/qet.svg similarity index 100% rename from ico/qet.svg rename to ico/scalable/qet.svg diff --git a/qelectrotech.pro b/qelectrotech.pro index 8fbf1a220..96faf6bab 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -116,6 +116,7 @@ HEADERS += sources/aboutqet.h \ sources/qetapp.h \ sources/qetarguments.h \ sources/qetdiagrameditor.h \ + sources/qeticons.h \ sources/qetproject.h \ sources/qetprintpreviewdialog.h \ sources/qetregexpvalidator.h \ @@ -213,6 +214,7 @@ SOURCES += sources/aboutqet.cpp \ sources/qetapp.cpp \ sources/qetarguments.cpp \ sources/qetdiagrameditor.cpp \ + sources/qeticons.cpp \ sources/qetproject.cpp \ sources/qetprintpreviewdialog.cpp \ sources/qetregexpvalidator.cpp \ diff --git a/qelectrotech.qrc b/qelectrotech.qrc index c0b21982a..9b73792de 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -1,120 +1,123 @@ - ico/add_col.png - ico/add_row.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/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/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-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/folder.png - ico/go-home.png - ico/ground.png - ico/hotspot.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/lower.png - ico/masquer.png - ico/mdiarea_bg.png - ico/move.png - ico/names.png - ico/neutral.png - ico/north.png - ico/object-locked.png - ico/object-rotate-right.png - ico/object-unlocked.png - ico/orientations.png - ico/phase.png - ico/polygon.png - ico/portrait.png - ico/printer.png - ico/project.png ico/qelectrotech.png - ico/qet-16.png - ico/qet.png - ico/qt.png - ico/raise.png - ico/rectangle.png - ico/remove_col.png - ico/remove_row.png - ico/restaurer.png - ico/select.png - ico/send_backward.png - ico/settings.png - ico/single_page.png - ico/south.png + ico/32x32/application-pdf.png + ico/conf_new_diagram_48.png + ico/32x32/printer.png + ico/conf_new_diagram_128.png + ico/mdiarea_bg.png ico/splash.png - ico/start.png - ico/terminal.png - ico/textfield.png - ico/text.png - ico/two_pages.png - ico/user-busy.png - ico/user-online.png - ico/view_fit_width.png - ico/view_fit_window.png - ico/view-fullscreen.png - ico/view-refresh.png - ico/view-restore.png - ico/west.png - ico/window-new.png - ico/zoom-fit-best.png - ico/zoom-in.png - ico/zoom-original.png - ico/zoom-out.png + ico/32x32/image-x-eps.png + ico/32x32/qt.png + ico/qet.png + ico/16x16/remove_col.png + ico/16x16/ground.png + ico/16x16/west.png + ico/16x16/user-busy.png + ico/16x16/add_row.png + ico/16x16/south.png + ico/16x16/item_cancel.png + ico/16x16/add_col.png + ico/16x16/endline-triangle.png + ico/16x16/endline-none.png + ico/16x16/folder.png + ico/16x16/neutral.png + ico/16x16/user-online.png + ico/16x16/item_copy.png + ico/16x16/east.png + ico/16x16/phase.png + ico/16x16/circle.png + ico/16x16/endline-diamond.png + ico/16x16/masquer.png + ico/16x16/remove_row.png + ico/16x16/endline-circle.png + ico/16x16/project.png + ico/16x16/item_move.png + ico/16x16/north.png + ico/16x16/qet-16.png + ico/16x16/orientations.png + ico/16x16/endline-simple.png + ico/diagram.png + ico/settings.png + ico/22x22/view-restore.png + ico/22x22/hotspot.png + ico/22x22/document-save.png + ico/22x22/zoom-fit-best.png + ico/22x22/edit-undo.png + ico/22x22/edit-clear.png + ico/22x22/edit-copy.png + ico/22x22/folder-new.png + ico/22x22/single_page.png + ico/22x22/document-print-frame.png + ico/22x22/zoom-original.png + ico/22x22/arrow-left-double.png + ico/22x22/folder-delete.png + ico/22x22/document-open-recent.png + ico/22x22/view-fullscreen.png + ico/22x22/configure.png + ico/22x22/line.png + ico/22x22/text.png + ico/22x22/application-exit.png + ico/22x22/bring_forward.png + ico/22x22/document-save-as.png + ico/22x22/lower.png + ico/22x22/textfield.png + ico/22x22/conductor2.png + ico/22x22/move.png + ico/22x22/edit-select-all.png + ico/22x22/folder-edit.png + ico/22x22/view_fit_width.png + ico/22x22/document-close.png + ico/22x22/conductor3.png + ico/22x22/dialog-information.png + ico/22x22/configure-toolbars.png + ico/22x22/document-delete.png + ico/22x22/arrow-left.png + ico/22x22/zoom-out.png + ico/22x22/diagram_del.png + ico/22x22/dialog-ok.png + ico/22x22/document-new.png + ico/22x22/send_backward.png + ico/22x22/names.png + ico/22x22/document-print.png + ico/22x22/object-rotate-right.png + ico/22x22/arrow-right.png + ico/22x22/document-save-all.png + ico/22x22/polygon.png + ico/22x22/dialog-cancel.png + ico/22x22/document-export.png + ico/22x22/document-edit.png + ico/22x22/ellipse.png + ico/22x22/view-refresh.png + ico/22x22/select.png + ico/22x22/document-open.png + ico/22x22/landscape.png + ico/22x22/edit-redo.png + ico/22x22/all_pages.png + ico/22x22/restaurer.png + ico/22x22/diagram_add.png + ico/22x22/conductor.png + ico/22x22/edit-clear-locationbar-ltr.png + ico/22x22/terminal.png + ico/22x22/two_pages.png + ico/22x22/portrait.png + ico/22x22/start.png + ico/22x22/zoom-in.png + ico/22x22/document-import.png + ico/22x22/edit-delete.png + ico/22x22/window-new.png + ico/22x22/go-home.png + ico/22x22/object-unlocked.png + ico/22x22/view_fit_window.png + ico/22x22/raise.png + ico/22x22/arrow-right-double.png + ico/22x22/arc.png + ico/22x22/object-locked.png + ico/22x22/edit-paste.png + ico/22x22/rectangle.png + ico/22x22/edit-cut.png + ico/conf_new_diagram_110.png LICENSE + diff --git a/sources/aboutqet.cpp b/sources/aboutqet.cpp index bea899d19..8760cc66d 100644 --- a/sources/aboutqet.cpp +++ b/sources/aboutqet.cpp @@ -19,6 +19,7 @@ #include "qettabwidget.h" #include "aboutqet.h" #include "qet.h" +#include "qeticons.h" /** Constructeur @@ -63,7 +64,7 @@ QWidget *AboutQET::title() const { QWidget *icon_and_title = new QWidget(); // icone QLabel *icon = new QLabel(); - icon -> setPixmap(QIcon(":/ico/qelectrotech.png").pixmap(48, 48)); + icon -> setPixmap(QET::Icons::QETIcon.pixmap(48, 48)); // label "QElectroTech" QLabel *title = new QLabel("QElectroTech v" + QET::displayedVersion + ""); title -> setTextFormat(Qt::RichText); diff --git a/sources/conductorpropertieswidget.cpp b/sources/conductorpropertieswidget.cpp index a828a45a4..bb56ccd16 100644 --- a/sources/conductorpropertieswidget.cpp +++ b/sources/conductorpropertieswidget.cpp @@ -18,6 +18,7 @@ #include "conductorpropertieswidget.h" #include #include "conductor.h" +#include "qeticons.h" /** Constructeur @@ -68,7 +69,7 @@ void ConductorPropertiesWidget::buildInterface() { QHBoxLayout *singleline_layout3 = new QHBoxLayout(); phase_checkbox = new QCheckBox(tr("phase")); - phase_checkbox -> setIcon(QIcon(":/ico/phase.png")); + phase_checkbox -> setIcon(QET::Icons::Phase); phase_slider = new QSlider(Qt::Horizontal); phase_slider -> setRange(1, 3); phase_spinbox = new QSpinBox(); @@ -79,9 +80,9 @@ void ConductorPropertiesWidget::buildInterface() { QVBoxLayout *singleline_layout2 = new QVBoxLayout(); ground_checkbox = new QCheckBox(tr("terre")); - ground_checkbox -> setIcon(QIcon(":/ico/ground.png")); + ground_checkbox -> setIcon(QET::Icons::Ground); neutral_checkbox = new QCheckBox(tr("neutre")); - neutral_checkbox -> setIcon(QIcon(":/ico/neutral.png")); + neutral_checkbox -> setIcon(QET::Icons::Neutral); singleline_layout2 -> addWidget(ground_checkbox); singleline_layout2 -> addWidget(neutral_checkbox); singleline_layout2 -> addLayout(singleline_layout3); diff --git a/sources/configpages.cpp b/sources/configpages.cpp index c55239bfd..54ed24a2b 100644 --- a/sources/configpages.cpp +++ b/sources/configpages.cpp @@ -22,6 +22,7 @@ #include "qetapp.h" #include "qetdiagrameditor.h" #include "borderinset.h" +#include "qeticons.h" /** Constructeur @@ -83,7 +84,7 @@ void NewDiagramPage::applyConf() { /// @return l'icone de cette page QIcon NewDiagramPage::icon() const { - return(QIcon(":/ico/conf_new_diagram_110.png")); + return(QET::Icons::NewDiagram); } /// @return le titre de cette page @@ -163,7 +164,7 @@ void GeneralConfigurationPage::applyConf() { /// @return l'icone de cette page QIcon GeneralConfigurationPage::icon() const { - return(QIcon(":/ico/settings.png")); + return(QET::Icons::Settings); } /// @return le titre de cette page diff --git a/sources/diagramprintdialog.cpp b/sources/diagramprintdialog.cpp index 397fce87c..d38ca5110 100644 --- a/sources/diagramprintdialog.cpp +++ b/sources/diagramprintdialog.cpp @@ -19,6 +19,7 @@ #include "qetprintpreviewdialog.h" #include #include "diagramschooser.h" +#include "qeticons.h" /** Constructeur @@ -170,9 +171,9 @@ void DiagramPrintDialog::buildPrintTypeDialog() { buttons_ = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); dialog_ -> setWindowTitle(tr("Choix du type d'impression")); - printer_icon_ -> setPixmap(QPixmap(":/ico/printer.png")); - pdf_icon_ -> setPixmap(QPixmap(":/ico/application-pdf.png")); - ps_icon_ -> setPixmap(QPixmap(":/ico/image-x-eps.png")); + printer_icon_ -> setPixmap(QET::Icons::Printer.pixmap(32, 32)); + pdf_icon_ -> setPixmap(QET::Icons::PDF.pixmap(32, 32)); + ps_icon_ -> setPixmap(QET::Icons::EPS.pixmap(32, 32)); 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 dd2125ab8..05f2da80b 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -27,6 +27,7 @@ #include "borderpropertieswidget.h" #include "integrationmoveelementshandler.h" #include "qetdiagrameditor.h" +#include "qeticons.h" /** Constructeur @@ -45,7 +46,7 @@ DiagramView::DiagramView(Diagram *diagram, QWidget *parent) : QGraphicsView(pare scene = diagram ? diagram : new Diagram(this); setScene(scene); scene -> undoStack().setClean(); - setWindowIcon(QIcon(":/ico/qet-16.png")); + setWindowIcon(QET::Icons::QETLogo); setTransformationAnchor(QGraphicsView::AnchorUnderMouse); setResizeAnchor(QGraphicsView::AnchorUnderMouse); setAlignment(Qt::AlignLeft | Qt::AlignTop); @@ -54,7 +55,7 @@ DiagramView::DiagramView(Diagram *diagram, QWidget *parent) : QGraphicsView(pare updateWindowTitle(); context_menu = new QMenu(this); - paste_here = new QAction(QIcon(":/ico/edit-paste.png"), tr("Coller ici", "context menu action"), this); + paste_here = new QAction(QET::Icons::EditPaste, 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/lineeditor.cpp b/sources/editor/lineeditor.cpp index 98fee3c2b..4d699ab29 100644 --- a/sources/editor/lineeditor.cpp +++ b/sources/editor/lineeditor.cpp @@ -18,6 +18,7 @@ #include "lineeditor.h" #include "partline.h" #include "qet.h" +#include "qeticons.h" /** Constructeur @@ -40,17 +41,17 @@ LineEditor::LineEditor(QETElementEditor *editor, PartLine *line, QWidget *parent y2 -> setValidator(new QDoubleValidator(y2)); end1_type = new QComboBox(); - end1_type -> addItem(QIcon(":/ico/endline-none.png"), tr("Normale", "type of the 1st end of a line"), QET::None ); - end1_type -> addItem(QIcon(":/ico/endline-simple.png"), tr("Fl\350che simple", "type of the 1st end of a line"), QET::Simple ); - end1_type -> addItem(QIcon(":/ico/endline-triangle.png"), tr("Fl\350che triangulaire", "type of the 1st end of a line"), QET::Triangle); - end1_type -> addItem(QIcon(":/ico/endline-circle.png"), tr("Cercle", "type of the 1st end of a line"), QET::Circle ); - end1_type -> addItem(QIcon(":/ico/endline-diamond.png"), tr("Carr\351", "type of the 1st end of a line"), QET::Diamond ); + end1_type -> addItem(QET::Icons::EndLineNone, tr("Normale", "type of the 1st end of a line"), QET::None ); + end1_type -> addItem(QET::Icons::EndLineSimple, tr("Fl\350che simple", "type of the 1st end of a line"), QET::Simple ); + end1_type -> addItem(QET::Icons::EndLineTriangle, tr("Fl\350che triangulaire", "type of the 1st end of a line"), QET::Triangle); + end1_type -> addItem(QET::Icons::EndLineCircle, tr("Cercle", "type of the 1st end of a line"), QET::Circle ); + end1_type -> addItem(QET::Icons::EndLineDiamond, tr("Carr\351", "type of the 1st end of a line"), QET::Diamond ); end2_type = new QComboBox(); - end2_type -> addItem(QIcon(":/ico/endline-none.png"), tr("Normale", "type of the 2nd end of a line"), QET::None ); - end2_type -> addItem(QIcon(":/ico/endline-simple.png"), tr("Fl\350che simple", "type of the 2nd end of a line"), QET::Simple ); - end2_type -> addItem(QIcon(":/ico/endline-triangle.png"), tr("Fl\350che triangulaire", "type of the 2nd end of a line"), QET::Triangle); - end2_type -> addItem(QIcon(":/ico/endline-circle.png"), tr("Cercle", "type of the 2nd end of a line"), QET::Circle ); - end2_type -> addItem(QIcon(":/ico/endline-diamond.png"), tr("Carr\351", "type of the 2nd end of a line"), QET::Diamond ); + end2_type -> addItem(QET::Icons::EndLineNone, tr("Normale", "type of the 2nd end of a line"), QET::None ); + end2_type -> addItem(QET::Icons::EndLineSimple, tr("Fl\350che simple", "type of the 2nd end of a line"), QET::Simple ); + end2_type -> addItem(QET::Icons::EndLineTriangle, tr("Fl\350che triangulaire", "type of the 2nd end of a line"), QET::Triangle); + end2_type -> addItem(QET::Icons::EndLineCircle, tr("Cercle", "type of the 2nd end of a line"), QET::Circle ); + end2_type -> addItem(QET::Icons::EndLineDiamond, tr("Carr\351", "type of the 2nd end of a line"), QET::Diamond ); end1_length = new QLineEdit(); end2_length = new QLineEdit(); diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index 283f4ca6c..909bbc42d 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -25,6 +25,7 @@ #include "elementdefinition.h" #include "elementdialog.h" #include "recentfiles.h" +#include "qeticons.h" /** Constructeur @@ -37,7 +38,7 @@ QETElementEditor::QETElementEditor(QWidget *parent) : opened_from_file(false) { setWindowTitle(min_title); - setWindowIcon(QIcon(":/ico/qet.png")); + setWindowIcon(QET::Icons::QETLogo); setupInterface(); setupActions(); @@ -69,43 +70,43 @@ QETElementEditor::~QETElementEditor() { Met en place les actions */ void QETElementEditor::setupActions() { - 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); + new_element = new QAction(QET::Icons::DocumentNew, tr("&Nouveau"), this); + open = new QAction(QET::Icons::DocumentOpen, tr("&Ouvrir"), this); + open_file = new QAction(QET::Icons::DocumentOpen, tr("&Ouvrir depuis un fichier"), this); + save = new QAction(QET::Icons::DocumentSave, tr("&Enregistrer"), this); + save_as = new QAction(QET::Icons::DocumentSaveAs, tr("Enregistrer sous"), this); + save_as_file = new QAction(QET::Icons::DocumentSaveAs, tr("Enregistrer dans un fichier"), this); + reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger"), this); + quit = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this); + selectall = new QAction(QET::Icons::EditSelectAll, tr("Tout s\351lectionner"), this); + deselectall = new QAction( tr("D\351s\351lectionner tout"), this); + cut = new QAction(QET::Icons::EditCut, tr("Co&uper"), this); + copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this); + paste = new QAction(QET::Icons::EditPaste, tr("C&oller"), this); + paste_in_area = new QAction(QET::Icons::EditPaste, tr("C&oller dans la zone..."), this); + inv_select = new QAction( tr("Inverser la s\351lection"), this); + edit_delete = new QAction(QET::Icons::EditDelete, tr("&Supprimer"), this); + zoom_in = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this); + zoom_out = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re"), this); + zoom_fit = new QAction(QET::Icons::ZoomFitBest, tr("Zoom adapt\351"), this); + zoom_reset = new QAction(QET::Icons::ZoomOriginal, tr("Pas de zoom"), this); + edit_size_hs = new QAction(QET::Icons::HotSpot, tr("\311diter la taille et le point de saisie"), this); + edit_names = new QAction(QET::Icons::Names, tr("\311diter les noms"), this); + edit_ori = new QAction(QET::Icons::Orientations, tr("\311diter les orientations"), this); + edit_raise = new QAction(QET::Icons::Raise, tr("Rapprocher"), this); + edit_lower = new QAction(QET::Icons::Lower, tr("\311loigner"), this); + edit_backward = new QAction(QET::Icons::SendBackward, tr("Envoyer au fond"), this); + edit_forward = new QAction(QET::Icons::BringForward, tr("Amener au premier plan"), this); + move = new QAction(QET::Icons::PartSelect, tr("D\351placer un objet"), this); + add_line = new QAction(QET::Icons::PartLine, tr("Ajouter une ligne"), this); + add_rectangle = new QAction(QET::Icons::PartRectangle, tr("Ajouter un rectangle"), this); + add_ellipse = new QAction(QET::Icons::PartEllipse, tr("Ajouter une ellipse"), this); + add_circle = new QAction(QET::Icons::PartCircle, tr("Ajouter un cercle"), this); + add_polygon = new QAction(QET::Icons::PartPolygon, tr("Ajouter un polygone"), this); + add_text = new QAction(QET::Icons::PartText, tr("Ajouter du texte"), this); + add_arc = new QAction(QET::Icons::PartArc, tr("Ajouter un arc de cercle"), this); + add_terminal = new QAction(QET::Icons::Terminal, tr("Ajouter une borne"), this); + add_textfield = new QAction(QET::Icons::PartTextField, 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 +121,8 @@ void QETElementEditor::setupActions() { undo = ce_scene -> undoStack().createUndoAction(this, tr("Annuler")); redo = ce_scene -> undoStack().createRedoAction(this, tr("Refaire")); - undo -> setIcon(QIcon(":/ico/edit-undo.png")); - redo -> setIcon(QIcon(":/ico/edit-redo.png")); + undo -> setIcon(QET::Icons::EditUndo); + redo -> setIcon(QET::Icons::EditRedo); undo -> setShortcuts(QKeySequence::Undo); redo -> setShortcuts(QKeySequence::Redo); @@ -237,7 +238,7 @@ void QETElementEditor::setupActions() { parts_toolbar -> setAllowedAreas(Qt::AllToolBarAreas); /* - QAction *xml_preview = new QAction(QIcon(":/ico/dialog-information.png"), tr("XML"), this); + QAction *xml_preview = new QAction(QET::Icons::DialogInformation, tr("XML"), this); connect(xml_preview, SIGNAL(triggered()), this, SLOT(xmlPreview())); parts_toolbar -> addAction(xml_preview); */ diff --git a/sources/editor/terminaleditor.cpp b/sources/editor/terminaleditor.cpp index f9592f58c..01f520eff 100644 --- a/sources/editor/terminaleditor.cpp +++ b/sources/editor/terminaleditor.cpp @@ -17,6 +17,7 @@ */ #include "terminaleditor.h" #include "partterminal.h" +#include "qeticons.h" /** Constructeur @@ -34,10 +35,10 @@ TerminalEditor::TerminalEditor(QETElementEditor *editor, PartTerminal *term, QWi qle_y -> setValidator(new QDoubleValidator(qle_y)); orientation = new QComboBox(); - orientation -> addItem(QIcon(":/ico/north.png"), tr("Nord"), QET::North); - orientation -> addItem(QIcon(":/ico/east.png"), tr("Est"), QET::East); - orientation -> addItem(QIcon(":/ico/south.png"), tr("Sud"), QET::South); - orientation -> addItem(QIcon(":/ico/west.png"), tr("Ouest"), QET::West); + orientation -> addItem(QET::Icons::North, tr("Nord"), QET::North); + orientation -> addItem(QET::Icons::East, tr("Est"), QET::East); + orientation -> addItem(QET::Icons::South, tr("Sud"), QET::South); + orientation -> addItem(QET::Icons::West, tr("Ouest"), QET::West); QVBoxLayout *main_layout = new QVBoxLayout(); main_layout -> addWidget(new QLabel(tr("Position : "))); diff --git a/sources/elementscategorieslist.cpp b/sources/elementscategorieslist.cpp index cc46c01dc..684881e4f 100644 --- a/sources/elementscategorieslist.cpp +++ b/sources/elementscategorieslist.cpp @@ -21,6 +21,7 @@ #include "elementscollection.h" #include "elementscategory.h" #include "elementdefinition.h" +#include "qeticons.h" /** Constructeur @@ -68,12 +69,12 @@ void ElementsCategoriesList::reload() { // chargement des elements de la collection commune si droits d'ecriture if (QETApp::commonElementsCollection() -> isWritable()) { if (!first_load) QETApp::commonElementsCollection() -> reload(); - addCollection(invisibleRootItem(), QETApp::commonElementsCollection(), tr("Collection QET"), QIcon(":/ico/qet-16.png")); + addCollection(invisibleRootItem(), QETApp::commonElementsCollection(), tr("Collection QET"), QET::Icons::QETLogo); } // chargement des elements de la collection utilisateur if (!first_load) QETApp::customElementsCollection() -> reload(); - addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QIcon(":/ico/go-home.png")); + addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QET::Icons::Home); if (first_load) first_load = false; } @@ -108,7 +109,7 @@ QTreeWidgetItem *ElementsCategoriesList::addCollection(QTreeWidgetItem *qtwi_par QTreeWidgetItem *ElementsCategoriesList::addCategory(QTreeWidgetItem *qtwi_parent, ElementsCategory *category, const QString &cat_name, const QIcon &icon) { // recupere le nom de la categorie QString final_name(cat_name.isEmpty() ? category -> name() : cat_name); - QIcon final_icon(icon.isNull() ? QIcon(":/ico/folder.png") : icon); + QIcon final_icon(icon.isNull() ? QET::Icons::Folder : icon); // creation du QTreeWidgetItem representant le dossier QTreeWidgetItem *qtwi_category = new QTreeWidgetItem(qtwi_parent, QStringList(final_name)); diff --git a/sources/elementscategorieswidget.cpp b/sources/elementscategorieswidget.cpp index d58b65388..b3c4e9002 100644 --- a/sources/elementscategorieswidget.cpp +++ b/sources/elementscategorieswidget.cpp @@ -20,6 +20,7 @@ #include "elementscategoryeditor.h" #include "elementscategorydeleter.h" #include "elementscategory.h" +#include "qeticons.h" /** Constructeur @@ -30,10 +31,10 @@ ElementsCategoriesWidget::ElementsCategoriesWidget(QWidget *parent) : QWidget(pa elementscategorieslist = new ElementsCategoriesList(false, QET::All, this); // actions - 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); + action_reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les cat\351gories"), this); + action_new = new QAction(QET::Icons::FolderNew, tr("Nouvelle cat\351gorie"), this); + action_open = new QAction(QET::Icons::FolderEdit, tr("\311diter la cat\351gorie"), this); + action_delete = new QAction(QET::Icons::FolderDelete, 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 695680d82..44bd70059 100644 --- a/sources/elementspanel.cpp +++ b/sources/elementspanel.cpp @@ -23,6 +23,7 @@ #include "customelement.h" #include "fileelementscollection.h" #include "fileelementdefinition.h" +#include "qeticons.h" /* Lorsque le flag ENABLE_PANEL_DND_CHECKS est defini, le panel d'elements @@ -424,7 +425,7 @@ void ElementsPanel::startDrag(Qt::DropActions) { if (selected_item -> isCategory() || selected_item -> isCollection()) { mimeData -> setData("application/x-qet-category-uri", location_string.toAscii()); - drag -> setPixmap(QPixmap(":/ico/folder.png")); + drag -> setPixmap(QET::Icons::Folder.pixmap(22, 22)); } else if (selected_item -> isElement()) { mimeData -> setData("application/x-qet-element-uri", location_string.toAscii()); @@ -518,7 +519,7 @@ QTreeWidgetItem *ElementsPanel::addDiagram(QTreeWidgetItem *qtwi_parent, Diagram qtwi_diagram = new QTreeWidgetItem(qtwi_parent); } qtwi_diagram -> setText(0, final_name); - qtwi_diagram -> setIcon(0, QIcon(":/ico/diagram.png")); + qtwi_diagram -> setIcon(0, QET::Icons::Diagram); diagrams_.insert(qtwi_diagram, diagram); return(qtwi_diagram); @@ -556,7 +557,7 @@ QTreeWidgetItem *ElementsPanel::addCategory(QTreeWidgetItem *qtwi_parent, Elemen // recupere le nom de la categorie QString final_name(cat_name.isEmpty() ? category -> name() : cat_name); - QIcon final_icon(icon.isNull() ? QIcon(":/ico/folder.png") : icon); + QIcon final_icon(icon.isNull() ? QET::Icons::Folder : icon); // creation du QTreeWidgetItem representant le dossier QTreeWidgetItem *qtwi_category = new QTreeWidgetItem(qtwi_parent, QStringList(final_name)); @@ -648,10 +649,10 @@ void ElementsPanel::reload(bool reload_collections) { custom_collection_item_ = 0; // chargement des elements de la collection QET - common_collection_item_ = addCollection(invisibleRootItem(), QETApp::commonElementsCollection(), tr("Collection QET"), QIcon(":/ico/qet-16.png")); + common_collection_item_ = addCollection(invisibleRootItem(), QETApp::commonElementsCollection(), tr("Collection QET"), QIcon(":/ico/16x16/qet-16.png")); // chargement des elements de la collection utilisateur - custom_collection_item_ = addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QIcon(":/ico/go-home.png")); + custom_collection_item_ = addCollection(invisibleRootItem(), QETApp::customElementsCollection(), tr("Collection utilisateur"), QET::Icons::Home); // chargement des projets foreach(QETProject *project, projects_to_display_.values()) { @@ -920,11 +921,10 @@ void ElementsPanel::updateProjectItemInformations(QETProject *project) { "tooltip for a file-less project in the element panel" ); } - QIcon final_icon(":/ico/project.png"); qtwi_project -> setText(0, final_name); qtwi_project -> setToolTip(0, final_tooltip); - qtwi_project -> setIcon(0, final_icon); + qtwi_project -> setIcon(0, QET::Icons::Project); } /** diff --git a/sources/elementspanelwidget.cpp b/sources/elementspanelwidget.cpp index 8214e3047..bc09aa626 100644 --- a/sources/elementspanelwidget.cpp +++ b/sources/elementspanelwidget.cpp @@ -27,6 +27,7 @@ #include "interactivemoveelementshandler.h" #include "qetproject.h" #include "diagram.h" +#include "qeticons.h" /* Lorsque le flag ENABLE_PANEL_WIDGET_DND_CHECKS est defini, le panel @@ -47,23 +48,23 @@ ElementsPanelWidget::ElementsPanelWidget(QWidget *parent) : QWidget(parent) { elements_panel = new ElementsPanel(this); // initialise les actions - 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); + reload = new QAction(QET::Icons::ViewRefresh, tr("Recharger les collections"), this); + new_category = new QAction(QET::Icons::FolderNew, tr("Nouvelle cat\351gorie"), this); + edit_category = new QAction(QET::Icons::FolderEdit, tr("\311diter la cat\351gorie"), this); + delete_category = new QAction(QET::Icons::FolderDelete, tr("Supprimer la cat\351gorie"), this); + delete_collection = new QAction(QET::Icons::FolderDelete, tr("Vider la collection"), this); + new_element = new QAction(QET::Icons::DocumentNew, tr("Nouvel \351l\351ment"), this); + edit_element = new QAction(QET::Icons::DocumentEdit, tr("\311diter l'\351l\351ment"), this); + delete_element = new QAction(QET::Icons::DocumentDelete, tr("Supprimer l'\351l\351ment"), this); + prj_close = new QAction(QET::Icons::DocumentClose, tr("Fermer ce projet"), this); + prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du projet"), this); + prj_prop_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this); + prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this); + prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer ce sch\351ma"), this); + move_elements_ = new QAction(QET::Icons::MoveFile, tr("D\351placer dans cette cat\351gorie"), this); + copy_elements_ = new QAction(QET::Icons::CopyFile, tr("Copier dans cette cat\351gorie"), this); + cancel_elements_ = new QAction(QET::Icons::Cancel, tr("Annuler"), this); + erase_textfield = new QAction(QET::Icons::EditClearLocationBar, 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 c449fac34..5dfdc6fd6 100644 --- a/sources/exportdialog.cpp +++ b/sources/exportdialog.cpp @@ -18,6 +18,7 @@ #include "exportdialog.h" #include #include +#include "qeticons.h" /** Constructeur @@ -317,9 +318,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/object-locked.png")); + current_diagram -> keep_ratio -> setIcon(QET::Icons::ObjectLocked); } else { - current_diagram -> keep_ratio -> setIcon(QIcon(":/ico/object-unlocked.png")); + current_diagram -> keep_ratio -> setIcon(QET::Icons::ObjectUnlocked); } // ne fait rien si l'option "Conserver les proportions" n'est pas activee @@ -717,15 +718,15 @@ ExportDialog::ExportDiagramLine::ExportDiagramLine(Diagram *dia) { keep_ratio = new QPushButton(); keep_ratio -> setCheckable(true); keep_ratio -> setChecked(true); - keep_ratio -> setIcon(QIcon(":/ico/object-locked.png")); + keep_ratio -> setIcon(QET::Icons::ObjectLocked); keep_ratio -> setToolTip(QObject::tr("Conserver les proportions")); reset_size = new QPushButton(); - reset_size -> setIcon(QIcon(":/ico/start.png")); + reset_size -> setIcon(QET::Icons::Start); reset_size -> setToolTip(QObject::tr("R\351initialiser les dimensions")); preview = new QPushButton(); - preview -> setIcon(QIcon(":/ico/zoom-original.png")); + preview -> setIcon(QET::Icons::ZoomOriginal); preview -> setToolTip(QObject::tr("Aper\347u")); } diff --git a/sources/orientationsetwidget.cpp b/sources/orientationsetwidget.cpp index b5f8d48fe..058e45fd6 100644 --- a/sources/orientationsetwidget.cpp +++ b/sources/orientationsetwidget.cpp @@ -16,6 +16,7 @@ along with QElectroTech. If not, see . */ #include "orientationsetwidget.h" +#include "qeticons.h" /** Constructeur @@ -26,8 +27,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/user-online.png"), tr("Possible"), "y");\ - a##_orientation -> addItem(QIcon(":/ico/user-busy.png"),tr("Impossible"), "n");\ + a##_orientation -> addItem(QET::Icons::Allowed, tr("Possible"), "y");\ + a##_orientation -> addItem(QET::Icons::Forbidden,tr("Impossible"), "n");\ connect(a##_orientation, SIGNAL(activated(int)), this, SLOT(updateOrientationSet()));\ a##_default = new QRadioButton(); @@ -47,13 +48,13 @@ OrientationSetWidget::OrientationSetWidget(QWidget *parent) : QWidget(parent) { // petites icones symbolisant les orientations QLabel *north_pixmap = new QLabel(tr("Nord :")); - north_pixmap -> setPixmap(QPixmap(":/ico/north.png")); + north_pixmap -> setPixmap(QET::Icons::North.pixmap(16, 16)); QLabel *east_pixmap = new QLabel(tr("Est :")); - east_pixmap -> setPixmap(QPixmap(":/ico/east.png")); + east_pixmap -> setPixmap(QET::Icons::East.pixmap(16, 16)); QLabel *south_pixmap = new QLabel(tr("Sud :")); - south_pixmap -> setPixmap(QPixmap(":/ico/south.png")); + south_pixmap -> setPixmap(QET::Icons::South.pixmap(16, 16)); QLabel *west_pixmap = new QLabel(tr("Ouest :")); - west_pixmap -> setPixmap(QPixmap(":/ico/west.png")); + west_pixmap -> setPixmap(QET::Icons::West.pixmap(16, 16)); QGridLayout *qgl = new QGridLayout(this); qgl -> addWidget(new QLabel(tr("Par d\351faut")), 0, 3); diff --git a/sources/projectview.cpp b/sources/projectview.cpp index 041933de0..cdd6d9fa6 100644 --- a/sources/projectview.cpp +++ b/sources/projectview.cpp @@ -28,6 +28,7 @@ #include "borderpropertieswidget.h" #include "insetpropertieswidget.h" #include "conductorpropertieswidget.h" +#include "qeticons.h" /** Constructeur @@ -39,7 +40,7 @@ ProjectView::ProjectView(QETProject *project, QWidget *parent) : project_(0) { setObjectName("ProjectView"); - setWindowIcon(QIcon(":/ico/project.png")); + setWindowIcon(QET::Icons::Project); // construit le widget "fallback" fallback_widget_ = new QWidget(); @@ -294,7 +295,7 @@ void ProjectView::addDiagram(DiagramView *diagram) { if (diagram_ids_.values().contains(diagram)) return; // ajoute un nouvel onglet pour le nouveau schema - tabs_ -> addTab(diagram, QIcon(":/ico/diagram.png"), diagram -> title()); + tabs_ -> addTab(diagram, QET::Icons::Diagram, diagram -> title()); diagrams_ << diagram; rebuildDiagramsMap(); connect(diagram, SIGNAL(titleChanged(DiagramView *, const QString &)), this, SLOT(updateTabTitle(DiagramView *, const QString &))); diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index db21b4e4d..e226e36b5 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -22,6 +22,7 @@ #include "fileelementscollection.h" #include "qetproject.h" #include "recentfiles.h" +#include "qeticons.h" #include #include #define QUOTE(x) STRINGIFY(x) @@ -49,6 +50,7 @@ QETApp::QETApp(int &argc, char **argv) : { parseArguments(); initLanguage(); + initStyle(); initConfiguration(); if (!non_interactive_execution_ && isRunning()) { @@ -64,7 +66,6 @@ QETApp::QETApp(int &argc, char **argv) : } initSplashScreen(); - initStyle(); initSystemTray(); // prise en compte des messages des autres instances @@ -792,6 +793,9 @@ void QETApp::initLanguage() { Met en place tout ce qui concerne le style graphique de l'application */ void QETApp::initStyle() { + // initialise les icones + QET::Icons::initIcons(); + // lorsque le style Plastique est active, on le remplace par une version amelioree if (qobject_cast(style())) { setStyle(new QETStyle()); @@ -828,15 +832,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/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); + quitter_qet = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this); + reduce_appli = new QAction(QET::Icons::Hide, tr("&Masquer"), this); + restore_appli = new QAction(QET::Icons::Restore, tr("&Restaurer"), this); + reduce_diagrams = new QAction(QET::Icons::Hide, tr("&Masquer tous les \351diteurs de sch\351ma"), this); + restore_diagrams = new QAction(QET::Icons::Restore, tr("&Restaurer tous les \351diteurs de sch\351ma"), this); + reduce_elements = new QAction(QET::Icons::Hide, tr("&Masquer tous les \351diteurs d'\351l\351ment"), this); + restore_elements = new QAction(QET::Icons::Restore, tr("&Restaurer tous les \351diteurs d'\351l\351ment"), this); + new_diagram = new QAction(QET::Icons::WindowNew, tr("&Nouvel \351diteur de sch\351ma"), this); + new_element = new QAction(QET::Icons::WindowNew, 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")); @@ -853,7 +857,7 @@ void QETApp::initSystemTray() { connect(new_element, SIGNAL(triggered()), this, SLOT(newElementEditor())); // initialisation de l'icone du systray - qsti = new QSystemTrayIcon(QIcon(":/ico/qet.png"), this); + qsti = new QSystemTrayIcon(QET::Icons::QETLogo, this); qsti -> setToolTip(tr("QElectroTech", "systray icon tooltip")); connect(qsti, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systray(QSystemTrayIcon::ActivationReason))); qsti -> setContextMenu(menu_systray); @@ -1002,22 +1006,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/document-save.png")); + return(QET::Icons::DocumentSave); case QStyle::SP_DialogOpenButton: - return(QIcon(":/ico/document-open.png")); + return(QET::Icons::DocumentOpen); case QStyle::SP_DialogCancelButton: - return(QIcon(":/ico/dialog-cancel.png")); + return(QET::Icons::DialogCancel); case QStyle::SP_DialogOkButton: case QStyle::SP_DialogApplyButton: - return(QIcon(":/ico/dialog-ok.png")); + return(QET::Icons::DialogOk); case QStyle::SP_DialogCloseButton: - return(QIcon(":/ico/document-close.png")); + return(QET::Icons::DocumentClose); case QStyle::SP_DialogYesButton: - return(QIcon(":/ico/user-online.png")); + return(QET::Icons::Allowed); case QStyle::SP_DialogNoButton: - return(QIcon(":/ico/user-busy.png")); + return(QET::Icons::Forbidden); case QStyle::SP_DialogResetButton: - return(QIcon(":/ico/edit-undo.png")); + return(QET::Icons::EditUndo); case QStyle::SP_DialogHelpButton: case QStyle::SP_DialogDiscardButton: return(QIcon()); diff --git a/sources/qetdiagrameditor.cpp b/sources/qetdiagrameditor.cpp index 3686edb10..0999209e1 100644 --- a/sources/qetdiagrameditor.cpp +++ b/sources/qetdiagrameditor.cpp @@ -26,6 +26,7 @@ #include "qetproject.h" #include "projectview.h" #include "recentfiles.h" +#include "qeticons.h" /** constructeur @@ -57,7 +58,7 @@ QETDiagramEditor::QETDiagramEditor(const QStringList &files, QWidget *parent) : setWindowTitle(tr("QElectroTech", "window title")); // icone de la fenetre - setWindowIcon(QIcon(":/ico/qet.png")); + setWindowIcon(QET::Icons::QETLogo); // barre de statut de la fenetre statusBar() -> showMessage(tr("QElectroTech", "status bar message")); @@ -190,66 +191,66 @@ void QETDiagramEditor::aboutQET() { */ void QETDiagramEditor::actions() { // icones et labels - 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); + new_file = new QAction(QET::Icons::DocumentNew, tr("&Nouveau"), this); + open_file = new QAction(QET::Icons::DocumentOpen, tr("&Ouvrir"), this); + close_file = new QAction(QET::Icons::DocumentClose, tr("&Fermer"), this); + save_file = new QAction(QET::Icons::DocumentSave, tr("&Enregistrer"), this); + save_file_sous = new QAction(QET::Icons::DocumentSaveAs, tr("Enregistrer sous"), this); + save_all = new QAction(QET::Icons::DocumentSaveAll, tr("&Enregistrer tous les sch\351mas"), this); + import_diagram = new QAction(QET::Icons::DocumentImport, tr("&Importer"), this); + export_diagram = new QAction(QET::Icons::DocumentExport, tr("E&xporter"), this); + print = new QAction(QET::Icons::DocumentPrint, tr("Imprimer"), this); + quit_editor = new QAction(QET::Icons::ApplicationExit, tr("&Quitter"), this); undo = undo_group.createUndoAction(this, tr("Annuler")); - undo -> setIcon(QIcon(":/ico/edit-undo.png")); + undo -> setIcon(QET::Icons::EditUndo); redo = undo_group.createRedoAction(this, tr("Refaire")); - 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); + redo -> setIcon(QET::Icons::EditRedo); + cut = new QAction(QET::Icons::EditCut, tr("Co&uper"), this); + copy = new QAction(QET::Icons::EditCopy, tr("Cop&ier"), this); + paste = new QAction(QET::Icons::EditPaste, tr("C&oller"), this); + select_all = new QAction(QET::Icons::EditSelectAll, 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(QET::Icons::EditDelete, tr("Supprimer"), this); + rotate_selection = new QAction(QET::Icons::ObjectRotateRight, tr("Pivoter"), this); + conductor_prop = new QAction(QET::Icons::Conductor, tr("Propri\351t\351s du conducteur"), this); + conductor_reset = new QAction(QET::Icons::ConductorSettings, tr("R\351initialiser les conducteurs"), this); + conductor_default = new QAction(QET::Icons::DefaultConductor, tr("Conducteurs par d\351faut"), this); + infos_diagram = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du sch\351ma"), this); + add_text = new QAction(QET::Icons::PartTextField, tr("Ajouter un champ de texte"), this); + add_column = new QAction(QET::Icons::AddColumn, tr("Ajouter une colonne"), this); + remove_column = new QAction(QET::Icons::RemoveColumn, tr("Enlever une colonne"), this); + add_row = new QAction(QET::Icons::AddRow, tr("Ajouter une ligne"), this); + remove_row = new QAction(QET::Icons::RemoveRow, tr("Enlever une ligne"), 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); + prj_edit_prop = new QAction(QET::Icons::DialogInformation, tr("Propri\351t\351s du projet"), this); + prj_add_diagram = new QAction(QET::Icons::DiagramAdd, tr("Ajouter un sch\351ma"), this); + prj_del_diagram = new QAction(QET::Icons::DiagramDelete, tr("Supprimer le sch\351ma"), this); + prj_clean = new QAction(QET::Icons::EditClear, tr("Nettoyer le projet"), 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); + zoom_in = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this); + zoom_out = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re"), this); + zoom_fit = new QAction(QET::Icons::ZoomFitBest, tr("Zoom adapt\351"), this); + zoom_reset = new QAction(QET::Icons::ZoomOriginal, 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(QET::Icons::PartSelect, tr("Mode Selection"), this); + mode_visualise = new QAction(QET::Icons::ViewMove, tr("Mode Visualisation"), this); fullscreen = new QAction(this); slot_updateFullScreenAction(); - configure = new QAction(QIcon(":/ico/configure.png"), tr("&Configurer QElectroTech"), this); + configure = new QAction(QET::Icons::Configure, 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(QET::Icons::QETLogo, tr("\300 &propos de QElectroTech"), this); + about_qt = new QAction(QET::Icons::QtLogo, tr("\300 propos de &Qt"), this); // raccourcis clavier new_file -> setShortcut(QKeySequence::New); @@ -503,7 +504,7 @@ void QETDiagramEditor::menus() { QMenu *display_toolbars = createPopupMenu(); display_toolbars -> setTearOffEnabled(true); display_toolbars -> setTitle(tr("Afficher")); - display_toolbars -> setIcon(QIcon(":/ico/configure-toolbars.png")); + display_toolbars -> setIcon(QET::Icons::ConfigureToolbars); 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 +1163,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/view-restore.png")); + fullscreen -> setIcon(QET::Icons::FullScreenExit); 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/view-fullscreen.png")); + fullscreen -> setIcon(QET::Icons::FullScreenEnter); fullscreen -> setStatusTip(tr("Affiche QElectroTech en mode plein \351cran", "status bar tip")); } } diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp new file mode 100644 index 000000000..27d91b16e --- /dev/null +++ b/sources/qeticons.cpp @@ -0,0 +1,244 @@ +#include "qeticons.h" +#include +#include +#include +#include + +// on redeclare ici les icones +namespace QET { + namespace Icons { + QIcon AddColumn; + QIcon AddRow; + QIcon Allowed; + QIcon ApplicationExit; + QIcon ArrowLeft; + QIcon ArrowLeftDouble; + QIcon ArrowRight; + QIcon ArrowRightDouble; + QIcon BringForward; + QIcon Cancel; + QIcon Conductor; + QIcon ConductorSettings; + QIcon Configure; + QIcon ConfigureToolbars; + QIcon CopyFile; + QIcon DefaultConductor; + QIcon DiagramAdd; + QIcon Diagram; + QIcon DiagramDelete; + QIcon DialogCancel; + QIcon DialogInformation; + QIcon DialogOk; + QIcon DocumentClose; + QIcon DocumentDelete; + QIcon DocumentEdit; + QIcon DocumentExport; + QIcon DocumentImport; + QIcon DocumentNew; + QIcon DocumentOpen; + QIcon DocumentOpenRecent; + QIcon DocumentPrint; + QIcon DocumentPrintFrame; + QIcon DocumentSave; + QIcon DocumentSaveAll; + QIcon DocumentSaveAs; + QIcon East; + QIcon EditClear; + QIcon EditClearLocationBar; + QIcon EditCopy; + QIcon EditCut; + QIcon EditDelete; + QIcon EditPaste; + QIcon EditRedo; + QIcon EditSelectAll; + QIcon EditUndo; + QIcon EndLineCircle; + QIcon EndLineDiamond; + QIcon EndLineNone; + QIcon EndLineSimple; + QIcon EndLineTriangle; + QIcon EPS; + QIcon Folder; + QIcon FolderDelete; + QIcon FolderEdit; + QIcon FolderNew; + QIcon Forbidden; + QIcon FullScreenEnter; + QIcon FullScreenExit; + QIcon Ground; + QIcon Hide; + QIcon Home; + QIcon HotSpot; + QIcon Lower; + QIcon MoveFile; + QIcon Names; + QIcon Neutral; + QIcon NewDiagram; + QIcon North; + QIcon ObjectLocked; + QIcon ObjectRotateRight; + QIcon ObjectUnlocked; + QIcon Orientations; + QIcon PartArc; + QIcon PartCircle; + QIcon PartEllipse; + QIcon PartLine; + QIcon PartPolygon; + QIcon PartRectangle; + QIcon PartSelect; + QIcon PartText; + QIcon PartTextField; + QIcon PDF; + QIcon Phase; + QIcon PrintAllPages; + QIcon Printer; + QIcon PrintLandscape; + QIcon PrintPortrait; + QIcon PrintTwoPages; + QIcon Project; + QIcon QETIcon; + QIcon QETLogo; + QIcon QtLogo; + QIcon Raise; + QIcon RemoveColumn; + QIcon RemoveRow; + QIcon Restore; + QIcon SendBackward; + QIcon Settings; + QIcon SinglePage; + QIcon South; + QIcon Start; + QIcon Terminal; + QIcon ViewFitWidth; + QIcon ViewFitWindow; + QIcon ViewMove; + QIcon ViewRefresh; + QIcon West; + QIcon WindowNew; + QIcon ZoomFitBest; + QIcon ZoomIn; + QIcon ZoomOriginal; + QIcon ZoomOut; + } +} + +/** + Initialise les icones de l'application QElectroTech +*/ +void QET::Icons::initIcons() { + AddColumn .addFile(":/ico/16x16/add_col.png"); + AddRow .addFile(":/ico/16x16/add_row.png"); + Allowed .addFile(":/ico/16x16/user-online.png"); + ApplicationExit .addFile(":/ico/22x22/application-exit.png"); + ArrowLeft .addFile(":/ico/22x22/arrow-left.png"); + ArrowLeftDouble .addFile(":/ico/22x22/arrow-left-double.png"); + ArrowRight .addFile(":/ico/22x22/arrow-right.png"); + ArrowRightDouble .addFile(":/ico/22x22/arrow-right-double.png"); + BringForward .addFile(":/ico/22x22/bring_forward.png"); + Cancel .addFile(":/ico/16x16/item_cancel.png"); + Conductor .addFile(":/ico/22x22/conductor.png"); + ConductorSettings .addFile(":/ico/22x22/conductor2.png"); + Configure .addFile(":/ico/22x22/configure.png"); + ConfigureToolbars .addFile(":/ico/22x22/configure-toolbars.png"); + CopyFile .addFile(":/ico/16x16/item_copy.png"); + DefaultConductor .addFile(":/ico/22x22/conductor3.png"); + DiagramAdd .addFile(":/ico/22x22/diagram_add.png"); + Diagram .addFile(":/ico/diagram.png"); + DiagramDelete .addFile(":/ico/22x22/diagram_del.png"); + DialogCancel .addFile(":/ico/22x22/dialog-cancel.png"); + DialogInformation .addFile(":/ico/22x22/dialog-information.png"); + DialogOk .addFile(":/ico/22x22/dialog-ok.png"); + DocumentClose .addFile(":/ico/22x22/document-close.png"); + DocumentDelete .addFile(":/ico/22x22/document-delete.png"); + DocumentEdit .addFile(":/ico/22x22/document-edit.png"); + DocumentExport .addFile(":/ico/22x22/document-export.png"); + DocumentImport .addFile(":/ico/22x22/document-import.png"); + DocumentNew .addFile(":/ico/22x22/document-new.png"); + DocumentOpen .addFile(":/ico/22x22/document-open.png"); + DocumentOpenRecent .addFile(":/ico/22x22/document-open-recent.png"); + DocumentPrint .addFile(":/ico/22x22/document-print.png"); + DocumentPrintFrame .addFile(":/ico/22x22/document-print-frame.png"); + DocumentSave .addFile(":/ico/22x22/document-save.png"); + DocumentSaveAll .addFile(":/ico/22x22/document-save-all.png"); + DocumentSaveAs .addFile(":/ico/22x22/document-save-as.png"); + East .addFile(":/ico/16x16/east.png"); + EditClear .addFile(":/ico/22x22/edit-clear.png"); + EditClearLocationBar.addFile(":/ico/22x22/edit-clear-locationbar-ltr.png"); + EditCopy .addFile(":/ico/22x22/edit-copy.png"); + EditCut .addFile(":/ico/22x22/edit-cut.png"); + EditDelete .addFile(":/ico/22x22/edit-delete.png"); + EditPaste .addFile(":/ico/22x22/edit-paste.png"); + EditRedo .addFile(":/ico/22x22/edit-redo.png"); + EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); + EditUndo .addFile(":/ico/22x22/edit-undo.png"); + EndLineCircle .addFile(":/ico/16x16/endline-circle.png"); + EndLineDiamond .addFile(":/ico/16x16/endline-diamond.png"); + EndLineNone .addFile(":/ico/16x16/endline-none.png"); + EndLineSimple .addFile(":/ico/16x16/endline-simple.png"); + EndLineTriangle .addFile(":/ico/16x16/endline-triangle.png"); + EPS .addFile(":/ico/32x32/image-x-eps.png"); + Folder .addFile(":/ico/16x16/folder.png"); + FolderDelete .addFile(":/ico/22x22/folder-delete.png"); + FolderEdit .addFile(":/ico/22x22/folder-edit.png"); + FolderNew .addFile(":/ico/22x22/folder-new.png"); + Forbidden .addFile(":/ico/16x16/user-busy.png"); + FullScreenEnter .addFile(":/ico/22x22/view-fullscreen.png"); + FullScreenExit .addFile(":/ico/22x22/view-restore.png"); + Ground .addFile(":/ico/16x16/ground.png"); + Hide .addFile(":/ico/16x16/masquer.png"); + Home .addFile(":/ico/22x22/go-home.png"); + HotSpot .addFile(":/ico/22x22/hotspot.png"); + Lower .addFile(":/ico/22x22/lower.png"); + MoveFile .addFile(":/ico/16x16/item_move.png"); + Names .addFile(":/ico/22x22/names.png"); + Neutral .addFile(":/ico/16x16/neutral.png"); + NewDiagram .addFile(":/ico/conf_new_diagram_48.png", QSize(48, 48)); + NewDiagram .addFile(":/ico/conf_new_diagram_110.png", QSize(110, 110)); + NewDiagram .addFile(":/ico/conf_new_diagram_128.png", QSize(128, 128)); + North .addFile(":/ico/16x16/north.png"); + ObjectLocked .addFile(":/ico/22x22/object-locked.png"); + ObjectRotateRight .addFile(":/ico/22x22/object-rotate-right.png"); + ObjectUnlocked .addFile(":/ico/22x22/object-unlocked.png"); + Orientations .addFile(":/ico/16x16/orientations.png"); + PartArc .addFile(":/ico/22x22/arc.png"); + PartCircle .addFile(":/ico/16x16/circle.png"); + PartEllipse .addFile(":/ico/22x22/ellipse.png"); + PartLine .addFile(":/ico/22x22/line.png"); + PartPolygon .addFile(":/ico/22x22/polygon.png"); + PartRectangle .addFile(":/ico/22x22/rectangle.png"); + PartSelect .addFile(":/ico/22x22/select.png"); + PartText .addFile(":/ico/22x22/text.png"); + PartTextField .addFile(":/ico/22x22/textfield.png"); + PDF .addFile(":/ico/32x32/application-pdf.png"); + Phase .addFile(":/ico/16x16/phase.png"); + PrintAllPages .addFile(":/ico/22x22/all_pages.png"); + Printer .addFile(":/ico/32x32/printer.png"); + PrintLandscape .addFile(":/ico/22x22/landscape.png"); + PrintPortrait .addFile(":/ico/22x22/portrait.png"); + PrintTwoPages .addFile(":/ico/22x22/two_pages.png"); + Project .addFile(":/ico/16x16/project.png"); + QETIcon .addFile(":/ico/qelectrotech.png"); + QETLogo .addFile(":/ico/16x16/qet-16.png", QSize(16, 16)); + QETLogo .addFile(":/ico/qet.png"); + QtLogo .addFile(":/ico/32x32/qt.png"); + Raise .addFile(":/ico/22x22/raise.png"); + RemoveColumn .addFile(":/ico/16x16/remove_col.png"); + RemoveRow .addFile(":/ico/16x16/remove_row.png"); + Restore .addFile(":/ico/22x22/restaurer.png"); + SendBackward .addFile(":/ico/22x22/send_backward.png"); + Settings .addFile(":/ico/settings.png"); + SinglePage .addFile(":/ico/22x22/single_page.png"); + South .addFile(":/ico/16x16/south.png"); + Start .addFile(":/ico/22x22/start.png"); + Terminal .addFile(":/ico/22x22/terminal.png"); + ViewFitWidth .addFile(":/ico/22x22/view_fit_width.png"); + ViewFitWindow .addFile(":/ico/22x22/view_fit_window.png"); + ViewMove .addFile(":/ico/22x22/move.png"); + ViewRefresh .addFile(":/ico/22x22/view-refresh.png"); + West .addFile(":/ico/16x16/west.png"); + WindowNew .addFile(":/ico/22x22/window-new.png"); + ZoomFitBest .addFile(":/ico/22x22/zoom-fit-best.png"); + ZoomIn .addFile(":/ico/22x22/zoom-in.png"); + ZoomOriginal .addFile(":/ico/22x22/zoom-original.png"); + ZoomOut .addFile(":/ico/22x22/zoom-out.png"); +} diff --git a/sources/qeticons.h b/sources/qeticons.h new file mode 100644 index 000000000..4cd0359d4 --- /dev/null +++ b/sources/qeticons.h @@ -0,0 +1,148 @@ +/* + Copyright 2006-2009 Xavier Guerrin + This file is part of QElectroTech. + + QElectroTech is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + + QElectroTech is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QElectroTech. If not, see . +*/ +#ifndef QET_ICONS_H +#define QET_ICONS_H +#include +/** + Ce namespace est reserve a la declaration des icones de l'application + QElectroTech. +*/ +namespace QET { + namespace Icons { + void initIcons(); + + // l'utilisation du mot-cle extern permet l'acces aux objets statiques + // depuis l'exterieur du namespace + extern QIcon AddColumn; + extern QIcon AddRow; + extern QIcon Allowed; + extern QIcon ApplicationExit; + extern QIcon ArrowLeft; + extern QIcon ArrowLeftDouble; + extern QIcon ArrowRight; + extern QIcon ArrowRightDouble; + extern QIcon BringForward; + extern QIcon Cancel; + extern QIcon Conductor; + extern QIcon ConductorSettings; + extern QIcon Configure; + extern QIcon ConfigureToolbars; + extern QIcon CopyFile; + extern QIcon DefaultConductor; + extern QIcon DiagramAdd; + extern QIcon Diagram; + extern QIcon DiagramDelete; + extern QIcon DialogCancel; + extern QIcon DialogInformation; + extern QIcon DialogOk; + extern QIcon DocumentClose; + extern QIcon DocumentDelete; + extern QIcon DocumentEdit; + extern QIcon DocumentExport; + extern QIcon DocumentImport; + extern QIcon DocumentNew; + extern QIcon DocumentOpen; + extern QIcon DocumentOpenRecent; + extern QIcon DocumentPrint; + extern QIcon DocumentPrintFrame; + extern QIcon DocumentSave; + extern QIcon DocumentSaveAll; + extern QIcon DocumentSaveAs; + extern QIcon East; + extern QIcon EditClear; + extern QIcon EditClearLocationBar; + extern QIcon EditCopy; + extern QIcon EditCut; + extern QIcon EditDelete; + extern QIcon EditPaste; + extern QIcon EditRedo; + extern QIcon EditSelectAll; + extern QIcon EditUndo; + extern QIcon EndLineCircle; + extern QIcon EndLineDiamond; + extern QIcon EndLineNone; + extern QIcon EndLineSimple; + extern QIcon EndLineTriangle; + extern QIcon EPS; + extern QIcon Folder; + extern QIcon FolderDelete; + extern QIcon FolderEdit; + extern QIcon FolderNew; + extern QIcon Forbidden; + extern QIcon FullScreenEnter; + extern QIcon FullScreenExit; + extern QIcon Ground; + extern QIcon Hide; + extern QIcon Home; + extern QIcon HotSpot; + extern QIcon Lower; + extern QIcon MoveFile; + extern QIcon Names; + extern QIcon Neutral; + extern QIcon NewDiagram; + extern QIcon NewDiagram; + extern QIcon NewDiagram; + extern QIcon North; + extern QIcon ObjectLocked; + extern QIcon ObjectRotateRight; + extern QIcon ObjectUnlocked; + extern QIcon Orientations; + extern QIcon PartArc; + extern QIcon PartCircle; + extern QIcon PartEllipse; + extern QIcon PartLine; + extern QIcon PartPolygon; + extern QIcon PartRectangle; + extern QIcon PartSelect; + extern QIcon PartText; + extern QIcon PartTextField; + extern QIcon PDF; + extern QIcon Phase; + extern QIcon PrintAllPages; + extern QIcon Printer; + extern QIcon PrintLandscape; + extern QIcon PrintPortrait; + extern QIcon PrintTwoPages; + extern QIcon Project; + extern QIcon QETIcon; + extern QIcon QETLogo; + extern QIcon QETLogo; + extern QIcon QtLogo; + extern QIcon Raise; + extern QIcon RemoveColumn; + extern QIcon RemoveRow; + extern QIcon Restore; + extern QIcon SendBackward; + extern QIcon Settings; + extern QIcon SinglePage; + extern QIcon South; + extern QIcon Start; + extern QIcon Terminal; + extern QIcon ViewFitWidth; + extern QIcon ViewFitWindow; + extern QIcon ViewMove; + extern QIcon ViewRefresh; + extern QIcon West; + extern QIcon WindowNew; + extern QIcon ZoomFitBest; + extern QIcon ZoomIn; + extern QIcon ZoomOriginal; + extern QIcon ZoomOut; + } +} +#endif diff --git a/sources/qetprintpreviewdialog.cpp b/sources/qetprintpreviewdialog.cpp index 5b297808f..105616cfc 100644 --- a/sources/qetprintpreviewdialog.cpp +++ b/sources/qetprintpreviewdialog.cpp @@ -1,5 +1,6 @@ #include "qetprintpreviewdialog.h" #include "diagramschooser.h" +#include "qeticons.h" /** Constructeur @@ -124,23 +125,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/zoom-out.png"), tr("Zoom arri\350re"), this); + toggle_diagrams_list_ = new QAction(QET::Icons::Diagram, tr("Cacher la liste des sch\351mas"), this); + toggle_print_options_ = new QAction(QET::Icons::Configure, tr("Cacher les options d'impression"), this); + adjust_width_ = new QAction(QET::Icons::ViewFitWidth, tr("Ajuster la largeur"), this); + adjust_page_ = new QAction(QET::Icons::ViewFitWindow, tr("Ajuster la page"), this); + zoom_out_ = new QAction(QET::Icons::ZoomOut, tr("Zoom arri\350re"), this); zoom_box_ = new QComboBox(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); + zoom_in_ = new QAction(QET::Icons::ZoomIn, tr("Zoom avant"), this); + landscape_ = new QAction(QET::Icons::PrintLandscape, tr("Paysage"), this); + portrait_ = new QAction(QET::Icons::PrintPortrait, tr("Portrait"), this); + first_page_ = new QAction(QET::Icons::ArrowLeftDouble, tr("Premi\350re page"), this); + previous_page_ = new QAction(QET::Icons::ArrowLeft, tr("Page pr\351c\351dente"), this); + next_page_ = new QAction(QET::Icons::ArrowRight, tr("Page suivante"), this); + last_page_ = new QAction(QET::Icons::ArrowRightDouble, tr("Derni\350re page"), this); + single_page_view_ = new QAction(QET::Icons::SinglePage, tr("Afficher une seule page"), this); + facing_pages_view_ = new QAction(QET::Icons::PrintTwoPages, tr("Afficher deux pages"), this); + all_pages_view_ = new QAction(QET::Icons::PrintAllPages, tr("Afficher un aper\347u de toutes les pages"), this); + page_setup_ = new QAction(QET::Icons::DocumentPrintFrame, tr("Mise en page"), this); toggle_diagrams_list_ -> setCheckable(true); toggle_diagrams_list_ -> setChecked(true); @@ -205,7 +206,7 @@ void QETPrintPreviewDialog::build() { fit_diagram_to_page_ -> setChecked(true); buttons_ = new QDialogButtonBox(); - buttons_ -> addButton(new QPushButton(QIcon(":/ico/document-print.png"), tr("Imprimer")), QDialogButtonBox::AcceptRole); + buttons_ -> addButton(new QPushButton(QET::Icons::DocumentPrint, 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 a2c8c01ab..77d01dd65 100644 --- a/sources/recentfiles.cpp +++ b/sources/recentfiles.cpp @@ -17,6 +17,7 @@ */ #include "recentfiles.h" #include "qetapp.h" +#include "qeticons.h" /** Constructeur @@ -141,7 +142,7 @@ void RecentFiles::buildMenu() { // reinitialise le menu if (!menu_) { menu_ = new QMenu(tr("&R\351cemment ouvert(s)")); - menu_ -> setIcon(QIcon(":/ico/document-open-recent.png")); + menu_ -> setIcon(QET::Icons::DocumentOpenRecent); } else { menu_ -> clear(); }