Преглед изворни кода

icons and css

icons and css

new icons
Nicolas Petton пре 11 година
родитељ
комит
681bcc6d48

+ 13 - 5
css/helios.css

@@ -106,15 +106,17 @@ i {
     padding: 2px 8px;
 }
 
-.navbar .navbar-fixed-top {
+.navbar-fixed-top {
     font-size: 11px;
     line-height: 16px;
+    box-shadow: 0 0 1px #333;
 }
 
 .navbar-fixed-top a span {
     padding-left: 18px;
     background-position: center left;
     background-repeat: no-repeat;
+    background-position: 0px -1px;
 }
 
 .navbar-fixed-top i.close {
@@ -127,12 +129,16 @@ i {
     margin-top: 2px;
 }
 
+.navbar-fixed-top a span.references {
+    background-image: url('../images/references.png')
+}
+
 .navbar-fixed-top a span.browser {
     background-image: url('../images/browser.png')
 }
 
-.navbar-fixed-top a span.references {
-    background-image: url('../images/references.gif')
+.navbar-fixed-top a span.sunit {
+    background-image: url('../images/sunit.png')
 }
 
 .navbar-fixed-top a span.workspace {
@@ -206,7 +212,6 @@ i {
     padding: 2px 2px 1px 4px;
     margin: 0;
     font-size: 11px;
-    font-family: Menlo, Monaco, "Lucida Console", Courier, monospace;
     color: #111;
     white-space: nowrap;
 }
@@ -398,6 +403,9 @@ i {
 .tool_container .pane .nav-pills i.private {
     background-image: url('../images/private.gif');
 }
+.tool_container .pane .nav-pills i.extension {
+    background-image: url('../images/extension.png');
+}
 .tool_container .pane .nav-pills i.default {
     background-image: url('../images/default.gif');
 }
@@ -417,7 +425,7 @@ i {
     background-image: url('../images/warning.gif');
 }
 .tool_container .pane .nav-pills i.uncommented {
-    background-image: url('../images/uncommented.gif');
+    background-image: url('../images/uncommented.png');
 }
 
 

BIN
images/browser.png


BIN
images/debugger.png


BIN
images/extension.gif


BIN
images/extension.png


BIN
images/inspector.png


BIN
images/package.png


BIN
images/references.gif


BIN
images/references.png




BIN
images/uncommented.gif


BIN
images/uncommented.png


BIN
images/warning.gif


BIN
images/widget.png


BIN
images/workspace.png


+ 7 - 3
js/Helios-Browser.deploy.js

@@ -2571,7 +2571,7 @@ selector: "cssClassForItem:",
 fn: function (anItem){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-var $1,$2,$3;
+var $1,$2,$3,$4;
 $1=_st(anItem).__eq(_st(self)._allProtocol());
 if(smalltalk.assert($1)){
 return "";
@@ -2584,9 +2584,13 @@ $3=_st(anItem).__eq("initialization");
 if(smalltalk.assert($3)){
 return "default";
 };
-return "public";
+$4=_st(anItem)._match_("^\x5c*");
+if(smalltalk.assert($4)){
+return "extension";
+};
+return "";
 }, function($ctx1) {$ctx1.fill(self,"cssClassForItem:",{anItem:anItem},smalltalk.HLProtocolsListWidget)})},
-messageSends: ["ifTrue:", "=", "allProtocol"]}),
+messageSends: ["ifTrue:", "=", "allProtocol", "match:"]}),
 smalltalk.HLProtocolsListWidget);
 
 smalltalk.addMethod(

+ 8 - 4
js/Helios-Browser.js

@@ -3342,7 +3342,7 @@ category: 'accessing',
 fn: function (anItem){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
-var $1,$2,$3;
+var $1,$2,$3,$4;
 $1=_st(anItem).__eq(_st(self)._allProtocol());
 if(smalltalk.assert($1)){
 return "";
@@ -3355,11 +3355,15 @@ $3=_st(anItem).__eq("initialization");
 if(smalltalk.assert($3)){
 return "default";
 };
-return "public";
+$4=_st(anItem)._match_("^\x5c*");
+if(smalltalk.assert($4)){
+return "extension";
+};
+return "";
 }, function($ctx1) {$ctx1.fill(self,"cssClassForItem:",{anItem:anItem},smalltalk.HLProtocolsListWidget)})},
 args: ["anItem"],
