* bug 4978 fixed - Icons did not follow the Tango norm. 85/5585/5
Clément DAVID [Tue, 6 Dec 2011 14:42:25 +0000 (15:42 +0100)]
Change-Id: Ifc0162dc602ab32918e17991b253a4b9d5e99f60

290 files changed:
scilab/CHANGES_5.4.X
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/desktop/Makefile.am [new file with mode: 0644]
scilab/desktop/Makefile.in [new file with mode: 0644]
scilab/desktop/images/Makefile.am [new file with mode: 0644]
scilab/desktop/images/Makefile.in [new file with mode: 0644]
scilab/desktop/images/icons/16x16/apps/scilab.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-bin.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cos.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cosf.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-dem.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-graph.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sav.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sce.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sci.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-tst.png [new file with mode: 0644]
scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-xcos.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/apps/scilab.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-bin.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cos.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cosf.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-dem.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-graph.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sav.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sce.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sci.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-tst.png [new file with mode: 0644]
scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-xcos.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/apps/scilab.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-bin.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cos.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cosf.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-dem.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-graph.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sav.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sce.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sci.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-tst.png [new file with mode: 0644]
scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-xcos.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/apps/scilab.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-bin.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cos.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cosf.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-dem.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-graph.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sav.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sce.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sci.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-tst.png [new file with mode: 0644]
scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-xcos.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/apps/scilab.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-bin.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cos.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cosf.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-dem.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-graph.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sav.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sce.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sci.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-tst.png [new file with mode: 0644]
scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-xcos.png [new file with mode: 0644]
scilab/desktop/images/icons/Makefile.am [new file with mode: 0644]
scilab/desktop/images/icons/Makefile.in [new file with mode: 0644]
scilab/desktop/images/icons/puffin.icns [moved from scilab/desktop/puffin.icns with 100% similarity]
scilab/desktop/images/icons/scilab.icns [moved from scilab/desktop/scilab.icns with 100% similarity]
scilab/desktop/puffin.png [deleted file]
scilab/desktop/puffin_128.png [deleted file]
scilab/desktop/puffin_256.png [deleted file]
scilab/desktop/puffin_32.png [deleted file]
scilab/desktop/puffin_48.png [deleted file]
scilab/desktop/scilab.ico [deleted file]
scilab/desktop/scilab.png [deleted file]
scilab/desktop/scilab.xml
scilab/modules/atoms/Makefile.am
scilab/modules/atoms/Makefile.in
scilab/modules/atoms/help/en_US/_atomsGettingStarted.xml
scilab/modules/atoms/images/icons/16x16/emblems/emblem-default.png [moved from scilab/modules/atoms/images/icons/emblem-default.png with 100% similarity]
scilab/modules/atoms/images/icons/16x16/status/dialog-information.png [moved from scilab/modules/atoms/images/icons/dialog-information.png with 100% similarity]
scilab/modules/atoms/images/icons/16x16/status/software-update-available.png [moved from scilab/modules/atoms/images/icons/software-update-available.png with 100% similarity]
scilab/modules/atoms/images/icons/16x16/status/software-update-installed.png [moved from scilab/modules/atoms/images/icons/installed.png with 100% similarity]
scilab/modules/atoms/images/icons/16x16/status/software-update-notinstalled.png [moved from scilab/modules/atoms/images/icons/notinstalled.png with 100% similarity]
scilab/modules/atoms/images/icons/16x16/status/software-update-notuptodate.png [moved from scilab/modules/atoms/images/icons/notuptodate.png with 100% similarity]
scilab/modules/atoms/images/icons/user-home.png [deleted file]
scilab/modules/atoms/macros/atoms_gui/atomsGui.sci
scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci
scilab/modules/atoms/macros/atoms_internals/atomsGetLeftListboxElts.sci
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/CopyAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/CutAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/DeleteAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/PasteAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/RedoAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/SelectAllAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/UndoAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java
scilab/modules/graph/src/java/org/scilab/modules/graph/actions/base/DefaultAction.java
scilab/modules/graphics/help/en_US/datatips/datatips.xml
scilab/modules/graphics/help/ja_JP/datatips/datatips.xml
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/graphics_toolbar.xml
scilab/modules/gui/etc/main_toolbar.xml
scilab/modules/gui/images/icons/16x16/actions/document-new.png [moved from scilab/modules/gui/images/icons/document-new.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/document-open-sci.png [moved from scilab/modules/gui/images/icons/document-open-sci.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/document-open.png [moved from scilab/modules/gui/images/icons/document-open.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/document-print-preview.png [moved from scilab/modules/gui/images/icons/document-print-preview.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/document-print.png [moved from scilab/modules/gui/images/icons/document-print.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/document-save-as.png [moved from scilab/modules/gui/images/icons/document-save-as.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/document-save.png [moved from scilab/modules/gui/images/icons/document-save.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/dynamic-blue-up.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/dynamic-blue-up.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-copy.png [moved from scilab/modules/gui/images/icons/edit-copy.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-cut.png [moved from scilab/modules/gui/images/icons/edit-cut.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-delete.png [moved from scilab/modules/gui/images/icons/edit-delete.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-find-replace.png [moved from scilab/modules/gui/images/icons/edit-find-replace.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-find.png [moved from scilab/modules/gui/images/icons/edit-find.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-paste.png [moved from scilab/modules/gui/images/icons/edit-paste.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-redo.png [moved from scilab/modules/gui/images/icons/edit-redo.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/edit-undo.png [moved from scilab/modules/gui/images/icons/edit-undo.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/filter.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/filter.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/format-text-bold.png [moved from scilab/modules/gui/images/icons/format-text-bold.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/go-next.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/go-next.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/go-previous.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/go-previous.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/media-playback-start.png [moved from scilab/modules/gui/images/icons/media-playback-start.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/scilab_search.png [moved from scilab/modules/gui/images/icons/16x16/search/scilab-file.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/stock_search.png [new symlink]
scilab/modules/gui/images/icons/16x16/actions/system-search.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/system-search.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/transform-rotate.png [moved from scilab/modules/gui/images/icons/transform-rotate.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/window-new.png [moved from scilab/modules/gui/images/icons/window-new.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/zoom-area-cursor.png [moved from scilab/modules/gui/images/icons/zoom-area-cursor.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/zoom-fit-drawing.png [moved from scilab/modules/gui/images/icons/zoom-fit-drawing.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/zoom-fit-selection.png [moved from scilab/modules/gui/images/icons/zoom-fit-selection.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/zoom-in.png [moved from scilab/modules/gui/images/icons/zoom-in.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/zoom-original.png [moved from scilab/modules/gui/images/icons/zoom-original.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/actions/zoom-out.png [moved from scilab/modules/gui/images/icons/zoom-out.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/animations/process-working.png [moved from scilab/modules/gui/images/icons/process-working.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/apps/accessories-text-editor.png [moved from scilab/modules/gui/images/icons/accessories-text-editor.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/apps/help-browser.png [moved from scilab/modules/gui/images/icons/help-browser.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/apps/utilities-system-monitor.png [moved from scilab/modules/gui/images/icons/utilities-system-monitor.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/categories/applications-system.png [moved from scilab/modules/gui/images/icons/applications-system.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/devices/media-floppy.png [moved from scilab/modules/gui/images/icons/media-floppy.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/devices/printer.png [moved from scilab/modules/gui/images/icons/printer.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/emblems/emblem-readonly.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/emblem-readonly.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/filebrowser/icon_scilab.png [deleted file]
scilab/modules/gui/images/icons/16x16/mimetypes/application-pdf.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/application-pdf.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/binary.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/binary.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/image-x-generic.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/image-x-generic.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/package-x-generic.png [moved from scilab/modules/gui/images/icons/package-x-generic.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/text-csv.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/text-csv.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/text-html.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/text-html.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/text-x-generic.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/text-x-generic.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/mimetypes/text-xml.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/text-xml.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/places/folder-saved-search.png [moved from scilab/modules/gui/images/icons/16x16/search/folder.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/places/folder.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/folder.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/places/scilab-folder.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/scilab-folder.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/places/user-home.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/user-home.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/search/file.png [deleted file]
scilab/modules/gui/images/icons/16x16/status/folder-open.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/folder-open.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/status/line-found.png [moved from scilab/modules/gui/images/icons/16x16/search/line-found.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/status/scilab-folder-open.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/open-scilab-folder.png with 100% similarity]
scilab/modules/gui/images/icons/16x16/status/user-home-open.png [moved from scilab/modules/gui/images/icons/16x16/filebrowser/open-user-home.png with 100% similarity]
scilab/modules/gui/images/icons/32x32/apps/datatips.png [moved from scilab/modules/gui/images/icons/datatips.png with 100% similarity]
scilab/modules/gui/images/icons/32x32/apps/graphic-window.png [moved from scilab/modules/gui/images/icons/graphic-window.png with 100% similarity]
scilab/modules/gui/images/icons/32x32/apps/scilab.png [moved from scilab/modules/gui/images/icons/scilab.png with 100% similarity]
scilab/modules/gui/images/icons/32x32/emblems/emblem-readonly.png [moved from scilab/modules/gui/images/icons/emblem-readonly.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-Matplot.png [moved from scilab/modules/gui/images/icons/64x64/Matplot.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-Sgrayplot.png [moved from scilab/modules/gui/images/icons/64x64/Sgrayplot.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-champ.png [moved from scilab/modules/gui/images/icons/64x64/champ.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-contour2d.png [moved from scilab/modules/gui/images/icons/64x64/contour2d.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-grayplot.png [moved from scilab/modules/gui/images/icons/64x64/grayplot.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-hist3d.png [moved from scilab/modules/gui/images/icons/64x64/hist3d.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-histplot.png [moved from scilab/modules/gui/images/icons/64x64/histplot.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-mesh.png [moved from scilab/modules/gui/images/icons/64x64/mesh.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-pie.png [moved from scilab/modules/gui/images/icons/64x64/pie.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-plot2d.png [moved from scilab/modules/gui/images/icons/64x64/plot2d.png with 100% similarity]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-plot3d.png [new file with mode: 0644]
scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-surf.png [moved from scilab/modules/gui/images/icons/64x64/surf.png with 100% similarity]
scilab/modules/gui/images/icons/64x64/plot2.png [deleted file]
scilab/modules/gui/images/icons/64x64/plot3d.png [deleted file]
scilab/modules/gui/images/icons/folder.png [deleted file]
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/OSXAdapter.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ScilabSwingUtilities.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ToolBarBuilder.java
scilab/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CopyAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/CutAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/DeleteAction.java
scilab/modules/history_browser/src/java/org/scilab/modules/history_browser/actions/HelpAction.java
scilab/modules/scinotes/etc/scinotesGUIConfiguration.xml
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/DefaultAction.java
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/images/icons/16x16/mimetypes/array_up.png [moved from scilab/modules/ui_data/images/icons/array_up.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/boolean.png [moved from scilab/modules/ui_data/images/icons/boolean.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/cell.png [moved from scilab/modules/ui_data/images/icons/cell.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/double.png [moved from scilab/modules/ui_data/images/icons/double.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/fptr.png [moved from scilab/modules/ui_data/images/icons/fptr.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/function.png [moved from scilab/modules/ui_data/images/icons/function.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/handle.png [moved from scilab/modules/ui_data/images/icons/handle.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/int.png [moved from scilab/modules/ui_data/images/icons/int.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/list.png [moved from scilab/modules/ui_data/images/icons/list.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/mlist.png [moved from scilab/modules/ui_data/images/icons/mlist.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/noicon.png [moved from scilab/modules/ui_data/images/icons/noicon.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/object.png [moved from scilab/modules/ui_data/images/icons/object.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/polynomial.png [moved from scilab/modules/ui_data/images/icons/polynomial.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/sparse.png [moved from scilab/modules/ui_data/images/icons/sparse.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/string.png [moved from scilab/modules/ui_data/images/icons/string.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/timeseries.png [moved from scilab/modules/ui_data/images/icons/timeseries.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/tlist.png [moved from scilab/modules/ui_data/images/icons/tlist.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/uint.png [moved from scilab/modules/ui_data/images/icons/uint.png with 100% similarity]
scilab/modules/ui_data/images/icons/16x16/mimetypes/user.png [moved from scilab/modules/ui_data/images/icons/user.png with 100% similarity]
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/actions/DefaultAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variablebrowser/actions/RefreshAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/SwingScilabVariableEditor.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CopyAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/CutAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PasteAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/PlotAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RedoAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/RefreshAction.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/variableeditor/actions/UndoAction.java
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/resources/bin.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_bin.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/cos.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_cos.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/cosf.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_cosf.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/dem.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_dem.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/graph.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_graph.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/icon_scilab.ico [deleted file]
scilab/modules/windows_tools/src/c/resources/sav.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_sav.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/sce.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_sce.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/sci.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_sci.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/tst.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_tst.ico with 100% similarity]
scilab/modules/windows_tools/src/c/resources/xcos.ico [moved from scilab/modules/windows_tools/src/c/resources/icon_xcos.ico with 100% similarity]
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/help/en_US/xcos.xml
scilab/modules/xcos/help/en_US/xcos_menu_entries.xml
scilab/modules/xcos/help/fr_FR/xcos.xml
scilab/modules/xcos/help/fr_FR/xcos_menu_entries.xml
scilab/modules/xcos/images/icons/16x16/actions/align-horizontal-center.png [moved from scilab/modules/xcos/images/icons/align-horizontal-center.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/align-horizontal-left.png [moved from scilab/modules/xcos/images/icons/align-horizontal-left.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/align-horizontal-right.png [moved from scilab/modules/xcos/images/icons/align-horizontal-right.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/align-vertical-bottom.png [moved from scilab/modules/xcos/images/icons/align-vertical-bottom.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/align-vertical-center.png [moved from scilab/modules/xcos/images/icons/align-vertical-center.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/align-vertical-top.png [moved from scilab/modules/xcos/images/icons/align-vertical-top.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/color-fill.png [moved from scilab/modules/xcos/images/icons/color-fill.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/draw-brush.png [moved from scilab/modules/xcos/images/icons/draw-brush.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/object-group.png [moved from scilab/modules/xcos/images/icons/object-group.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/process-stop.png [moved from scilab/modules/xcos/images/icons/process-stop.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/select-by-color.png [moved from scilab/modules/xcos/images/icons/select-by-color.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/transform-flip.png [moved from scilab/modules/xcos/images/icons/transform-flip.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/actions/transform-mirror.png [moved from scilab/modules/xcos/images/icons/transform-mirror.png with 100% similarity]
scilab/modules/xcos/images/icons/16x16/categories/preferences-desktop.png [moved from scilab/modules/xcos/images/icons/preferences-desktop.png with 100% similarity]
scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/EditFormatAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/NewDiagramAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/PrintAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SaveAsAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/SetupAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StartAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/StopAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDemonstrationsAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/XcosDocumentationAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/DebugLevelDialog.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/SetContextDialog.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/dialog/SetupDialog.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockDocumentationAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BlockParametersAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/BorderColorAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/FilledColorAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/FlipAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/MirrorAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RotateAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionBottom.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionCenter.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionLeft.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionMiddle.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionRight.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/alignement/AlignBlockActionTop.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/modelica/ModelicaController.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/LoadAsPalAction.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/view/PaletteManagerView.java

index 0f05f7e..56bb074 100644 (file)
@@ -2,6 +2,13 @@
             =========================================================
 
 
+Graphical User Interface
+========================
+
+* bug 4978 fixed - Icons did not follow the Tango norm.
+
+
+
 Javasci
 =======
 
index b4f1b79..7b7a378 100644 (file)
@@ -16,7 +16,8 @@ AUTOMAKE_OPTIONS = 1.11 dist-zip dist-bzip2
 
 SUBDIRS= libs \
        modules \
-       contrib
+       contrib \
+       desktop
 
 ACLOCAL_AMFLAGS = -I m4/
 
@@ -132,27 +133,9 @@ $(top_srcdir)/Readme_Visual.txt \
 $(top_srcdir)/README_Windows.txt \
 $(top_builddir)/Version.incl
 
-iconsdir=$(pkgdatadir)/desktop/
-icons_DATA = $(top_srcdir)/desktop/scilab.png \
-$(top_srcdir)/desktop/puffin_128.png \
-$(top_srcdir)/desktop/puffin_256.png \
-$(top_srcdir)/desktop/puffin_32.png \
-$(top_srcdir)/desktop/puffin_48.png \
-$(top_srcdir)/desktop/puffin.png \
-$(top_srcdir)/desktop/puffin.icns \
-$(top_srcdir)/desktop/scilab.xml \
-$(top_srcdir)/desktop/scilab.icns
-
 valgrinddir=$(pkgdatadir)/tools/profiling
 valgrind_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
 
-# Desktop file
-# Note that here, it is datadir and NOT pkgdatadir
-desktopdir = $(datadir)/applications
-desktop_DATA = $(top_srcdir)/desktop/scilab-adv-cli.desktop \
-$(top_srcdir)/desktop/scilab-cli.desktop \
-$(top_srcdir)/desktop/scilab.desktop
-
 macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
        -@( cd $(top_builddir) ; \
        echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
index 5f91f7c..8d29326 100644 (file)
@@ -124,7 +124,6 @@ CONFIG_CLEAN_FILES = scilab.pc etc/modules.xml etc/classpath.xml \
 CONFIG_CLEAN_VPATH_FILES =
 @ENABLE_STATIC_TRUE@am__EXEEXT_1 = scilab-static-bin$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-       "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(iconsdir)" \
        "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \
        "$(DESTDIR)$(rootdir)" "$(DESTDIR)$(valgrinddir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -286,8 +285,8 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-pdf-recursive install-ps-recursive install-recursive \
        installcheck-recursive installdirs-recursive pdf-recursive \
        ps-recursive uninstall-recursive
-DATA = $(desktop_DATA) $(icons_DATA) $(infofiles_DATA) \
-       $(pkgconfig_DATA) $(root_DATA) $(valgrind_DATA)
+DATA = $(infofiles_DATA) $(pkgconfig_DATA) $(root_DATA) \
+       $(valgrind_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -584,7 +583,8 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.11 dist-zip dist-bzip2
 SUBDIRS = libs \
        modules \
-       contrib
+       contrib \
+       desktop
 
 ACLOCAL_AMFLAGS = -I m4/
 changelogs = CHANGES CHANGES_5.1.X CHANGES_5.2.X CHANGES_5.3.X CHANGES_5.4.X
@@ -650,28 +650,9 @@ $(top_srcdir)/Readme_Visual.txt \
 $(top_srcdir)/README_Windows.txt \
 $(top_builddir)/Version.incl
 
-iconsdir = $(pkgdatadir)/desktop/
-icons_DATA = $(top_srcdir)/desktop/scilab.png \
-$(top_srcdir)/desktop/puffin_128.png \
-$(top_srcdir)/desktop/puffin_256.png \
-$(top_srcdir)/desktop/puffin_32.png \
-$(top_srcdir)/desktop/puffin_48.png \
-$(top_srcdir)/desktop/puffin.png \
-$(top_srcdir)/desktop/puffin.icns \
-$(top_srcdir)/desktop/scilab.xml \
-$(top_srcdir)/desktop/scilab.icns
-
 valgrinddir = $(pkgdatadir)/tools/profiling
 valgrind_DATA = $(top_srcdir)/tools/profiling/valgrind.supp
 
-# Desktop file
-# Note that here, it is datadir and NOT pkgdatadir
-desktopdir = $(datadir)/applications
-desktop_DATA = $(top_srcdir)/desktop/scilab-adv-cli.desktop \
-$(top_srcdir)/desktop/scilab-cli.desktop \
-$(top_srcdir)/desktop/scilab.desktop
-
-
 # Used for mac os x because it needs to remove the charset=UTF-8 because it is breaking the accents.
 @IS_MACOSX_TRUE@MACOSX = 1
 
@@ -1117,46 +1098,6 @@ clean-libtool:
 
 distclean-libtool:
        -rm -f libtool config.lt
-install-desktopDATA: $(desktop_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
-       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
-       done
-
-uninstall-desktopDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
-install-iconsDATA: $(icons_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
-       @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
-       done
-
-uninstall-iconsDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
 install-infofilesDATA: $(infofiles_DATA)
        @$(NORMAL_INSTALL)
        test -z "$(infofilesdir)" || $(MKDIR_P) "$(DESTDIR)$(infofilesdir)"
@@ -1556,7 +1497,7 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) all-local
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rootdir)" "$(DESTDIR)$(valgrinddir)"; do \
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rootdir)" "$(DESTDIR)$(valgrinddir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
@@ -1609,9 +1550,8 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-desktopDATA \
-       install-iconsDATA install-infofilesDATA install-pkgconfigDATA \
-       install-rootDATA install-valgrindDATA
+install-data-am: install-data-local install-infofilesDATA \
+       install-pkgconfigDATA install-rootDATA install-valgrindDATA
 
 install-dvi: install-dvi-recursive
 
@@ -1660,7 +1600,6 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-       uninstall-desktopDATA uninstall-iconsDATA \
        uninstall-infofilesDATA uninstall-pkgconfigDATA \
        uninstall-rootDATA uninstall-valgrindDATA
 
@@ -1677,18 +1616,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
        distdir distuninstallcheck dvi dvi-am html html-am info \
        info-am install install-am install-binPROGRAMS \
        install-binSCRIPTS install-data install-data-am \
-       install-data-local install-desktopDATA install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-iconsDATA install-info install-info-am \
-       install-infofilesDATA install-man install-pdf install-pdf-am \
-       install-pkgconfigDATA install-ps install-ps-am \
+       install-data-local install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-infofilesDATA install-man install-pdf \
+       install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
        install-rootDATA install-strip install-valgrindDATA \
        installcheck installcheck-am installdirs installdirs-am \
        maintainer-clean maintainer-clean-generic mostlyclean \
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
        pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
        uninstall-binPROGRAMS uninstall-binSCRIPTS \
-       uninstall-desktopDATA uninstall-iconsDATA \
        uninstall-infofilesDATA uninstall-pkgconfigDATA \
        uninstall-rootDATA uninstall-valgrindDATA
 
index 50605b8..4dca488 100755 (executable)
@@ -37691,7 +37691,7 @@ if test "$enable_stop_on_warning" = yes; then
    CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
 fi
 
-ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
+ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/images/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 
 
 # Detection of the module for the future version of Scilab 6
@@ -39041,6 +39041,9 @@ do
     "libs/hashtable/Makefile") CONFIG_FILES="$CONFIG_FILES libs/hashtable/Makefile" ;;
     "libs/libst/Makefile") CONFIG_FILES="$CONFIG_FILES libs/libst/Makefile" ;;
     "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
+    "desktop/images/icons/Makefile") CONFIG_FILES="$CONFIG_FILES desktop/images/icons/Makefile" ;;
+    "desktop/images/Makefile") CONFIG_FILES="$CONFIG_FILES desktop/images/Makefile" ;;
+    "desktop/Makefile") CONFIG_FILES="$CONFIG_FILES desktop/Makefile" ;;
     "modules/helptools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/helptools/Makefile" ;;
     "modules/data_structures/Makefile") CONFIG_FILES="$CONFIG_FILES modules/data_structures/Makefile" ;;
     "modules/differential_equations/Makefile") CONFIG_FILES="$CONFIG_FILES modules/differential_equations/Makefile" ;;
index 6584c66..b102f67 100644 (file)
@@ -1742,6 +1742,9 @@ libs/doublylinkedlist/Makefile
 libs/hashtable/Makefile
 libs/libst/Makefile
 contrib/Makefile
+desktop/images/icons/Makefile
+desktop/images/Makefile
+desktop/Makefile
 modules/helptools/Makefile
 modules/data_structures/Makefile
 modules/differential_equations/Makefile
diff --git a/scilab/desktop/Makefile.am b/scilab/desktop/Makefile.am
new file mode 100644 (file)
index 0000000..1c142dd
--- /dev/null
@@ -0,0 +1,25 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) Scilab Enterprises - 2011 - Clement David
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+SUBDIRS = images
+
+# Desktop file
+# Note that here, it is datadir and NOT pkgdatadir
+desktopdir = $(datadir)/applications
+desktop_DATA = scilab-adv-cli.desktop \
+scilab-cli.desktop \
+scilab.desktop
+
+# Mimetype file
+# Note that here, it is datadir and NOT pkgdatadir
+mimedir = $(datadir)/mime/packages
+mime_DATA = scilab.xml
+
diff --git a/scilab/desktop/Makefile.in b/scilab/desktop/Makefile.in
new file mode 100644 (file)
index 0000000..1a5d010
--- /dev/null
@@ -0,0 +1,795 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) Scilab Enterprises - 2011 - Clement David
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = desktop
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
+       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
+       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+       install-dvi-recursive install-exec-recursive \
+       install-html-recursive install-info-recursive \
+       install-pdf-recursive install-ps-recursive install-recursive \
+       installcheck-recursive installdirs-recursive pdf-recursive \
+       ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"
+DATA = $(desktop_DATA) $(mime_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+       distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
+AMTAR = @AMTAR@
+ANT = @ANT@
+ANTLR = @ANTLR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
+AWK = @AWK@
+BATIK = @BATIK@
+BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
+CC = @CC@
+CCACHE = @CCACHE@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKSTYLE = @CHECKSTYLE@
+COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
+COMMONS_IO = @COMMONS_IO@
+COMMONS_LOGGING = @COMMONS_LOGGING@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
+DEPDIR = @DEPDIR@
+DOCBOOK_ROOT = @DOCBOOK_ROOT@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FFTW3_LIB = @FFTW3_LIB@
+FFTW_ENABLE = @FFTW_ENABLE@
+FGREP = @FGREP@
+FLEXDOCK = @FLEXDOCK@
+FLIBS = @FLIBS@
+FOP = @FOP@
+GENHTML = @GENHTML@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIWS_BIN = @GIWS_BIN@
+GLUEGEN_RT = @GLUEGEN_RT@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
+GREP = @GREP@
+GUI_ENABLE = @GUI_ENABLE@
+HDF5_CFLAGS = @HDF5_CFLAGS@
+HDF5_ENABLE = @HDF5_ENABLE@
+HDF5_LIBS = @HDF5_LIBS@
+HELP_ENABLE = @HELP_ENABLE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JAR = @JAR@
+JAVA = @JAVA@
+JAVAC = @JAVAC@
+JAVAC_DEBUG = @JAVAC_DEBUG@
+JAVADOC = @JAVADOC@
+JAVAH = @JAVAH@
+JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_ENABLE = @JAVA_ENABLE@
+JAVA_G = @JAVA_G@
+JAVA_HOME = @JAVA_HOME@
+JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
+JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
+JDB = @JDB@
+JEUCLID_CORE = @JEUCLID_CORE@
+JGRAPHX = @JGRAPHX@
+JHALL = @JHALL@
+JHDF5 = @JHDF5@
+JLATEXMATH = @JLATEXMATH@
+JLATEXMATH_FOP = @JLATEXMATH_FOP@
+JOGL = @JOGL@
+JROSETTA_API = @JROSETTA_API@
+JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
+LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOGGING_LEVEL = @LOGGING_LEVEL@
+LOOKS = @LOOKS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MATIO_CFLAGS = @MATIO_CFLAGS@
+MATIO_ENABLE = @MATIO_ENABLE@
+MATIO_LIBS = @MATIO_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGCAT = @MSGCAT@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OCAMLC = @OCAMLC@
+OCAMLDEP = @OCAMLDEP@
+OCAMLLEX = @OCAMLLEX@
+OCAMLOPT = @OCAMLOPT@
+OCAMLYACC = @OCAMLYACC@
+OPENMP_CFLAGS = @OPENMP_CFLAGS@
+OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+OPENMP_ENABLE = @OPENMP_ENABLE@
+OPENMP_LIBS = @OPENMP_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CFLAGS = @PCRE_CFLAGS@
+PCRE_CONFIG = @PCRE_CONFIG@
+PCRE_LIBS = @PCRE_LIBS@
+PCRE_VERSION = @PCRE_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+POW_LIB = @POW_LIB@
+PYTHON = @PYTHON@
+QDOX = @QDOX@
+RANLIB = @RANLIB@
+RELOCATABLE = @RELOCATABLE@
+RT_LIB = @RT_LIB@
+SAXON = @SAXON@
+SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
+SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
+SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
+SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
+SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SET_RELOCATABLE = @SET_RELOCATABLE@
+SHELL = @SHELL@
+SKINLF = @SKINLF@
+SPLINT = @SPLINT@
+STRIP = @STRIP@
+SWIG_BIN = @SWIG_BIN@
+SWIG_JAVA = @SWIG_JAVA@
+SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
+TCLTK_LIBS = @TCLTK_LIBS@
+TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
+TK_INC_PATH = @TK_INC_PATH@
+UMFPACK_ENABLE = @UMFPACK_ENABLE@
+UMFPACK_LIB = @UMFPACK_LIB@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_OCAML = @WITH_OCAML@
+WITH_TKSCI = @WITH_TKSCI@
+XCOS_ENABLE = @XCOS_ENABLE@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XMKMF = @XMKMF@
+XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
+XML_APIS_EXT = @XML_APIS_EXT@
+XML_CONFIG = @XML_CONFIG@
+XML_FLAGS = @XML_FLAGS@
+XML_LIBS = @XML_LIBS@
+XML_VERSION = @XML_VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cxx_present = @cxx_present@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = images
+
+# Desktop file
+# Note that here, it is datadir and NOT pkgdatadir
+desktopdir = $(datadir)/applications
+desktop_DATA = scilab-adv-cli.desktop \
+scilab-cli.desktop \
+scilab.desktop
+
+
+# Mimetype file
+# Note that here, it is datadir and NOT pkgdatadir
+mimedir = $(datadir)/mime/packages
+mime_DATA = scilab.xml
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+               && { if test -f $@; then exit 0; else break; fi; }; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign desktop/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign desktop/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+       done
+
+uninstall-desktopDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+install-mimeDATA: $(mime_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
+       @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
+       done
+
+uninstall-mimeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(mimedir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       target=`echo $@ | sed s/-recursive//`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           dot_seen=yes; \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done; \
+       if test "$$dot_seen" = "no"; then \
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       rev=''; for subdir in $$list; do \
+         if test "$$subdir" = "."; then :; else \
+           rev="$$subdir $$rev"; \
+         fi; \
+       done; \
+       rev="$$rev ."; \
+       target=`echo $@ | sed s/-recursive//`; \
+       for subdir in $$rev; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done && test -z "$$fail"
+tags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+       done
+ctags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       set x; \
+       here=`pwd`; \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+         include_option=--etags-include; \
+         empty_fix=.; \
+       else \
+         include_option=--include; \
+         empty_fix=; \
+       fi; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test ! -f $$subdir/TAGS || \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+         fi; \
+       done; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$unique; \
+         fi; \
+       fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+         else \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+           || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
+               am__remove_distdir=: \
+               am__skip_length_check=: \
+               am__skip_mode_fix=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+       for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-desktopDATA install-mimeDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-desktopDATA uninstall-mimeDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+       install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+       all all-am check check-am clean clean-generic clean-libtool \
+       ctags ctags-recursive distclean distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-desktopDATA install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-mimeDATA \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am \
+       uninstall-desktopDATA uninstall-mimeDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/scilab/desktop/images/Makefile.am b/scilab/desktop/images/Makefile.am
new file mode 100644 (file)
index 0000000..0ea8284
--- /dev/null
@@ -0,0 +1,13 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) Scilab Enterprises - 2011 - Clement David
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+SUBDIRS = icons
+
diff --git a/scilab/desktop/images/Makefile.in b/scilab/desktop/images/Makefile.in
new file mode 100644 (file)
index 0000000..013dfcf
--- /dev/null
@@ -0,0 +1,714 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) Scilab Enterprises - 2011 - Clement David
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = desktop/images
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
+       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
+       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+       install-dvi-recursive install-exec-recursive \
+       install-html-recursive install-info-recursive \
+       install-pdf-recursive install-ps-recursive install-recursive \
+       installcheck-recursive installdirs-recursive pdf-recursive \
+       ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+       distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
+AMTAR = @AMTAR@
+ANT = @ANT@
+ANTLR = @ANTLR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
+AWK = @AWK@
+BATIK = @BATIK@
+BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
+CC = @CC@
+CCACHE = @CCACHE@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKSTYLE = @CHECKSTYLE@
+COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
+COMMONS_IO = @COMMONS_IO@
+COMMONS_LOGGING = @COMMONS_LOGGING@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
+DEPDIR = @DEPDIR@
+DOCBOOK_ROOT = @DOCBOOK_ROOT@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FFTW3_LIB = @FFTW3_LIB@
+FFTW_ENABLE = @FFTW_ENABLE@
+FGREP = @FGREP@
+FLEXDOCK = @FLEXDOCK@
+FLIBS = @FLIBS@
+FOP = @FOP@
+GENHTML = @GENHTML@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIWS_BIN = @GIWS_BIN@
+GLUEGEN_RT = @GLUEGEN_RT@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
+GREP = @GREP@
+GUI_ENABLE = @GUI_ENABLE@
+HDF5_CFLAGS = @HDF5_CFLAGS@
+HDF5_ENABLE = @HDF5_ENABLE@
+HDF5_LIBS = @HDF5_LIBS@
+HELP_ENABLE = @HELP_ENABLE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JAR = @JAR@
+JAVA = @JAVA@
+JAVAC = @JAVAC@
+JAVAC_DEBUG = @JAVAC_DEBUG@
+JAVADOC = @JAVADOC@
+JAVAH = @JAVAH@
+JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_ENABLE = @JAVA_ENABLE@
+JAVA_G = @JAVA_G@
+JAVA_HOME = @JAVA_HOME@
+JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
+JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
+JDB = @JDB@
+JEUCLID_CORE = @JEUCLID_CORE@
+JGRAPHX = @JGRAPHX@
+JHALL = @JHALL@
+JHDF5 = @JHDF5@
+JLATEXMATH = @JLATEXMATH@
+JLATEXMATH_FOP = @JLATEXMATH_FOP@
+JOGL = @JOGL@
+JROSETTA_API = @JROSETTA_API@
+JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
+LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOGGING_LEVEL = @LOGGING_LEVEL@
+LOOKS = @LOOKS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MATIO_CFLAGS = @MATIO_CFLAGS@
+MATIO_ENABLE = @MATIO_ENABLE@
+MATIO_LIBS = @MATIO_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGCAT = @MSGCAT@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OCAMLC = @OCAMLC@
+OCAMLDEP = @OCAMLDEP@
+OCAMLLEX = @OCAMLLEX@
+OCAMLOPT = @OCAMLOPT@
+OCAMLYACC = @OCAMLYACC@
+OPENMP_CFLAGS = @OPENMP_CFLAGS@
+OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+OPENMP_ENABLE = @OPENMP_ENABLE@
+OPENMP_LIBS = @OPENMP_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CFLAGS = @PCRE_CFLAGS@
+PCRE_CONFIG = @PCRE_CONFIG@
+PCRE_LIBS = @PCRE_LIBS@
+PCRE_VERSION = @PCRE_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+POW_LIB = @POW_LIB@
+PYTHON = @PYTHON@
+QDOX = @QDOX@
+RANLIB = @RANLIB@
+RELOCATABLE = @RELOCATABLE@
+RT_LIB = @RT_LIB@
+SAXON = @SAXON@
+SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
+SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
+SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
+SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
+SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SET_RELOCATABLE = @SET_RELOCATABLE@
+SHELL = @SHELL@
+SKINLF = @SKINLF@
+SPLINT = @SPLINT@
+STRIP = @STRIP@
+SWIG_BIN = @SWIG_BIN@
+SWIG_JAVA = @SWIG_JAVA@
+SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
+TCLTK_LIBS = @TCLTK_LIBS@
+TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
+TK_INC_PATH = @TK_INC_PATH@
+UMFPACK_ENABLE = @UMFPACK_ENABLE@
+UMFPACK_LIB = @UMFPACK_LIB@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_OCAML = @WITH_OCAML@
+WITH_TKSCI = @WITH_TKSCI@
+XCOS_ENABLE = @XCOS_ENABLE@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XMKMF = @XMKMF@
+XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
+XML_APIS_EXT = @XML_APIS_EXT@
+XML_CONFIG = @XML_CONFIG@
+XML_FLAGS = @XML_FLAGS@
+XML_LIBS = @XML_LIBS@
+XML_VERSION = @XML_VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cxx_present = @cxx_present@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = icons
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+               && { if test -f $@; then exit 0; else break; fi; }; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign desktop/images/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign desktop/images/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       target=`echo $@ | sed s/-recursive//`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           dot_seen=yes; \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done; \
+       if test "$$dot_seen" = "no"; then \
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       rev=''; for subdir in $$list; do \
+         if test "$$subdir" = "."; then :; else \
+           rev="$$subdir $$rev"; \
+         fi; \
+       done; \
+       rev="$$rev ."; \
+       target=`echo $@ | sed s/-recursive//`; \
+       for subdir in $$rev; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done && test -z "$$fail"
+tags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+       done
+ctags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+       done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       set x; \
+       here=`pwd`; \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+         include_option=--etags-include; \
+         empty_fix=.; \
+       else \
+         include_option=--include; \
+         empty_fix=; \
+       fi; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test ! -f $$subdir/TAGS || \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+         fi; \
+       done; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       shift; \
+       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         if test $$# -gt 0; then \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             "$$@" $$unique; \
+         else \
+           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$unique; \
+         fi; \
+       fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+             END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && $(am__cd) $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+         else \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+           || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
+               am__remove_distdir=: \
+               am__skip_length_check=: \
+               am__skip_mode_fix=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+       install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+       all all-am check check-am clean clean-generic clean-libtool \
+       ctags ctags-recursive distclean distclean-generic \
+       distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-dvi install-dvi-am install-exec \
+       install-exec-am install-html install-html-am install-info \
+       install-info-am install-man install-pdf install-pdf-am \
+       install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/scilab/desktop/images/icons/16x16/apps/scilab.png b/scilab/desktop/images/icons/16x16/apps/scilab.png
new file mode 100644 (file)
index 0000000..5c3e078
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/apps/scilab.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-bin.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-bin.png
new file mode 100644 (file)
index 0000000..8c8607e
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-bin.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cos.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cos.png
new file mode 100644 (file)
index 0000000..7c4c87e
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cos.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cosf.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cosf.png
new file mode 100644 (file)
index 0000000..d452905
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-cosf.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-dem.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-dem.png
new file mode 100644 (file)
index 0000000..7c9a8e6
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-dem.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-graph.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-graph.png
new file mode 100644 (file)
index 0000000..1e0ab7f
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-graph.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sav.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sav.png
new file mode 100644 (file)
index 0000000..9929b6b
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sav.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sce.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sce.png
new file mode 100644 (file)
index 0000000..89e084a
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sce.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sci.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sci.png
new file mode 100644 (file)
index 0000000..830982b
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-sci.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-tst.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-tst.png
new file mode 100644 (file)
index 0000000..e911f27
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-tst.png differ
diff --git a/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-xcos.png b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-xcos.png
new file mode 100644 (file)
index 0000000..b915422
Binary files /dev/null and b/scilab/desktop/images/icons/16x16/mimetypes/application-x-scilab-xcos.png differ
diff --git a/scilab/desktop/images/icons/24x24/apps/scilab.png b/scilab/desktop/images/icons/24x24/apps/scilab.png
new file mode 100644 (file)
index 0000000..abcc611
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/apps/scilab.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-bin.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-bin.png
new file mode 100644 (file)
index 0000000..c9e8ba0
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-bin.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cos.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cos.png
new file mode 100644 (file)
index 0000000..0178e6e
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cos.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cosf.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cosf.png
new file mode 100644 (file)
index 0000000..ea694c9
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-cosf.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-dem.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-dem.png
new file mode 100644 (file)
index 0000000..dd617b8
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-dem.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-graph.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-graph.png
new file mode 100644 (file)
index 0000000..cf638d6
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-graph.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sav.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sav.png
new file mode 100644 (file)
index 0000000..e1a80d2
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sav.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sce.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sce.png
new file mode 100644 (file)
index 0000000..52c6c35
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sce.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sci.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sci.png
new file mode 100644 (file)
index 0000000..09ef157
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-sci.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-tst.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-tst.png
new file mode 100644 (file)
index 0000000..69f1560
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-tst.png differ
diff --git a/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-xcos.png b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-xcos.png
new file mode 100644 (file)
index 0000000..f667e70
Binary files /dev/null and b/scilab/desktop/images/icons/24x24/mimetypes/application-x-scilab-xcos.png differ
diff --git a/scilab/desktop/images/icons/256x256/apps/scilab.png b/scilab/desktop/images/icons/256x256/apps/scilab.png
new file mode 100644 (file)
index 0000000..4268cbe
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/apps/scilab.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-bin.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-bin.png
new file mode 100644 (file)
index 0000000..99d66b7
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-bin.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cos.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cos.png
new file mode 100644 (file)
index 0000000..53246fd
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cos.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cosf.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cosf.png
new file mode 100644 (file)
index 0000000..e392a2c
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-cosf.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-dem.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-dem.png
new file mode 100644 (file)
index 0000000..080673b
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-dem.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-graph.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-graph.png
new file mode 100644 (file)
index 0000000..e6f9f48
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-graph.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sav.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sav.png
new file mode 100644 (file)
index 0000000..779d444
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sav.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sce.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sce.png
new file mode 100644 (file)
index 0000000..0996f6f
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sce.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sci.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sci.png
new file mode 100644 (file)
index 0000000..8c16095
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-sci.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-tst.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-tst.png
new file mode 100644 (file)
index 0000000..7a9b83b
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-tst.png differ
diff --git a/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-xcos.png b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-xcos.png
new file mode 100644 (file)
index 0000000..45e5a7d
Binary files /dev/null and b/scilab/desktop/images/icons/256x256/mimetypes/application-x-scilab-xcos.png differ
diff --git a/scilab/desktop/images/icons/32x32/apps/scilab.png b/scilab/desktop/images/icons/32x32/apps/scilab.png
new file mode 100644 (file)
index 0000000..b0f7ce2
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/apps/scilab.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-bin.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-bin.png
new file mode 100644 (file)
index 0000000..04735c7
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-bin.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cos.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cos.png
new file mode 100644 (file)
index 0000000..66c1212
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cos.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cosf.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cosf.png
new file mode 100644 (file)
index 0000000..690d7eb
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-cosf.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-dem.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-dem.png
new file mode 100644 (file)
index 0000000..5c5961c
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-dem.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-graph.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-graph.png
new file mode 100644 (file)
index 0000000..5ab4ca7
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-graph.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sav.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sav.png
new file mode 100644 (file)
index 0000000..09df15b
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sav.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sce.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sce.png
new file mode 100644 (file)
index 0000000..e34e91f
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sce.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sci.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sci.png
new file mode 100644 (file)
index 0000000..88258c6
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-sci.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-tst.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-tst.png
new file mode 100644 (file)
index 0000000..f9b628a
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-tst.png differ
diff --git a/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-xcos.png b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-xcos.png
new file mode 100644 (file)
index 0000000..634baac
Binary files /dev/null and b/scilab/desktop/images/icons/32x32/mimetypes/application-x-scilab-xcos.png differ
diff --git a/scilab/desktop/images/icons/48x48/apps/scilab.png b/scilab/desktop/images/icons/48x48/apps/scilab.png
new file mode 100644 (file)
index 0000000..e90aa27
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/apps/scilab.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-bin.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-bin.png
new file mode 100644 (file)
index 0000000..f50202f
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-bin.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cos.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cos.png
new file mode 100644 (file)
index 0000000..88f7341
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cos.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cosf.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cosf.png
new file mode 100644 (file)
index 0000000..c931eeb
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-cosf.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-dem.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-dem.png
new file mode 100644 (file)
index 0000000..34bdfb7
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-dem.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-graph.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-graph.png
new file mode 100644 (file)
index 0000000..7454e40
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-graph.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sav.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sav.png
new file mode 100644 (file)
index 0000000..49cd81d
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sav.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sce.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sce.png
new file mode 100644 (file)
index 0000000..d1e9e61
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sce.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sci.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sci.png
new file mode 100644 (file)
index 0000000..c6eee3b
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-sci.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-tst.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-tst.png
new file mode 100644 (file)
index 0000000..94924ff
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-tst.png differ
diff --git a/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-xcos.png b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-xcos.png
new file mode 100644 (file)
index 0000000..423d07c
Binary files /dev/null and b/scilab/desktop/images/icons/48x48/mimetypes/application-x-scilab-xcos.png differ
diff --git a/scilab/desktop/images/icons/Makefile.am b/scilab/desktop/images/icons/Makefile.am
new file mode 100644 (file)
index 0000000..9eade2f
--- /dev/null
@@ -0,0 +1,68 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) Scilab Enterprises - 2011 - Clement David
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+iconsdir = $(datadir)/icons/hicolor
+nobase_icons_DATA = 16x16/apps/scilab.png \
+16x16/mimetypes/application-x-scilab-bin.png \
+16x16/mimetypes/application-x-scilab-cosf.png \
+16x16/mimetypes/application-x-scilab-cos.png \
+16x16/mimetypes/application-x-scilab-dem.png \
+16x16/mimetypes/application-x-scilab-graph.png \
+16x16/mimetypes/application-x-scilab-sav.png \
+16x16/mimetypes/application-x-scilab-sce.png \
+16x16/mimetypes/application-x-scilab-sci.png \
+16x16/mimetypes/application-x-scilab-tst.png \
+16x16/mimetypes/application-x-scilab-xcos.png \
+24x24/apps/scilab.png \
+24x24/mimetypes/application-x-scilab-bin.png \
+24x24/mimetypes/application-x-scilab-cosf.png \
+24x24/mimetypes/application-x-scilab-cos.png \
+24x24/mimetypes/application-x-scilab-dem.png \
+24x24/mimetypes/application-x-scilab-graph.png \
+24x24/mimetypes/application-x-scilab-sav.png \
+24x24/mimetypes/application-x-scilab-sce.png \
+24x24/mimetypes/application-x-scilab-sci.png \
+24x24/mimetypes/application-x-scilab-tst.png \
+24x24/mimetypes/application-x-scilab-xcos.png \
+256x256/apps/scilab.png \
+256x256/mimetypes/application-x-scilab-bin.png \
+256x256/mimetypes/application-x-scilab-cosf.png \
+256x256/mimetypes/application-x-scilab-cos.png \
+256x256/mimetypes/application-x-scilab-dem.png \
+256x256/mimetypes/application-x-scilab-graph.png \
+256x256/mimetypes/application-x-scilab-sav.png \
+256x256/mimetypes/application-x-scilab-sce.png \
+256x256/mimetypes/application-x-scilab-sci.png \
+256x256/mimetypes/application-x-scilab-tst.png \
+256x256/mimetypes/application-x-scilab-xcos.png \
+32x32/apps/scilab.png \
+32x32/mimetypes/application-x-scilab-bin.png \
+32x32/mimetypes/application-x-scilab-cosf.png \
+32x32/mimetypes/application-x-scilab-cos.png \
+32x32/mimetypes/application-x-scilab-dem.png \
+32x32/mimetypes/application-x-scilab-graph.png \
+32x32/mimetypes/application-x-scilab-sav.png \
+32x32/mimetypes/application-x-scilab-sce.png \
+32x32/mimetypes/application-x-scilab-sci.png \
+32x32/mimetypes/application-x-scilab-tst.png \
+32x32/mimetypes/application-x-scilab-xcos.png \
+48x48/apps/scilab.png \
+48x48/mimetypes/application-x-scilab-bin.png \
+48x48/mimetypes/application-x-scilab-cosf.png \
+48x48/mimetypes/application-x-scilab-cos.png \
+48x48/mimetypes/application-x-scilab-dem.png \
+48x48/mimetypes/application-x-scilab-graph.png \
+48x48/mimetypes/application-x-scilab-sav.png \
+48x48/mimetypes/application-x-scilab-sce.png \
+48x48/mimetypes/application-x-scilab-sci.png \
+48x48/mimetypes/application-x-scilab-tst.png \
+48x48/mimetypes/application-x-scilab-xcos.png
+
diff --git a/scilab/desktop/images/icons/Makefile.in b/scilab/desktop/images/icons/Makefile.in
new file mode 100644 (file)
index 0000000..431ac47
--- /dev/null
@@ -0,0 +1,619 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) Scilab Enterprises - 2011 - Clement David
+#
+# This file must be used under the terms of the CeCILL.
+# This source file is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+#
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = desktop/images/icons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
+       $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
+       $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
+       $(top_srcdir)/m4/intel_compiler.m4 \
+       $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
+       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
+       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
+       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
+       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
+       $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(nobase_icons_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
+AMTAR = @AMTAR@
+ANT = @ANT@
+ANTLR = @ANTLR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
+AWK = @AWK@
+BATIK = @BATIK@
+BLAS_LIBS = @BLAS_LIBS@
+BSH = @BSH@
+CC = @CC@
+CCACHE = @CCACHE@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CHECKSTYLE = @CHECKSTYLE@
+COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
+COMMONS_IO = @COMMONS_IO@
+COMMONS_LOGGING = @COMMONS_LOGGING@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
+DEPDIR = @DEPDIR@
+DOCBOOK_ROOT = @DOCBOOK_ROOT@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FFTW3_LIB = @FFTW3_LIB@
+FFTW_ENABLE = @FFTW_ENABLE@
+FGREP = @FGREP@
+FLEXDOCK = @FLEXDOCK@
+FLIBS = @FLIBS@
+FOP = @FOP@
+GENHTML = @GENHTML@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GIWS_BIN = @GIWS_BIN@
+GLUEGEN_RT = @GLUEGEN_RT@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
+GREP = @GREP@
+GUI_ENABLE = @GUI_ENABLE@
+HDF5_CFLAGS = @HDF5_CFLAGS@
+HDF5_ENABLE = @HDF5_ENABLE@
+HDF5_LIBS = @HDF5_LIBS@
+HELP_ENABLE = @HELP_ENABLE@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+JAR = @JAR@
+JAVA = @JAVA@
+JAVAC = @JAVAC@
+JAVAC_DEBUG = @JAVAC_DEBUG@
+JAVADOC = @JAVADOC@
+JAVAH = @JAVAH@
+JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_ENABLE = @JAVA_ENABLE@
+JAVA_G = @JAVA_G@
+JAVA_HOME = @JAVA_HOME@
+JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
+JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
+JDB = @JDB@
+JEUCLID_CORE = @JEUCLID_CORE@
+JGRAPHX = @JGRAPHX@
+JHALL = @JHALL@
+JHDF5 = @JHDF5@
+JLATEXMATH = @JLATEXMATH@
+JLATEXMATH_FOP = @JLATEXMATH_FOP@
+JOGL = @JOGL@
+JROSETTA_API = @JROSETTA_API@
+JROSETTA_ENGINE = @JROSETTA_ENGINE@
+JUNIT = @JUNIT@
+LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBM = @LIBM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LOGGING_LEVEL = @LOGGING_LEVEL@
+LOOKS = @LOOKS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MATIO_CFLAGS = @MATIO_CFLAGS@
+MATIO_ENABLE = @MATIO_ENABLE@
+MATIO_LIBS = @MATIO_LIBS@
+MKDIR_P = @MKDIR_P@
+MSGCAT = @MSGCAT@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OCAMLC = @OCAMLC@
+OCAMLDEP = @OCAMLDEP@
+OCAMLLEX = @OCAMLLEX@
+OCAMLOPT = @OCAMLOPT@
+OCAMLYACC = @OCAMLYACC@
+OPENMP_CFLAGS = @OPENMP_CFLAGS@
+OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+OPENMP_ENABLE = @OPENMP_ENABLE@
+OPENMP_LIBS = @OPENMP_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CFLAGS = @PCRE_CFLAGS@
+PCRE_CONFIG = @PCRE_CONFIG@
+PCRE_LIBS = @PCRE_LIBS@
+PCRE_VERSION = @PCRE_VERSION@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+POW_LIB = @POW_LIB@
+PYTHON = @PYTHON@
+QDOX = @QDOX@
+RANLIB = @RANLIB@
+RELOCATABLE = @RELOCATABLE@
+RT_LIB = @RT_LIB@
+SAXON = @SAXON@
+SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
+SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
+SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
+SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
+SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SET_RELOCATABLE = @SET_RELOCATABLE@
+SHELL = @SHELL@
+SKINLF = @SKINLF@
+SPLINT = @SPLINT@
+STRIP = @STRIP@
+SWIG_BIN = @SWIG_BIN@
+SWIG_JAVA = @SWIG_JAVA@
+SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
+TCLTK_LIBS = @TCLTK_LIBS@
+TCL_INC_PATH = @TCL_INC_PATH@
+TESTNG = @TESTNG@
+TK_INC_PATH = @TK_INC_PATH@
+UMFPACK_ENABLE = @UMFPACK_ENABLE@
+UMFPACK_LIB = @UMFPACK_LIB@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WITH_OCAML = @WITH_OCAML@
+WITH_TKSCI = @WITH_TKSCI@
+XCOS_ENABLE = @XCOS_ENABLE@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XMKMF = @XMKMF@
+XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
+XML_APIS_EXT = @XML_APIS_EXT@
+XML_CONFIG = @XML_CONFIG@
+XML_FLAGS = @XML_FLAGS@
+XML_LIBS = @XML_LIBS@
+XML_VERSION = @XML_VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_F77 = @ac_ct_F77@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cxx_present = @cxx_present@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+iconsdir = $(datadir)/icons/hicolor
+nobase_icons_DATA = 16x16/apps/scilab.png \
+16x16/mimetypes/application-x-scilab-bin.png \
+16x16/mimetypes/application-x-scilab-cosf.png \
+16x16/mimetypes/application-x-scilab-cos.png \
+16x16/mimetypes/application-x-scilab-dem.png \
+16x16/mimetypes/application-x-scilab-graph.png \
+16x16/mimetypes/application-x-scilab-sav.png \
+16x16/mimetypes/application-x-scilab-sce.png \
+16x16/mimetypes/application-x-scilab-sci.png \
+16x16/mimetypes/application-x-scilab-tst.png \
+16x16/mimetypes/application-x-scilab-xcos.png \
+24x24/apps/scilab.png \
+24x24/mimetypes/application-x-scilab-bin.png \
+24x24/mimetypes/application-x-scilab-cosf.png \
+24x24/mimetypes/application-x-scilab-cos.png \
+24x24/mimetypes/application-x-scilab-dem.png \
+24x24/mimetypes/application-x-scilab-graph.png \
+24x24/mimetypes/application-x-scilab-sav.png \
+24x24/mimetypes/application-x-scilab-sce.png \
+24x24/mimetypes/application-x-scilab-sci.png \
+24x24/mimetypes/application-x-scilab-tst.png \
+24x24/mimetypes/application-x-scilab-xcos.png \
+256x256/apps/scilab.png \
+256x256/mimetypes/application-x-scilab-bin.png \
+256x256/mimetypes/application-x-scilab-cosf.png \
+256x256/mimetypes/application-x-scilab-cos.png \
+256x256/mimetypes/application-x-scilab-dem.png \
+256x256/mimetypes/application-x-scilab-graph.png \
+256x256/mimetypes/application-x-scilab-sav.png \
+256x256/mimetypes/application-x-scilab-sce.png \
+256x256/mimetypes/application-x-scilab-sci.png \
+256x256/mimetypes/application-x-scilab-tst.png \
+256x256/mimetypes/application-x-scilab-xcos.png \
+32x32/apps/scilab.png \
+32x32/mimetypes/application-x-scilab-bin.png \
+32x32/mimetypes/application-x-scilab-cosf.png \
+32x32/mimetypes/application-x-scilab-cos.png \
+32x32/mimetypes/application-x-scilab-dem.png \
+32x32/mimetypes/application-x-scilab-graph.png \
+32x32/mimetypes/application-x-scilab-sav.png \
+32x32/mimetypes/application-x-scilab-sce.png \
+32x32/mimetypes/application-x-scilab-sci.png \
+32x32/mimetypes/application-x-scilab-tst.png \
+32x32/mimetypes/application-x-scilab-xcos.png \
+48x48/apps/scilab.png \
+48x48/mimetypes/application-x-scilab-bin.png \
+48x48/mimetypes/application-x-scilab-cosf.png \
+48x48/mimetypes/application-x-scilab-cos.png \
+48x48/mimetypes/application-x-scilab-dem.png \
+48x48/mimetypes/application-x-scilab-graph.png \
+48x48/mimetypes/application-x-scilab-sav.png \
+48x48/mimetypes/application-x-scilab-sce.png \
+48x48/mimetypes/application-x-scilab-sci.png \
+48x48/mimetypes/application-x-scilab-tst.png \
+48x48/mimetypes/application-x-scilab-xcos.png
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+               && { if test -f $@; then exit 0; else break; fi; }; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign desktop/images/icons/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign desktop/images/icons/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+install-nobase_iconsDATA: $(nobase_icons_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+       @list='$(nobase_icons_DATA)'; test -n "$(iconsdir)" || list=; \
+       $(am__nobase_list) | while read dir files; do \
+         xfiles=; for file in $$files; do \
+           if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+           else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+         test -z "$$xfiles" || { \
+           test "x$$dir" = x. || { \
+             echo "$(MKDIR_P) '$(DESTDIR)$(iconsdir)/$$dir'"; \
+             $(MKDIR_P) "$(DESTDIR)$(iconsdir)/$$dir"; }; \
+           echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(iconsdir)/$$dir'"; \
+           $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(iconsdir)/$$dir" || exit $$?; }; \
+       done
+
+uninstall-nobase_iconsDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(nobase_icons_DATA)'; test -n "$(iconsdir)" || list=; \
+       $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         if test -d $$d/$$file; then \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+         else \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+       for dir in "$(DESTDIR)$(iconsdir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-nobase_iconsDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-nobase_iconsDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man \
+       install-nobase_iconsDATA install-pdf install-pdf-am install-ps \
+       install-ps-am install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am uninstall uninstall-am uninstall-nobase_iconsDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/scilab/desktop/puffin.png b/scilab/desktop/puffin.png
deleted file mode 100644 (file)
index cf2e671..0000000
Binary files a/scilab/desktop/puffin.png and /dev/null differ
diff --git a/scilab/desktop/puffin_128.png b/scilab/desktop/puffin_128.png
deleted file mode 100644 (file)
index 3c97200..0000000
Binary files a/scilab/desktop/puffin_128.png and /dev/null differ
diff --git a/scilab/desktop/puffin_256.png b/scilab/desktop/puffin_256.png
deleted file mode 100644 (file)
index 5fbe156..0000000
Binary files a/scilab/desktop/puffin_256.png and /dev/null differ
diff --git a/scilab/desktop/puffin_32.png b/scilab/desktop/puffin_32.png
deleted file mode 100644 (file)
index aa212ad..0000000
Binary files a/scilab/desktop/puffin_32.png and /dev/null differ
diff --git a/scilab/desktop/puffin_48.png b/scilab/desktop/puffin_48.png
deleted file mode 100644 (file)
index bfdbfc9..0000000
Binary files a/scilab/desktop/puffin_48.png and /dev/null differ
diff --git a/scilab/desktop/scilab.ico b/scilab/desktop/scilab.ico
deleted file mode 100644 (file)
index 7e54280..0000000
Binary files a/scilab/desktop/scilab.ico and /dev/null differ
diff --git a/scilab/desktop/scilab.png b/scilab/desktop/scilab.png
deleted file mode 100644 (file)
index f97642f..0000000
Binary files a/scilab/desktop/scilab.png and /dev/null differ
index a0e1f4b..f6cd6a3 100644 (file)
@@ -1,19 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="text/sci">
+  <mime-type type="application/x-scilab-sci">
+    <sub-class-of type="text/plain"/>
     <comment xml:lang="en">Scilab macro</comment>
     <glob pattern="*.sci"/>
   </mime-type>
-  <mime-type type="text/sce">
+  <mime-type type="application/x-scilab-sce">
+    <sub-class-of type="text/plain"/>
     <comment xml:lang="en">Scilab script</comment>
     <glob pattern="*.sce"/>
   </mime-type>
-  <mime-type type="text/tst">
+  <mime-type type="application/x-scilab-tst">
+    <sub-class-of type="application/sce"/>
     <comment xml:lang="en">Scilab test</comment>
     <glob pattern="*.tst"/>
   </mime-type>
-  <mime-type type="application/xcos+xml">
+  <mime-type type="application/x-scilab-dem">
+    <sub-class-of type="application/sce"/>
+    <comment xml:lang="en">Scilab demo</comment>
+    <glob pattern="*.dem"/>
+  </mime-type>
+  <mime-type type="application/x-scilab-xcos">
+    <sub-class-of type="text/xml"/>
     <comment xml:lang="en">Scilab/Xcos schema</comment>
     <glob pattern="*.xcos"/>
   </mime-type>
+  <!-- Deprecated -->
+  <mime-type type="application/x-scilab-bin">
+    <sub-class-of type="application/octet-stream"/>
+    <comment xml:lang="en">Scilab binary</comment>
+    <glob pattern="*.bin"/>
+  </mime-type>
+  <mime-type type="application/x-scilab-cosf">
+    <sub-class-of type="application/x-scilab-sce"/>
+    <comment xml:lang="en">Scicos schema</comment>
+    <glob pattern="*.cosf"/>
+  </mime-type>
+  <mime-type type="application/x-scilab-cos">
+    <sub-class-of type="application/x-scilab-bin"/>
+    <comment xml:lang="en">Scicos binary schema</comment>
+    <glob pattern="*.cos"/>
+  </mime-type>
 </mime-info>
index ea5ba3a..ccbf641 100644 (file)
@@ -21,13 +21,15 @@ libsciatoms_la_etc_DATA = etc/atoms.quit etc/atoms.start etc/repositories
 MACROSDIRSEXT = macros/atoms_internals macros/atoms_gui
 
 #### atoms : icons files ####
+#
+# Generated with:
+#    $ find images/ -type f -printf "%p \\\\\n" -name *.svg -or -name *.gif -or -name *.jpg -or -name *.png |sort -u
 libsciatoms_la_iconsdir=$(mydatadir)/
-nobase_libsciatoms_la_icons_DATA = images/icons/installed.png \
-images/icons/notinstalled.png \
-images/icons/notuptodate.png \
-images/icons/software-update-available.png \
-images/icons/dialog-information.png \
-images/icons/emblem-default.png \
-images/icons/user-home.png
+nobase_libsciatoms_la_icons_DATA = images/icons/16x16/emblems/emblem-default.png \
+images/icons/16x16/status/dialog-information.png \
+images/icons/16x16/status/software-update-available.png \
+images/icons/16x16/status/software-update-installed.png \
+images/icons/16x16/status/software-update-notinstalled.png \
+images/icons/16x16/status/software-update-notuptodate.png
 
 include $(top_srcdir)/Makefile.incl.am
index 085c0a6..41bda3a 100644 (file)
@@ -378,14 +378,16 @@ libsciatoms_la_etc_DATA = etc/atoms.quit etc/atoms.start etc/repositories
 MACROSDIRSEXT = macros/atoms_internals macros/atoms_gui
 
 #### atoms : icons files ####
+#
+# Generated with:
+#    $ find images/ -type f -printf "%p \\\\\n" -name *.svg -or -name *.gif -or -name *.jpg -or -name *.png |sort -u
 libsciatoms_la_iconsdir = $(mydatadir)/
-nobase_libsciatoms_la_icons_DATA = images/icons/installed.png \
-images/icons/notinstalled.png \
-images/icons/notuptodate.png \
-images/icons/software-update-available.png \
-images/icons/dialog-information.png \
-images/icons/emblem-default.png \
-images/icons/user-home.png
+nobase_libsciatoms_la_icons_DATA = images/icons/16x16/emblems/emblem-default.png \
+images/icons/16x16/status/dialog-information.png \
+images/icons/16x16/status/software-update-available.png \
+images/icons/16x16/status/software-update-installed.png \
+images/icons/16x16/status/software-update-notinstalled.png \
+images/icons/16x16/status/software-update-notuptodate.png
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index cb62ca4..c8397ed 100644 (file)
  *
  -->
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="_atomsGettingStarted">
-
   <refnamediv>
     <refname>Getting started</refname>
   </refnamediv>
-       
   <refsection>
     <title>Introduction</title>
     <para>
                        scilab platform towards a session example. It describes how one can install
                        a module and load it in Scilab environment.
                </para>
-       </refsection>
-       
+  </refsection>
   <refsection>
     <title>Atoms</title>
     <para>
-                       <itemizedlist>
-                               
-                               <listitem>
-                                       <para>
-                                               <emphasis role="strong">Configure ATOMS to display extra-informations</emphasis> 
-                                               <programlisting>
-<![CDATA[-->atomsSetConfig('Verbose','True');]]>
-                                               </programlisting>
-                                       </para>
-                               </listitem>
-                               
-                               <listitem>
-                                       <para>
-                                               <emphasis role="strong">List available modules</emphasis> 
-                                               <programlisting>
-<![CDATA[
+      <itemizedlist>
+        <listitem>
+          <para>
+            <emphasis role="strong">Configure ATOMS to display extra-informations</emphasis>
+            <programlisting><![CDATA[-->atomsSetConfig('Verbose','True');]]></programlisting>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <emphasis role="strong">List available modules</emphasis>
+            <programlisting><![CDATA[
 -->atomsList();
 
       ampl_toolbox - An interface to load .nl files created by AMPL
            simplex - This package contains the simplex optimization method
    sndfile_toolbox - Read & write sound files
            stixbox - Statistics toolbox for Scilab 5.2
-]]>
-                                               </programlisting>
-                                       </para>
-                               </listitem>
-                               
-                               <listitem>
-                                       <para>
-                                               <emphasis role="strong">Install a module</emphasis>
+]]></programlisting>
+          </para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="strong">Install a module</emphasis>
                                                Installing a module download and extract it.
-                                               <programlisting>
-<![CDATA[
+                                               <programlisting><![CDATA[
 -->atomsInstall('NISP');
 
     NISP (2.1) will be installed in the 'allusers' section
     Installing NISP (2.1) ... success
 
-]]>
-                                               </programlisting>
+]]></programlisting>
                                        </para>
-                               </listitem>
-                                       
-                               <listitem>
-                                       <para>
-                                               <emphasis role="strong">Load a module</emphasis>
+        </listitem>
+        <listitem>
+          <para><emphasis role="strong">Load a module</emphasis>
                                                The module is installed but it's not loaded in the scilab environment
                                                and its functionnalities are not available yet.
                                        </para>
-                                       <para>
-                                               <inlinemediaobject>
-                                                       <imageobject>
-                                                               <imagedata fileref="../images/dialog-information.png"/>
-                                                       </imageobject>
-                                               </inlinemediaobject>
+          <para><inlinemediaobject><imageobject><imagedata fileref="../../images/icons/16x16/status/dialog-information.png"/></imageobject></inlinemediaobject>
                                                By default, a module is added to the list of modules to load at Scilab
                                                start when it's installed.
                                                <emphasis>
                                                (&gt;&gt; More information on the autoload
                                                system :
-                                                       <simplelist type="inline">
-                                                               <member>
-                                                                       <link linkend="atomsAutoloadList">atomsAutoloadList</link>
-                                                               </member>
-                                                               <member>
-                                                                       <link linkend="atomsAutoloadAdd">atomsAutoloadAdd</link>
-                                                               </member>
-                                                               <member>
-                                                                       <link linkend="atomsAutoloadDel">atomsAutoloadDel</link>
-                                                               </member>
-                                                       </simplelist>
+                                                       <simplelist type="inline"><member><link linkend="atomsAutoloadList">atomsAutoloadList</link></member><member><link linkend="atomsAutoloadAdd">atomsAutoloadAdd</link></member><member><link linkend="atomsAutoloadDel">atomsAutoloadDel</link></member></simplelist>
                                                ).
                                                </emphasis>
                                        </para>
-                                               
-                                       <para>
-                                               
-                                               <programlisting>
-
-                       <![CDATA[
+          <para>
+            <programlisting><![CDATA[
 -->atomsLoad('NISP');
       
     Start NISP Toolbox
       Load gateways
       Load help
       Load demos
-]]>
-                                       </programlisting>
-                                       </para>
-                       </listitem>
-                               <listitem>
-                                       <para>
-                                               <emphasis role="strong">Remove a module:</emphasis> 
-                                               <programlisting>
-<![CDATA[
+]]></programlisting>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <emphasis role="strong">Remove a module:</emphasis>
+            <programlisting><![CDATA[
 -->atomsRemove NISP
   
     NISP (2.1) will be removed from the 'allusers' section
     the package NISP (2.1) is currently loaded, It will removed at next Scilab restart
-]]>
-                                               </programlisting>
-                                       </para>
-                               </listitem>
-                       </itemizedlist>
-               </para>
-  </refsection>        
-       
+]]></programlisting>
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+  </refsection>
   <!-- ===================================================================== -->
   <!-- Authors -->
   <!-- ===================================================================== -->
diff --git a/scilab/modules/atoms/images/icons/user-home.png b/scilab/modules/atoms/images/icons/user-home.png
deleted file mode 100644 (file)
index 13d2c00..0000000
Binary files a/scilab/modules/atoms/images/icons/user-home.png and /dev/null differ
index 5c31e1b..503f23d 100644 (file)
@@ -327,10 +327,10 @@ function elements = getHomeListboxElements()
         MRVersionInstalled = MRVersionInstalled(1);
         if atomsVersionCompare(MRVersionInstalled,MRVersionAvailable) == -1 then
             // Not up-to-date
-            icon = "notuptodate.png";
+            icon = "software-update-notinstalled.png";
         else
             // The Most Recent Version is already installed
-            icon = "installed.png";
+            icon = "software-update-installed.png";
         end
 
         if modulo(i,2) == 0 then
@@ -342,7 +342,7 @@ function elements = getHomeListboxElements()
         thisItem =            "<html>";
 
         thisItem = thisItem + "<table style=""background-color:"+background+";color:#000000;"" ><tr>";
-        thisItem = thisItem + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/"+icon+""" /></td>";
+        thisItem = thisItem + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/16x16/status/"+icon+""" /></td>";
         thisItem = thisItem + "<td>";
         thisItem = thisItem + "  <div style=""width:383px;text-align:left;"">";
         thisItem = thisItem + "    <span style=""font-weight:bold;"">"+allModules(installed(i,1))(installed(i,2)).Title+" "+installed(i,2)+"</span><br />";
index edebf8a..844c742 100644 (file)
@@ -502,18 +502,18 @@ function updateStatusBar(status,msg)
     select status
         case "warning" then
             fontcolor = "#ff0000"; // red
-            icon      = "software-update-available.png";
+            icon      = "status/software-update-available.png";
         case "success" then
             fontcolor = "#009a1b"; // dark green
-            icon      = "emblem-default.png";
+            icon      = "emblems/emblem-default.png";
         case "info" then
             fontcolor = "#7d7d7d"; // dark green
-            icon      = "dialog-information.png";
+            icon      = "status/dialog-information.png";
     end
 
     str =       "<html>";
     str = str + "<table><tr>";
-    str = str + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/"+icon+""" /></td>";
+    str = str + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/16x16/"+icon+""" /></td>";
     str = str + "<td><div style=""color:"+fontcolor+";font-style:italic;"">"+msg+"</div></td>";
     str = str + "</tr></table>";
     str = str + "</html>";
index ab3fc96..e40de50 100644 (file)
@@ -62,7 +62,7 @@ function elements = atomsGetLeftListboxElts(category)
 
         thisItem  =            "<html>";
         thisItem  = thisItem + "<table style=""background-color:#ffffff;color:#000000;""><tr>";
-        thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/user-home.png"" /></td>";
+        thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/gui/images/icons/16x16/places/user-home.png"" /></td>";
         thisItem  = thisItem + "<td style=""width:132px;""><div style=""width:118px;text-align:left;font-weight:bold;"">"+gettext("All modules")+"</div></td>";
         thisItem  = thisItem + "</tr></table>";
         thisItem  = thisItem + "</html>";
@@ -80,7 +80,7 @@ function elements = atomsGetLeftListboxElts(category)
 
             thisItem  =            "<html>";
             thisItem  = thisItem + "<table style=""background-color:"+background+";color:#000000;"" ><tr>";
-            thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/gui/images/icons/folder.png"" /></td>";
+            thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/gui/images/icons/16x16/places/folder.png"" /></td>";
             thisItem  = thisItem + "<td style=""width:132px;""><div style=""width:118px;text-align:left;"">"+categories(i)+"</div></td>";
             thisItem  = thisItem + "</tr></table>";
             thisItem  = thisItem + "</html>";
@@ -121,7 +121,7 @@ function elements = atomsGetLeftListboxElts(category)
 
         thisItem  =            "<html>";
         thisItem  = thisItem + "<table style=""background-color:#ffffff;color:#000000;"" ><tr>";
-        thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/user-home.png"" /></td>";
+        thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/gui/images/icons/16x16/places/user-home.png"" /></td>";
         thisItem  = thisItem + "<td style=""width:132px;""><div style=""width:118px;text-align:left;font-weight:bold;"">"+top_str+"</div></td>";
 
         thisItem  = thisItem + "</tr></table>";
@@ -140,7 +140,7 @@ function elements = atomsGetLeftListboxElts(category)
 
             thisItem  =            "<html>";
             thisItem  = thisItem + "<table style=""background-color:"+background+";color:#000000;"" ><tr>";
-            thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/gui/images/icons/folder.png"" /></td>";
+            thisItem  = thisItem + "<td><img src=""file:///"+SCI+"/modules/gui/images/icons/16x16/places/folder.png"" /></td>";
             thisItem  = thisItem + "<td style=""width:132px;""><div style=""width:118px;text-align:left;"">"+categories(i)+"</div></td>";
             thisItem  = thisItem + "</tr></table>";
             thisItem  = thisItem + "</html>";
@@ -171,14 +171,14 @@ function elements = atomsGetLeftListboxElts(category)
 
                 if atomsVersionCompare(MRVersionInstalled,MRVersionAvailable) == -1 then
                     // Not up-to-date
-                    icon = "notuptodate.png";
+                    icon = "software-update-notuptodate.png";
                 else
                     // The Most Recent Version is already installed
-                    icon = "installed.png";
+                    icon = "software-update-installed.png";
                 end
 
             else
-                icon = "notinstalled.png";
+                icon = "software-update-notinstalled.png";
             end
 
             if background == "#eeeeee" then
@@ -189,7 +189,7 @@ function elements = atomsGetLeftListboxElts(category)
 
             thisItem =            "<html>";
             thisItem = thisItem + "<table style=""background-color:"+background+";color:#000000;"" ><tr>";
-            thisItem = thisItem + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/"+icon+""" /></td>";
+            thisItem = thisItem + "<td><img src=""file:///"+SCI+"/modules/atoms/images/icons/16x16/status/"+icon+""" /></td>";
             thisItem = thisItem + "<td style=""width:132px;""><div style=""width:118px;text-align:left;"">"+thisModuleTitle+"</div></td>";
             thisItem = thisItem + "</tr></table>";
             thisItem = thisItem + "</html>";
index 34abd1a..2b04e47 100644 (file)
@@ -33,7 +33,7 @@ public final class CopyAction extends VertexSelectionDependantAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.COPY;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-copy.png";
+    public static final String SMALL_ICON = "edit-copy";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_C;
        /** Accelerator key for the action */
@@ -61,6 +61,7 @@ public final class CopyAction extends VertexSelectionDependantAction {
         * @param e the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
+    @Override
     public void actionPerformed(ActionEvent e) {
        mxGraphTransferHandler.getCopyAction().actionPerformed(new ActionEvent(getGraph(e).getAsComponent(), e.getID(), e.getActionCommand()));
        
index 799fb19..e7481e9 100644 (file)
@@ -33,7 +33,7 @@ public final class CutAction extends VertexSelectionDependantAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.CUT;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-cut.png";
+    public static final String SMALL_ICON = "edit-cut";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_X;
        /** Accelerator key for the action */
@@ -61,6 +61,7 @@ public final class CutAction extends VertexSelectionDependantAction {
         * @param e the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
+    @Override
     public void actionPerformed(ActionEvent e) {
        mxGraphTransferHandler.getCutAction().actionPerformed(new ActionEvent(getGraph(e).getAsComponent(), e.getID(), e.getActionCommand()));
        
index bdafc12..089f7b0 100644 (file)
@@ -29,7 +29,7 @@ public final class DeleteAction extends OneSelectionDependantAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.DELETE;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-delete.png";
+    public static final String SMALL_ICON = "edit-delete";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_DELETE;
        /** Accelerator key for the action */
@@ -66,7 +66,8 @@ public final class DeleteAction extends OneSelectionDependantAction {
         * @param e the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
-       public void actionPerformed(ActionEvent e) {
+       @Override
+    public void actionPerformed(ActionEvent e) {
        getGraph(e).removeCells(getGraph(e).getSelectionCells());
        }
 
index 52302cf..3b6ec2f 100644 (file)
@@ -36,7 +36,7 @@ public final class PasteAction extends DefaultAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.PASTE;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-paste.png";
+    public static final String SMALL_ICON = "edit-paste";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_V;
        /** Accelerator key for the action */
@@ -66,7 +66,8 @@ public final class PasteAction extends DefaultAction {
         * @param e the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
-       public void actionPerformed(ActionEvent e) {
+       @Override
+    public void actionPerformed(ActionEvent e) {
                mxGraphTransferHandler.getPasteAction().actionPerformed(new ActionEvent(getGraph(e).getAsComponent(),
                                e.getID(), e.getActionCommand()));
        }
index 8182a9a..56f1509 100644 (file)
@@ -36,7 +36,7 @@ public class RedoAction extends DefaultAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.REDO;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-redo.png";
+    public static final String SMALL_ICON = "edit-redo";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_Y;
        /** Accelerator key for the action */
@@ -87,7 +87,8 @@ public class RedoAction extends DefaultAction {
                 * @param evt the current event
                 * @see com.mxgraph.util.mxEventSource.mxIEventListener#invoke(java.lang.Object, com.mxgraph.util.mxEventObject)
                 */
-               public void invoke(Object sender, mxEventObject evt) {
+               @Override
+        public void invoke(Object sender, mxEventObject evt) {
                        boolean canRedo = scilabGraph.getUndoManager().canRedo();
                        super.setEnabled(canRedo);
                }
@@ -129,7 +130,8 @@ public class RedoAction extends DefaultAction {
         *            the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
-       public void actionPerformed(ActionEvent e) {
+       @Override
+    public void actionPerformed(ActionEvent e) {
                final ScilabGraph graph = getGraph(e);
 
                graph.removeUndoHandler();
index 7756b08..54a5d4b 100644 (file)
@@ -29,7 +29,7 @@ public final class SelectAllAction extends OneBlockDependantAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.SELECT_ALL;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-select-all.png";
+    public static final String SMALL_ICON = "edit-select-all";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_A;
        /** Accelerator key for the action */
@@ -57,7 +57,8 @@ public final class SelectAllAction extends OneBlockDependantAction {
         * @param e the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
-       public void actionPerformed(ActionEvent e) {
+       @Override
+    public void actionPerformed(ActionEvent e) {
                getGraph(e).selectAll();
        }
 }
index 79e0676..a02dd01 100644 (file)
@@ -36,7 +36,7 @@ public class UndoAction extends DefaultAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.UNDO;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "edit-undo.png";
+    public static final String SMALL_ICON = "edit-undo";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_Z;
        /** Accelerator key for the action */
@@ -86,7 +86,8 @@ public class UndoAction extends DefaultAction {
                 * @param evt the current event
                 * @see com.mxgraph.util.mxEventSource.mxIEventListener#invoke(java.lang.Object, com.mxgraph.util.mxEventObject)
                 */
-               public void invoke(Object sender, mxEventObject evt) {
+               @Override
+        public void invoke(Object sender, mxEventObject evt) {
                        boolean canUndo = scilabGraph.getUndoManager().canUndo();
                        super.setEnabled(canUndo);
                }
@@ -128,7 +129,8 @@ public class UndoAction extends DefaultAction {
         *            the event
         * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
         */
-       public void actionPerformed(ActionEvent e) {
+       @Override
+    public void actionPerformed(ActionEvent e) {
                final ScilabGraph graph = getGraph(e);
 
                graph.removeUndoHandler();
index 30674f6..3043297 100644 (file)
@@ -39,7 +39,7 @@ public class ZoomInAction extends DefaultAction {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.ZOOM_IN;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "zoom-in.png";
+    public static final String SMALL_ICON = "zoom-in";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_ADD;
        /** Accelerator key for the action */
index 09d4c38..8cfdbc9 100644 (file)
@@ -41,7 +41,7 @@ public class ZoomOutAction extends DefaultAction implements ActionListener {
        /** Name of the action */
        public static final String NAME = ScilabGraphMessages.ZOOM_OUT;
        /** Icon name of the action */
-       public static final String SMALL_ICON = "zoom-out.png";
+    public static final String SMALL_ICON = "zoom-out";
        /** Mnemonic key of the action */
        public static final int MNEMONIC_KEY = KeyEvent.VK_SUBTRACT;
        /** Accelerator key for the action */
index 1372162..7fa7cc9 100644 (file)
@@ -16,10 +16,6 @@ package org.scilab.modules.graph.actions.base;
 import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -37,6 +33,7 @@ import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.pushbutton.ScilabPushButton;
+import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 
 import com.mxgraph.swing.mxGraphComponent;
 
@@ -44,267 +41,231 @@ import com.mxgraph.swing.mxGraphComponent;
  * Default action for a Scilab Graph
  */
 public abstract class DefaultAction extends CallBack {
-       private static final Set<String> ICON_PATH = new HashSet<String>();
-
-       static {
-               addIconPath(System.getenv("SCI") + "/modules/gui/images/icons/");
-       }
-       
-       private final ScilabGraph scilabGraph;
-
-       /**
-        * Default constructor.
-        * 
-        *The {@link AbstractAction} object is configured using the reflection API.
-        * So you have to be sure that the following fields are declared as static
-        * final fields of each subclasses.
-        * <ul>
-        * <li>String NAME : The name of the action</li>
-        * <li>String SMALL_ICON : The associated icon name (located on
-        * $SCI/modules/gui/images/icons)</li>
-        * <li>int MNEMONIC_KEY : The key associated with the action (see
-        * {@link KeyEvent})</li>
-        * <li>int ACCELERATOR_KEY : The key mask to apply to the mnemonic</li>
-        * </ul>
-        * 
-        * @param scilabGraph
-        *            corresponding Scilab Graph
-        */
-       public DefaultAction(ScilabGraph scilabGraph) {
-               super("");
-               this.scilabGraph = scilabGraph;
-
-               installProperties();
-       }
-       
-       /**
-        * Add an icon path to the default icon path.
-        * 
-        * @param path the icon path (with the trailing /)
-        */
-       public static void addIconPath(String path) {
-               ICON_PATH.add(path);
-       }
-
-       /**
-        * Add an icon path to the default icon path.
-        * 
-        * @param path the icon path (with the trailing /)
-        */
-       public static void addIconPath(File path) {
-               if (path.isDirectory()) {
-                       try {
-                               ICON_PATH.add(path.getCanonicalPath() + File.separatorChar);
-                       } catch (IOException e) { }
-               }
-       }
-       
-       /**
-        * Install the static actions properties on the instance
-        */
-       private void installProperties() {
-               String name = "";
-               String icon = "";
-               int mnemonic = 0;
-               int accelerator = 0;
-               try {
-                       name = (String) getClass().getField("NAME").get(null);
-                       
-                       /*
-                        * Getting icon from the registered icon path
-                        */
-                       String iconName = (String) getClass().getField("SMALL_ICON").get(null);
-                       if (iconName != null && !iconName.isEmpty()) {
-                               // TODO: manage icons according to http://live.gnome.org/ThemableAppSpecificIcons
-                               
-                               // add default extension of no-one set
-                               if (iconName.lastIndexOf('.') == -1) {
-                                       iconName = iconName + ".png";
-                               }
-                               
-                               // get the existing icon path
-                               for (String path : ICON_PATH) {
-                                       if (new File(path + iconName).isFile()) {
-                                               icon = path + iconName;
-                                               break;
-                                       }
-                               }
-                       }
-                       
-                       mnemonic = getClass().getField("MNEMONIC_KEY").getInt(null);
-                       accelerator = getClass().getField("ACCELERATOR_KEY").getInt(null);
-               } catch (IllegalArgumentException e) {
-                       e.printStackTrace();
-               } catch (SecurityException e) {
-                       e.printStackTrace();
-               } catch (IllegalAccessException e) {
-                       e.printStackTrace();
-               } catch (NoSuchFieldException e) {
-                       e.printStackTrace();
-               }
-
-               assert !"".equals(name);
-               putValue(Action.NAME, name);
-               putValue(Action.SHORT_DESCRIPTION, name);
-               putValue(Action.LONG_DESCRIPTION, name);
-               if (!icon.isEmpty()) {
-                       putValue(Action.SMALL_ICON, new ImageIcon(icon));
-               }
-
-               /*
-                * Set up the accelerator instead of the mnemonic as the menu is the
-                * preferred way on keyboard control. We are using Action.MNEMONIC_KEY
-                * as keyboard key and Action.ACCELERATOR_KEY as a mask.
-                * 
-                * Install it only when there is a real shortcut (with a mnemonic).
-                */
-               if (mnemonic != 0) {
-                       putValue(Action.MNEMONIC_KEY, mnemonic);
-                       putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(mnemonic,
-                                       accelerator));
-               }
-       }
-
-       /**
-        * Create a menu item associated with the graph
-        * 
-        * @param graph
-        *            the graph to work on
-        * @param klass
-        *            the associated klass
-        * @return the menu item
-        */
-       protected static MenuItem createMenu(ScilabGraph graph,
-                       final Class< ? extends DefaultAction> klass) {
-               DefaultAction action = GraphActionManager.getInstance(graph, klass);
-               MenuItem item = ScilabMenuItem.createMenuItem();
-
-               SwingScilabMenuItem swingItem = (SwingScilabMenuItem) item
-                               .getAsSimpleMenuItem();
-               swingItem.setAction(action);
-
-               return item;
-       }
-
-       /**
-        * Create a menu item associated with the graph
-        * 
-        * @param graph
-        *            the graph to work on
-        * @param klass
-        *            the associated klass
-        * @return the push button
-        */
-       protected static PushButton createButton(ScilabGraph graph,
-                       final Class< ? extends DefaultAction> klass) {
-               DefaultAction action = GraphActionManager.getInstance(graph, klass);
-               PushButton item = ScilabPushButton.createPushButton();
-
-               SwingScilabPushButton swingItem = (SwingScilabPushButton) item
-                               .getAsSimplePushButton();
-               swingItem.setAction(action);
-
-               // Hide the text on buttons
-               swingItem.setHideActionText(true);
-
-               return item;
-       }
-
-       /**
-        * Create a menu item associated with the graph
-        * 
-        * @param graph
-        *            the graph to work on
-        * @param klass
-        *            the associated klass
-        * @return the checkbox item
-        */
-       protected static CheckBoxMenuItem createCheckBoxMenu(ScilabGraph graph,
-                       Class< ? extends DefaultAction> klass) {
-               DefaultAction action = GraphActionManager.getInstance(graph, klass);
-               CheckBoxMenuItem item = ScilabCheckBoxMenuItem.createCheckBoxMenuItem();
-
-               SwingScilabCheckBoxMenuItem swingItem = (SwingScilabCheckBoxMenuItem) item
-                               .getAsSimpleCheckBoxMenuItem();
-               swingItem.setAction(action);
-
-               return item;
-       }
-
-       /**
-        * Constructor
-        * @param label action descriptor
-        * @param scilabGraph associated Scilab Graph
-        */
-       @Deprecated
-       protected DefaultAction(String label, ScilabGraph scilabGraph) {
-               super(label);
-               this.scilabGraph = scilabGraph;
-       }
-
-       /**
-        * Get associated graph
-        * @param e event
-        * @return Returns the graph for the given action event.
-        */
-       protected final ScilabGraph getGraph(ActionEvent e) {
-               if (this.scilabGraph != null) {
-                       return this.scilabGraph;
-               }
-               
-               if (e == null) {
-                       return null;
-               }
-
-               if (e.getSource() instanceof Component) {
-                       Component component = (Component) e.getSource();
-
-                       while (component != null && !(component instanceof mxGraphComponent)) {
-                               component = component.getParent();
-                       }
-
-                       return (ScilabGraph) ((mxGraphComponent) component).getGraph();
-               }
-
-               return null;
-       }
-
-
-       /**
-        * Create a button for a graph toolbar
-        * @param title label of the menu
-        * @param icon the path the an icon file
-        * @param listener action listener associated
-        * @param keyStroke menu shortcut
-        * @return the button
-        */
-       @Deprecated
-       protected static MenuItem createMenu(String title, String icon, DefaultAction listener, KeyStroke keyStroke) {
-               MenuItem menu = ScilabMenuItem.createMenuItem();
-               menu.setCallback(listener);
-               menu.setText(title);
-
-               if (keyStroke != null) {
-                       ((SwingScilabMenuItem) menu.getAsSimpleMenuItem()).setAccelerator(keyStroke);
-               }
-
-               return menu;
-       }
-       
-       /**
-        * Action
-        * @param e parameters
-        * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
-        */
-       @Override
-       public abstract void actionPerformed(ActionEvent e);
-       
-       /**
-        * Not used
-        * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
-        */
-       @Override
-       public void callBack() {
-               assert "Must never be called as we bypass Callback.java".equals("");
-       }
+    private final ScilabGraph scilabGraph;
+
+    /**
+     * Default constructor.
+     * 
+     * The {@link AbstractAction} object is configured using the reflection API.
+     * So you have to be sure that the following fields are declared as static
+     * final fields of each subclasses.
+     * <ul>
+     * <li>String NAME : The name of the action</li>
+     * <li>String SMALL_ICON : The associated icon name (located on
+     * $SCI/modules/gui/images/icons)</li>
+     * <li>int MNEMONIC_KEY : The key associated with the action (see
+     * {@link KeyEvent})</li>
+     * <li>int ACCELERATOR_KEY : The key mask to apply to the mnemonic</li>
+     * </ul>
+     * 
+     * @param scilabGraph
+     *            corresponding Scilab Graph
+     */
+    public DefaultAction(ScilabGraph scilabGraph) {
+        super("");
+        this.scilabGraph = scilabGraph;
+
+        installProperties();
+    }
+
+    /**
+     * Install the static actions properties on the instance
+     */
+    private void installProperties() {
+        String name = "";
+        ImageIcon icon = null;
+        int mnemonic = 0;
+        int accelerator = 0;
+        try {
+            name = (String) getClass().getField("NAME").get(null);
+
+            /*
+             * Getting icon from the registered icon path
+             */
+            String iconName = (String) getClass().getField("SMALL_ICON").get(null);
+            if (iconName != null && !iconName.isEmpty()) {
+                icon = new ImageIcon(ScilabSwingUtilities.findIcon(iconName));
+            }
+
+            mnemonic = getClass().getField("MNEMONIC_KEY").getInt(null);
+            accelerator = getClass().getField("ACCELERATOR_KEY").getInt(null);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        } catch (SecurityException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+
+        assert !"".equals(name);
+        putValue(Action.NAME, name);
+        putValue(Action.SHORT_DESCRIPTION, name);
+        putValue(Action.LONG_DESCRIPTION, name);
+        if (icon != null) {
+            putValue(Action.SMALL_ICON, icon);
+        }
+
+        /*
+         * Set up the accelerator instead of the mnemonic as the menu is the
+         * preferred way on keyboard control. We are using Action.MNEMONIC_KEY
+         * as keyboard key and Action.ACCELERATOR_KEY as a mask.
+         * 
+         * Install it only when there is a real shortcut (with a mnemonic).
+         */
+        if (mnemonic != 0) {
+            putValue(Action.MNEMONIC_KEY, mnemonic);
+            putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(mnemonic, accelerator));
+        }
+    }
+
+    /**
+     * Create a menu item associated with the graph
+     * 
+     * @param graph
+     *            the graph to work on
+     * @param klass
+     *            the associated klass
+     * @return the menu item
+     */
+    protected static MenuItem createMenu(ScilabGraph graph, final Class<? extends DefaultAction> klass) {
+        DefaultAction action = GraphActionManager.getInstance(graph, klass);
+        MenuItem item = ScilabMenuItem.createMenuItem();
+
+        SwingScilabMenuItem swingItem = (SwingScilabMenuItem) item.getAsSimpleMenuItem();
+        swingItem.setAction(action);
+
+        return item;
+    }
+
+    /**
+     * Create a menu item associated with the graph
+     * 
+     * @param graph
+     *            the graph to work on
+     * @param klass
+     *            the associated klass
+     * @return the push button
+     */
+    protected static PushButton createButton(ScilabGraph graph, final Class<? extends DefaultAction> klass) {
+        DefaultAction action = GraphActionManager.getInstance(graph, klass);
+        PushButton item = ScilabPushButton.createPushButton();
+
+        SwingScilabPushButton swingItem = (SwingScilabPushButton) item.getAsSimplePushButton();
+        swingItem.setAction(action);
+
+        // Hide the text on buttons
+        swingItem.setHideActionText(true);
+
+        return item;
+    }
+
+    /**
+     * Create a menu item associated with the graph
+     * 
+     * @param graph
+     *            the graph to work on
+     * @param klass
+     *            the associated klass
+     * @return the checkbox item
+     */
+    protected static CheckBoxMenuItem createCheckBoxMenu(ScilabGraph graph, Class<? extends DefaultAction> klass) {
+        DefaultAction action = GraphActionManager.getInstance(graph, klass);
+        CheckBoxMenuItem item = ScilabCheckBoxMenuItem.createCheckBoxMenuItem();
+
+        SwingScilabCheckBoxMenuItem swingItem = (SwingScilabCheckBoxMenuItem) item.getAsSimpleCheckBoxMenuItem();
+        swingItem.setAction(action);
+
+        return item;
+    }
+
+    /**
+     * Constructor
+     * 
+     * @param label
+     *            action descriptor
+     * @param scilabGraph
+     *            associated Scilab Graph
+     */
+    @Deprecated
+    protected DefaultAction(String label, ScilabGraph scilabGraph) {
+        super(label);
+        this.scilabGraph = scilabGraph;
+    }
+
+    /**
+     * Get associated graph
+     * 
+     * @param e
+     *            event
+     * @return Returns the graph for the given action event.
+     */
+    protected final ScilabGraph getGraph(ActionEvent e) {
+        if (this.scilabGraph != null) {
+            return this.scilabGraph;
+        }
+
+        if (e == null) {
+            return null;
+        }
+
+        if (e.getSource() instanceof Component) {
+            Component component = (Component) e.getSource();
+
+            while (component != null && !(component instanceof mxGraphComponent)) {
+                component = component.getParent();
+            }
+
+            return (ScilabGraph) ((mxGraphComponent) component).getGraph();
+        }
+
+        return null;
+    }
+
+    /**
+     * Create a button for a graph toolbar
+     * 
+     * @param title
+     *            label of the menu
+     * @param icon
+     *            the path the an icon file
+     * @param listener
+     *            action listener associated
+     * @param keyStroke
+     *            menu shortcut
+     * @return the button
+     */
+    @Deprecated
+    protected static MenuItem createMenu(String title, String icon, DefaultAction listener, KeyStroke keyStroke) {
+        MenuItem menu = ScilabMenuItem.createMenuItem();
+        menu.setCallback(listener);
+        menu.setText(title);
+
+        if (keyStroke != null) {
+            ((SwingScilabMenuItem) menu.getAsSimpleMenuItem()).setAccelerator(keyStroke);
+        }
+
+        return menu;
+    }
+
+    /**
+     * Action
+     * 
+     * @param e
+     *            parameters
+     * @see org.scilab.modules.gui.events.callback.CallBack#actionPerformed(java.awt.event.ActionEvent)
+     */
+    @Override
+    public abstract void actionPerformed(ActionEvent e);
+
+    /**
+     * Not used
+     * 
+     * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
+     */
+    @Override
+    public void callBack() {
+        assert "Must never be called as we bypass Callback.java".equals("");
+    }
 }
index dbc97d3..10fa7da 100644 (file)
@@ -26,7 +26,7 @@
     <para>
      The datatips mode can be enabled by <link linkend="datatipToggle">datatipToggle()</link> or using the
      <literal>Edit/Start datatip manager</literal> or clicking on the
-     toolbar icon <inlinemediaobject><imageobject><imagedata fileref="../../../../gui/images/icons/datatips.png"/></imageobject></inlinemediaobject> of the desired graphic window.
+     toolbar icon <inlinemediaobject><imageobject><imagedata fileref="../../../../gui/images/icons/32x32/apps/datatips.png"/></imageobject></inlinemediaobject> of the desired graphic window.
     </para>
     <para>Once enabled, a simple left click on a curve will add a tip
      ( a small box with information on the current point) at the
index b200a6c..534822e 100644 (file)
@@ -8,7 +8,7 @@
  * are also available at    
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg"  xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="ja" xml:id="datatips">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="ja" xml:id="datatips">
   <info>
     <pubdate>$LastChangedDate: 19-02-2010 $</pubdate>
   </info>
     <refname>datatips</refname>
     <refpurpose>プロットされた曲線に情報(tips)を配置,編集するためのツール.</refpurpose>
   </refnamediv>
   <refsection>
-  <title>説明</title>
+    <title>説明</title>
     <para>
        このツールにより,曲線(ポリライン)上に情報を配置,移動,修正することが
        できます.これはプログラムまたは対話的に行うことができます.
        通常使用されるモードは対話モードです:
     </para>
     <para>
-     datatipsモードは <link linkend="datatipToggle"
-     >datatipToggle()</link> または
+     datatipsモードは <link linkend="datatipToggle">datatipToggle()</link> または
      <literal>Edit/Start datatip manager</literal> または指定するグラフィックウインドウの
        ツールバーアイコンの
-<inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../../../gui/images/icons/datatips.png"/>
-       </imageobject>
-      </inlinemediaobject>をクリックすることにより有効にすることができます.
+<inlinemediaobject><imageobject><imagedata fileref="../../../../gui/images/icons/32x32/apps/datatips.png"/></imageobject></inlinemediaobject>をクリックすることにより有効にすることができます.
     </para>
-     <para>一度有効になると,曲線を左クリックするだけで,
+    <para>一度有効になると,曲線を左クリックするだけで,
        情報(カレントの点に関する情報を有する小さな箱)が曲線の最も近いdatapointに
        追加されます.
        デフォルトで各曲線は1つの情報を有することができますが,
        情報を移動するには,曲線の小さな正方形の記号の上で左ボタンを押し,
        少し待ってから好きな位置にドラッグします.
     </para>
-  
     <para>
        情報記号の上で右クリックするとコンテキストダイアログがオープンします.
        このダイアログにより関連する曲線の全ての datatips に表示される専用の情報を
        カスタマイズすることができます.
     </para>
-
-   <para>
+    <para>
        情報記号の上で真ん中のボタンをクリックすると,
        選択された情報の向きを管理することができるコンテキスト依存のダイアログが
        オープンされます.
     </para>
-
-
   </refsection>
   <refsection>
     <title>例</title>
@@ -87,9 +77,9 @@
      ]]></programlisting>
     <para>
       <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips.svg"/>
-       </imageobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips.svg"/>
+        </imageobject>
       </inlinemediaobject>
     </para>
     <programlisting role="example"><![CDATA[
      ]]></programlisting>
     <para>
       <inlinemediaobject>
-       <imageobject>
-         <imagedata fileref="../../images/datatips4.svg"/>
-       </imageobject>
+        <imageobject>
+          <imagedata fileref="../../images/datatips4.svg"/>
+        </imageobject>
       </inlinemediaobject>
     </para>
   </refsection>
     <title>参照</title>
     <simplelist type="inline">
       <member>
-        <link linkend="datatipToggle" >datatipToggle</link>
+        <link linkend="datatipToggle">datatipToggle</link>
       </member>
       <member>
         <link linkend="datatipInitStruct">datatipInitStruct</link>
       <member>
         <link linkend="datatipCreate">datatipCreate</link>
       </member>
-     <member>
+      <member>
         <link linkend="datatipMove">datatipMove</link>
       </member>
       <member>
       <member>Serge Steer, INRIA</member>
     </simplelist>
   </refsection>
 </refentry>
index 8747969..515f563 100644 (file)
@@ -297,105 +297,108 @@ libscigui_la_sci_gateway_DATA = sci_gateway/gui_gateway.xml
 # Generated with:
 #    $ find images/ -type f -printf "%p \\\\\n" -name *.svg -or -name *.gif -or -name *.jpg -or -name *.png |sort -u
 libscigui_la_iconsdir=$(mydatadir)/
-nobase_libscigui_la_icons_DATA = images/icons/32x32/apps/accessories-text-editor.png \
-images/icons/32x32/actions/edit-clear.png \
-images/icons/32x32/apps/rrze_table.png \
-images/icons/32x32/apps/utilities-system-monitor.png \
-images/icons/32x32/apps/system-search.png \
+nobase_libscigui_la_icons_DATA = images/icons/16x16/actions/document-new.png \
+images/icons/16x16/actions/document-open.png \
+images/icons/16x16/actions/document-open-sci.png \
+images/icons/16x16/actions/document-print.png \
+images/icons/16x16/actions/document-print-preview.png \
+images/icons/16x16/actions/document-save-as.png \
+images/icons/16x16/actions/document-save.png \
+images/icons/16x16/actions/dynamic-blue-up.png \
 images/icons/16x16/actions/edit-clear.png \
+images/icons/16x16/actions/edit-copy.png \
+images/icons/16x16/actions/edit-cut.png \
+images/icons/16x16/actions/edit-delete.png \
+images/icons/16x16/actions/edit-find.png \
+images/icons/16x16/actions/edit-find-replace.png \
+images/icons/16x16/actions/edit-paste.png \
+images/icons/16x16/actions/edit-redo.png \
+images/icons/16x16/actions/edit-undo.png \
 images/icons/16x16/actions/execute-all.png \
+images/icons/16x16/actions/filter.png \
+images/icons/16x16/actions/format-text-bold.png \
 images/icons/16x16/actions/go-bottom.png \
+images/icons/16x16/actions/go-next.png \
+images/icons/16x16/actions/go-previous.png \
 images/icons/16x16/actions/go-top.png \
-images/icons/16x16/actions/view-refresh.png \
-images/icons/16x16/actions/SizeColumnsToFit.png \
-images/icons/16x16/actions/long.png \
 images/icons/16x16/actions/longe.png \
-images/icons/16x16/actions/short.png \
+images/icons/16x16/actions/long.png \
+images/icons/16x16/actions/media-playback-start.png \
+images/icons/16x16/actions/plot.png \
+images/icons/16x16/actions/save-and-execute.png \
+images/icons/16x16/actions/scilab_search.png \
 images/icons/16x16/actions/shorte.png \
+images/icons/16x16/actions/short.png \
+images/icons/16x16/actions/SizeColumnsToFit.png \
+images/icons/16x16/actions/system-search.png \
+images/icons/16x16/actions/transform-rotate.png \
+images/icons/16x16/actions/variable-from-selection.png \
 images/icons/16x16/actions/variable-new.png \
-images/icons/16x16/search/folder.png \
-images/icons/16x16/search/file.png \
-images/icons/16x16/search/line-found.png \
-images/icons/16x16/search/scilab-file.png \
-images/icons/16x16/actions/save-and-execute.png \
-images/icons/16x16/filebrowser/application-pdf.png \
-images/icons/16x16/filebrowser/binary.png \
-images/icons/16x16/filebrowser/dynamic-blue-up.png \
-images/icons/16x16/filebrowser/emblem-readonly.png \
-images/icons/16x16/filebrowser/filter.png \
-images/icons/16x16/filebrowser/folder-open.png \
-images/icons/16x16/filebrowser/folder.png \
-images/icons/16x16/filebrowser/go-next.png \
-images/icons/16x16/filebrowser/go-previous.png \
-images/icons/16x16/filebrowser/icon_scilab.png \
-images/icons/16x16/filebrowser/image-x-generic.png \
-images/icons/16x16/filebrowser/open-scilab-folder.png \
-images/icons/16x16/filebrowser/open-user-home.png \
-images/icons/16x16/filebrowser/scilab-folder.png \
-images/icons/16x16/filebrowser/system-search.png \
-images/icons/16x16/filebrowser/text-csv.png \
-images/icons/16x16/filebrowser/text-html.png \
-images/icons/16x16/filebrowser/text-x-generic.png \
-images/icons/16x16/filebrowser/text-xml.png \
-images/icons/16x16/filebrowser/user-home.png \
-images/icons/64x64/plot2d.png \
-images/icons/64x64/Matplot.png \
-images/icons/64x64/grayplot.png \
-images/icons/64x64/Sgrayplot.png \
-images/icons/64x64/champ.png \
-images/icons/64x64/histplot.png \
-images/icons/64x64/mesh.png \
-images/icons/64x64/surf.png \
-images/icons/64x64/hist3d.png \
+images/icons/16x16/actions/view-refresh.png \
+images/icons/16x16/actions/window-new.png \
+images/icons/16x16/actions/zoom-area-cursor.png \
+images/icons/16x16/actions/zoom-fit-drawing.png \
+images/icons/16x16/actions/zoom-fit-selection.png \
+images/icons/16x16/actions/zoom-in.png \
+images/icons/16x16/actions/zoom-original.png \
+images/icons/16x16/actions/zoom-out.png \
+images/icons/16x16/animations/process-working.png \
+images/icons/16x16/apps/accessories-text-editor.png \
+images/icons/16x16/apps/help-browser.png \
+images/icons/16x16/apps/utilities-system-monitor.png \
+images/icons/16x16/categories/applications-system.png \
+images/icons/16x16/devices/media-floppy.png \
+images/icons/16x16/devices/printer.png \
+images/icons/16x16/emblems/emblem-readonly.png \
+images/icons/16x16/mimetypes/application-pdf.png \
+images/icons/16x16/mimetypes/binary.png \
+images/icons/16x16/mimetypes/image-x-generic.png \
+images/icons/16x16/mimetypes/package-x-generic.png \
+images/icons/16x16/mimetypes/text-csv.png \
+images/icons/16x16/mimetypes/text-html.png \
+images/icons/16x16/mimetypes/text-x-generic.png \
+images/icons/16x16/mimetypes/text-xml.png \
+images/icons/16x16/places/folder.png \
+images/icons/16x16/places/folder-saved-search.png \
+images/icons/16x16/places/scilab-folder.png \
+images/icons/16x16/places/user-home.png \
+images/icons/16x16/status/folder-open.png \
+images/icons/16x16/status/line-found.png \
+images/icons/16x16/status/scilab-folder-open.png \
+images/icons/16x16/status/user-home-open.png \
+images/icons/32x32/actions/edit-clear.png \
+images/icons/32x32/apps/accessories-text-editor.png \
+images/icons/32x32/apps/datatips.png \
+images/icons/32x32/apps/graphic-window.png \
+images/icons/32x32/apps/rrze_table.png \
+images/icons/32x32/apps/scilab.png \
+images/icons/32x32/apps/system-search.png \
+images/icons/32x32/apps/utilities-system-monitor.png \
+images/icons/32x32/emblems/emblem-readonly.png \
+images/icons/64x40/mimetypes/application-x-scilab-champ.png \
+images/icons/64x40/mimetypes/application-x-scilab-contour2d.png \
+images/icons/64x40/mimetypes/application-x-scilab-grayplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-hist3d.png \
+images/icons/64x40/mimetypes/application-x-scilab-histplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-Matplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-mesh.png \
+images/icons/64x40/mimetypes/application-x-scilab-pie.png \
+images/icons/64x40/mimetypes/application-x-scilab-plot2d.png \
+images/icons/64x40/mimetypes/application-x-scilab-plot3d.png \
+images/icons/64x40/mimetypes/application-x-scilab-Sgrayplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-surf.png \
 images/icons/aboutscilab.png \
-images/icons/accessories-text-editor.png \
-images/icons/applications-system.png \
 images/icons/check-icon.png \
-images/icons/close-tab.png \
 images/icons/close-tab-on.png \
-images/icons/datatips.png \
-images/icons/document-new.png \
-images/icons/document-open.png \
-images/icons/document-open-sci.png \
-images/icons/document-print.png \
-images/icons/document-print-preview.png \
-images/icons/document-save-as.png \
-images/icons/document-save.png \
-images/icons/edit-copy.png \
-images/icons/edit-cut.png \
-images/icons/edit-delete.png \
-images/icons/edit-find.png \
-images/icons/edit-find-replace.png \
-images/icons/edit-paste.png \
-images/icons/edit-redo.png \
-images/icons/edit-undo.png \
-images/icons/emblem-readonly.png \
-images/icons/folder.png \
-images/icons/format-text-bold.png \
-images/icons/graphic-window.png \
-images/icons/help-browser.png \
-images/icons/media-floppy.png \
-images/icons/media-playback-start.png \
-images/icons/package-x-generic.png \
-images/icons/printer.png \
-images/icons/process-working.png \
+images/icons/close-tab.png \
 images/icons/puff.png \
 images/icons/rotate.png \
 images/icons/scilab_close_active.png \
 images/icons/scilab_close_default.png \
-images/icons/scilab.png \
-images/icons/transform-rotate.png \
 images/icons/undock_active.png \
-images/icons/undock_default.png \
-images/icons/utilities-system-monitor.png \
-images/icons/window-new.png \
-images/icons/zoom-area-cursor.png \
-images/icons/zoom-fit-drawing.png \
-images/icons/zoom-fit-selection.png \
-images/icons/zoom-in.png \
-images/icons/zoom-original.png \
-images/icons/zoom-out.png
+images/icons/undock_default.png
 
 if GUI
 USEANT=1
 endif
+
index 4fd57d9..457024e 100644 (file)
@@ -860,104 +860,106 @@ libscigui_la_sci_gateway_DATA = sci_gateway/gui_gateway.xml
 # Generated with:
 #    $ find images/ -type f -printf "%p \\\\\n" -name *.svg -or -name *.gif -or -name *.jpg -or -name *.png |sort -u
 libscigui_la_iconsdir = $(mydatadir)/
-nobase_libscigui_la_icons_DATA = images/icons/32x32/apps/accessories-text-editor.png \
-images/icons/32x32/actions/edit-clear.png \
-images/icons/32x32/apps/rrze_table.png \
-images/icons/32x32/apps/utilities-system-monitor.png \
-images/icons/32x32/apps/system-search.png \
+nobase_libscigui_la_icons_DATA = images/icons/16x16/actions/document-new.png \
+images/icons/16x16/actions/document-open.png \
+images/icons/16x16/actions/document-open-sci.png \
+images/icons/16x16/actions/document-print.png \
+images/icons/16x16/actions/document-print-preview.png \
+images/icons/16x16/actions/document-save-as.png \
+images/icons/16x16/actions/document-save.png \
+images/icons/16x16/actions/dynamic-blue-up.png \
 images/icons/16x16/actions/edit-clear.png \
+images/icons/16x16/actions/edit-copy.png \
+images/icons/16x16/actions/edit-cut.png \
+images/icons/16x16/actions/edit-delete.png \
+images/icons/16x16/actions/edit-find.png \
+images/icons/16x16/actions/edit-find-replace.png \
+images/icons/16x16/actions/edit-paste.png \
+images/icons/16x16/actions/edit-redo.png \
+images/icons/16x16/actions/edit-undo.png \
 images/icons/16x16/actions/execute-all.png \
+images/icons/16x16/actions/filter.png \
+images/icons/16x16/actions/format-text-bold.png \
 images/icons/16x16/actions/go-bottom.png \
+images/icons/16x16/actions/go-next.png \
+images/icons/16x16/actions/go-previous.png \
 images/icons/16x16/actions/go-top.png \
-images/icons/16x16/actions/view-refresh.png \
-images/icons/16x16/actions/SizeColumnsToFit.png \
-images/icons/16x16/actions/long.png \
 images/icons/16x16/actions/longe.png \
-images/icons/16x16/actions/short.png \
+images/icons/16x16/actions/long.png \
+images/icons/16x16/actions/media-playback-start.png \
+images/icons/16x16/actions/plot.png \
+images/icons/16x16/actions/save-and-execute.png \
+images/icons/16x16/actions/scilab_search.png \
 images/icons/16x16/actions/shorte.png \
+images/icons/16x16/actions/short.png \
+images/icons/16x16/actions/SizeColumnsToFit.png \
+images/icons/16x16/actions/system-search.png \
+images/icons/16x16/actions/transform-rotate.png \
+images/icons/16x16/actions/variable-from-selection.png \
 images/icons/16x16/actions/variable-new.png \
-images/icons/16x16/search/folder.png \
-images/icons/16x16/search/file.png \
-images/icons/16x16/search/line-found.png \
-images/icons/16x16/search/scilab-file.png \
-images/icons/16x16/actions/save-and-execute.png \
-images/icons/16x16/filebrowser/application-pdf.png \
-images/icons/16x16/filebrowser/binary.png \
-images/icons/16x16/filebrowser/dynamic-blue-up.png \
-images/icons/16x16/filebrowser/emblem-readonly.png \
-images/icons/16x16/filebrowser/filter.png \
-images/icons/16x16/filebrowser/folder-open.png \
-images/icons/16x16/filebrowser/folder.png \
-images/icons/16x16/filebrowser/go-next.png \
-images/icons/16x16/filebrowser/go-previous.png \
-images/icons/16x16/filebrowser/icon_scilab.png \
-images/icons/16x16/filebrowser/image-x-generic.png \
-images/icons/16x16/filebrowser/open-scilab-folder.png \
-images/icons/16x16/filebrowser/open-user-home.png \
-images/icons/16x16/filebrowser/scilab-folder.png \
-images/icons/16x16/filebrowser/system-search.png \
-images/icons/16x16/filebrowser/text-csv.png \
-images/icons/16x16/filebrowser/text-html.png \
-images/icons/16x16/filebrowser/text-x-generic.png \
-images/icons/16x16/filebrowser/text-xml.png \
-images/icons/16x16/filebrowser/user-home.png \
-images/icons/64x64/plot2d.png \
-images/icons/64x64/Matplot.png \
-images/icons/64x64/grayplot.png \
-images/icons/64x64/Sgrayplot.png \
-images/icons/64x64/champ.png \
-images/icons/64x64/histplot.png \
-images/icons/64x64/mesh.png \
-images/icons/64x64/surf.png \
-images/icons/64x64/hist3d.png \
+images/icons/16x16/actions/view-refresh.png \
+images/icons/16x16/actions/window-new.png \
+images/icons/16x16/actions/zoom-area-cursor.png \
+images/icons/16x16/actions/zoom-fit-drawing.png \
+images/icons/16x16/actions/zoom-fit-selection.png \
+images/icons/16x16/actions/zoom-in.png \
+images/icons/16x16/actions/zoom-original.png \
+images/icons/16x16/actions/zoom-out.png \
+images/icons/16x16/animations/process-working.png \
+images/icons/16x16/apps/accessories-text-editor.png \
+images/icons/16x16/apps/help-browser.png \
+images/icons/16x16/apps/utilities-system-monitor.png \
+images/icons/16x16/categories/applications-system.png \
+images/icons/16x16/devices/media-floppy.png \
+images/icons/16x16/devices/printer.png \
+images/icons/16x16/emblems/emblem-readonly.png \
+images/icons/16x16/mimetypes/application-pdf.png \
+images/icons/16x16/mimetypes/binary.png \
+images/icons/16x16/mimetypes/image-x-generic.png \
+images/icons/16x16/mimetypes/package-x-generic.png \
+images/icons/16x16/mimetypes/text-csv.png \
+images/icons/16x16/mimetypes/text-html.png \
+images/icons/16x16/mimetypes/text-x-generic.png \
+images/icons/16x16/mimetypes/text-xml.png \
+images/icons/16x16/places/folder.png \
+images/icons/16x16/places/folder-saved-search.png \
+images/icons/16x16/places/scilab-folder.png \
+images/icons/16x16/places/user-home.png \
+images/icons/16x16/status/folder-open.png \
+images/icons/16x16/status/line-found.png \
+images/icons/16x16/status/scilab-folder-open.png \
+images/icons/16x16/status/user-home-open.png \
+images/icons/32x32/actions/edit-clear.png \
+images/icons/32x32/apps/accessories-text-editor.png \
+images/icons/32x32/apps/datatips.png \
+images/icons/32x32/apps/graphic-window.png \
+images/icons/32x32/apps/rrze_table.png \
+images/icons/32x32/apps/scilab.png \
+images/icons/32x32/apps/system-search.png \
+images/icons/32x32/apps/utilities-system-monitor.png \
+images/icons/32x32/emblems/emblem-readonly.png \
+images/icons/64x40/mimetypes/application-x-scilab-champ.png \
+images/icons/64x40/mimetypes/application-x-scilab-contour2d.png \
+images/icons/64x40/mimetypes/application-x-scilab-grayplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-hist3d.png \
+images/icons/64x40/mimetypes/application-x-scilab-histplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-Matplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-mesh.png \
+images/icons/64x40/mimetypes/application-x-scilab-pie.png \
+images/icons/64x40/mimetypes/application-x-scilab-plot2d.png \
+images/icons/64x40/mimetypes/application-x-scilab-plot3d.png \
+images/icons/64x40/mimetypes/application-x-scilab-Sgrayplot.png \
+images/icons/64x40/mimetypes/application-x-scilab-surf.png \
 images/icons/aboutscilab.png \
-images/icons/accessories-text-editor.png \
-images/icons/applications-system.png \
 images/icons/check-icon.png \
-images/icons/close-tab.png \
 images/icons/close-tab-on.png \
-images/icons/datatips.png \
-images/icons/document-new.png \
-images/icons/document-open.png \
-images/icons/document-open-sci.png \
-images/icons/document-print.png \
-images/icons/document-print-preview.png \
-images/icons/document-save-as.png \
-images/icons/document-save.png \
-images/icons/edit-copy.png \
-images/icons/edit-cut.png \
-images/icons/edit-delete.png \
-images/icons/edit-find.png \
-images/icons/edit-find-replace.png \
-images/icons/edit-paste.png \
-images/icons/edit-redo.png \
-images/icons/edit-undo.png \
-images/icons/emblem-readonly.png \
-images/icons/folder.png \
-images/icons/format-text-bold.png \
-images/icons/graphic-window.png \
-images/icons/help-browser.png \
-images/icons/media-floppy.png \
-images/icons/media-playback-start.png \
-images/icons/package-x-generic.png \
-images/icons/printer.png \
-images/icons/process-working.png \
+images/icons/close-tab.png \
 images/icons/puff.png \
 images/icons/rotate.png \
 images/icons/scilab_close_active.png \
 images/icons/scilab_close_default.png \
-images/icons/scilab.png \
-images/icons/transform-rotate.png \
 images/icons/undock_active.png \
-images/icons/undock_default.png \
-images/icons/utilities-system-monitor.png \
-images/icons/window-new.png \
-images/icons/zoom-area-cursor.png \
-images/icons/zoom-fit-drawing.png \
-images/icons/zoom-fit-selection.png \
-images/icons/zoom-in.png \
-images/icons/zoom-original.png \
-images/icons/zoom-out.png
+images/icons/undock_default.png
 
 @GUI_TRUE@USEANT = 1
 all: $(BUILT_SOURCES)
index d6a9366..f41489c 100644 (file)
@@ -1,34 +1,27 @@
 <?xml version="1.0"?>
 <toolbar>
-<!-- [SCILAB_FIGURE_ID] pattern is replaced at generation of Java menu by the ID of the figure -->
-    <!-- Rotate -->
-    <button icon="transform-rotate.png" tooltiptext="Rotate">
-        <callback instruction="rotate_axes(get_figure_handle([SCILAB_FIGURE_ID]))" type="-2"/>
-    </button>
-
-    <separator/>
-
-    <!-- Zoom Area -->
-    <button icon="zoom-fit-selection.png" tooltiptext="Zoom Area">
-        <callback instruction='zoom_rect(get_figure_handle([SCILAB_FIGURE_ID]))' type="-2"/>
-    </button>
-    <!-- Original View -->
-    <button icon="zoom-original.png" tooltiptext="Original View">
-        <callback instruction='unzoom(get_figure_handle([SCILAB_FIGURE_ID]))' type="-2"/>
-    </button>
-
-    <separator/>
-
-    <!-- Datatips -->
-    <button icon="datatips.png" tooltiptext="toggle datatip mode">
-        <callback instruction='datatipManagerMode([SCILAB_FIGURE_ID],"toggle");' type="-2"/>
-    </button>
-
-    <separator/>
-
-    <!-- Help -->
-    <button icon="help-browser.png" tooltiptext="Help Browser">
-        <callback instruction='help();' type="-2"/>
-    </button>
-
+  <!-- [SCILAB_FIGURE_ID] pattern is replaced at generation of Java menu by the ID of the figure -->
+  <!-- Rotate -->
+  <button icon="transform-rotate" tooltiptext="Rotate">
+    <callback instruction="rotate_axes(get_figure_handle([SCILAB_FIGURE_ID]))" type="-2"/>
+  </button>
+  <separator/>
+  <!-- Zoom Area -->
+  <button icon="zoom-fit-selection" tooltiptext="Zoom Area">
+    <callback instruction="zoom_rect(get_figure_handle([SCILAB_FIGURE_ID]))" type="-2"/>
+  </button>
+  <!-- Original View -->
+  <button icon="zoom-original" tooltiptext="Original View">
+    <callback instruction="unzoom(get_figure_handle([SCILAB_FIGURE_ID]))" type="-2"/>
+  </button>
+  <separator/>
+  <!-- Datatips -->
+  <button icon="datatips" tooltiptext="toggle datatip mode">
+    <callback instruction="datatipManagerMode([SCILAB_FIGURE_ID],&quot;toggle&quot;);" type="-2"/>
+  </button>
+  <separator/>
+  <!-- Help -->
+  <button icon="help-browser" tooltiptext="Help Browser">
+    <callback instruction="help();" type="-2"/>
+  </button>
 </toolbar>
index d4e0dda..5700e53 100644 (file)
@@ -1,68 +1,51 @@
 <?xml version="1.0"?>
 <toolbar>
-    <!-- scinotes -->
-    <button icon="accessories-text-editor.png" tooltiptext="Launch SciNotes">
-        <callback instruction='editor()' type="0"/>
-    </button>
-    <!-- Open File -->
-    <button icon="document-open.png" tooltiptext="Open a file">
-        <callback 
-        instruction='
-          %fileToOpen = uigetfile("*.sc*", pwd(), gettext("Select a file to open with SciNotes"));
-          if ~(%fileToOpen == "") then
-            editor(%fileToOpen);
-          end
-          clear("%fileToOpen");' type="0"/>
-    </button> 
-
-    <separator/>
-
-    <!-- Copy -->
-    <button icon="edit-cut.png" tooltiptext="Cut">
-        <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection' type="3"/>
-    </button>
-    <button icon="edit-copy.png" tooltiptext="Copy">
-        <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection' type="3"/>
-    </button>
-    <!-- Paste -->
-    <button icon="edit-paste.png" tooltiptext="Paste">
-            <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole' type="3"/>
-    </button>
-
-    <separator/>
-
-    <!-- Change font -->
-    <button icon="format-text-bold.png" tooltiptext="Choose Font...">
-        <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleFont' type="3"/>
-    </button>
-    <!-- Print -->
-    <button icon="printer.png" tooltiptext="Print...">
-        <callback instruction='org.scilab.modules.gui.bridge.CallScilabBridge.printConsoleContents' type="3"/>
-    </button>
-
-    <separator/>
-
-    <!-- Atoms -->
-    <button icon="package-x-generic.png" tooltiptext="Module manager - ATOMS">
-        <callback instruction='if with_module("atoms") then atomsGui(); else disp(gettext("Please install atoms module.")); end' type="0"/>
-    </button>
-
-    <separator/>
-
-    <!-- Xcos -->
-    <button icon="utilities-system-monitor.png" tooltiptext="Xcos">
-        <callback instruction='if with_module("xcos") then xcos(); else disp(gettext("Please install xcos module.")); end' type="0"/>
-    </button>
-
-    <separator/>
-
-    <!-- Démos -->
-    <button icon="applications-system.png" tooltiptext="Scilab Demonstrations">
-        <callback instruction='demo_gui();' type="0"/>
-    </button>
-
-    <!-- Help -->
-    <button icon="help-browser.png" tooltiptext="Help Browser">
-        <callback instruction='help();' type="0"/>
-    </button>
+  <!-- scinotes -->
+  <button icon="accessories-text-editor" tooltiptext="Launch SciNotes">
+    <callback instruction="editor()" type="0"/>
+  </button>
+  <!-- Open File -->
+  <button icon="document-open" tooltiptext="Open a file">
+    <callback instruction="           %fileToOpen = uigetfile(&quot;*.sc*&quot;, pwd(), gettext(&quot;Select a file to open with SciNotes&quot;));           if ~(%fileToOpen == &quot;&quot;) then             editor(%fileToOpen);           end           clear(&quot;%fileToOpen&quot;);" type="0"/>
+  </button>
+  <separator/>
+  <!-- Copy -->
+  <button icon="edit-cut" tooltiptext="Cut">
+    <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.cutConsoleSelection" type="3"/>
+  </button>
+  <button icon="edit-copy" tooltiptext="Copy">
+    <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.copyConsoleSelection" type="3"/>
+  </button>
+  <!-- Paste -->
+  <button icon="edit-paste" tooltiptext="Paste">
+    <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.pasteClipboardIntoConsole" type="3"/>
+  </button>
+  <separator/>
+  <!-- Change font -->
+  <button icon="format-text-bold" tooltiptext="Choose Font...">
+    <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.changeConsoleFont" type="3"/>
+  </button>
+  <!-- Print -->
+  <button icon="printer" tooltiptext="Print...">
+    <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.printConsoleContents" type="3"/>
+  </button>
+  <separator/>
+  <!-- Atoms -->
+  <button icon="package-x-generic" tooltiptext="Module manager - ATOMS">
+    <callback instruction="if with_module(&quot;atoms&quot;) then atomsGui(); else disp(gettext(&quot;Please install atoms module.&quot;)); end" type="0"/>
+  </button>
+  <separator/>
+  <!-- Xcos -->
+  <button icon="utilities-system-monitor" tooltiptext="Xcos">
+    <callback instruction="if with_module(&quot;xcos&quot;) then xcos(); else disp(gettext(&quot;Please install xcos module.&quot;)); end" type="0"/>
+  </button>
+  <separator/>
+  <!-- Démos -->
+  <button icon="applications-system" tooltiptext="Scilab Demonstrations">
+    <callback instruction="demo_gui();" type="0"/>
+  </button>
+  <!-- Help -->
+  <button icon="help-browser" tooltiptext="Help Browser">
+    <callback instruction="help();" type="0"/>
+  </button>
 </toolbar>
diff --git a/scilab/modules/gui/images/icons/16x16/actions/stock_search.png b/scilab/modules/gui/images/icons/16x16/actions/stock_search.png
new file mode 120000 (symlink)
index 0000000..dd41368
--- /dev/null
@@ -0,0 +1 @@
+edit-find.png
\ No newline at end of file
diff --git a/scilab/modules/gui/images/icons/16x16/filebrowser/icon_scilab.png b/scilab/modules/gui/images/icons/16x16/filebrowser/icon_scilab.png
deleted file mode 100644 (file)
index 8b4927c..0000000
Binary files a/scilab/modules/gui/images/icons/16x16/filebrowser/icon_scilab.png and /dev/null differ
diff --git a/scilab/modules/gui/images/icons/16x16/search/file.png b/scilab/modules/gui/images/icons/16x16/search/file.png
deleted file mode 100644 (file)
index d072d3c..0000000
Binary files a/scilab/modules/gui/images/icons/16x16/search/file.png and /dev/null differ
diff --git a/scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-plot3d.png b/scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-plot3d.png
new file mode 100644 (file)
index 0000000..5eba4be
Binary files /dev/null and b/scilab/modules/gui/images/icons/64x40/mimetypes/application-x-scilab-plot3d.png differ
diff --git a/scilab/modules/gui/images/icons/64x64/plot2.png b/scilab/modules/gui/images/icons/64x64/plot2.png
deleted file mode 100644 (file)
index 0b38539..0000000
Binary files a/scilab/modules/gui/images/icons/64x64/plot2.png and /dev/null differ
diff --git a/scilab/modules/gui/images/icons/64x64/plot3d.png b/scilab/modules/gui/images/icons/64x64/plot3d.png
deleted file mode 100644 (file)
index ec3cac0..0000000
Binary files a/scilab/modules/gui/images/icons/64x64/plot3d.png and /dev/null differ
diff --git a/scilab/modules/gui/images/icons/folder.png b/scilab/modules/gui/images/icons/folder.png
deleted file mode 100644 (file)
index 901edc9..0000000
Binary files a/scilab/modules/gui/images/icons/folder.png and /dev/null differ
index 5f6a028..91f350c 100644 (file)
@@ -124,11 +124,11 @@ public class OSXAdapter implements InvocationHandler {
         * Pass this method an Image which is going to be the Dock Icon of Scilab 
         * @param icon the icon itself
         */
-    public static void setDockIcon(String pathIcon) {
+    public static void setDockIcon(ImageIcon icon) {
  
        try {
             Method setDockIconMethod = macOSXApplication.getClass().getDeclaredMethod("setDockIconImage", new Class[] { Image.class });
-          setDockIconMethod.invoke(macOSXApplication, new Object[] { new ImageIcon(pathIcon).getImage() });
+            setDockIconMethod.invoke(macOSXApplication, new Object[] { icon.getImage() });
     }catch (java.lang.NoSuchMethodException ex){
           System.err.println("Could not access to the method setDockIconImage. ");
           System.err.println("This is due to your version of Java / Mac OS X which is too old or not up-to-date");
@@ -138,7 +138,7 @@ public class OSXAdapter implements InvocationHandler {
        }catch (java.lang.reflect.InvocationTargetException ex){
            System.err.println("Exception occured while the method was invocated setDockIconImage");
        }catch (java.lang.NullPointerException ex){
-           System.err.println("Exception occured while the method was executed with the icon "+pathIcon);
+            System.err.println("Exception occured while the method was executed with the icon " + icon);
        }
        
           /*        } catch (Exception ex) {
@@ -155,7 +155,8 @@ public class OSXAdapter implements InvocationHandler {
         setHandler(new OSXAdapter("handleOpenFile", target, fileHandler) {
                // Override OSXAdapter.callTarget to send information on the
                // file to be opened
-               public boolean callTarget(Object appleEvent) {
+               @Override
+        public boolean callTarget(Object appleEvent) {
                    if (appleEvent != null) {
                        try {
                            Method getFilenameMethod = appleEvent.getClass().getDeclaredMethod("getFilename", (Class[])null);
@@ -217,6 +218,7 @@ public class OSXAdapter implements InvocationHandler {
     
     // InvocationHandler implementation
     // This is the entry point for our proxy object; it is called every time an ApplicationListener method is invoked
+    @Override
     public Object invoke (Object proxy, Method method, Object[] args) throws Throwable {
         if (isCorrectMethod(method, args)) {
             boolean handled = callTarget(args[0]);
index 9949b01..c5a48fe 100644 (file)
 package org.scilab.modules.gui.bridge.window;
 
 import java.awt.Dimension;
-import java.awt.Point;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
-import javax.swing.JSplitPane;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
 import org.flexdock.docking.Dockable;
-import org.flexdock.docking.DockingConstants;
 import org.flexdock.docking.DockingManager;
 import org.flexdock.docking.DockingPort;
-import org.flexdock.docking.DockingStrategy;
 import org.flexdock.docking.activation.ActiveDockableTracker;
 import org.flexdock.docking.defaults.DefaultDockingPort;
 import org.flexdock.docking.defaults.DefaultDockingStrategy;
-import org.flexdock.view.View;
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.commons.gui.ScilabKeyStroke;
 import org.scilab.modules.gui.bridge.menubar.SwingScilabMenuBar;
@@ -61,9 +54,9 @@ import org.scilab.modules.gui.toolbar.ToolBar;
 import org.scilab.modules.gui.utils.ClosingOperationsManager;
 import org.scilab.modules.gui.utils.Position;
 import org.scilab.modules.gui.utils.SciDockingListener;
+import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 import org.scilab.modules.gui.utils.Size;
 import org.scilab.modules.gui.utils.UIElementMapper;
-import org.scilab.modules.gui.utils.WindowsConfigurationManager;
 import org.scilab.modules.gui.window.SimpleWindow;
 import org.scilab.modules.renderer.utils.RenderingCapabilities;
 
@@ -95,7 +88,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     private SimpleTextBox infoBar;
     private String uuid;
     private int elementId; // the id of the Window which contains this SimpleWindow
-    private boolean MAC_OS_X = (System.getProperty("os.name").toLowerCase().startsWith("mac os x"));
+    private final boolean MAC_OS_X = (System.getProperty("os.name").toLowerCase().startsWith("mac os x"));
 
     /**
      * Constructor
@@ -108,6 +101,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
 
         // By default ctrl+w close the window
         ActionListener listener = new ActionListener() {
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     processWindowEvent(new WindowEvent(SwingScilabWindow.this, WindowEvent.WINDOW_CLOSING));
                 }
@@ -148,6 +142,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
         setLocationByPlatform(true);
 
         addWindowListener(new WindowAdapter() {
+                @Override
                 public void windowClosing(WindowEvent e) {
                     ClosingOperationsManager.startClosingOperation(SwingScilabWindow.this);
                 }
@@ -168,7 +163,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
             // use as delegates for various com.apple.eawt.ApplicationListener methods
             OSXAdapter.setAboutHandler(this, getClass().getDeclaredMethod("OSXabout", (Class[])null));
             OSXAdapter.setQuitHandler(this, getClass().getDeclaredMethod("OSXquit", (Class[])null));
-            OSXAdapter.setDockIcon(System.getenv("SCI") + "/desktop/puffin.png");
+            OSXAdapter.setDockIcon(new ImageIcon(ScilabSwingUtilities.findIcon("scilab")));
         } catch (java.lang.NoSuchMethodException e) {
             System.err.println("OSXAdapter could not find the method: "+e.getLocalizedMessage());
         }
@@ -213,6 +208,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * Draws a swing Scilab window
      * @see org.scilab.modules.gui.UIElement#draw()
      */
+    @Override
     public void draw() {
         this.setVisible(true);
         this.doLayout();
@@ -235,12 +231,14 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * Deiconify the window and put it in front of other window
      */
+    @Override
     public void raise() {
         // blocking call. So graphic synchronization must be desactivated here.
         if (!SwingUtilities.isEventDispatchThread()) {
             /* javasci bug: See bug 9544 why we are doing this check */
             try {
                 SwingUtilities.invokeAndWait(new Runnable() {
+                        @Override
                         public void run() {
                             raiseToFront();
                         }
@@ -260,6 +258,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @return the dimensions of the window
      * @see org.scilab.modules.gui.UIElement#getDims()
      */
+    @Override
     public Size getDims() {
         return new Size(getSize().width, getSize().height);
     }
@@ -269,6 +268,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newWindowSize the dimensions to set to the window
      * @see org.scilab.modules.gui.UIElement#setDims(org.scilab.modules.gui.utils.Size)
      */
+    @Override
     public void setDims(Size newWindowSize) {
         // get the greatest size we can use
         int[] maxSize = RenderingCapabilities.getMaxWindowSize();
@@ -287,6 +287,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @return the position of the window
      * @see org.scilab.modules.gui.UIElement#getPosition()
      */
+    @Override
     public Position getPosition() {
         return new Position(this.getX(), this.getY());
     }
@@ -296,6 +297,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newWindowPosition the position to set to the window
      * @see org.scilab.modules.gui.UIElement#setPosition(org.scilab.modules.gui.utils.Position)
      */
+    @Override
     public void setPosition(Position newWindowPosition) {
         this.setLocation(newWindowPosition.getX(), newWindowPosition.getY());
     }
@@ -305,6 +307,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @return the title of the window
      * @see java.awt.Frame#getTitle(java.lang.String)
      */
+    @Override
     public String getTitle() {
         return super.getTitle();
     }
@@ -314,6 +317,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newWindowTitle the title to set to the window
      * @see java.awt.Frame#setTitle(java.lang.String)
      */
+    @Override
     public void setTitle(String newWindowTitle) {
         // set only if required
         if (newWindowTitle != null && !newWindowTitle.equals(getTitle())) {
@@ -324,6 +328,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * {@inheritedDoc}
      */
+    @Override
     public void setName(String name) {
         super.setName(name);
         setTitle(name);
@@ -335,7 +340,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      */
     public DockingPort getDockingPort() {
         //return (DockingPort) centerFrame.getContentPane();
-        return (DockingPort) sciDockingPort;
+        return sciDockingPort;
     }
 
     /**
@@ -343,6 +348,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newTab the Scilab tab to add to the Scilab window
      * @see org.scilab.modules.gui.window.Window#addTab(org.scilab.modules.gui.tab.Tab)
      */
+    @Override
     public void addTab(Tab newTab) {
         final SwingScilabTab tabImpl = ((SwingScilabTab) newTab.getAsSimpleTab());
 
@@ -385,7 +391,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
             /* Make sur a Tab is active */
             Set<SwingScilabTab> docks = sciDockingPort.getDockables();
             Iterator<SwingScilabTab> it = docks.iterator();
-            ActiveDockableTracker.requestDockableActivation((SwingScilabTab) it.next());
+            ActiveDockableTracker.requestDockableActivation(it.next());
         }
     }
 
@@ -394,6 +400,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param tab the Scilab tab to remove from the Scilab window
      * @see org.scilab.modules.gui.window.Window#removeTab(org.scilab.modules.gui.tab.Tab)
      */
+    @Override
     public void removeTab(Tab tab) {
         removeTabs(new SwingScilabTab[]{(SwingScilabTab) tab.getAsSimpleTab()});
     }
@@ -403,6 +410,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newMenuBar the Scilab MenuBar to add to the Scilab window
      * @see org.scilab.modules.gui.window.Window#setMenuBar(org.scilab.modules.gui.menubar.MenuBar)
      */
+    @Override
     public void addMenuBar(MenuBar newMenuBar) {
         if (newMenuBar == null) {
             if (this.menuBar != null) {
@@ -426,6 +434,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newToolBar the Scilab ToolBar to set to the Scilab window
      * @see org.scilab.modules.gui.window.Window#setToolBar(org.scilab.modules.gui.toolbar.ToolBar)
      */
+    @Override
     public void addToolBar(ToolBar newToolBar) {
         if (newToolBar == null) {
             if (this.toolBar != null) {
@@ -454,6 +463,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * @param newInfoBar the Scilab InfoBar to set to the Scilab window
      * @see org.scilab.modules.gui.window.Window#setInfoBar(org.scilab.modules.gui.textbox.TextBox)
      */
+    @Override
     public void addInfoBar(TextBox newInfoBar) {
         if (newInfoBar == null) {
             if (this.infoBar != null) {
@@ -481,6 +491,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * Get the element id for this window
      * @return id the id of the corresponding window object
      */
+    @Override
     public int getElementId() {
         return elementId;
     }
@@ -489,6 +500,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * Set the element id for this window
      * @param id the id of the corresponding window object
      */
+    @Override
     public void setElementId(int id) {
         this.elementId = id;
         sciDockingListener.setAssociatedWindowId(id);
@@ -498,6 +510,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * Close the window
      * @see org.scilab.modules.gui.window.SimpleWindow#close()
      */
+    @Override
     public void close() {
         dispose();
     }
@@ -505,6 +518,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * @return number of objects (tabs) docked in this window
      */
+    @Override
     public int getNbDockedObjects() {
         return sciDockingPort.getDockables().size();
     }
@@ -513,6 +527,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
      * Update the dimension of the window and its component.
      * Only useful when the window is not yet visible
      */
+    @Override
     public void updateDimensions() {
         pack();
     }
@@ -520,6 +535,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * DeIconify Window
      */
+    @Override
     public void windowDeiconified() {
         super.setState(Frame.NORMAL);
     }
@@ -527,6 +543,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * Iconify Window
      */
+    @Override
     public void windowIconified() {
         super.setState(Frame.ICONIFIED);
     }
@@ -534,6 +551,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * Maximized Window
      */
+    @Override
     public void windowMaximized() {
         super.setExtendedState(Frame.MAXIMIZED_BOTH);
     }
@@ -541,6 +559,7 @@ public class SwingScilabWindow extends JFrame implements SimpleWindow {
     /**
      * Window is in the "normal" state.
      */
+    @Override
     public void windowNormal() {
         super.setState(Frame.NORMAL);
     }
index 1904447..4044a86 100644 (file)
@@ -21,15 +21,22 @@ import java.awt.Image;
 import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.Window;
-import java.awt.image.BufferedImage;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.FileFilter;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.TreeSet;
 
 import javax.imageio.ImageIO;
 import javax.swing.JComponent;
@@ -89,6 +96,7 @@ public final class ScilabSwingUtilities {
         final Component componentF = component;
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
+                    @Override
                     public void run() {
                         componentF.setVisible(false);
                         Container parent = componentF.getParent();
@@ -202,6 +210,214 @@ public final class ScilabSwingUtilities {
         return Toolkit.getDefaultToolkit().createCustomCursor(compatibleIcon, new Point(0, 0), cursorName);
     }
 
+    /*
+     * freedesktop icon lookup mechanism
+     * http://standards.freedesktop.org/icon-theme
+     * -spec/icon-theme-spec-latest.html#icon_lookup
+     */
+
+    /**
+     * Look for the icon associated with the name.
+     * 
+     * @param icon
+     *            the name to look for
+     * @return the image icon path
+     */
+    public static String findIcon(final String icon) {
+        return findIcon(icon, "16x16");
+    }
+
+    /**
+     * Look for the icon associated with the name for a specific module.
+     * 
+     * @param name
+     *            the name to look for
+     * @param size
+     *            the size to look for
+     * @return the loaded image icon
+     */
+    public static String findIcon(final String icon, final String size) {
+        if (icon == null || icon.isEmpty()) {
+            return null;
+        }
+
+        final String filename = findIconHelper(icon, size, "Tango");
+        if (filename != null) {
+            return filename;
+        }
+
+        final String fallback = lookupFallbackIcon(icon);
+        if (fallback == null) {
+            System.err.println("Unable to found icon: " + icon + '[' + size + ']');
+        }
+        return fallback;
+    }
+
+    private static String findIconHelper(final String icon, final String size, final String theme) {
+        try {
+            final String filename = lookupIcon(icon, size, theme);
+            if (filename != null) {
+                return filename;
+            }
+        } catch (IOException e) {
+        }
+
+        /*
+         * always look for hicolor and then empty theme in case of invalid
+         * theme.
+         */
+        if (!theme.isEmpty() && theme != HICOLOR) {
+            return findIconHelper(icon, size, HICOLOR);
+        } else if (!theme.isEmpty()) {
+            return findIconHelper(icon, size, "");
+        } else {
+            return null;
+        }
+    }
+
+    private static final String SCI = System.getenv("SCI");
+    private static final String SEP = System.getProperty("file.separator");
+    private static final String DOT = ".";
+    private static final String HICOLOR = "hicolor";
+    private static final List<String> ICONS_EXTENSIONS = Arrays.asList("png", "svg", "xpm");
+    private static final HashMap<File, TreeSet<String>> THEME_SUBDIR_CACHE = new HashMap<File, TreeSet<String>>();
+
+    private static final FileFilter DIR_FILTER;
+    private static final List<String> THEME_BASENAME;
+    static {
+        DIR_FILTER = new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.isDirectory();
+            }
+        };
+        THEME_BASENAME = new ArrayList<String>();
+
+        /*
+         * Default themes
+         */
+        THEME_BASENAME.add("~/.icons");
+        THEME_BASENAME.add("/usr/share/icons");
+        THEME_BASENAME.add("/usr/share/pixmaps");
+
+        /*
+         * Scilab embedded icons
+         */
+
+        final ArrayList<File> dirs = new ArrayList<File>();
+        
+        // Append SCI/desktop and SCI/modules/xxx to the dirs
+        dirs.add(new File(SCI + SEP + "desktop"));
+        dirs.addAll(Arrays.asList(new File(SCI + SEP + "modules").listFiles(DIR_FILTER)));
+        for (File m : dirs) {
+            final File icons = new File(m, "images" + SEP + "icons");
+            final boolean iconsIsDir = icons.isDirectory();
+
+            // add dirs/images/icons/ to the base name
+            if (iconsIsDir) {
+                THEME_BASENAME.add(icons.getAbsolutePath());
+            }
+
+            // add dirs/images/icons/*/* to the base name
+            if (iconsIsDir) {
+                for (File s : icons.listFiles(DIR_FILTER)) {
+                    for (File category : s.listFiles(DIR_FILTER)) {
+                        THEME_BASENAME.add(category.getAbsolutePath());
+                    }
+                }
+            }
+        }
+    }
+
+    private static String lookupIcon(final String iconname, final String size, final String theme) throws IOException {
+        for (String directory : THEME_BASENAME) {
+            final File themeDir = new File(directory + SEP + theme);
+            if (!themeDir.exists() || !themeDir.isDirectory()) {
+                continue;
+            }
+
+            /*
+             * FIXME: implement an index.theme reader, for now we are parsing
+             * the file path to get the information
+             */
+
+            /*
+             * Create the theme subdirs
+             */
+            final int themeDirLen = themeDir.getCanonicalPath().length();
+            final TreeSet<String> themeSubdirs = findThemeSubdir(themeDir, themeDirLen);
+
+            /*
+             * Create a theme subdirs for a specific size
+             */
+            final TreeSet<String> sizedSubDirs = findSizedSubdirs(size, themeSubdirs);
+
+            /*
+             * Look for the icon
+             */
+            for (final String s : sizedSubDirs) {
+                for (String extension : ICONS_EXTENSIONS) {
+                    final File f = new File(themeDir, s + SEP + iconname + DOT + extension);
+
+                    if (f.exists()) {
+                        return f.getCanonicalPath();
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private static TreeSet<String> findSizedSubdirs(final String size, final TreeSet<String> themeSubdirs) {
+        final TreeSet<String> sizedSubDirs = new TreeSet<String>();
+        for (String subdir : themeSubdirs) {
+            if (subdir.startsWith(size)) {
+                sizedSubDirs.add(subdir);
+            }
+        }
+        return sizedSubDirs;
+    }
+
+    private static TreeSet<String> findThemeSubdir(final File themeDir, final int themeDirLen) throws IOException {
+        final TreeSet<String> cache = THEME_SUBDIR_CACHE.get(themeDir);
+        if (cache != null) {
+            return cache;
+        }
+
+        final TreeSet<String> themeSubdirs = new TreeSet<String>();
+
+        final LinkedList<File> dirs = new LinkedList<File>(Arrays.asList(themeDir.listFiles(DIR_FILTER)));
+        while (!dirs.isEmpty()) {
+            final File d = dirs.poll();
+
+            final List<File> sub = Arrays.asList(d.listFiles(DIR_FILTER));
+            if (sub.isEmpty()) {
+                final String s = d.getCanonicalPath();
+
+                themeSubdirs.add(s.substring(themeDirLen + 1));
+            } else {
+                dirs.addAll(sub);
+            }
+        }
+
+        THEME_SUBDIR_CACHE.put(themeDir, themeSubdirs);
+        return themeSubdirs;
+    }
+
+    private static String lookupFallbackIcon(final String icon) {
+        for (String directory : THEME_BASENAME) {
+            for (String extension : ICONS_EXTENSIONS) {
+                final File f = new File(directory + SEP + icon + DOT + extension);
+                if (f.exists()) {
+                    return f.getAbsolutePath();
+                }
+            }
+        }
+
+        return null;
+    }
+
     /**
      * Add an action to close the window when the ESCAPE key is hit.
      * @param window the window where to add the action, it must be an instance of
@@ -212,6 +428,7 @@ public final class ScilabSwingUtilities {
         KeyStroke ctrlw = ScilabKeyStroke.getKeyStroke("OSSCKEY W");
 
         ActionListener listener = new ActionListener() {
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     WindowListener[] listeners = window.getWindowListeners();
                     for (int i = 0; i < listeners.length; i++) {
index f287a7f..5f8e16d 100644 (file)
@@ -21,14 +21,8 @@ import java.lang.reflect.Proxy;
 import java.util.Collection;
 import java.util.TreeSet;
 
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
 import org.scilab.modules.commons.xml.ScilabDocumentBuilderFactory;
 import org.scilab.modules.gui.events.callback.CallBack;
 import org.scilab.modules.gui.pushbutton.PushButton;
@@ -36,6 +30,10 @@ import org.scilab.modules.gui.pushbutton.ScilabPushButton;
 import org.scilab.modules.gui.toolbar.ScilabToolBar;
 import org.scilab.modules.gui.toolbar.ToolBar;
 import org.scilab.modules.localization.Messages;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.SAXException;
 
 /**
  * Create a toolBar from an XML file
@@ -129,11 +127,9 @@ public final class ToolBarBuilder {
                protected static final String TRUE = "true";
                protected static final String FALSE = "false";
                protected static final String TOOLTIPTEXT = "tooltiptext";
-               
-               protected static final String DEFAULT_ICON_PATH = System.getenv("SCI") + "/modules/gui/images/icons/";
 
-               private Document dom;
-               private Collection<String> internalMethodNames;
+               private final Document dom;
+               private final Collection<String> internalMethodNames;
 
 
                /**
@@ -171,7 +167,8 @@ public final class ToolBarBuilder {
                 * @throws NoSuchMethodException thrown when invoking a non-existing method
                 * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])
                 */
-               public Object invoke(Object proxy, Method method, Object[] args) 
+               @Override
+        public Object invoke(Object proxy, Method method, Object[] args) 
                        throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
                        
                        if (internalMethodNames.contains(method.getName())) {
@@ -208,7 +205,7 @@ public final class ToolBarBuilder {
                                        
                                                if (buttonAttributes.item(i).getNodeName().equals(ICON)) {
                                                        // Icon file
-                                                       pushButton.setIcon(DEFAULT_ICON_PATH + buttonAttributes.item(i).getNodeValue());
+                            pushButton.setIcon(ScilabSwingUtilities.findIcon(buttonAttributes.item(i).getNodeValue()));
                                                } else if (buttonAttributes.item(i).getNodeName().equals(ENABLED)) {
                                                        // Enable are disable the button
                                                        pushButton.setEnabled(buttonAttributes.item(i).getNodeValue().equals(TRUE));
index 7c07a54..c0aa80f 100644 (file)
 
 package org.scilab.modules.helptools;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.scilab.modules.commons.ScilabCommonsUtils;
 import org.scilab.modules.commons.ScilabConstants;
-import org.scilab.modules.helptools.BuildJavaHelp;
-
+import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 import org.scilab.modules.helptools.external.HTMLMathMLHandler;
 import org.scilab.modules.helptools.external.HTMLSVGHandler;
 
@@ -132,8 +125,8 @@ public final class SciDocMain {
             ScilabCommonsUtils.copyFile(new File(SCI + "/modules/helptools/data/css/xml_code.css"), new File(outputDirectory + "/xml_code.css"));
             ScilabCommonsUtils.copyFile(new File(SCI + "/modules/helptools/data/css/c_code.css"), new File(outputDirectory + "/c_code.css"));
             ScilabCommonsUtils.copyFile(new File(SCI + "/modules/helptools/data/css/style.css"), new File(outputDirectory + "/style.css"));
-            ScilabCommonsUtils.copyFile(new File(SCI + "/modules/gui/images/icons/media-playback-start.png"), new File(outputDirectory + "/ScilabExecute.png"));
-            ScilabCommonsUtils.copyFile(new File(SCI + "/modules/gui/images/icons/accessories-text-editor.png"), new File(outputDirectory + "/ScilabEdit.png"));
+            ScilabCommonsUtils.copyFile(new File(ScilabSwingUtilities.findIcon("media-playback-start")), new File(outputDirectory + "/ScilabExecute.png"));
+            ScilabCommonsUtils.copyFile(new File(ScilabSwingUtilities.findIcon("accessories-text-editor")), new File(outputDirectory + "/ScilabEdit.png"));
             if (format.equalsIgnoreCase("javahelp")) {
                 if (!isToolbox) {
                     ScilabCommonsUtils.copyFile(new File(SCI + "/modules/helptools/data/pages/error.html"), new File(outputDirectory + "/ScilabErrorPage.html"));
index 82b51fa..2368491 100644 (file)
@@ -22,6 +22,7 @@ import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.pushbutton.ScilabPushButton;
+import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 
@@ -34,7 +35,7 @@ public final class CopyAction extends CallBack {
     private static final long serialVersionUID = 1L;
 
     private static final String LABEL = CommandHistoryMessages.COPY;
-    private static final String ICON = System.getenv("SCI") + "/modules/gui/images/icons/edit-copy.png";
+    private static final String ICON = ScilabSwingUtilities.findIcon("edit-copy");
     private static final char MNEMONIC = 'C';
 
     private static final String KEY = "OSSCKEY C";
@@ -107,6 +108,7 @@ public final class CopyAction extends CallBack {
      * Action!
      * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
      */
+    @Override
     public void callBack() {
         String commands = CommandHistory.getSelectedCommands();
         if (commands == null) {
index 877e133..92ca5b0 100644 (file)
@@ -20,6 +20,7 @@ import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.pushbutton.ScilabPushButton;
+import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 
@@ -32,7 +33,7 @@ public final class CutAction extends CallBack {
     private static final long serialVersionUID = 1L;
 
     private static final String LABEL = CommandHistoryMessages.CUT;
-    private static final String ICON = System.getenv("SCI") + "/modules/gui/images/icons/edit-cut.png";
+    private static final String ICON = ScilabSwingUtilities.findIcon("edit-cut");
     private static final char MNEMONIC = 'U';
 
     private static final String KEY = "OSSCKEY X";
@@ -105,6 +106,7 @@ public final class CutAction extends CallBack {
      * Action!
      * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
      */
+    @Override
     public void callBack() {
         CallBack copyAction = new CopyAction();
         copyAction.callBack();
index f131afb..4359aca 100644 (file)
@@ -14,8 +14,8 @@ package org.scilab.modules.history_browser.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
-import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.KeyStroke;
+import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
 
@@ -24,6 +24,7 @@ import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.menuitem.ScilabMenuItem;
 import org.scilab.modules.gui.pushbutton.PushButton;
 import org.scilab.modules.gui.pushbutton.ScilabPushButton;
+import org.scilab.modules.gui.utils.ScilabSwingUtilities;
 import org.scilab.modules.history_browser.CommandHistory;
 import org.scilab.modules.history_browser.CommandHistoryMessages;
 import org.scilab.modules.history_manager.HistoryManagement;
@@ -37,7 +38,7 @@ public final class DeleteAction extends CallBack {
     private static final long serialVersionUID = 1L;
 
     private static final String LABEL = CommandHistoryMessages.DELETE;
-    private static final String ICON = System.getenv("SCI") + "/modules/gui/images/icons/edit-delete.png";
+    private static final String ICON = ScilabSwingUtilities.findIcon("edit-delete");
     private static final char MNEMONIC = 'D';
 
     private static final String KEY = "DELETE";
@@ -110,6 +111,7 @@ public final class DeleteAction extends CallBack {
      * Action!
      * @see org.scilab.modules.gui.events.callback.CallBack#callBack()
      */
+    @Override
     public void callBack() {
         TreePath[] currentSelection = CommandHistory.getTree().getSelectionPaths();
         if (currentSelection != null) {