[squeak-dev] The Trunk: Morphic-mt.975.mczcommits at source.squeak.org commits at source.squeak.orgSun May 10 12:53:25 UTC 2015
Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.975.mcz ==================== Summary ==================== Name: Morphic-mt.975 Author: mt Time: 10 May 2015, 2:52:49.059 pm UUID: 0fc30e99-40c1-6042-9eba-14903faaf027 Ancestors: Morphic-mt.974 Reduced/updated icon usage in menus to make those other icons more effective. Postscript unloads menu entries for universe tools and language editor tools because those are not functional the moment. =============== Diff against Morphic-mt.974 =============== Item was added: + ----- Method: MenuIcons class>>fugueBroomIcon (in category 'private - icons') ----- + fugueBroomIcon + + ^ Icons + at: #broom + ifAbsentPut:[ Form fromBinaryStream: (Base64MimeConverter mimeDecodeToBytes: self fugueBroomIconContents readStream) ].! Item was added: + ----- Method: MenuIcons class>>fugueBroomIconContents (in category 'private - icons') ----- + fugueBroomIconContents + "Fugue Icons + (C) 2013 Yusuke Kamiyamane. All rights reserved. + + These icons are licensed under a Creative Commons + Attribution 3.0 License. + <http://creativecommons.org/licenses/by/3.0/>" + + ^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i + ZSBJbWFnZVJlYWR5ccllPAAAAoNJREFUeNqkU11Ik1EYfo6bm7WZW2r+MDNTZ9ZQcbYws0iN + piZEBF4UXWgXCXURXQQiBTYhgi4qRo0y+gEpNImauKVkhkzDNrxoCjrNZSSapnNLv+n2nc5H + GmFJgQcezuGc93nPc877vIRSivUMYqwkEFIIeQQQsnzA5rP1FEe0BKXZP894Bm6AQiKGPsjD + sLSEmpD/uCSX8e4JYOv9LJF+noNhb/ExrW8BBvE/yClmO824YbpaKUgwG6sjvy8gQVdwQNv4 + qNkeCK6tQMHiz7H5kMs1fKe1Rw7/xARKTl8+Gq4hX5496bR/nkINz8MiKAhliGCIYohjRF2Y + LCJnW2ZelrM8I6mlxYzCQj1arX4cTBzC4ZMXyhYD11soD074E3KrglwJkyl3S2WbZBvCI8Oj + E1JjlDGqqCXvojjg4bB5ZwKaO0NRUFAKq/U5CpOGIRKJYG2638AuOxHCZLT5PDP+NF3Jvvhk + bSY3y8eOdA+IvV9nsFGlxLf+MZRle2E2NyI/vxQvnXGYc88hEABhgEifSdw2O521dfSmyyji + ZRFyxKSqIGK1Gu8bgTI5FgEfh3TFPBra+6BW70H5+dqGvBTUs2d8XKmCJVtDFqanHRd35GqK + hxz9EFMRtmakwDc1C8oFoUjcglO7PNCdKW9i8beZ/C7BMr+qwDY6+/rpTeO1h3ZFlAJJOWqM + D36CZ3IG0mg5Jj+48fjp3bdV+dTEwrtWeKt9YEnbTvy21y+q1ercIp59UHJWGsYcQ7B0tHUz + 99WFSdH+O+EPIzElHa5RKnWN2pQVVce1gz1OvHn3vpcPolYiwavV8Ws50SKVgD4wNdUt98il + EALLX5tp3d243gQ/BBgABJ4L2+7frOgAAAAASUVORK5CYII='! Item was added: + ----- Method: MenuIcons class>>fugueDocumentClockIcon (in category 'private - icons') ----- + fugueDocumentClockIcon + + ^ Icons + at: #documentClock + ifAbsentPut:[ Form fromBinaryStream: (Base64MimeConverter mimeDecodeToBytes: self fugueDocumentClockIconContents readStream) ].! Item was added: + ----- Method: MenuIcons class>>fugueDocumentClockIconContents (in category 'private - icons') ----- + fugueDocumentClockIconContents + "Fugue Icons + (C) 2013 Yusuke Kamiyamane. All rights reserved. + + These icons are licensed under a Creative Commons + Attribution 3.0 License. + <http://creativecommons.org/licenses/by/3.0/>" + + ^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i + ZSBJbWFnZVJlYWR5ccllPAAAAhNJREFUeNqMU11LG1EQPbvZfEgaSKKBtFX71BcFjT8hCb4I + Pjb1qc/9F4og9AcU6rPgk9KCb0Uw0D9gCsWAaSJBoSSp+Wg2rbp3d3vuDZtuWS0dmL3DvTNn + 5szMaq7rQkppa2udx2P8W04cx/nq2Dbe7+yoC8N74cOTvc3N3Ts+WlIdBzbBvQSVSgV7x8ev + aWrUmhenTwBsW3NkkGUpvbu5wa/RCKZpYjgcqvNwe3uXfkW6Pw8A2ASQ0Dq/4VAIsXAYEcOA + oevQeNftdvF2fx+FhYV3X05PX3pxhq8CXQbrCgYKZCJCoFAoKDqJRAIfK5VeAEDICnwA94EI + UvR8AwC2EBMKI3Kv1+vo9/sqa5xZs3NzMCIRRUf6BnsghKLwk8Gf2XGX/KdiMSytrMCIRlE7 + O4O4vUVoDKAHAAQv1XzOzxFlxqlkEh8ODtBh9+PpNBKpFK4uLhQt8QCA6sH3TgdxBs8yqNVq + 4dnMDJ4yODk9jd71NcKcivBR+NMDy1IVWNwBnU5S2+02Xm1sIJvNYnVtTS7bmAJ9g1OQFPiY + YrYfrMLNZHB4dDQeMRtZrVZhDgZqDR+mwDOXy+Fbs4lGrSabpVTazUYDS8vLakr3UuDaKjvN + ClaLRZTLZXyiSpmdn0c+n1dvms/3L4BBrxf17AzLf1EqqR2Qv5J3Sioae+P3nQCMTPPy0eLi + G/yHEOTSs38LMADvCBAJ/QIAlQAAAABJRU5ErkJggg=='! Item was added: + ----- Method: MenuIcons class>>fugueUserSilhouetteQuestionIcon (in category 'private - icons') ----- + fugueUserSilhouetteQuestionIcon + + ^ Icons + at: #userSilhouetteQuestion + ifAbsentPut:[ Form fromBinaryStream: (Base64MimeConverter mimeDecodeToBytes: self fugueUserSilhouetteQuestionIconContents readStream) ].! Item was added: + ----- Method: MenuIcons class>>fugueUserSilhouetteQuestionIconContents (in category 'private - icons') ----- + fugueUserSilhouetteQuestionIconContents + "Fugue Icons + (C) 2013 Yusuke Kamiyamane. All rights reserved. + + These icons are licensed under a Creative Commons + Attribution 3.0 License. + <http://creativecommons.org/licenses/by/3.0/>" + + ^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9i + ZSBJbWFnZVJlYWR5ccllPAAAAgBJREFUeNqkk7+LGlEQx2f9rXiLvwhYHYQENaRJ4RJFsFMQ + bLQOBCRFSBGLtJciYJc21wRsUqS7v0IRlSNFjjt/d6IJaKEXFV1v853H3rHZmKTIwIfdN+87 + s/PmzUqappEkSWSyJ+AFeKSvL8FH8MUoErEHEqQ8Hs/7eDz+MBwOy+yYTCaLdrvdX61Wb7Cs + GRNY6Hd7qShKLBQKBfb7vU1VVVswGAwgYYz3zGJzgjiI+ny+o+12S8xutxP4/f4j3tM1v57D + YF/x9etsNqvN5/M7arWalslkNN5jjTHWZqrgHNy3WCxUqVREb5LJJKVSKYpEItRsNiVd88cj + PG+1Wg0EqqPRiIbDIS0WC5pOpzSbzVTeY83fErCd9nq9Gb9Eo1FKp9NUrVb56+w7/VcT2c4G + g8G13W6nUqlEnU6HxuMxV8PnPzOLbQfWr4CVF+VyWfTB7XaT7nsNPgD10C0o4DPoF4tFLZ/P + axggrV6vi/dCocDCvq5RzLfwDNP3DpMXQLfl9XpNVquVcBTCNQoB+3K53INut3sPiZ9iKt/C + /el2lC8SiUQM12dxOByiZH4ul0sR7PV6xVBtNhsxVJjQm0ajcYXYx7cVHLtcLo4np9MpEvBT + lmVRJsZZVMT9YA183PxjYw9OwA34Ab6BoT5x5zoXYAS+6xrWntz9jf9jPwUYAKt/9B8pRO/y + AAAAAElFTkSuQmCC'! Item was changed: ----- Method: MenuIcons class>>itemsIcons (in category 'menu decoration') ----- itemsIcons "answer a collection of associations wordings -> icon to decorate the menus all over the image" | icons | icons := OrderedCollection new. "icons add: #('Test Runner' ) -> self smallTrafficIcon." " world menu" + "icons add: #('previous project' 'go to previous project') -> self smallProjectBackIcon." - icons add: #('previous project' 'go to previous project') -> self smallProjectBackIcon. icons add: #('go to next project') -> self smallProjectNextIcon. icons add: #('select' ) -> self smallSelectIcon. icons add: #('jump to project...' ) -> self smallProjectJumpIcon. icons add: #('open...' ) -> self smallOpenIcon. icons add: #('appearance...' ) -> self smallConfigurationIcon. icons add: #('help...' ) -> self smallHelpIcon. + "icons add: #('windows...' ) -> self smallWindowIcon." + icons add: #('changes...' ) -> self smallDocumentClockIcon. - icons add: #('windows...' ) -> self smallWindowIcon. - icons add: #('changes...' ) -> self smallChangesIcon. icons add: #('print PS to file...' ) -> self smallPrintIcon. icons add: #('debug...' ) -> self smallDebugIcon. icons add: #('export...' ) -> self smallExportIcon. icons add: #('save' ) -> self smallSaveIcon. + "icons add: #('save project on file...' ) -> self smallProjectSaveIcon." + "icons add: #('save as...') -> self smallSaveAsIcon. - icons add: #('save project on file...' ) -> self smallProjectSaveIcon. - icons add: #('save as...') -> self smallSaveAsIcon. icons add: #('save as new version') -> self smallSaveNewIcon. + icons add: #('save and quit' ) -> self smallQuitIcon." - icons add: #('save and quit' ) -> self smallQuitIcon. icons add: #('quit') -> self smallQuitNoSaveIcon. + "icons add: #('load project from file...' ) -> self smallProjectLoadIcon." - icons add: #('load project from file...' ) -> self smallProjectLoadIcon. "" icons add: #('do it (d)' ) -> self smallDoItIcon. + icons add: #('inspect it (i)' 'inspect world' 'explore world' 'inspect model' 'inspect morph' 'explore morph' 'inspect owner chain' 'explore' 'inspect' 'explore (I)' 'inspect (i)' 'basic inspect' ) -> self smallInspectItIcon. - icons add: #('inspect it (i)' 'explore it (I)' 'inspect world' 'explore world' 'inspect model' 'inspect morph' 'explore morph' 'inspect owner chain' 'explore' 'inspect' 'explore (I)' 'inspect (i)' 'basic inspect' ) -> self smallInspectItIcon. icons add: #('print it (p)' ) -> self smallPrintIcon. icons add: #('debug it' ) -> self smallDebugIcon. icons add: #('tally it' ) -> self smallTimerIcon. "" icons add: #('copy (c)' 'copy to paste buffer' 'copy text' ) -> self smallCopyIcon. + icons add: #('paste (v)') -> self smallPasteIcon. - icons add: #('paste (v)' 'paste...' ) -> self smallPasteIcon. icons add: #('cut (x)' ) -> self smallCutIcon. "" icons add: #('accept (s)' 'yes' 'Yes' ) -> self smallOkIcon. icons add: #('cancel (l)' 'no' 'No' ) -> self smallCancelIcon. "" icons add: #('do again (j)' ) -> self smallRedoIcon. icons add: #('undo (z)' ) -> self smallUndoIcon. "" icons add: #( 'find class... (f)' 'find method...' ) -> self smallSearchIcon. + icons add: #('find...(f)') -> self smallFindIcon. - icons add: #('find...(f)' 'find again (g)') -> self smallFindIcon. "" icons add: #('remove' 'remove class (x)' 'delete method from changeset (d)' 'remove method from system (x)' 'delete class from change set (d)' 'remove class from system (x)' 'destroy change set (X)' ) -> self smallDeleteIcon. icons add: #('add item...' 'new category...' 'new change set... (n)' ) -> self smallNewIcon. "" + icons add: #('objects (o)' ) -> self smallObjectCatalogIcon. - icons add: #('new morph...' 'objects (o)' ) -> self smallObjectCatalogIcon. icons add: #('authoring tools...') -> self smallAuthoringToolsIcon. icons add: #('projects...') -> self smallProjectIcon. "" icons add: #('make screenshot') -> self smallScreenshotIcon. "" icons add: #('leftFlush' ) -> self smallLeftFlushIcon. icons add: #('rightFlush' ) -> self smallRightFlushIcon. icons add: #('centered' 'set alignment... (u)' ) -> self smallCenteredIcon. icons add: #('justified' ) -> self smallJustifiedIcon. "" icons add: #('set font... (k)' 'list font...' 'set subtitles font' 'change font' 'system fonts...' 'change font...' 'default text font...' 'flaps font...' 'eToys font...' 'eToys title font...' 'halo label font...' 'menu font...' 'window-title font...' 'balloon-help font...' 'code font...' 'button font...') -> self smallFontsIcon. icons add: #('full screen on') -> self smallFullscreenOnIcon. icons add: #('full screen off' ) -> self smallFullscreenOffIcon. "" ^ icons! Item was added: + ----- Method: MenuIcons class>>smallBroomIcon (in category 'accessing - icons') ----- + smallBroomIcon + + ^ self fugueBroomIcon! Item was added: + ----- Method: MenuIcons class>>smallDocumentClockIcon (in category 'accessing - icons') ----- + smallDocumentClockIcon + + ^ self fugueDocumentClockIcon! Item was added: + ----- Method: MenuIcons class>>smallUserQuestionIcon (in category 'accessing - icons') ----- + smallUserQuestionIcon + + ^ self fugueUserSilhouetteQuestionIcon! Item was changed: ----- Method: TheWorldMainDockingBar>>extrasMenuOn: (in category 'submenu - extras') ----- extrasMenuOn: aDockingBar aDockingBar addItem: [ :it| it contents: 'Extras' translated; addSubMenu: [:menu| menu addItem:[:item| item contents: 'Recover Changes' translated; help: 'Recover changes after a crash' translated; + icon: MenuIcons smallDocumentClockIcon; - icon: MenuIcons smallHelpIcon; target: ChangeList; selector: #browseRecentLog]. menu addLine. menu addItem:[:item| item contents: 'Window Colors' translated; help: 'Changes the window color scheme' translated; addSubMenu:[:submenu| self windowColorsOn: submenu]]. menu addItem:[:item| item contents: 'Set Author Initials' translated; help: 'Sets the author initials' translated; + icon: MenuIcons smallUserQuestionIcon; target: Utilities; selector: #setAuthorInitials]. menu addItem:[:item| item contents: 'Restore Display (r)' translated; help: 'Redraws the entire display' translated; target: World; selector: #restoreMorphicDisplay]. menu addItem:[:item| item contents: 'Rebuild Menus' translated; help: 'Rebuilds the menu bar' translated; target: TheWorldMainDockingBar; selector: #updateInstances]. menu addLine. menu addItem:[:item| item contents: 'Start Profiler' translated; help: 'Starts the profiler' translated; + icon: MenuIcons smallTimerIcon; target: self; selector: #startMessageTally]. menu addItem:[:item| item contents: 'Collect Garbage' translated; help: 'Run the garbage collector and report space usage' translated; target: Utilities; selector: #garbageCollectAndReport]. menu addItem:[:item| item contents: 'Purge Undo Records' translated; help: 'Save space by removing all the undo information remembered in all projects' translated; target: CommandHistory; selector: #resetAllHistory]. menu addItem:[:item| item contents: 'VM statistics' translated; help: 'Virtual Machine information' translated; target: self; selector: #vmStatistics]. menu addLine. menu addItem:[:item| item contents: 'Graphical Imports' translated; help: 'View the global repository called ImageImports; you can easily import external graphics into ImageImports via the FileList' translated; target: (Imports default); selector: #viewImages]. menu addItem:[:item| item contents: 'Standard Graphics Library' translated; help: 'Lets you view and change the system''s standard library of graphics' translated; target: ScriptingSystem; selector: #inspectFormDictionary]. menu addItem:[:item| item contents: 'Annotation Setup' translated; help: 'Click here to get a little window that will allow you to specify which types of annotations, in which order, you wish to see in the annotation panes of browsers and other tools' translated; target: Preferences; selector: #editAnnotations]. menu addItem:[:item| item contents: 'Browse My Changes' translated; help: 'Browse all of my changes since the last time #condenseSources was run.' translated; target: SystemNavigation new; selector: #browseMyChanges]. ] ]! Item was changed: ----- Method: TheWorldMainDockingBar>>listWindowsOn: (in category 'submenu - windows') ----- listWindowsOn: menu | windows | windows := SortedCollection sortBlock: [:winA :winB | winA model name = winB model name ifTrue: [winA label < winB label] ifFalse: [winA model name < winB model name]]. windows addAll: self allVisibleWindows. windows ifEmpty: [ menu addItem: [ :item | item contents: 'No Windows' translated; isEnabled: false ] ]. windows do: [ :each | menu addItem: [ :item | item contents: (self windowMenuItemLabelFor: each); icon: (self colorIcon: each model defaultBackgroundColor); target: each; selector: #comeToFront; subMenuUpdater: self selector: #windowMenuFor:on: arguments: { each }; action: [ each activateAndForceLabelToShow; expand ] ] ]. menu addLine; add: 'Close all windows' target: self selector: #closeAllWindowsUnsafe; + addItem: [:item | item + contents: 'Close all windows without changes'; + target: self; + icon: MenuIcons smallBroomIcon; + selector: #closeAllWindows]; - add: 'Close all windows without changes' target: self selector: #closeAllWindows; add: 'Close all windows but workspaces' target: self selector: #closeAllWindowsButWorkspaces.! Item was changed: ----- Method: TheWorldMainDockingBar>>loadProjectMenuItemOn: (in category 'submenu - projects') ----- loadProjectMenuItemOn: menu menu addItem: [ :item | item contents: 'Load Project' translated; help: 'Load a project from a file' translated; - icon: MenuIcons smallProjectLoadIcon; target: self; selector: #loadProject ]! Item was changed: ----- Method: TheWorldMainDockingBar>>previousProjectMenuItemOn: (in category 'submenu - projects') ----- previousProjectMenuItemOn: menu menu addItem: [ :item | item contents: 'Previous Project' translated; help: 'Return to the most-recently-visited project' translated; - icon: MenuIcons smallProjectBackIcon; target: World; selector: #goBack ]! Item was changed: ----- Method: TheWorldMainDockingBar>>projectsMenuOn: (in category 'construction') ----- projectsMenuOn: aDockingBar aDockingBar addItem: [ :item | item contents: 'Projects' translated; addSubMenu: [ :menu | + self newProjectMenuItemOn: menu. + menu addLine. self - newProjectMenuItemOn: menu; saveProjectMenuItemOn: menu; + loadProjectMenuItemOn: menu. + menu addLine. + self - loadProjectMenuItemOn: menu; previousProjectMenuItemOn: menu; jumpToProjectMenuItemOn: menu ] ] ! Item was changed: ----- Method: TheWorldMainDockingBar>>saveAndQuitMenuItemOn: (in category 'submenu - squeak') ----- saveAndQuitMenuItemOn: menu menu addItem: [ :item | item contents: 'Save And Quit' translated; help: 'Save the current state of Squeak on disk, and quit out of Squeak' translated; - icon: MenuIcons smallQuitIcon; target: self; selector: #saveAndQuitSqueak ]! Item was changed: ----- Method: TheWorldMainDockingBar>>saveAsMenuItemOn: (in category 'submenu - squeak') ----- saveAsMenuItemOn: menu menu addItem: [ :item | item + contents: 'Save As...' translated; - contents: 'Save Image As...' translated; help: 'Save the current state of Squeak on disk under a new name' translated; - icon: MenuIcons smallSaveAsIcon; target: self; selector: #saveImageAs ]! Item was changed: ----- Method: TheWorldMainDockingBar>>saveAsNewVersionMenuItemOn: (in category 'submenu - squeak') ----- saveAsNewVersionMenuItemOn: menu menu addItem: [ :item | item contents: 'Save As New Version' translated; help: 'Save the current state of Squeak on disk under a version-stamped name' translated; - icon: MenuIcons smallSaveNewIcon; target: self; selector: #saveAsNewVersion ]! Item was changed: ----- Method: TheWorldMainDockingBar>>saveMenuItemOn: (in category 'submenu - squeak') ----- saveMenuItemOn: menu menu addItem: [ :item | item + contents: 'Save' translated; - contents: 'Save Image' translated; help: 'Save the current state of Squeak on disk' translated; icon: MenuIcons smallSaveIcon; target: self; selector: #saveImage ]! Item was changed: ----- Method: TheWorldMainDockingBar>>saveProjectMenuItemOn: (in category 'submenu - projects') ----- saveProjectMenuItemOn: menu menu addItem: [ :item | item contents: 'Save Project' translated; help: 'Save this project on a file' translated; - icon: MenuIcons smallProjectSaveIcon; target: World; selector: #saveOnFile ]! Item was changed: ----- Method: TheWorldMainDockingBar>>updateMenuItemOn: (in category 'submenu - squeak') ----- updateMenuItemOn: menu menu addItem: [ :item | item contents: 'Update Squeak' translated; help: 'Load latest code updates via the internet' translated; + icon: MenuIcons smallChangesIcon; target: self; selector: #updateSqueak ]! Item was changed: (PackageInfo named: 'Morphic') postscript: '"Initialize the key bindings and menus" Editor initialize. "apply the new icons" MenuIcons initializeIcons. TheWorldMainDockingBar updateInstances. + "Fix missing inset of old-style windows." - "Fix missing inset of open windows." SystemWindow allSubInstancesDo: [:ea | + (ea paneMorphs detect: [:m | m layoutFrame leftFraction = 0] ifNone: []) + ifNotNil: [:m | m layoutFrame leftOffset > 0 + ifTrue: [ea layoutInset: 0]]]. + + "Remove non-functional tools from world menu." + LanguageEditor unload. + UUniverseBrowser unload. + UUniverseEditor unload.'! - ea - wantsPaneSplitters: true; - layoutInset: ProportionalSplitterMorph gripThickness; - cellInset: ProportionalSplitterMorph gripThickness]. - - "Update minimum extents and clipping." - PluggableButtonMorph allSubInstancesDo: [:ea | - ea - clipSubmorphs: true; - updateMinimumExtent].'!
More information about the Squeak-dev mailing list |