-source: "cssClassForItem: anItem\x0a\x09anItem = self allProtocol ifTrue: [ ^ '' ].\x0a\x09anItem = 'private' ifTrue: [ ^ 'private' ].\x0a\x09anItem = 'initialization' ifTrue: [ ^ 'default' ].\x0a\x09^ 'public'",
-messageSends: ["ifTrue:", "=", "allProtocol"],
+source: "cssClassForItem: anItem\x0a\x09anItem = self allProtocol ifTrue: [ ^ '' ].\x0a\x09anItem = 'private' ifTrue: [ ^ 'private' ].\x0a\x09anItem = 'initialization' ifTrue: [ ^ 'default' ].\x0a\x09(anItem match: '^\x5c*') ifTrue: [ ^ 'extension' ].\x0a\x09^ ''",
+messageSends: ["ifTrue:", "=", "allProtocol", "match:"],
 referencedClasses: []
 }),
 smalltalk.HLProtocolsListWidget);

+ 15 - 4
js/Helios-Core.deploy.js

@@ -618,7 +618,8 @@ if(($receiver = $4) == nil || $receiver == undefined){
 self["@selectedClass"]=nil;
 self["@selectedClass"];
 } else {
-_st(self)._selectedPackage_(_st(_st(aClass)._theNonMetaClass())._package());
+self["@selectedPackage"]=_st(_st(aClass)._theNonMetaClass())._package();
+self["@selectedPackage"];
 $5=_st(self)._showInstance();
 if(smalltalk.assert($5)){
 self["@selectedClass"]=_st(aClass)._theNonMetaClass();
@@ -632,7 +633,7 @@ _st(self)._selectedProtocol_(nil);
 return _st(_st(self)._announcer())._announce_(_st($HLClassSelected())._on_(_st(self)._selectedClass()));
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 return self}, function($ctx1) {$ctx1.fill(self,"selectedClass:",{aClass:aClass},smalltalk.HLToolModel)})},
-messageSends: ["ifTrue:", "and:", "isNil", "=", "selectedClass", "withChangesDo:", "selectedProtocol:", "ifNil:ifNotNil:", "selectedPackage:", "package", "theNonMetaClass", "ifTrue:ifFalse:", "theMetaClass", "showInstance", "announce:", "on:", "announcer"]}),
+messageSends: ["ifTrue:", "and:", "isNil", "=", "selectedClass", "withChangesDo:", "selectedProtocol:", "ifNil:ifNotNil:", "package", "theNonMetaClass", "ifTrue:ifFalse:", "theMetaClass", "showInstance", "announce:", "on:", "announcer"]}),
 smalltalk.HLToolModel);
 
 smalltalk.addMethod(
@@ -1765,7 +1766,6 @@ fn: function (html){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2,$3,$4;
-_st(self)._registerBindings();
 $1=_st(html)._div();
 _st($1)._class_("hl_widget");
 $2=_st($1)._yourself();
@@ -1785,7 +1785,7 @@ return smalltalk.withContext(function($ctx2) {
 return _st(_st(_st(self)._wrapper())._asJQuery())._addClass_(_st(self)._focusClass());
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 return self}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},smalltalk.HLFocusableWidget)})},
-messageSends: ["registerBindings", "class:", "div", "yourself", "with:", "renderContentOn:", "at:put:", "onBlur:", "removeClass:", "focusClass", "asJQuery", "wrapper", "onFocus:", "addClass:"]}),
+messageSends: ["class:", "div", "yourself", "with:", "renderContentOn:", "at:put:", "onBlur:", "removeClass:", "focusClass", "asJQuery", "wrapper", "onFocus:", "addClass:"]}),
 smalltalk.HLFocusableWidget);
 
 
