diff --git a/docs/config.rst b/docs/config.rst index 9f79560..7ce7f38 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -611,6 +611,12 @@ values. The valid configuration keys are listed below. **Default:** ``[]`` (an empty list) + +``poititle`` + This controls the display name of the POI/marker dropdown control. + + **Default:** "Signs" + .. _option_overlay: ``overlay`` diff --git a/overviewer.py b/overviewer.py index 3759594..00c2c49 100755 --- a/overviewer.py +++ b/overviewer.py @@ -421,7 +421,7 @@ dir but you forgot to put quotes around the directory, since it contains spaces. # only pass to the TileSet the options it really cares about render['name'] = render_name # perhaps a hack. This is stored here for the asset manager - tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "defaultzoom", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn", "overlay","base"]) + tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "defaultzoom", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn", "overlay","base", "poititle"]) tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this tset = tileset.TileSet(w, rset, assetMrg, tex, tileSetOpts, tileset_dir) tilesets.append(tset) diff --git a/overviewer_core/aux_files/genPOI.py b/overviewer_core/aux_files/genPOI.py index ee2babe..f67e556 100755 --- a/overviewer_core/aux_files/genPOI.py +++ b/overviewer_core/aux_files/genPOI.py @@ -196,18 +196,14 @@ def main(): markerSetDict[name]['raw'].append(d) #print markerSetDict - poiDropdownTitle = config.get('poiDropdownTitle', 'Signs') - with open(os.path.join(destdir, "markersDB.js"), "w") as output: output.write("var markersDB=") json.dump(markerSetDict, output, indent=2) output.write(";\n"); - output.write("var poiDropdownTitle = '%s';\n" % poiDropdownTitle) with open(os.path.join(destdir, "markers.js"), "w") as output: output.write("var markers=") json.dump(markers, output, indent=2) output.write(";\n"); - output.write("var poiDropdownTitle = '%s';\n" % poiDropdownTitle) with open(os.path.join(destdir, "baseMarkers.js"), "w") as output: output.write("overviewer.util.injectMarkerScript('markersDB.js');\n") output.write("overviewer.util.injectMarkerScript('markers.js');\n") diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js index 01f4317..7f12083 100644 --- a/overviewer_core/data/js_src/views.js +++ b/overviewer_core/data/js_src/views.js @@ -440,7 +440,7 @@ overviewer.views.SignControlView = Backbone.View.extend({ var controlText = document.createElement('DIV'); - controlText.innerHTML = poiDropdownTitle; + controlText.innerHTML = overviewer.mapView.options.currentTileSet.get("poititle"); var controlBorder = document.createElement('DIV'); $(controlBorder).addClass('top'); diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py index c73c67d..d3a83c0 100644 --- a/overviewer_core/settingsDefinition.py +++ b/overviewer_core/settingsDefinition.py @@ -83,6 +83,7 @@ renders = Setting(required=True, default=util.OrderedDict(), "overlay": Setting(required=False, validator=validateOverlays, default=[]), "showspawn": Setting(required=False, validator=validateBool, default=True), "base": Setting(required=False, validator=validateStr, default=""), + "poititle": Setting(required=False, validator=validateStr, default="Signs"), # Remove this eventually (once people update their configs) "worldname": Setting(required=False, default=None, diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index bbc080a..1a91f51 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -527,7 +527,8 @@ class TileSet(object): (" - " + self.options.get('dimension') if self.options.get('dimension') != 'default' else ''), last_rendertime = self.max_chunk_mtime, imgextension = self.imgextension, - isOverlay = isOverlay + isOverlay = isOverlay, + poititle = self.options.get("poititle") ) if isOverlay: