loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Replaced ungrouped checkboxes with toggle buttons.

Browse Source 
Only the filters in the sidebar are checkboxes now.
This commit is contained in:
Oliver Hamlet
2015-01-31 01:12:10 +00:00
parent f14f2295c2
commit 6416528d6b
7 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/report/bower.json
+2 -1
View File
@@ -34,6 +34,7 @@
"paper-toast": "Polymer/paper-toast#~0.5.1",
"core-list": "WrinklyNinja/core-list#z-order-items",
"core-dropdown": "WrinklyNinja/core-dropdown#null-dimensions-positions-fix",
"jed-gettext-parser": "~1.0.0"
"jed-gettext-parser": "~1.0.0",
"paper-toggle-button": "Polymer/paper-toggle-button#~0.5.4"
}
}
resources/report/css/overrides.css
+11
View File
@@ -86,3 +86,14 @@ html /deep/ paper-checkbox::shadow #checkbox.checked {
border-color: #3F51B5;
background-color: #3F51B5;
}
/* Style the paper-toggle-button colours. */
html /deep/ paper-toggle-button::shadow [checked] .toggle-bar {
background-color: rgba(63, 81, 181, 0.5);
}
html /deep/ paper-toggle-button::shadow [checked] .toggle-button {
background-color: #3F51B5;
}
html /deep/ paper-toggle-button::shadow [checked] .toggle-ink {
color: #3F51B5;
}
resources/report/css/style.css
+3
View File
@@ -189,6 +189,9 @@ li.warn {
#settingsDialog > div > :last-child {
margin-right: 0;
}
#settingsDialog core-label [for]:last-child {
margin-left: 16px;
}
#gameTable {
margin: 32px 0 0;
}
resources/report/html/loot-plugin-card.html
+17 -3
View File
@@ -16,11 +16,13 @@ loot-clear-metadata
<link rel="import" href="../bower_components/core-tooltip/core-tooltip.html">
<link rel="import" href="../bower_components/core-icon/core-icon.html">
<link rel="import" href="../bower_components/core-icons/core-icons.html">
<link rel="import" href="../bower_components/core-label/core-label.html">
<link rel="import" href="../bower_components/paper-menu-button/paper-menu-button.html">
<link rel="import" href="../bower_components/paper-item/paper-item.html">
<link rel="import" href="../bower_components/paper-dropdown/paper-dropdown.html">
<link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="../bower_components/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="loot-plugin-editor.html">
<link rel="import" href="loot-custom-icons.html">
@@ -138,12 +140,20 @@ loot-clear-metadata
core-tooltip > core-icon {
vertical-align: inherit !important;
}
#showOnlyConflicts {
display: block;
core-menu > core-label {
font-size: 1rem;
font-weight: 500;
padding: 0 16px;
height: 48px;
line-height: 48px;
}
core-menu > core-label > core-icon {
margin-right: 32px;
color: rgba(0, 0, 0, 0.54);
}
core-menu > core-label [for] {
margin-left: 32px;
}
</style>
<div id="wrapper">
<section id="front">
@@ -172,7 +182,11 @@ loot-clear-metadata
<paper-icon-button icon="more-vert"></paper-icon-button>
<paper-dropdown class="dropdown" halign="right" opened="{{data.isMenuOpen}}">
<core-menu class="menu">
<paper-checkbox id="showOnlyConflicts" label="Show Only Conflicts" checked="{{data.isConflictFilterChecked}}" flex></paper-checkbox>
<core-label center horizontal layout>
<core-icon icon="filter-list"></core-icon>
<div flex>Show Only Conflicts</div>
<paper-toggle-button id="showOnlyConflicts" checked="{{data.isConflictFilterChecked}}" for></paper-toggle-button>
</core-label>
<paper-item id="editMetadata" noink>
<core-icon icon="create"></core-icon>
Edit Metadata
resources/report/html/loot-plugin-editor.html
+12 -7
View File
@@ -11,12 +11,14 @@ loot-editor-close
<link rel="import" href="../bower_components/core-tooltip/core-tooltip.html">
<link rel="import" href="../bower_components/core-icon/core-icon.html">
<link rel="import" href="../bower_components/core-icons/core-icons.html">
<link rel="import" href="../bower_components/core-selector/core-selector.html">
<link rel="import" href="../bower_components/core-label/core-label.html">
<link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
<link rel="import" href="../bower_components/paper-input/paper-input.html">
<link rel="import" href="../bower_components/paper-input/paper-input-decorator.html">
<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html">
<link rel="import" href="../bower_components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="../bower_components/core-selector/core-selector.html">
<link rel="import" href="../bower_components/paper-toggle-button/paper-toggle-button.html">
<link rel="import" href="editable-table.html">
@@ -77,9 +79,6 @@ loot-editor-close
#main > paper-checkbox, #main > core-tooltip {
line-height: 48px;
}
#main > core-tooltip {
display: table;
}
#main > div > div:first-child {
margin-right: 16px;
}
@@ -155,9 +154,15 @@ loot-editor-close
</core-toolbar>
<core-selector selected="main" valueattr="id">
<div id="main">
<paper-checkbox id="enableEdits" label="Enable Edits"></paper-checkbox>
<core-tooltip label="Compare against all other plugins, not just conflicting plugins." position="right" noarrow>
<paper-checkbox id="globalPriority" label="Global Priority"></paper-checkbox>
<core-label center horizontal layout>
<div flex>Enable Edits</div>
<paper-toggle-button id="enableEdits" for></paper-toggle-button>
</core-label>
<core-tooltip label="Compare against all other plugins, not just conflicting plugins." noarrow center horizontal layout>
<core-label center horizontal layout flex>
<div flex>Global Priority</div>
<paper-toggle-button id="globalPriority" for></paper-toggle-button>
</core-label>
</core-tooltip>
<div horizontal layout center>
<div>Priority Value</div>
resources/report/js/l10n.js
+6 -6
View File
@@ -64,7 +64,7 @@
pluginCard.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads BSA").fetch());
pluginCard.getElementById('hasUserEdits').setAttribute('label', l10n.translate("Has User Metadata").fetch());
pluginCard.getElementById('showOnlyConflicts').setAttribute('label', l10n.translate("Show Only Conflicts").fetch());
pluginCard.getElementById('showOnlyConflicts').previousElementSibling.textContent = l10n.translate("Show Only Conflicts").fetch();
pluginCard.getElementById('editMetadata').lastChild.textContent = l10n.translate("Edit Metadata").fetch();
pluginCard.getElementById('copyMetadata').lastChild.textContent = l10n.translate("Copy Metadata").fetch();
pluginCard.getElementById('clearMetadata').lastChild.textContent = l10n.translate("Clear User Metadata").fetch();
@@ -82,9 +82,9 @@
pluginEditor.getElementById('emptyPlugin').setAttribute('label', l10n.translate("Empty Plugin").fetch());
pluginEditor.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads BSA").fetch());
pluginEditor.getElementById('enableEdits').setAttribute('label', l10n.translate("Enable Edits").fetch());
pluginEditor.getElementById('globalPriority').parentElement.setAttribute('label', l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch());
pluginEditor.getElementById('globalPriority').setAttribute('label', l10n.translate("Global Priority").fetch());
pluginEditor.getElementById('enableEdits').previousElementSibling.textContent = l10n.translate("Enable Edits").fetch();
pluginEditor.getElementById('globalPriority').parentElement.parentElement.setAttribute('label', l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch());
pluginEditor.getElementById('globalPriority').previousElementSibling.textContent = l10n.translate("Global Priority").fetch();
pluginEditor.getElementById('priorityValue').parentElement.previousElementSibling.textContent = l10n.translate("Priority Value").fetch();
pluginEditor.getElementById('tableTabs').querySelector('[data-for=main]').textContent = l10n.translate("Main").fetch();
@@ -277,10 +277,10 @@
document.getElementById('languageSelect').previousElementSibling.textContent = l10n.translate("Language").fetch();
document.getElementById('languageSelect').previousElementSibling.label = l10n.translate("Language changes will be applied after LOOT is restarted.").fetch();
document.getElementById('enableDebugLogging').label = l10n.translate("Enable debug logging").fetch();
document.getElementById('enableDebugLogging').previousElementSibling.textContent = l10n.translate("Enable debug logging").fetch();
document.getElementById('enableDebugLogging').parentElement.label = l10n.translate("The output is logged to the LOOTDebugLog.txt file.").fetch();
document.getElementById('updateMasterlist').label = l10n.translate("Update masterlist before sorting").fetch();
document.getElementById('updateMasterlist').previousElementSibling.textContent = l10n.translate("Update masterlist before sorting").fetch();
var gameTable = document.getElementById('gameTable');
gameTable.querySelector('th:first-child').textContent = l10n.translate("Name").fetch();
resources/report/report.html
+11 -3
View File
@@ -24,6 +24,7 @@
<link rel="import" href="bower_components/core-animated-pages/core-animated-pages.html">
<link rel="import" href="bower_components/core-animated-pages/transitions/slide-from-right.html">
<link rel="import" href="bower_components/core-list/core-list.html">
<link rel="import" href="bower_components/core-label/core-label.html">
<link rel="import" href="bower_components/paper-menu-button/paper-menu-button.html">
<link rel="import" href="bower_components/paper-item/paper-item.html">
@@ -37,6 +38,7 @@
<link rel="import" href="bower_components/paper-dropdown/paper-dropdown.html">
<link rel="import" href="bower_components/paper-progress/paper-progress.html">
<link rel="import" href="bower_components/paper-toast/paper-toast.html">
<link rel="import" href="bower_components/paper-toggle-button/paper-toggle-button.html">
<script src="bower_components/requirejs/require.js"></script>
</head>
@@ -256,10 +258,16 @@
<!-- Language <option> elements go here. -->
</loot-dropdown-menu>
</div>
<core-tooltip label="The output is logged to the LOOTDebugLog.txt file." center horizontal layout noarrow>
<paper-checkbox id="enableDebugLogging" label="Enable debug logging"></paper-checkbox>
<core-tooltip label="The output is logged to the LOOTDebugLog.txt file." noarrow>
<core-label center horizontal layout>
<div>Enable debug logging</div>
<paper-toggle-button id="enableDebugLogging" for></paper-toggle-button>
</core-label>
</core-tooltip>
<paper-checkbox id="updateMasterlist" label="Update masterlist before sorting"></paper-checkbox>
<core-label center horizontal layout>
<div>Update masterlist before sorting</div>
<paper-toggle-button id="updateMasterlist" for></paper-toggle-button>
</core-label>
</div>
<table is="editable-table" id="gameTable" data-template="gameRow">
<thead>