@@ -3227,6 +3227,17 @@ return true;
 messageSends: []}),
 smalltalk.HLSUnit.klass);
 
+smalltalk.addMethod(
+smalltalk.method({
+selector: "tabClass",
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+return "sunit";
+}, function($ctx1) {$ctx1.fill(self,"tabClass",{},smalltalk.HLSUnit.klass)})},
+messageSends: []}),
+smalltalk.HLSUnit.klass);
+
 smalltalk.addMethod(
 smalltalk.method({
 selector: "tabLabel",

+ 22 - 6
js/Helios-Core.js

@@ -816,7 +816,8 @@ if(($receiver = $4) == nil || $receiver == undefined){
 self["@selectedClass"]=nil;
 self["@selectedClass"];
 } else {
-_st(self)._selectedPackage_(_st(_st(aClass)._theNonMetaClass())._package());
+self["@selectedPackage"]=_st(_st(aClass)._theNonMetaClass())._package();
+self["@selectedPackage"];
 $5=_st(self)._showInstance();
 if(smalltalk.assert($5)){
 self["@selectedClass"]=_st(aClass)._theNonMetaClass();
@@ -831,8 +832,8 @@ return _st(_st(self)._announcer())._announce_(_st($HLClassSelected())._on_(_st(s
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 return self}, function($ctx1) {$ctx1.fill(self,"selectedClass:",{aClass:aClass},smalltalk.HLToolModel)})},
 args: ["aClass"],
-source: "selectedClass: aClass\x0a\x09(self selectedClass = aClass and: [ aClass isNil ]) \x0a\x09\x09ifTrue: [ ^ self ].\x0a\x09\x0a\x09self withChangesDo: [\x0a\x09\x09selectedClass = aClass ifTrue: [ \x0a\x09\x09\x09self selectedProtocol: nil ].\x0a    \x0a\x09\x09aClass \x0a   \x09\x09\x09ifNil: [ selectedClass := nil ]\x0a    \x09\x09ifNotNil: [\x0a\x09\x09\x09\x09self selectedPackage: aClass theNonMetaClass package.\x0a\x09\x09\x09\x09self showInstance \x0a   \x09\x09\x09\x09\x09ifTrue: [ selectedClass := aClass theNonMetaClass ]\x0a     \x09\x09\x09\x09ifFalse: [ selectedClass := aClass theMetaClass ] ].\x0a\x09\x09self selectedProtocol: nil.\x0a\x09\x09self announcer announce: (HLClassSelected on: self selectedClass) ]",
-messageSends: ["ifTrue:", "and:", "isNil", "=", "selectedClass", "withChangesDo:", "selectedProtocol:", "ifNil:ifNotNil:", "selectedPackage:", "package", "theNonMetaClass", "ifTrue:ifFalse:", "theMetaClass", "showInstance", "announce:", "on:", "announcer"],
+source: "selectedClass: aClass\x0a\x09(self selectedClass = aClass and: [ aClass isNil ]) \x0a\x09\x09ifTrue: [ ^ self ].\x0a\x09\x0a\x09self withChangesDo: [\x0a\x09\x09selectedClass = aClass ifTrue: [ \x0a\x09\x09\x09self selectedProtocol: nil ].\x0a    \x0a\x09\x09aClass \x0a   \x09\x09\x09ifNil: [ selectedClass := nil ]\x0a    \x09\x09ifNotNil: [\x0a\x09\x09\x09\x09selectedPackage := aClass theNonMetaClass package.\x0a\x09\x09\x09\x09self showInstance \x0a   \x09\x09\x09\x09\x09ifTrue: [ selectedClass := aClass theNonMetaClass ]\x0a     \x09\x09\x09\x09ifFalse: [ selectedClass := aClass theMetaClass ] ].\x0a\x09\x09self selectedProtocol: nil.\x0a\x09\x09self announcer announce: (HLClassSelected on: self selectedClass) ]",
+messageSends: ["ifTrue:", "and:", "isNil", "=", "selectedClass", "withChangesDo:", "selectedProtocol:", "ifNil:ifNotNil:", "package", "theNonMetaClass", "ifTrue:ifFalse:", "theMetaClass", "showInstance", "announce:", "on:", "announcer"],
 referencedClasses: ["HLClassSelected"]
 }),
 smalltalk.HLToolModel);
@@ -2340,7 +2341,6 @@ fn: function (html){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1,$2,$3,$4;
-_st(self)._registerBindings();
 $1=_st(html)._div();
 _st($1)._class_("hl_widget");
 $2=_st($1)._yourself();
@@ -2361,8 +2361,8 @@ return _st(_st(_st(self)._wrapper())._asJQuery())._addClass_(_st(self)._focusCla
 }, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
 return self}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},smalltalk.HLFocusableWidget)})},
 args: ["html"],
