Add an ability to destroy a window programmatically

Author: r0x0r

README.md

@@ -53,8 +53,12 @@ For more elaborated usage, refer to the examples in the examples folder
 - `webview.load_url(url)`
 	Load a new URL into a previously created WebView window. This function must be invoked after WebView windows is created with create_window(). Otherwise an exception is thrown.
 
-- `webview.create_file_dialog(dialog_type=OPEN_DIALOG, allow_multiple=False)`
-    Create an open file (`webview.OPEN_DIALOG`) or open folder (`webview.FOLDER_DIALOG`) dialog. `allow_multiple=True` enables multiple selection. Return a tuple of selected files, None if cancelled
+- `webview.create_file_dialog(dialog_type=OPEN_DIALOG, directory='', allow_multiple=False, save_filename='')`
+    Create an open file (`webview.OPEN_DIALOG`), open folder (`webview.FOLDER_DIALOG`) or save file (`webview.SAVE_DIALOG`) dialog. `allow_multiple=True` enables multiple selection. `directory` Initial directory. `save_filename` Default filename for save file dialog.
+    Return a tuple of selected files, None if cancelled
+
+- `webview.destroy_window()`
+    Destroy a webview window
 
 
 # What web renderer is used?
@@ -84,6 +88,17 @@ Use py2app on OS X and py2exe on Windows. For reference setup.py files, look in
 
 # Changelog
 
+
+## 1.0
+
+- `New` [All] Add an ability to programmatically destroy a webview window
+- `Fix` [Windows] Fullscreen mode
+- `Fix` [Windows] Change setup.py to use pypiwin32 #22
+- `Fix` [Windows] Relative import of win32_gen fixed on Python 3 #20. Thanks to @yoavram for the contribution
+- `Fix` [Windows] FileNotFound exception on Windows 2003. Thanks to @jicho for the contribution
+- `Fix` [OSX] Non-SSL URLs are allowed by default on El Capitan. Thanks to @cr0hn for the contribution
+
+
 ## 0.9
 
 Released 27/11/2015

examples/destroy_window.py

@@ -0,0 +1,22 @@
+import webview
+import threading
+
+"""
+This example demonstrates how a webview window is created and destroyed programmatically after 5 seconds
+"""
+#import os
+#os.environ["USE_GTK"] = "true"
+
+def destroy():
+    import time
+    time.sleep(5)
+    print("Destroying window..")
+    webview.destroy_window()
+
+
+if __name__ == '__main__':
+    t = threading.Thread(target=destroy)
+    t.start()
+    webview.create_window("Simple browser", "http://www.google.com")
+    print("Window is destroyed")
+

setup.py

@@ -14,10 +14,10 @@
     author_email = "roman@flowrl.com",
     description = ("A cross-platform lightweight native wrapper around a web view component"),
     url = "http://github.com/r0x0r/pywebview",
-    download_url = 'https://github.com/r0x0r/pywebview/archive/0.9.tar.gz',
-    keywords = ['gui', 'webkit', 'html', 'web'  ],
+    download_url = 'https://github.com/r0x0r/pywebview/archive/1.0.tar.gz',
+    keywords = ['gui', 'webkit', 'html', 'web'],
     install_requires = install_requires,
