Merge branch 'main' into dev

northgreen · Jul 24, 2024 · 9808eb6 · 9808eb6
2 parents 69905dd + 3d3d67d
commit 9808eb6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/ictye-live-dm/pyproject.toml b/ictye-live-dm/pyproject.toml
@@ -57,6 +57,7 @@ out_dir = "./src/ictye_live_dm/GUI"
 work_dir = "./src/ictye_live_dm/QT-GUI"
 commands = [
     "pyuic5 ./main.ui -o ../GUI/Ui_MainWindow.py"
+
 ]
 artifacts = [
     "Ui_MainWindow.py"

diff --git a/ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py b/ictye-live-dm/src/ictye_live_dm/GUI/Ui_MainWindow.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+
 # Form implementation generated from reading ui file './main.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.11
@@ -289,7 +290,6 @@ def setupUi(self, Form):
         self.verticalLayout_3.addWidget(self.settingScrollArea)
         self.tabWidget.addTab(self.setting_Tab, "")
         self.verticalLayout.addWidget(self.tabWidget)
-
         self.retranslateUi(Form)
         self.tabWidget.setCurrentIndex(3)
         QtCore.QMetaObject.connectSlotsByName(Form)

diff --git a/ictye-live-dm/src/ictye_live_dm/QT-GUI/main.ui b/ictye-live-dm/src/ictye_live_dm/QT-GUI/main.ui
@@ -313,6 +313,7 @@
          <property name="selectionMode">
           <enum>QAbstractItemView::NoSelection</enum>
          </property>
+
          <attribute name="horizontalHeaderCascadingSectionResizes">
           <bool>false</bool>
          </attribute>

diff --git a/ictye-live-dm/src/ictye_live_dm/http_server.py b/ictye-live-dm/src/ictye_live_dm/http_server.py
@@ -15,7 +15,6 @@
 log = logging.getLogger(__name__)
 runner: Optional[web.AppRunner] = None
 
-
 def return_file(file: str):
     async def header(request):
         nonlocal file

diff --git a/ictye-live-dm/src/ictye_live_dm/main.py b/ictye-live-dm/src/ictye_live_dm/main.py
@@ -99,7 +99,6 @@ def main():
         print('🐧 Linux萬歲！')
 
     parse_args()  # 參數解析
-
     # 檢查GUI啓動
     if configs.ConfigManager()["GUI"]:
         print("starting gui")