Skip to content
This repository has been archived by the owner on Jun 25, 2024. It is now read-only.

Commit

Permalink
1.9.10
Browse files Browse the repository at this point in the history 
Mostly UI fixes, some async issues.  It's downright speedy now.
  • Loading branch information
@jtsage
jtsage committed May 27, 2021
1 parent 03af804 commit 50849f4
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 14 deletions.
2 changes: 1 addition & 1 deletion main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const { app, Menu, BrowserWindow, ipcMain, clipboard } = require('electron')

if (require('electron-squirrel-startup')) return app.quit()

const devDebug = true
const devDebug = false

const path = require('path')
const xml2js = require('xml2js')
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fs19-mod-checker",
"version": "1.9.9",
"version": "1.9.10",
"description": "FS19 Mod Folder Checker",
"main": "main.js",
"homepage": "https://github.com/jtsage/FS19_Mod_Checker#readme",
Expand Down
45 changes: 33 additions & 12 deletions renderer/main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,23 @@ <h2 class="ps-2"><span class="i18n" data-i18n="title"></span> v<span class="i18n
<button class="link-dark nav-link active i18n" data-i18n="tab_config" id="tab_config" data-bs-toggle="tab" data-bs-target="#tab_config_content" type="button" role="tab" aria-selected="true" aria-controls="tab_config_content"></button>
</li>
<li class="nav-item" role="presentation">
<button class="link-dark nav-link i18n" data-i18n="tab_broken" id="tab_broken" data-bs-toggle="tab" data-bs-target="#tab_broken_content" type="button" role="tab" aria-selected="false" aria-controls="tab_broken_content"></button>
<button class="disabled link-dark nav-link i18n" data-i18n="tab_broken" id="tab_broken" data-bs-toggle="tab" data-bs-target="#tab_broken_content" type="button" role="tab" aria-selected="false" aria-controls="tab_broken_content"></button>
</li>
<li class="nav-item" role="presentation">
<button class="link-dark nav-link i18n" data-i18n="tab_missing" id="tab_missing" data-bs-toggle="tab" data-bs-target="#tab_missing_content" type="button" role="tab" aria-selected="false" aria-controls="tab_missing_content"></button>
<button class="disabled link-dark nav-link i18n" data-i18n="tab_missing" id="tab_missing" data-bs-toggle="tab" data-bs-target="#tab_missing_content" type="button" role="tab" aria-selected="false" aria-controls="tab_missing_content"></button>
</li>
<li class="nav-item" role="presentation">
<button class="link-dark nav-link i18n" data-i18n="tab_conflict" id="tab_conflict" data-bs-toggle="tab" data-bs-target="#tab_conflict_content" type="button" role="tab" aria-selected="false" aria-controls="tab_conflict_content"></button>
<button class="disabled link-dark nav-link i18n" data-i18n="tab_conflict" id="tab_conflict" data-bs-toggle="tab" data-bs-target="#tab_conflict_content" type="button" role="tab" aria-selected="false" aria-controls="tab_conflict_content"></button>
</li>
<li class="nav-item" role="presentation">
<button class="link-dark nav-link i18n" data-i18n="tab_explore" id="tab_explore" data-bs-toggle="tab" data-bs-target="#tab_explore_content" type="button" role="tab" aria-selected="false" aria-controls="tab_explore_content"></button>
<button class="disabled link-dark nav-link i18n" data-i18n="tab_explore" id="tab_explore" data-bs-toggle="tab" data-bs-target="#tab_explore_content" type="button" role="tab" aria-selected="false" aria-controls="tab_explore_content"></button>
</li>
</ul>





<div class="tab-content pt-3" id="mainTabContent">

<div class="tab-pane fade show active" id="tab_config_content" role="tabpanel" aria-labelledby="tab_config">
Expand Down Expand Up @@ -125,6 +129,9 @@ <h2 class="ps-2"><span class="i18n" data-i18n="title"></span> v<span class="i18n
</div>
</div>




