Release 0.9.2

ngld · Apr 15, 2018 · 6298333 · 6298333
2 parents 7f9206a + 866250c
commit 6298333
Show file tree

Hide file tree

Showing 23 changed files with 397 additions and 291 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,12 +10,13 @@ __pycache__
 # generated files
 build
 dist
+version-rthook.py
 /knossos/ui/*
 /knossos/data/resources.rcc
 /knossos/data/resources.qrc
-/html/js/modlist_ts.js
-/tools/windows/support/*
 /knossos.egg-info/
+/html/qwebchannel.js
+/html/js/translations.js
 
 # Sublime Text
 *.sublime-*
@@ -31,12 +32,9 @@ dist
 # Releng
 .vagrant
 ssh_config
+/node_modules/
 /releng/config/
 /releng/freebsd/packer/
 /releng/arch/pkg/
-/html/js/modlist.*.js
-/node_modules/
-/html/js/translations.js
 /releng/windows/support/
 /releng/ubuntu/cache/
-/html/qwebchannel.js
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,11 @@ matrix:
 env:
   - secure: "fMo6M/KJV0QvkTo9rvksH3gDirKiDQlkOj5bwP0VBTdQPt0l/4Top9n9ZZ4ZZqtUBo6fACsbCaBV7WYSpvE3q0iPBRV3a07vyVnHy5O5+p8NZI+FJWHUhAEZKQHTVQztBLeDzlgoP4JNHPtVrwSp+EQO7Ci7bpmKpFR2uZi+Gcg="
 
+addons:
+  apt:
+    packages:
+      - docker-ce
+
 before_install:
 - cd releng/config
 - openssl aes-256-cbc -K $encrypted_7dc0ff3d6916_key -iv $encrypted_7dc0ff3d6916_iv -in ci.tar.enc -out ci.tar -d

diff --git a/file_list.json b/file_list.json
@@ -118,6 +118,7 @@
     "templates": [
         "html/templates/kn-details-page.vue",
         "html/templates/kn-dev-mod.vue",
+        "html/templates/kn-dev-staff.vue",
         "html/templates/kn-devel-page.vue",
         "html/templates/kn-drawer.vue",
         "html/templates/kn-dropdown.vue",

diff --git a/html/templates/kn-devel-page.vue b/html/templates/kn-devel-page.vue
@@ -24,6 +24,7 @@ export default {
         edit_dep_idx: -1,
         edit_dep_mod: null,
         edit_dep_version: null,
+        edit_dep_allow_new: false,
         edit_dep_pkgs: null,
         edit_dep_pkg_sel: null,
 
@@ -59,9 +60,12 @@ export default {
                 let found = false;
 
                 for(let mod of new_list) {
-                    if(mod.id === this.selected_mod.id && mod.version === this.selected_mod.version) {
-                        this.selected_mod = Object.assign({}, mod);
+                    if(mod.id === this.selected_mod.id) {
                         found = true;
+                        let version = this.selected_mod.version;
+
+                        this.selected_mod = Object.assign({}, mod);
+                        if(version !== this.selected_mod.version) this.selectVersion(version);
                         break;
                     }
                 }
@@ -244,6 +248,7 @@ export default {
             this.edit_dep_idx = -1;
             this.edit_dep_mod = null;
             this.edit_dep_version = null;
+            this.edit_dep_allow_new = true;
             this.edit_dep_pkgs = [];
             this.edit_dep_pkg_sel = {};
             this.edit_dep = true;
@@ -253,9 +258,15 @@ export default {
             this.edit_dep_idx = idx;
             this.edit_dep_mod = dep.id;
             this.edit_dep_version = dep.version;
+            this.edit_dep_allow_new = false;
             this.edit_dep_pkg_sel = {};
             this.edit_dep = true;
 
+            if(dep.version && dep.version.substring(0, 2) === '>=') {
+                this.edit_dep_version = dep.version.substring(2);
+                this.edit_dep_allow_new = true;
+            }
+
             this.updateDepModVersion();
 
             if(dep.packages !== null) {
@@ -269,6 +280,7 @@ export default {
             let mod = this.mod_map[this.edit_dep_mod];
 
             this.edit_dep_version = null;
+            this.edit_dep_allow_new = false;
             this.edit_dep_pkgs = [];
             this.edit_dep_pkg_sel = {};
 
@@ -310,7 +322,7 @@ export default {
         saveDep() {
             let dep = {
                 id: this.edit_dep_mod,
-                version: this.edit_dep_version,
+                version: (this.edit_dep_allow_new ? '>=' : '') + this.edit_dep_version,
                 packages: []
             };
 
@@ -863,7 +875,12 @@ export default {
                                                 <select class="form-control" v-model="edit_dep_version" @change="updateDepModVersion" v-else>
                                                     <option :value="null" :key="'newest'">newest</option>
                                                     <option v-for="v in mod_map[edit_dep_mod].versions" :value="v.version" :key="v.version">{{ v.version }}</option>
-                                                </select>
+                                                </select><br>
+
+                                                <label>
+                                                    <input type="checkbox" v-model="edit_dep_allow_new">
+                                                    Allow newer versions
+                                                </label>
                                             </div>
                                         </div>
 
@@ -882,9 +899,10 @@ export default {
                                             </div>
                                         </div>
 
-                                        <button class="btn btn-small" @click.prevent="saveDep">Save</button>
-
+                                        <button class="btn btn-small btn-success" @click.prevent="saveDep">Save</button>
+                                        &nbsp;&nbsp;
                                         <button class="btn btn-small" @click.prevent="edit_dep = false">Cancel</button>
+
                                         <button class="btn btn-small pull-right" v-if="edit_dep_idx !== -1" @click.prevent="deleteDep">Delete</button>
                                     </div>
                                 </div>
@@ -935,7 +953,9 @@ export default {
 
                             <div class="form-group">
                                 <div class="col-xs-9 col-xs-offset-3">
-                                    <button class="mod-btn btn-green" @click.prevent="savePackage"><span class="btn-text">SAVE</span></button>
+                                    <button :class="'mod-btn btn-' + (edit_dep ? 'grey' : 'green')" @click.prevent="savePackage" :disabled="edit_dep">
+                                        <span class="btn-text">SAVE</span>
+                                    </button>
 
                                     <button class="mod-btn btn-red" @click.prevent="deletePackage">DELETE</button>
                                 </div>

diff --git a/html/templates/kn-page.vue b/html/templates/kn-page.vue
@@ -326,23 +326,25 @@ export default {
         <div class="welcome-overlay" v-if="page === 'welcome'"></div>
 
     <!-------------------------------------------------------------------------------- Start the Details Menu ---------->
-        <div id="details-tab-bar" v-if="page === 'details'">
+        <div id="details-tab-bar" v-show="page === 'details'">
             <a href="#" class="main-btn" @click="exitDetails"><i class="fa fa-chevron-left"></i> Back</a>
             <span class="main-btn active"><i class="fa fa-exclamation-circle"></i> Details</span>
         </div>
 
     <!-------------------------------------------------------------------------------- Build the Main View container ---------->
-        <kn-scroll-container v-show="page === 'modlist'" key="modlist">
-            <div class="container-fluid mod-container">
-                <div v-if="tab === 'home'">
-                    <kn-mod-home v-for="mod in mods" :key="mod.id" :mod="mod" :tab="tab"></kn-mod-home>
-                </div>
-                <div v-else>
-                    <kn-mod-explore v-for="mod in mods" :key="mod.id" :mod="mod" :tab="tab"></kn-mod-explore>
+        <keep-alive>
+            <kn-scroll-container v-if="page === 'modlist'" key="modlist">
+                <div class="container-fluid mod-container">
+                    <div v-if="tab === 'home'">
+                        <kn-mod-home v-for="mod in mods" :key="mod.id" :mod="mod" :tab="tab"></kn-mod-home>
+                    </div>
+                    <div v-else>
+                        <kn-mod-explore v-for="mod in mods" :key="mod.id" :mod="mod" :tab="tab"></kn-mod-explore>
+                    </div>
+                    <div v-if="mods.length === 0" class="main-notice">No mods found.</div>
                 </div>
-                <div v-if="mods.length === 0" class="main-notice">No mods found.</div>
-            </div>
-        </kn-scroll-container>
+            </kn-scroll-container>
+        </keep-alive>
 
         <kn-scroll-container v-if="page === 'welcome'" key="welcome">
             <kn-welcome-page></kn-welcome-page>
@@ -360,11 +362,13 @@ export default {
             </div>
         </kn-scroll-container>
 
-        <kn-scroll-container v-if="page === 'develop'" key="develop">
-            <div class="info-page devel-page" v-if="page === 'develop'">
-                <kn-devel-page :mods="mods"></kn-devel-page>
-            </div>
-        </kn-scroll-container>
+        <keep-alive>
+            <kn-scroll-container v-if="page === 'develop'" key="develop">
+                <div class="info-page devel-page" v-if="page === 'develop'">
+                    <kn-devel-page :mods="mods"></kn-devel-page>
+                </div>
+            </kn-scroll-container>
+        </keep-alive>
 
         <div class="popup-bg" v-if="popup_visible" @click="popup_visible = false"></div>
 
@@ -520,7 +524,7 @@ export default {
                                 </select>
 
                                 <span class="help-block">
-                                    Please select your parent TC here. If this doesn't apply to a TC, select FS2.
+                                    Please select your parent TC here. If this mod doesn't extend a TC, select "Retail FS2".
                                 </span>
                             </div>
                         </div>

diff --git a/html/templates/kn-scroll-container.vue b/html/templates/kn-scroll-container.vue
@@ -1,8 +1,16 @@
 <script>
-export default {};
+export default {
+    data: () => ({
+        scroll: 0
+    }),
+
+    activated() {
+        this.$refs.container.scrollTop = this.scroll;
+    }
+};
 </script>
 <template>
-	<div class="main-container scroll-style">
+	<div class="main-container scroll-style" ref="container" @scroll.stop="scroll = $refs.container.scrollTop">
 	    <div class="main-background"></div>
 	    <slot></slot>
 	    <div class="main-shadow-effect"></div>

diff --git a/knossos/center.py b/knossos/center.py
@@ -24,7 +24,7 @@
 
 # The version should follow the http://semver.org guidelines.
 # Only remove the -dev tag if you're making a release!
-VERSION = '0.9.1'
+VERSION = '0.9.2'
 UPDATE_LINK = 'https://fsnebula.org/knossos'
 INNOEXTRACT_LINK = 'https://dev.tproxy.de/knossos/innoextract.txt'
 DEBUG = os.getenv('KN_DEBUG', '0').strip() == '1'