Skip to content
This repository was archived by the owner on Feb 21, 2020. It is now read-only.

Commit 739d38d

Browse files
author
sebba
committed
2 parents c666d6a + 60b4dc6 commit 739d38d

File tree

7 files changed

+42
-22
lines changed

7 files changed

+42
-22
lines changed

modules/Console/css/Console.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#console {
22
min-height:195px;
3-
height: 195px;
3+
height: 99%;
4+
max-height: 660px;
45
padding-top: 0px;
56
display: block;
67
border: 9px solid #fcb600;
78
padding-left: 0px;
9+
background-color: #ffffff;
810
}
911

1012
#logger {
11-
height: 177px;
13+
height: 99%;
14+
max-height: 632px;
15+
overflow: hidden;
1216
background-color: #ffffff;
1317
border: none;
1418
/*border:1px solid #EEE; border-right:0 solid;*/

modules/Console/main.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,24 @@ define(function(require, exports, module){
8686
brackets.arduino.dispatcher.trigger("arduino-event-serialmonitor-hide");
8787
if(!panel.isVisible){
8888
panel.show();
89+
$('#toolbar-console-btn').addClass('consolehover');
8990
}
9091
},
9192
hideConsole = function($event){
9293
if(panel.isVisible){
9394
panel.hide();
95+
$('#toolbar-console-btn').removeClass('consolehover');
9496
}
9597
},
9698
showHideConsole = function($event){
9799
if(panel.isVisible()){
98100
panel.hide();
101+
$('#toolbar-console-btn').removeClass('consolehover');
99102
}
100103
else{
101104
brackets.arduino.dispatcher.trigger("arduino-event-serialmonitor-hide");
102105
panel.show();
106+
$('#toolbar-console-btn').addClass('consolehover');
103107
}
104108
};
105109

@@ -124,8 +128,10 @@ define(function(require, exports, module){
124128
brackets.arduino.dispatcher.on("arduino-event-console-hide", hideConsole);
125129
brackets.arduino.dispatcher.on("arduino-event-console", showHideConsole);
126130

127-
if(brackets.arduino.preferences.get("arduino.ide.preferences.consoleshow"))
131+
if(brackets.arduino.preferences.get("arduino.ide.preferences.consoleshow")){
128132
panel.show();
133+
$('#toolbar-console-btn').addClass('consolehover');
134+
}
129135
}
130136

131137
AppInit.htmlReady(function () {

modules/SerialMonitor/css/SerialMonitor.css

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
#plugin-serialmonitor {
2-
padding-top: 10px;
3-
display: block;
4-
padding-bottom: 56px;
5-
margin-left: 7px;
1+
/* commento inserito per comodità */
2+
#serialmonitor {
3+
min-height: 380px;
4+
height: 99%;
5+
max-height: 380px;
6+
padding-top: 0px;
67
display: block;
8+
border: 9px solid #f27a20;
9+
padding-left: 0px;
10+
background-color: #ffffff;
11+
padding-left: 16px;
712
}
813

914
input#scroll {
@@ -18,22 +23,18 @@ input#scroll {
1823
#message_input{
1924
width: 86%;
2025
margin-left: 15px;
21-
height: 27px;
22-
}
23-
24-
#logarea {
25-
height: 100%;
26+
border: 1px solid #b2b5b5;
2627
}
2728

2829
#console_log {
2930
width: 96%;
31+
min-height: 220px;
32+
max-height: 220px;
3033
overflow-y: scroll !important;
3134
margin-left: 15px;
3235
background-color: #ffffff;
3336
padding-top: 0px;
3437
border: 1px solid #b2b5b5;
35-
min-height: 130px;
36-
height: 60%;
3738

3839
-moz-user-select: text;
3940
-khtml-user-select: text;

modules/SerialMonitor/html/SerialMonitor.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<div id="plugin-serialmonitor" class="modal-bar">
2-
<label class="serial_title">Serial Monitor</label>
1+
<div id="serialmonitor" class="modal-bar">
32
<div id="options">
43
<div class="form-inline text-center">
54
<label class="serial_label">AutoScroll</label><input type="checkbox" id="scroll" checked=true />&nbsp;&nbsp;|&nbsp;&nbsp;
@@ -33,8 +32,6 @@
3332
<input type="text" id="message_input" /><a class="btn" id="send_button" title="Send Message" /><a id="clear_button" class="btn" title="Clear Log and Message" />
3433
<!--<input type="button" id="send_button" value="Send">-->
3534
</div>
36-
<div id="logarea" class="form-group">
37-
<label class="serial_label">Log</label>
38-
<div id="console_log"></div>
39-
</div>
35+
<label class="serial_label">Log</label>
36+
<div id="console_log"></div>
4037
</div>

modules/SerialMonitor/main.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ define(function (require, exports, module) {
117117

118118
var showSerialMonitor = function(){
119119
brackets.arduino.dispatcher.trigger("arduino-event-console-hide");
120+
$('#toolbar-console-btn').removeClass('consolehover');
120121

121122
if (!serialMonitorPanel.isVisible()) {
122123
serialMonitorPanel.show();
@@ -129,10 +130,13 @@ define(function (require, exports, module) {
129130
brackets.arduino.dispatcher.trigger("arduino-event-console-log", serialMonitorPrefix + " Serial monitor connected to " + serialPort.address);
130131
}
131132
});
133+
$('#toolbar-serial-btn').addClass('serialhover');
132134
}
133135
}
134136

135137
var hideSerialMonitor = function(){
138+
$('#toolbar-serial-btn').removeClass('serialhover');
139+
136140
if (serialMonitorPanel.isVisible()){
137141
serialMonitorPanel.hide();
138142
closeSerialPort(serialPort, function(err){

modules/Toolbar/css/toolbar.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@
131131
background: url('../img/console_over.png') center no-repeat;
132132
}
133133

134+
.consolehover {
135+
background: url('../img/console_over.png') center no-repeat !important;
136+
}
137+
134138
#toolbar-serial-btn {
135139
background: url('../img/serial.png') center no-repeat;
136140
cursor:pointer;
@@ -141,6 +145,10 @@
141145
background: url('../img/serial_over.png') center no-repeat;
142146
}
143147

148+
.serialhover {
149+
background: url('../img/serial_over.png') center no-repeat !important;
150+
}
151+
144152
#toolbar-toggle-btn {
145153
background: url('../img/apri.png') center no-repeat;
146154
padding-bottom: 16px;

node/compiler.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,4 +667,4 @@
667667

668668
exports.init = init;
669669

670-
}());
670+
}());

0 commit comments

Comments
 (0)