-source: "renderOn: html\x0a\x09self registerBindings.\x0a    \x0a    wrapper := html div \x0a    \x09class: 'hl_widget';\x0a\x09\x09yourself.\x0a\x09\x09\x0a       wrapper with: [ self renderContentOn: html ].\x0a\x09\x0a\x09wrapper\x0a\x09\x09at: 'tabindex' put: '0';\x0a\x09\x09onBlur: [ self wrapper asJQuery removeClass: self focusClass ];\x0a        onFocus: [ self wrapper asJQuery addClass: self focusClass ]",
-messageSends: ["registerBindings", "class:", "div", "yourself", "with:", "renderContentOn:", "at:put:", "onBlur:", "removeClass:", "focusClass", "asJQuery", "wrapper", "onFocus:", "addClass:"],
+source: "renderOn: html\x0a    wrapper := html div \x0a    \x09class: 'hl_widget';\x0a\x09\x09yourself.\x0a\x09\x09\x0a       wrapper with: [ self renderContentOn: html ].\x0a\x09\x0a\x09wrapper\x0a\x09\x09at: 'tabindex' put: '0';\x0a\x09\x09onBlur: [ self wrapper asJQuery removeClass: self focusClass ];\x0a        onFocus: [ self wrapper asJQuery addClass: self focusClass ]",
+messageSends: ["class:", "div", "yourself", "with:", "renderContentOn:", "at:put:", "onBlur:", "removeClass:", "focusClass", "asJQuery", "wrapper", "onFocus:", "addClass:"],
 referencedClasses: []
 }),
 smalltalk.HLFocusableWidget);
@@ -4201,6 +4201,22 @@ referencedClasses: []
 }),
 smalltalk.HLSUnit.klass);
 
+smalltalk.addMethod(
+smalltalk.method({
+selector: "tabClass",
+category: 'accessing',
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
+return "sunit";
+}, function($ctx1) {$ctx1.fill(self,"tabClass",{},smalltalk.HLSUnit.klass)})},
+args: [],
+source: "tabClass\x0a\x09^ 'sunit'",
+messageSends: [],
+referencedClasses: []
+}),
+smalltalk.HLSUnit.klass);
+
 smalltalk.addMethod(
 smalltalk.method({
 selector: "tabLabel",

+ 2 - 1
st/Helios-Browser.st

@@ -1192,7 +1192,8 @@ cssClassForItem: anItem
 	anItem = self allProtocol ifTrue: [ ^ '' ].
 	anItem = 'private' ifTrue: [ ^ 'private' ].
 	anItem = 'initialization' ifTrue: [ ^ 'default' ].
-	^ 'public'
+	(anItem match: '^\*') ifTrue: [ ^ 'extension' ].
+	^ ''
 !
 
 label

+ 4 - 0
st/Helios-Core.st

@@ -1430,6 +1430,10 @@ HLWidget subclass: #HLSUnit
 
 !HLSUnit class methodsFor: 'accessing'!
 
+tabClass
+	^ 'sunit'
+!
+
 tabLabel
 	^ 'SUnit'
 !