v35.12; exit w3m without user confirmation

eliranwong · Oct 9, 2023 · 2516999 · 2516999
1 parent 04841bd
commit 2516999
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/UniqueBibleAppVersion.txt b/UniqueBibleAppVersion.txt
@@ -1 +1 @@
-35.11
+35.12
diff --git a/latest_changes.txt b/latest_changes.txt
@@ -1,3 +1,6 @@
+Changes in 35.12:
+* exit w3m without user confirmation
+
 Changes in 35.11:
 * added a startup command exception in terminal mode
 

diff --git a/patches.txt b/patches.txt
@@ -1175,11 +1175,8 @@
 (32.71, "file", "util/UpdateUtil.py")
 (32.72, "folder", "plugins/terminal")
 (32.72, "file", "plugins/terminal/Readme.md")
-(32.72, "file", "plugins/terminal/generate reference table from copied text.py")
-(32.72, "file", "plugins/terminal/generate reference table from latest content.py")
 (32.72, "file", "plugins/terminal/display word forms.py")
 (32.72, "file", "plugins/terminal/open html content with lynx.py")
-(32.72, "file", "plugins/terminal/open html content with w3m.py")
 (32.81, "file", "testing/file_input.py")
 (32.81, "folder", "nltk_data")
 (32.81, "folder", "nltk_data/corpora")
@@ -1389,7 +1386,10 @@
 (35.10, "file", "plugins/startup/highlightActiveVerse.py")
 (35.10, "file", "util/ConfigUtil.py")
 (35.10, "file", "util/terminal_system_command_prompt.py")
-(35.11, "file", "util/LocalCliHandler.py")
-(35.11, "file", "patches.txt")
-(35.11, "file", "UniqueBibleAppVersion.txt")
-(35.11, "file", "latest_changes.txt")
+(35.12, "file", "plugins/terminal/generate reference table from copied text.py")
+(35.12, "file", "plugins/terminal/generate reference table from latest content.py")
+(35.12, "file", "plugins/terminal/open html content with w3m.py")
+(35.12, "file", "util/LocalCliHandler.py")
+(35.12, "file", "patches.txt")
+(35.12, "file", "UniqueBibleAppVersion.txt")
+(35.12, "file", "latest_changes.txt")
diff --git a/plugins/terminal/generate reference table from copied text.py b/plugins/terminal/generate reference table from copied text.py
@@ -59,7 +59,7 @@ def generateCharts(text):
 
 def displayHtml(html):
     if WebtopUtil.isPackageInstalled("w3m"):
-        config.mainWindow.cliTool("w3m -T text/html", config.mainWindow.html)
+        config.mainWindow.cliTool("w3m -T text/html -o confirm_qq=false", config.mainWindow.html)
     else:
         openHtmlFile(html)
 

diff --git a/plugins/terminal/generate reference table from latest content.py b/plugins/terminal/generate reference table from latest content.py
@@ -59,7 +59,7 @@ def generateCharts(text):
 
 def displayHtml(html):
     if WebtopUtil.isPackageInstalled("w3m"):
-        config.mainWindow.cliTool("w3m -T text/html", config.mainWindow.html)
+        config.mainWindow.cliTool("w3m -T text/html -o confirm_qq=false", config.mainWindow.html)
     else:
         openHtmlFile(html)
 

diff --git a/plugins/terminal/open html content with w3m.py b/plugins/terminal/open html content with w3m.py
@@ -1,10 +1,10 @@
-# "open html content in lynx"
+# "open html content in w3m"
 import config
 from util.WebtopUtil import WebtopUtil
 
 
 if WebtopUtil.isPackageInstalled("w3m"):
     html = config.mainWindow.fineTuneTextForWebBrowserDisplay()
-    config.mainWindow.cliTool("w3m -T text/html", html)
+    config.mainWindow.cliTool("w3m -T text/html -o confirm_qq=false", html)
 else:
     config.mainWindow.printToolNotFound("w3m")
diff --git a/util/LocalCliHandler.py b/util/LocalCliHandler.py
@@ -826,7 +826,7 @@ def fineTuneTextForWebBrowserDisplay(self, text=""):
     def displayOutputOnTerminal(self, content):
         if content.startswith("[BROWSER]"):
             html = self.fineTuneTextForWebBrowserDisplay()
-            self.cliTool("w3m -T text/html", html)
+            self.cliTool("w3m -T text/html -o confirm_qq=false", html)
         else:
             if config.terminalEnablePager:
                 content = TextUtil.convertHtmlTagToColorama(content)