feat(ui): add menus

feat(dist): support download file

closes #8, 5

Author: sculove

.gitignore

@@ -1,3 +1,2 @@
 storage/
-dist/
 build/

README.md

@@ -12,6 +12,10 @@
  - Python 3.4.4 32bit (https://www.python.org/downloads/release/python-344/)
  - pyQt5.5.1 32bit (https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.5.1/)
 
+## Download
+ - Win32 QWebview-pluse 1.0 설치 파일
+
+
 ## 키움 Open API+를 제공하는 kiwoom 객체 제공
 
 ### window.kiwoom
@@ -28,18 +32,6 @@
     - 이벤트에 의해 전달되는 속성은 detail에 포함되어 전달됨
     - 이벤트에 전달되는 속성명은 타입약어가 제거되고, 첫 문자를 소문자로 변경 `sScrNo => scrNo`
 
-## 사용 예
-```bash
-python main.py -u [실행항 URL]
-python main.py -f [실행할 html 파일명]
-```
-> 실행할 파일을 입력하지 않을 경우, 기본적으로 index.html을 부른다.
->
-> - -f --file 시작 페이지 경로 (기본: ./index.html)
-> - -u --url 시작 URL 경로
->
-> **URL과 페이지 경로를 함께 입력했을 경우, URL이 우선한다.**
-
 ## [Kiwoom-Helper](https://github.com/sculove/Kiwoom-Helper) 유틸
 QWebview-Plus에서 제공하는 kiwoom 객체와 이벤트를 손쉽게 사용할 수 있는 유틸
 > 별도의 프로젝트로 관리 https://github.com/sculove/Kiwoom-Helper

dist/QWebview-plus-1.0-win32.msi

@@ -1,11 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env pythonw
 #-*-coding: utf-8 -*-
 import sys
 import os.path
 import re
 from optparse import OptionParser
 from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QApplication, QFileDialog, qApp, QAction, QMainWindow, QStatusBar, QVBoxLayout, QSplitter, QMessageBox
+from PyQt5.QtWidgets import QApplication, QFileDialog, qApp, QAction, QMainWindow, QStatusBar, QVBoxLayout, QSplitter, QMessageBox, QInputDialog, QLineEdit
 from plus.kiwoom import KiwoomWebViewPlus
 
 class Window(QMainWindow):
@@ -14,16 +14,7 @@ def __init__(self):
         self.view = KiwoomWebViewPlus()
         self.initUI()
 
-    def initUI(self):
-        self.setMinimumSize(1024, 640)
-        self.setWindowTitle("QWebview-plus for Kiwoom")
-        self.setCentralWidget(self.view)
-
-        self.view.statusbar = QStatusBar()
-        self.setStatusBar(self.view.statusbar)
-        self.view.statusbar.showMessage("[F4키] 개발자 도구, [F5키] 화면 Refresh")
-        # self.view.devTool.setVisible(True)
-        
+    def menuUI(self):
         openfile_action = QAction('&Open File', self)
         openfile_action.setShortcut('Ctrl+O') 
         openfile_action.setStatusTip('Open files')
@@ -35,22 +26,28 @@ def initUI(self):
         openurl_action.triggered.connect(self.onOpenUrl)
         # exit_action = QAction(QIcon('exit.png'), "&Exit", self)
 
+        quit_action = QAction('&Quit', self)
+        quit_action.setShortcut('Ctrl+Q') 
+        quit_action.setStatusTip('Exit application')
+        quit_action.triggered.connect(qApp.quit)
+
         fileMenu = self.menuBar().addMenu('Menu')
         fileMenu.addAction(openfile_action)
         fileMenu.addAction(openurl_action)
+        fileMenu.addAction(quit_action)
+
+    def initUI(self):
+        self.setMinimumSize(1024, 640)
+        self.setWindowTitle("QWebview-plus for Kiwoom")
+        self.setCentralWidget(self.view)
+
+        self.view.statusbar = QStatusBar()
+        self.setStatusBar(self.view.statusbar)
+        self.view.statusbar.showMessage("[F4키] 개발자 도구, [F5키] 화면 Refresh")
+        # self.view.devTool.setVisible(True)
 
-       
+        self.menuUI()
 
-        # view split
-        # self.splitter = QSplitter(self)
-        # self.splitter.setOrientation(Qt.Horizontal)
-        # layout = QVBoxLayout(self)
-        # layout.setContentsMargins(0,0,0,0)
-        # layout.addWidget(self.splitter)
-        # self.splitter.addWidget(self.view)
-        # self.splitter.addWidget(self.view.webInspector)
-        # self.view.webInspector.setVisible(True)
-        # self.splitter.setSizes([640,640])
 
     def onOpenFile(self, event):
         vOpenfilename = QFileDialog.getOpenFileName(self, 'Open File', filter="*.*")
@@ -60,35 +57,16 @@ def onOpenFile(self, event):
             window.view.load(QUrl.fromLocalFile(vOpenfilename[0]))         
 
     def onOpenUrl(self, event):
-        vOpenfilename = QFileDialog.getOpenFileName(self, 'Open Url', filter="*.*")
-        if vOpenfilename == "":
-            return
-        if os.path.isfile(vOpenfilename[0]):
-            window.view.load(QUrl.fromLocalFile(vOpenfilename[0]))                      
+        url, okPressed = QInputDialog.getText(self, "Open URL","인터넷 주소를 입력해주세요", QLineEdit.Normal, "")
+        if okPressed and url != "":
+            prefix = "" if bool(re.match('^(?:http)s?://', url)) else "http://"
+            window.view.load(QUrl(prefix + url))
 
-    def closeEvent(self, event):
-        reply = QMessageBox.question(self, 'Message', "QWebview를 종료하시겠습니까?",QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
-        if reply == QMessageBox.Yes:
-            event.accept()
-        else:
-            event.ignore()
 
 if __name__ == "__main__":
     #parsing command line arguments
     app = QApplication(sys.argv)
     window = Window()
     window.show()
     sys.exit(app.exec_())
-    # elif os.path.isfile(opt.file):
-    # if opt.url:
-    #     prefix = "" if bool(re.match('^(?:http|ftp)s?://', opt.url)) else "http://"
-    #     window.view.load(QUrl(prefix + opt.url))
-    #     window.show()
-    #     sys.exit(app.exec_())
-    # elif os.path.isfile(opt.file):
-    #     window.view.load(QUrl.fromLocalFile(os.path.join(os.path.dirname( os.path.abspath( __file__ ) ), opt.file)))
-    #     window.show()
-    #     sys.exit(app.exec_())
-    # else:
-    #     parser.print_help()
-    #     sys.exit()
+    

main.py qwebviewplus.pymain.py renamed to qwebviewplus.py

@@ -5,4 +5,4 @@
         version = "1.0",
         description = "QWebview supports Kiwoom Open API+ for JavaScript",
         author = "sculove",
-        executables = [Executable("main.py")])
+        executables = [Executable("qwebviewplus.py", base="Win32GUI")])