diff --git a/changelog.md b/changelog.md index 8d7df4a..d8436d7 100644 --- a/changelog.md +++ b/changelog.md @@ -31,27 +31,27 @@ b['1']['2'] = {'3':1} # OK - no c/c++/java/perl switch-case, not use two much if-elif-elif, use this to simplify: ``` suff = {'MD':'.md','CSV':'.csv','JSON':'.json'} - 198 op = OUTPREF+suff[ft] + op = OUTPREF+suff[ft] ``` - assign value style is pithiness ``` (authinfo, dateinfo, content) = (s[0], s[1], s[2] if len(s)==3 else None) ``` -## 1.0.1 (20200530) +## 1.0.2 (20200530) ### feature - remove duplication - refactor some code +- optimize search feature ## learn lesson - change dict keys between iteration, will throw RuntimeError: dictionary changed size during iteration - reference - http://www.cocoachina.com/articles/89748 - +- pyQt5 reference - https://www.learnpyqt.com/ # feature plan ## 20200528 -- optimize search feature - first abstract from kindle hard / local directory for different OS - add GUI use QT diff --git a/icons/Ab10.png b/icons/Ab10.png new file mode 100644 index 0000000..337de10 Binary files /dev/null and b/icons/Ab10.png differ diff --git a/icons/Ab2.png b/icons/Ab2.png new file mode 100644 index 0000000..75fd80d Binary files /dev/null and b/icons/Ab2.png differ diff --git a/icons/Ab5.png b/icons/Ab5.png new file mode 100644 index 0000000..3081a20 Binary files /dev/null and b/icons/Ab5.png differ diff --git a/icons/Ab6.png b/icons/Ab6.png new file mode 100644 index 0000000..7254572 Binary files /dev/null and b/icons/Ab6.png differ diff --git a/icons/Ar18.png b/icons/Ar18.png new file mode 100644 index 0000000..db7853f Binary files /dev/null and b/icons/Ar18.png differ diff --git a/icons/Ar5.png b/icons/Ar5.png new file mode 100644 index 0000000..68fcd82 Binary files /dev/null and b/icons/Ar5.png differ diff --git a/icons/Cbb14.png b/icons/Cbb14.png new file mode 100644 index 0000000..0d5fcf7 Binary files /dev/null and b/icons/Cbb14.png differ diff --git a/icons/Cbb20.png b/icons/Cbb20.png new file mode 100644 index 0000000..0cf0a51 Binary files /dev/null and b/icons/Cbb20.png differ diff --git a/icons/file1.png b/icons/file1.png new file mode 100644 index 0000000..a75d362 Binary files /dev/null and b/icons/file1.png differ diff --git a/icons/file18.png b/icons/file18.png new file mode 100644 index 0000000..c192d20 Binary files /dev/null and b/icons/file18.png differ diff --git a/kmanapp.py b/kmanapp.py new file mode 100644 index 0000000..71c6b00 --- /dev/null +++ b/kmanapp.py @@ -0,0 +1,23 @@ +# This Python file uses the following encoding: utf-8 +import sys +from PySide2.QtWidgets import QApplication +from PySide2.QtWidgets import QApplication +from PySide2.QtWidgets import QMainWindow +from mainwindow import Ui_MainWindow # 加载我们的布局 + + +class UsingTest(QMainWindow, Ui_MainWindow): + def __init__(self, *args, **kwargs): + super(UsingTest, self).__init__(*args, **kwargs) + self.setupUi(self) # 初始化ui + # 在这里，可以做一些UI的操作了，或者是点击事件或者是别的 + # 也可以另外写方法，可以改变lable的内容 + +if __name__ == "__main__": + import sys + from PySide2.QtWidgets import QApplication, QLabel + + app = QApplication(sys.argv) + mw = UsingTest() + mw.show() + app.exec_() diff --git a/kmanapp.pyproject b/kmanapp.pyproject new file mode 100644 index 0000000..4f6016f --- /dev/null +++ b/kmanapp.pyproject @@ -0,0 +1,3 @@ +{ + "files": ["kmanapp.py"] +} diff --git a/mainwindow.py b/mainwindow.py new file mode 100644 index 0000000..bf61c5d --- /dev/null +++ b/mainwindow.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'mainwindow.ui' +## +## Created by: Qt User Interface Compiler version 5.15.0 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, + QObject, QPoint, QRect, QSize, QTime, QUrl, Qt) +from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, + QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter, + QPixmap, QRadialGradient) +from PySide2.QtWidgets import * + + +class Ui_MainWindow(object): + def setupUi(self, MainWindow): + if not MainWindow.objectName(): + MainWindow.setObjectName(u"MainWindow") + MainWindow.resize(800, 600) + self.actionimport = QAction(MainWindow) + self.actionimport.setObjectName(u"actionimport") + icon = QIcon(QIcon.fromTheme(u"Ab6.png")) + self.actionimport.setIcon(icon) + self.actionimport_2 = QAction(MainWindow) + self.actionimport_2.setObjectName(u"actionimport_2") + self.actionimport_3 = QAction(MainWindow) + self.actionimport_3.setObjectName(u"actionimport_3") + self.centralwidget = QWidget(MainWindow) + self.centralwidget.setObjectName(u"centralwidget") + MainWindow.setCentralWidget(self.centralwidget) + self.statusbar = QStatusBar(MainWindow) + self.statusbar.setObjectName(u"statusbar") + MainWindow.setStatusBar(self.statusbar) + self.toolBar = QToolBar(MainWindow) + self.toolBar.setObjectName(u"toolBar") + MainWindow.addToolBar(Qt.TopToolBarArea, self.toolBar) + self.menuBar = QMenuBar(MainWindow) + self.menuBar.setObjectName(u"menuBar") + self.menuBar.setGeometry(QRect(0, 0, 800, 22)) + self.menuImport = QMenu(self.menuBar) + self.menuImport.setObjectName(u"menuImport") + MainWindow.setMenuBar(self.menuBar) + + self.toolBar.addAction(self.actionimport) + self.toolBar.addAction(self.actionimport_2) + self.toolBar.addAction(self.actionimport_3) + self.menuBar.addAction(self.menuImport.menuAction()) + self.menuImport.addAction(self.actionimport_2) + self.menuImport.addAction(self.actionimport_3) + + self.retranslateUi(MainWindow) + + QMetaObject.connectSlotsByName(MainWindow) + # setupUi + + def retranslateUi(self, MainWindow): + MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"MainWindow", None)) + self.actionimport.setText(QCoreApplication.translate("MainWindow", u"Import", None)) +#if QT_CONFIG(tooltip) + self.actionimport.setToolTip(QCoreApplication.translate("MainWindow", u"import clipping file from kindle", None)) +#endif // QT_CONFIG(tooltip) +#if QT_CONFIG(shortcut) + self.actionimport.setShortcut(QCoreApplication.translate("MainWindow", u"Meta+I", None)) +#endif // QT_CONFIG(shortcut) + self.actionimport_2.setText(QCoreApplication.translate("MainWindow", u"import", None)) + self.actionimport_3.setText(QCoreApplication.translate("MainWindow", u"import", None)) + self.toolBar.setWindowTitle(QCoreApplication.translate("MainWindow", u"toolBar", None)) + self.menuImport.setTitle(QCoreApplication.translate("MainWindow", u"Import", None)) + # retranslateUi + diff --git a/mainwindow.ui b/mainwindow.ui new file mode 100644 index 0000000..8117abe --- /dev/null +++ b/mainwindow.ui @@ -0,0 +1,77 @@ + + + MainWindow + + + + 0 + 0 + 800 + 600 + + + + MainWindow + + + + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + + 0 + 0 + 800 + 22 + + + + + Import + + + + + + + + + + + + Import + + + import clipping file from kindle + + + Meta+I + + + + + import + + + + + import + + + + + + diff --git a/ui/屏幕截图(10).png b/ui/屏幕截图(10).png new file mode 100755 index 0000000..e368c61 Binary files /dev/null and b/ui/屏幕截图(10).png differ diff --git a/ui/屏幕截图(11).png b/ui/屏幕截图(11).png new file mode 100755 index 0000000..710841c Binary files /dev/null and b/ui/屏幕截图(11).png differ diff --git a/ui/屏幕截图(12).png b/ui/屏幕截图(12).png new file mode 100755 index 0000000..8546fa8 Binary files /dev/null and b/ui/屏幕截图(12).png differ diff --git a/ui/屏幕截图(13).png b/ui/屏幕截图(13).png new file mode 100755 index 0000000..fb44156 Binary files /dev/null and b/ui/屏幕截图(13).png differ diff --git a/ui/屏幕截图(14).png b/ui/屏幕截图(14).png new file mode 100755 index 0000000..e99f810 Binary files /dev/null and b/ui/屏幕截图(14).png differ diff --git a/ui/屏幕截图(15).png b/ui/屏幕截图(15).png new file mode 100755 index 0000000..34f2d56 Binary files /dev/null and b/ui/屏幕截图(15).png differ diff --git a/ui/屏幕截图(16).png b/ui/屏幕截图(16).png new file mode 100755 index 0000000..3f372ea Binary files /dev/null and b/ui/屏幕截图(16).png differ diff --git a/ui/屏幕截图(2).png b/ui/屏幕截图(2).png new file mode 100755 index 0000000..4bf1f2b Binary files /dev/null and b/ui/屏幕截图(2).png differ diff --git a/ui/屏幕截图(3).png b/ui/屏幕截图(3).png new file mode 100755 index 0000000..46b89c4 Binary files /dev/null and b/ui/屏幕截图(3).png differ diff --git a/ui/屏幕截图(4).png b/ui/屏幕截图(4).png new file mode 100755 index 0000000..5c7f87a Binary files /dev/null and b/ui/屏幕截图(4).png differ diff --git a/ui/屏幕截图(5).png b/ui/屏幕截图(5).png new file mode 100755 index 0000000..d07bc0b Binary files /dev/null and b/ui/屏幕截图(5).png differ diff --git a/ui/屏幕截图(6).png b/ui/屏幕截图(6).png new file mode 100755 index 0000000..fd52703 Binary files /dev/null and b/ui/屏幕截图(6).png differ diff --git a/ui/屏幕截图(7).png b/ui/屏幕截图(7).png new file mode 100755 index 0000000..2a298b8 Binary files /dev/null and b/ui/屏幕截图(7).png differ diff --git a/ui/屏幕截图(8).png b/ui/屏幕截图(8).png new file mode 100755 index 0000000..95c0655 Binary files /dev/null and b/ui/屏幕截图(8).png differ diff --git a/ui/屏幕截图(9).png b/ui/屏幕截图(9).png new file mode 100755 index 0000000..f583424 Binary files /dev/null and b/ui/屏幕截图(9).png differ