Skip to content

Commit ba4fe59

Browse files
committed
clear layouts
1 parent 60d4523 commit ba4fe59

File tree

4 files changed

+46
-4
lines changed

4 files changed

+46
-4
lines changed

_locales/en/messages.json

+6
Original file line numberDiff line numberDiff line change
@@ -4847,6 +4847,9 @@
48474847
"paste": {
48484848
"message": "Paste"
48494849
},
4850+
"clear": {
4851+
"message": "Clear"
4852+
},
48504853
"active": {
48514854
"message": "Active"
48524855
},
@@ -5646,6 +5649,9 @@
56465649
"osdLayoutPasteFromClipboard": {
56475650
"message": "Layout has been restored from clipboard"
56485651
},
5652+
"osdClearLayout": {
5653+
"message": "Layout has been cleared"
5654+
},
56495655
"failedToOpenSerialPort": {
56505656
"message": "<span style=\"color: red\">Failed</span> to open serial port"
56515657
},

src/css/tabs/osd.css

+11-2
Original file line numberDiff line numberDiff line change
@@ -738,9 +738,7 @@ button {
738738
.settings .btn a{
739739
margin-top: 0;
740740
margin-bottom: 0;
741-
background-color: #37a8db;
742741
border-radius: 3px;
743-
border: 1px solid #3394b5;
744742
color: #fff;
745743
font-family: 'open_sansbold', Arial, serif;
746744
font-size: 12px;
@@ -751,6 +749,17 @@ button {
751749
line-height: 22px;
752750
}
753751

752+
.settings .btn_blue a{
753+
background-color: #37a8db;
754+
border: 1px solid #3394b5;
755+
}
756+
757+
.settings .btn_danger a{
758+
background-color: #e2a2a2;
759+
border: 1px solid #e58383;
760+
}
761+
762+
754763
.settings .btn a:hover {
755764
background-color: #3394b5;
756765
transition: all ease 0.2s;

tabs/osd.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ <h1 class="tab_title" data-i18n="tabOSD"></h1>
1010
<div class="settings spacer_right">
1111
<select class="osd_layouts">
1212
</select>
13-
<span class="btn">
13+
<span class="btn btn_blue">
1414
<a class="active osd_copy" href="#" data-i18n="copy"></a>
1515
</span>
16-
<span class="btn">
16+
<span class="btn btn_blue">
1717
<a class="active osd_paste" href="#" data-i18n="paste"></a>
1818
</span>
19+
<span class="btn btn_danger">
20+
<a class="active osd_clear" href="#" data-i18n="clear"></a>
21+
</span>
1922
<input class="osd_search" placeholder="Search...">
2023
</div>
2124
<div class="spacer_right">

tabs/osd.js

+24
Original file line numberDiff line numberDiff line change
@@ -3110,6 +3110,7 @@ OSD.GUI.updateAll = function() {
31103110
var layouts = $('.osd_layouts');
31113111
var copy = $('.osd_copy');
31123112
var paste = $('.osd_paste').hide();
3113+
var clear = $('.osd_clear');
31133114
if (OSD.data.layout_count > 1) {
31143115
layouts.empty();
31153116
for (var ii = 0; ii < OSD.data.layout_count; ii++) {
@@ -3149,6 +3150,26 @@ OSD.GUI.updateAll = function() {
31493150
}
31503151
});
31513152

3153+
clear.on('click', function() {
3154+
var oldLayout = JSON.parse(JSON.stringify(OSD.data.layouts[OSD.data.selected_layout]));
3155+
3156+
var clearedLayout = [];
3157+
oldLayout.forEach(function(item, index){
3158+
var itemCopy = JSON.parse(JSON.stringify(item));
3159+
itemCopy.isVisible = false;
3160+
clearedLayout[index] = itemCopy;
3161+
})
3162+
3163+
OSD.data.layouts[OSD.data.selected_layout] = clearedLayout;
3164+
layouts.trigger('change');
3165+
OSD.data.layouts[OSD.data.selected_layout].forEach(function(item, index){
3166+
if(oldLayout[index].isVisible === true){
3167+
OSD.saveItem({id: index});
3168+
}
3169+
});
3170+
GUI.log(chrome.i18n.getMessage('osdClearLayout'));
3171+
});
3172+
31523173

31533174
} else {
31543175
layouts.hide();
@@ -3159,6 +3180,9 @@ OSD.GUI.updateAll = function() {
31593180

31603181
paste.hide();
31613182
paste.off('change');
3183+
3184+
clear.hide();
3185+
clear.off('change');
31623186
}
31633187

31643188
$('.osd_search').on('input', function() {

0 commit comments

Comments
 (0)