From 914322b07d0bac57c07aaeb79888ce8fe89f5769 Mon Sep 17 00:00:00 2001 From: Robot-Inventor <30.keita@gmail.com> Date: Mon, 27 Jan 2020 23:19:05 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=83=E3=83=97=E3=83=AB=E3=82=A8?= =?UTF-8?q?=E3=83=95=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AE=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=83=BB=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AB=E3=83=BC=E3=81=AE=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.en.md | 97 ++++++++++++++++ changelog.md | 116 +++++++++---------- orizin_agent.py | 5 +- resource/css/layout.css | 13 +-- resource/css/ripple.css | 45 ++++++++ resource/dictionary/unknownQuestions.txt | 1 + resource/html/about_oa.html | 3 +- resource/html/basic.html | 10 +- resource/html/index.html | 9 +- resource/html/oss_license.html | 28 +++++ resource/html/privacy_policy.html | 3 +- resource/html/setting.html | 9 +- resource/html/splash.html | 2 +- resource/information.txt | 4 +- resource/javascript/basic.js | 14 ++- resource/javascript/ripple.js | 135 +++++++++++++++++++++++ update_message.txt | 1 + 17 files changed, 410 insertions(+), 85 deletions(-) create mode 100644 changelog.en.md create mode 100644 resource/css/ripple.css create mode 100644 resource/javascript/ripple.js create mode 100644 update_message.txt diff --git a/changelog.en.md b/changelog.en.md new file mode 100644 index 00000000..6ae8ba53 --- /dev/null +++ b/changelog.en.md @@ -0,0 +1,97 @@ +# Change Log +All notable changes to this project will be documented in this file. + +## Information +Series Name : ORIZIN Agent +Edition : ORIZIN Agent HTML Based + +To read other information, check resource/information.txt. + +## Versioning +The meaning of the version, "a.b.c.de-f" is shown below: + +|Place|Meaning|Character Type|Minimum| +|:-----:|:-------:|:--:|:--:| +|a|Major Version|Number|0| +|b|Minor Version|Number|0| +|c|Build (Total Version)|Number|1| +|d|Revision|Number|0| +|e|Release|Alphabet (dev or nothing)|N/A| +|f|Development Code Name|Alphabet|N/A| + +The meaning of the words are shown below: + +|Word|Meaning| +|:-----:|:-------:| +|Major Version|Big functions were added or there are big changes in UI.| +|Minor Version|Small functions were added or there are small changes in UI.| +|Build (Total Version)|When the version was changed, this number increase.| +|Revision|There are bug fixes or changed comments in the program.| +|Release|If the program is "Develop", the value is "dev".| +|Development Code Name|Code name of the major (or minor) version.| + +## Releases + +### [Unreleased] +#### Added +- You can use tkinter instead of web browser for GUI now. +- You can choose your favorite colors for UI now. + +#### Changed +- Behavior became a little faster than before by optimizing variable types. + +### [v0.5.6.0dev-Albatross] - 2020-01-27 +#### Added +- Added ripple effect to the buttons. Because of this, oss_license.html was modified. +- You can see update contents on the push notification of Auto/Manual Update Checker now. + +### [v0.4.5.0dev-Albatross] - 2020-01-23 +#### Added +- 10 responses were added to the dictionary, so there are 271 responses in total. +- Added the Flag Page. You can see it from the Settings Page. + +#### Changed +- The behavior in dictionary error is changed. The error message is shown in the new window made by tkinter. +- Google Search Function became more useful. + +### [v0.3.4.0dev-Albatross] - 2020-01-23 +#### Added +- Added Auto Update Checker with a push notification, and Manual Update Checker. Because of this, oss_license.html was modified. + +#### Changed +- Changed the background color of selected text. +- Google Search Function became more useful. + +#### Fixed +- Fixed the issue that default web browser was not used in Google Search Function. +- Fixed the issue that app bar was shown in splash screen. + +### [v0.2.3.0dev-Albatross] - 2020-01-22 +#### Added +- 3 responses were added to the dictionary, so there are 261 responses in total. +- Added Google Search Function. If you ask questions to ORIZIN Agent, it'll open the default web browser and search the questions. + +#### Changed +- Changed privacy_policy.txt for Google Search Function. +- The UI design was made similar to the Material Design. + +#### Fixed +- Fixed some dictionary format error. + +### [v0.1.2.0dev-Albatross] - 2020-01-21 +#### Added +- 108 responses were added to the dictionary, so there are 258 responses in total. + +#### Changed +- The panel layout supports vertical screens by changing panel layout and panel size. + +### [v0.0.1.0dev-Albatross] - 2019-12-26 +#### Added +- privacy_policy.txt was added. + +#### Notice +In this release, there were some changes, but the version was not changed. + +### [v0.0.1.0dev-Albatross] - 2019-12-25 +#### Added +- All files of ORIZIN Agent HTML Based was released. diff --git a/changelog.md b/changelog.md index aaf9fbe5..5cb8a92d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,93 +1,97 @@ # Change Log -All notable changes to this project will be documented in this file. +このプロジェクトに対するすべての重要な変更は、このファイルに文書化されます。 -## Information +## 情報 Series Name : ORIZIN Agent Edition : ORIZIN Agent HTML Based -To read other information, check resource/information.txt. +他の情報を読むには，resource/information.txtを参照してください。 -## Versioning -The meaning of the version, "a.b.c.de-f" is shown below: +## バージョニング +"a.b.c.de-f"というバージョン番号の意味は以下の通りです。 -|Place|Meaning|Character Type|Minimum| +|位置|意味|文字の種類|最小値| |:-----:|:-------:|:--:|:--:| -|a|Major Version|Number|0| -|b|Minor Version|Number|0| -|c|Build (Total Version)|Number|1| -|d|Revision|Number|0| -|e|Release|Alphabet (dev or nothing)|N/A| -|f|Development Code Name|Alphabet|N/A| +|a|メジャーバージョン|数字|0| +|b|マイナーバージョン|数字|0| +|c|ビルド（累積バージョン）|数字|1| +|d|リビジョン|数字|0| +|e|リリース|アルファベット（dev または なし）|N/A| +|f|開発コードネーム|アルファベット|N/A| -The meaning of the words are shown below: +それぞれの言葉の意味は以下の通りです。 -|Word|Meaning| +|言葉|意味| |:-----:|:-------:| -|Major Version|Big functions were added or there are big changes in UI.| -|Minor Version|Small functions were added or there are small changes in UI.| -|Build (Total Version)|When the version was changed, this number increase.| -|Revision|There are bug fixes or changed comments in the program.| -|Release|If the program is "Develop", the value is "dev".| -|Development Code Name|Code name of the major (or minor) version.| +|メジャーバージョン|大きな機能の追加またはUIの大きな変更| +|マイナーバージョン|小さな機能の追加またはUIの小さな変更| +|ビルド（累積バージョン）|バージョン番号が変わるたびにこの数字が増えます| +|リビジョン|バグの修正またはプログラム中のコメントの変更| +|リリース|プログラムがDevelop版の場合"dev"になる| +|開発コードネーム|メジャー（マイナー）バージョンのコードネーム| -## Releases +## リリース ### [Unreleased] -#### Added +#### 追加 - You can use tkinter instead of web browser for GUI now. - You can choose your favorite colors for UI now. -#### Changed +#### 変更 - Behavior became a little faster than before by optimizing variable types. -### [v0.4.5.0dev-Albatross] - 2020-1-23 -#### Added -- 10 responses were added to the dictionary, so there are 271 responses in total. -- The Space Battle Ship Game as the easter egg is now available. -- Added the Flag Page. You can see it from the Settings Page. +### [v0.5.6.0dev-Albatross] - 2020-01-27 +#### 追加 +- ボタンにリップルエフェクトを追加しました。また，それに伴いoss_license.htmlを変更しました。 +- アップデートを確認した際にプッシュ通知でアップデートの内容が表示されるようになりました。 -#### Changed -- The behavior in dictionary error is changed. The error message is shown in the new window made by tkinter. -- Google Search Function became more useful. +### [v0.4.5.0dev-Albatross] - 2020-01-23 +#### 追加 +- 10通りの応答を辞書に追加し，応答は全てで271通りになりました。 +- 試験機能ページを追加しました。設定ページから見ることができます。 + +#### 変更 +- 辞書エラーの際の挙動が変更になりました。tkinter +- Google検索機能がより使いやすくなりました。 ### [v0.3.4.0dev-Albatross] - 2020-01-23 -#### Added -- Added Auto Update Checker with a push notification, and Manual Update Checker. Because of this, oss_license.html was modified. +#### 追加 +- プッシュ通知付きのオートアップデートチェッカーとマニュアルアップデートチェッカーを追加しました。また，それに伴いoss_license.htmlを変更しました。 -#### Changed -- Changed the background color of selected text. -- Google Search Function became more useful. +#### 変更 +- 選択されたテキストの背景色を変更しました。 +- Google検索機能がより使いやすくなりました。 -#### Fixed -- Fixed the issue that default web browser was not used in Google Search Function. -- Fixed the issue that app bar was shown in splash screen. +#### 修正 +- Google検索機能でデフォルトのWEBブラウザが使われない問題を修正しました。 +- スプラッシュ画面でアプリバーが表示されてしまう問題を修正しました。 ### [v0.2.3.0dev-Albatross] - 2020-01-22 -#### Added -- 3 responses were added to the dictionary, so there are 261 responses in total. -- Added Google Search Function. If you ask questions to ORIZIN Agent, it'll open the default web browser and search the questions. +#### 追加 +- 3通りの応答を辞書に追加し，応答は全てで261通りになりました。 +- Google検索機能を追加しました。ORIZIN Agentに質問するとデフォルトのWEBブラウザで質問が検索されます。 -#### Changed -- Changed privacy_policy.txt for Google Search Function. -- The UI design was made similar to the Material Design. +#### 変更 +- privacy_policy.txtをGoogle検索機能のために変更しました。 +- UIのデザインをマテリアルデザインに近づけました。 -#### Fixed -- Fixed some dictionary format error. +#### 修正 +- 辞書の書式のミスを修正しました。 ### [v0.1.2.0dev-Albatross] - 2020-01-21 -#### Added -- 108 responses were added to the dictionary, so there are 258 responses in total. +#### 追加 +- 108通りの応答を辞書に追加し，応答は全てで258通りになりました。 -#### Changed -- The panel layout supports vertical screens by changing panel layout and panel size. +#### 変更 +- パネルレイアウトとパネルサイズを変更することで縦画面をサポートしました。 ### [v0.0.1.0dev-Albatross] - 2019-12-26 -#### Added -- privacy_policy.txt was added. +#### 追加 +- privacy_policy.txtが追加されました。 #### Notice -In this release, there were some changes, but the version was not changed. +- このリリースでは，幾つかの変更がありましたが，バージョン番号は変更されませんでした。 ### [v0.0.1.0dev-Albatross] - 2019-12-25 -#### Added -- All files of ORIZIN Agent HTML Based was released. +#### 追加 +- ORIZIN Agent HTML Basedのすべてのファイルがリリースされました。 diff --git a/orizin_agent.py b/orizin_agent.py index a4764780..389db5ef 100644 --- a/orizin_agent.py +++ b/orizin_agent.py @@ -112,15 +112,16 @@ def check_version_from_info(file): @eel.expose def check_update(): info_file = urllib.request.urlopen("https://raw.githubusercontent.com/Robot-Inventor/ORIZIN-Agent-HTML-Based/master/resource/information.txt").read().decode() + update_message = urllib.request.urlopen("https://raw.githubusercontent.com/Robot-Inventor/ORIZIN-Agent-HTML-Based/master/resource/update_message.txt").read().decode() f = open("resource/information.txt") local_info_file = f.read() f.close() current_version = check_version_from_info(local_info_file) new_version = check_version_from_info(info_file) if info_file != local_info_file: - return ["true", current_version, new_version] + return ["true", current_version, new_version, update_message] else: - return ["false", current_version, new_version] + return ["false", current_version, new_version, update_message] load_dictionary() diff --git a/resource/css/layout.css b/resource/css/layout.css index eac5f64c..e8dae97d 100644 --- a/resource/css/layout.css +++ b/resource/css/layout.css @@ -1,5 +1,7 @@ @import url("light_theme.css"); +@import url("ripple.css"); + @font-face { font-family: "League Spartan"; src: url("../font/LeagueSpartan-Regular.ttf") format("truetype"); @@ -200,23 +202,18 @@ pre { white-space: pre-wrap; } -#waiting { - width: 100%; +#waiting, #listening { + width: calc(100% - 4vh); height: 38vh; position: absolute; top: 10vh; left: 0vw; z-index: 1; + margin: 2vh; } #listening { - width: 100%; - height: 38vh; - position: absolute; - top: 10vh; - left: 0vw; display: none; - z-index: 1; } .message { diff --git a/resource/css/ripple.css b/resource/css/ripple.css new file mode 100644 index 00000000..7b56f4f1 --- /dev/null +++ b/resource/css/ripple.css @@ -0,0 +1,45 @@ +.has-ripple { + position: relative; + overflow: hidden; + -webkit-transform: translate3d(0,0,0); + -o-transform: translate3d(0,0,0); + transform: translate3d(0,0,0); +} +.ripple { + display: block; + position: absolute; + pointer-events: none; + border-radius: 50%; + + -webkit-transform: scale(0); + -o-transform: scale(0); + transform: scale(0); + + background: #fff; + opacity: 1; +} +.ripple-animate { + -webkit-animation: ripple; + -o-animation: ripple; + animation: ripple; +} +@-webkit-keyframes ripple { + 100% { + opacity: 0; + -webkit-transform: scale(2); + transform: scale(2); + } +} +@-o-keyframes ripple { + 100% { + opacity: 0; + -o-transform: scale(2); + transform: scale(2); + } +} +@keyframes ripple { + 100% { + opacity: 0; + transform: scale(2); + } +} diff --git a/resource/dictionary/unknownQuestions.txt b/resource/dictionary/unknownQuestions.txt index df287edb..cb49fcc6 100644 --- a/resource/dictionary/unknownQuestions.txt +++ b/resource/dictionary/unknownQuestions.txt @@ -1,2 +1,3 @@  明日の気温は何度 +ありがとう diff --git a/resource/html/about_oa.html b/resource/html/about_oa.html index b316208b..c9a55b83 100644 --- a/resource/html/about_oa.html +++ b/resource/html/about_oa.html @@ -17,13 +17,14 @@