<div class="tab-pane fade" id="tab_broken_content" role="tabpanel" aria-labelledby="tab_broken">
<p class="text-center i18n" data-i18n="broken_blurb"></p>
<div class="text-center my-3">
Expand All @@ -136,6 +143,9 @@ <h2 class="ps-2"><span class="i18n" data-i18n="title"></span> v<span class="i18n
<ul class="list-group list-group-flush mb-4" id="broken_list"></ul>
</div>




<div class="tab-pane fade" id="tab_missing_content" role="tabpanel" aria-labelledby="tab_missing">
<p class="text-center i18n px-4" data-i18n="missing_blurb"></p>
<div class="mx-0 table-responsive">
Expand All @@ -154,24 +164,35 @@ <h2 class="ps-2"><span class="i18n" data-i18n="title"></span> v<span class="i18n
</div>
</div>




<div class="tab-pane fade" id="tab_conflict_content" role="tabpanel" aria-labelledby="tab_conflict">
<p class="text-center i18n px-4" data-i18n="conflict_blurb"></p>
<ul class="list-group list-group-flush mb-4" id="conflict_list"></ul>
<button type="button" id="button_un_hide_conflict" onclick="unHideAllConflict()" class="d-none btn mb-4 btn-primary d-block w-75 mx-auto btn-sm i18n" data-i18n="conflict_un_hide_button"></button>
</div>




<div class="tab-pane fade" id="tab_explore_content" role="tabpanel" aria-labelledby="tab_explore">
<p class="text-center i18n px-4" data-i18n="explore_blurb"></p>

<div class="input-group input-group-sm mb-3 w-75 mx-auto">
<span class="border-secondary input-group-text" id="search-addon"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16"><path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/></svg></span>
<input type="text" id="explore-search" onkeyup="searchExploreTable()" class="border-secondary form-control" aria-describedby="search-addon">
<button class="btn btn-outline-secondary" onclick="searchExploreClear()" type="button"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x" viewBox="0 0 16 16">
<path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
</svg></button>
<div class="row mx-5">
<div class="col-8">
<div class="input-group input-group-sm mb-3 w-100 mx-auto">
<span class="border-secondary input-group-text" id="search-addon"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-search" viewBox="0 0 16 16"><path d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"/></svg></span>
<input type="text" id="explore-search" onkeyup="searchExploreTable()" class="border-secondary form-control" aria-describedby="search-addon">
<button class="btn btn-outline-secondary" onclick="searchExploreClear()" type="button"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x" viewBox="0 0 16 16">
<path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z"/>
</svg></button>
</div>
</div>
<div class="col-4">
<button class="w-100 mx-auto btn btn-primary btn-sm d-block i18n" data-i18n="explore_options_button" type="button" data-bs-toggle="offcanvas" data-bs-target="#exploreOptions" aria-controls="exploreOptions"></button>
</div>
</div>

<button class="w-75 mx-auto btn btn-primary btn-sm d-block i18n" data-i18n="explore_options_button" type="button" data-bs-toggle="offcanvas" data-bs-target="#exploreOptions" aria-controls="exploreOptions"></button>
<div class="mx-0 table-responsive">
<table class="table table-hover sortable" id="table_explore_parent">
<thead>
Expand Down
2 changes: 2 additions & 0 deletions renderer/preload-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ ipcRenderer.on('trigger-i18n-on-data', () => {
ipcRenderer.send('askConflictList')
ipcRenderer.send('askExploreList', 0)
ipcRenderer.send('askGamesActive')
classRem(['tab_broken', 'tab_missing', 'tab_conflict', 'tab_explore'], 'disabled')
}
})

Expand Down Expand Up @@ -195,6 +196,7 @@ ipcRenderer.on('processModsDone', () => {
classAdd('process_bar_working', 'd-none')
classRem('process_bar_done', 'd-none')
classRem(['button_process', 'button_load'], 'disabled')
classRem(['tab_broken', 'tab_missing', 'tab_conflict', 'tab_explore'], 'disabled')

// Fuzzy logic. Used to request reload of display data when changing l10n setting.
dataIsLoaded = true
Expand Down

0 comments on commit 50849f4

Please sign in to comment.