1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 13:25:30 +03:00

removing custom frame, changes for 35M

This commit is contained in:
cTn 2014-04-19 22:43:19 +02:00
parent 1280c7668c
commit 5deb48f6cb
3 changed files with 70 additions and 135 deletions

View file

@ -11,11 +11,11 @@
function start_app() { function start_app() {
chrome.app.window.create('main.html', { chrome.app.window.create('main.html', {
id: 'main-window', id: 'main-window',
frame: 'none', frame: 'chrome',
resizable: false resizable: false
}, function(createdWindow) { }, function(createdWindow) {
// set window size // set window size
createdWindow.setBounds({'width': 962, 'height': 650}); createdWindow.setBounds({'width': 960, 'height': 625});
// bind events // bind events
createdWindow.onMaximized.addListener(function() { createdWindow.onMaximized.addListener(function() {

View file

@ -41,65 +41,7 @@ input[type="number"]::-webkit-inner-spin-button {
.right { .right {
float: right; float: right;
} }
#outter-wrapper {
border: 1px solid silver;
}
#frame {
height: 25px;
line-height: 25px;
-webkit-app-region: drag;
background-color: white;
}
#frame .title {
float: left;
margin-left: 15px;
font-weight: bold;
/* text-shadow: 1px 1px #e4e4e4; */
}
#frame .minimize {
float: right;
display: block;
width: 26px;
height: 20px;
background: url('../images/controls/minimize.png') no-repeat 0 0;
}
#frame .maximize {
float: right;
display: block;
width: 27px;
height: 20px;
background: url('../images/controls/maximize.png') no-repeat 0 0;
}
#frame .close {
float: right;
display: block;
width: 45px;
height: 20px;
background: url('../images/controls/close.png') no-repeat 0 0;
}
#frame a {
cursor: default;
-webkit-app-region: no-drag;
}
#frame a:hover {
/* hover is disabled untill webkit-app-region: drag; starts to fire events or chromium implements native frame */
/* background-position: 0px -20px; */
}
#frame a:active {
background-position: 0px -40px;
}
#main-wrapper { #main-wrapper {
width: 940px;
margin: 10px auto 0 auto; margin: 10px auto 0 auto;
padding: 0 10px 0 10px; padding: 0 10px 0 10px;
@ -256,7 +198,7 @@ input[type="number"]::-webkit-inner-spin-button {
padding: 10px; padding: 10px;
background-color: white; background-color: white;
height: 429px; height: 431px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
@ -266,10 +208,11 @@ input[type="number"]::-webkit-inner-spin-button {
-webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */ -webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */
} }
#status-bar { #status-bar {
margin-left: -10px; position: fixed;
margin-top: 10px;
width: 940px; bottom: 0px;
width: 100%;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;

134
main.html
View file

@ -47,81 +47,73 @@
<script type="text/javascript" src="./tabs/firmware_flasher.js"></script> <script type="text/javascript" src="./tabs/firmware_flasher.js"></script>
</head> </head>
<body> <body>
<div id="outter-wrapper"> <div id="main-wrapper">
<div id="frame"> <div id="port-picker">
<span class="title">Baseflight - Configurator</span> <ul>
<a class="close" href="#" title="Close"></a> <li class="port">
<a class="maximize" href="#"></a> <select id="port" title="Port">
<a class="minimize" href="#" title="Minimize"></a> <!-- port list gets generated here -->
</select>
</li>
<li>
<select id="baud" title="Baud Rate">
<option value="115200" selected="selected">115200</option>
<option value="57600">57600</option>
<option value="38400">38400</option>
<option value="28800">28800</option>
<option value="19200">19200</option>
<option value="14400">14400</option>
<option value="9600">9600</option>
<option value="4800">4800</option>
<option value="2400">2400</option>
<option value="1200">1200</option>
</select>
</li>
<li>
<a class="connect" href="#" title="">Connect</a>
<label>
<input class="auto_connect" type="checkbox" title="Auto-Connect" />
<span class="auto_connect">Auto-Connect</span>
</label>
</li>
</ul>
</div> </div>
<div id="main-wrapper"> <div id="sensor-status">
<div id="port-picker"> <ul>
<ul> <li class="gyro" title="Gyroscope">Gyro</li>
<li class="port"> <li class="accel" title="Accelerometer">Accel</li>
<select id="port" title="Port"> <li class="mag" title="Magnetometer">Mag</li>
<!-- port list gets generated here --> <li class="baro" title="Barometer">Baro</li>
</select> <li class="gps" title="GPS">GPS</li>
</li> <li class="sonar" title="Sonar / Range finder">Sonar</li>
<li> </ul>
<select id="baud" title="Baud Rate"> </div>
<option value="115200" selected="selected">115200</option> <div class="clear-both"></div>
<option value="57600">57600</option> <div id="log">
<option value="38400">38400</option> <div class="wrapper">
<option value="28800">28800</option>
<option value="19200">19200</option>
<option value="14400">14400</option>
<option value="9600">9600</option>
<option value="4800">4800</option>
<option value="2400">2400</option>
<option value="1200">1200</option>
</select>
</li>
<li>
<a class="connect" href="#" title="">Connect</a>
<label>
<input class="auto_connect" type="checkbox" title="Auto-Connect" />
<span class="auto_connect">Auto-Connect</span>
</label>
</li>
</ul>
</div>
<div id="sensor-status">
<ul>
<li class="gyro" title="Gyroscope">Gyro</li>
<li class="accel" title="Accelerometer">Accel</li>
<li class="mag" title="Magnetometer">Mag</li>
<li class="baro" title="Barometer">Baro</li>
<li class="gps" title="GPS">GPS</li>
<li class="sonar" title="Sonar / Range finder">Sonar</li>
</ul>
</div> </div>
</div>
<div id="tabs">
<ul>
<li class="tab_initial_setup"><a href="#">Initial Setup</a></li>
<li class="tab_pid_tuning"><a href="#">PID Tuning</a></li>
<li class="tab_receiver"><a href="#">Receiver</a></li>
<li class="tab_auxiliary_configuration"><a href="#">Auxiliary Configuration</a></li>
<li class="tab_servos"><a href="#">Servos</a></li>
<li class="tab_gps"><a href="#">GPS</a></li>
<li class="tab_motor_outputs"><a href="#">Motor/Servo Outputs</a></li>
<li class="tab_sensors"><a href="#">Raw Sensor Data</a></li>
<li class="tab_cli"><a href="#">CLI</a></li>
</ul>
<div class="clear-both"></div> <div class="clear-both"></div>
<div id="log">
<div class="wrapper">
</div>
</div>
<div id="tabs">
<ul>
<li class="tab_initial_setup"><a href="#">Initial Setup</a></li>
<li class="tab_pid_tuning"><a href="#">PID Tuning</a></li>
<li class="tab_receiver"><a href="#">Receiver</a></li>
<li class="tab_auxiliary_configuration"><a href="#">Auxiliary Configuration</a></li>
<li class="tab_servos"><a href="#">Servos</a></li>
<li class="tab_gps"><a href="#">GPS</a></li>
<li class="tab_motor_outputs"><a href="#">Motor/Servo Outputs</a></li>
<li class="tab_sensors"><a href="#">Raw Sensor Data</a></li>
<li class="tab_cli"><a href="#">CLI</a></li>
</ul>
<div class="clear-both"></div>
</div>
<div id="content">
</div>
<div id="status-bar">
<span i18n="statusbar_port_utilization"></span> <span class="port_usage_down">D: 0%</span> <span class="port_usage_up">U: 0%</span> |
<span i18n="statusbar_packet_error"></span> <span class="packet-error">0</span> |
<span i18n="statusbar_cycle_time"></span> <span class="cycle-time">0</span>
</div>
</div> </div>
<div id="content">
</div>
</div>
<div id="status-bar">
<span i18n="statusbar_port_utilization"></span> <span class="port_usage_down">D: 0%</span> <span class="port_usage_up">U: 0%</span> |
<span i18n="statusbar_packet_error"></span> <span class="packet-error">0</span> |
<span i18n="statusbar_cycle_time"></span> <span class="cycle-time">0</span>
</div> </div>
</body> </body>
</html> </html>