About ORIZIN Agent


                 
ORIZIN Agentとは

-                ORIZIN Agentは，MITライセンスの下に公開されているオープンソースの会話を目的としたルールベースのAIアシスタントです。Robot-Inventorによって開発されました。詳しくは、ORIZIN Agent公式サイトを御覧ください。
+                ORIZIN Agentは，MITライセンスの下に公開されているオープンソースの会話を目的としたルールベースのAIアシスタントです。Robot-Inventorによって開発されました。詳しくは、ORIZIN Agent公式サイトを御覧ください。
                 
ライセンス

                 

             
         
         
         
+        
         
         
         
+        
         
         
         
+        
         
     
 
diff --git a/resource/html/privacy_policy.html b/resource/html/privacy_policy.html
index 009a2b77..f8c058c2 100644
--- a/resource/html/privacy_policy.html
+++ b/resource/html/privacy_policy.html
@@ -20,6 +20,7 @@ 
プライバシーポリシー

         
         
         
+        
         
         
     
-
\ No newline at end of file
+
diff --git a/resource/html/setting.html b/resource/html/setting.html
index 7f408867..e43416e9 100644
--- a/resource/html/setting.html
+++ b/resource/html/setting.html
@@ -24,18 +24,19 @@ 
設定

                         
                     
                     
  • 
-                        アップデートを確認　
+                        アップデートを確認　
                     
    • 
                     
  • 
-                        試験機能
+                        試験機能
                     
    • 
                 
-                
+                
             
         
         
         
         
+