-    version='0.9',
+    version='1.0',
     packages=['webview',],
     license='New BSD license',
     classifiers=[

webview/__init__.py

@@ -54,7 +54,17 @@
     raise Exception("Unsupported platform. Only Windows, Linux and OS X are supported.")
 
 
+
 def create_file_dialog(dialog_type=OPEN_DIALOG, directory='', allow_multiple=False, save_filename=''):
+    """
+    Create a file dialog
+    :param dialog_type: Dialog type: open file (OPEN_DIALOG), save file (SAVE_DIALOG), open folder (OPEN_FOLDER). Default
+                        is open file.
+    :param directory: Initial directory
+    :param allow_multiple: Allow multiple selection. Default is false.
+    :param save_filename: Default filename for save file dialog.
+    :return:
+    """
     if not os.path.exists(directory):
         directory = ''
 
@@ -84,6 +94,12 @@ def create_window(title, url, width=800, height=600, resizable=True, fullscreen=
     gui.create_window(_make_unicode(title), _transform_url(url), width, height, resizable, fullscreen, min_size)
 
 
+def destroy_window():
+    """
+    Destroy a web view window
+    """
+    gui.destroy_window()
+
 def _make_unicode(string):
     """
     Python 2 and 3 compatibility function that converts a string to Unicode. In case of Unicode, the string is returned

webview/gtk.py

@@ -62,6 +62,11 @@ def show(self):
         gtk.main()
         Gdk.threads_leave()
 
+    def destroy(self):
+        Gdk.threads_enter()
+        self.window.destroy()
+        Gdk.threads_leave()
+
     def create_file_dialog(self, dialog_type, directory, allow_multiple, save_filename):
         Gdk.threads_enter()
 
@@ -112,6 +117,13 @@ def create_window(title, url, width, height, resizable, fullscreen, min_size):
     browser.show()
 
 
+def destroy_window():
+    if BrowserView.instance is not None:
+        BrowserView.instance.destroy()
+    else:
+        raise Exception("Create a web view window first, before invoking this function")
+
+
 def load_url(url):
     if BrowserView.instance is not None:
         BrowserView.instance.load_url(url)

webview/qt.py

@@ -51,6 +51,7 @@ class BrowserView(QMainWindow):
     instance = None
     url_trigger = QtCore.pyqtSignal(str)
     dialog_trigger = QtCore.pyqtSignal(int, str, bool, str)
+    destroy_trigger = QtCore.pyqtSignal()
 
     def __init__(self, title, url, width, height, resizable, fullscreen, min_size):
         super(BrowserView, self).__init__()
@@ -76,6 +77,7 @@ def __init__(self, title, url, width, height, resizable, fullscreen, min_size):
         self.setCentralWidget(self.view)
         self.url_trigger.connect(self._handle_load_url)
         self.dialog_trigger.connect(self._handle_file_dialog)
+        self.destroy_trigger.connect(self._handle_destroy_window)
 
         self.move(QApplication.desktop().availableGeometry().center() - self.rect().center())
         self.activateWindow()
@@ -100,6 +102,9 @@ def _handle_file_dialog(self, dialog_type, directory, allow_multiple, save_filen
     def _handle_load_url(self, url):
         self.view.setUrl(QtCore.QUrl(url))
 
+    def _handle_destroy_window(self):
+        self.close()
+
     def load_url(self, url):
         self.url_trigger.emit(url)
 
@@ -119,6 +124,10 @@ def create_file_dialog(self, dialog_type, directory, allow_multiple, save_filena
         else:
             return None
 
+    def destroy_(self):
+        self.destroy_trigger.emit()
+
+
 
 def create_window(title, url, width, height, resizable, fullscreen, min_size):
     """
@@ -135,7 +144,7 @@ def create_window(title, url, width, height, resizable, fullscreen, min_size):
 
     browser = BrowserView(title, url, width, height, resizable, fullscreen, min_size)
     browser.show()
-    sys.exit(app.exec_())
+    app.exec_()
 
 
 def load_url(url):
@@ -145,6 +154,13 @@ def load_url(url):
         raise Exception("Create a web view window first, before invoking this function")
 
 
+def destroy_window():
+    if BrowserView.instance is not None:
+        BrowserView.instance.destroy_()
+    else:
+        raise Exception("Create a web view window first, before invoking this function")
+
+
 def create_file_dialog(dialog_type, directory, allow_multiple, save_filename):
     if BrowserView.instance is not None:
         return BrowserView.instance.create_file_dialog(dialog_type, directory, allow_multiple, save_filename)

webview/win32.py

@@ -180,6 +180,9 @@ def show(self):
         # Pump messages
         win32gui.PumpMessages()
 
+    def destroy(self):
+        win32gui.SendMessage(self.hwnd, win32con.WM_DESTROY)
+
     def load_url(self, url):
         self.url = url
         self.browser.Navigate2(url)
@@ -229,10 +232,13 @@ def create_file_dialog(self, dialog_type, directory, allow_multiple, save_filena
         except:
             return None
 
-    def _on_destroy(self, hwnd, message, wparam, lparam):
+    def _destroy(self):
         del self.browser
         win32gui.PostQuitMessage(0)
 
+    def _on_destroy(self, hwnd, message, wparam, lparam):
+        self._destroy()
+
         return True
 
     def _on_resize(self, hwnd, message, wparam, lparam):
@@ -282,6 +288,13 @@ def load_url(url):
         raise Exception("Create a web view window first, before invoking this function")
 
 
+def destroy_window():
+    if BrowserView.instance is not None:
+        BrowserView.instance.destroy()
+    else:
+        raise Exception("Create a web view window first, before invoking this function")
+
+
 def _set_ie_mode():
     """
     By default hosted IE control emulates IE7 regardless which version of IE is installed. To fix this, a proper value