[Impl] tema dark high contrast - inicio

Author: Ernesto-Alves67

.github/workflows/linux-build.yml

@@ -36,9 +36,9 @@ jobs:
         run: |
           # pyinstaller --onefile MarkViewDesktop/main.py --name markview
           pyinstaller --noconsole --name DocViewer \
-            --icon="MarkViewDesktop/icons_svg/doc_icon.ico" \
-            --add-data "MarkViewDesktop/ui_docV.py:." \
-            --add-data "MarkViewDesktop/icons_svg/*:icons" \
+            --icon="MarkViewDesktop/resources/icons_svg/doc_icon.ico" \
+            --add-data "MarkViewDesktop/ui/ui_docV.py:." \
+            --add-data "MarkViewDesktop/resources/icons_svg/*:icons" \
             MarkViewDesktop/main.py 
           ls dist  
       - name: Compressing files

.github/workflows/windows-build.yml

@@ -35,9 +35,9 @@ jobs:
       - name: Build with PyInstaller
         run: |
             pyinstaller --noconsole --name DocViewer `
-            --icon="MarkViewDesktop/icons_svg/doc_icon.ico" `
-            --add-data "MarkViewDesktop/ui_docV.py;." `
-            --add-data "MarkViewDesktop/icons_svg/*;icons" `
+            --icon="MarkViewDesktop/resources/icons_svg/doc_icon.ico" `
+            --add-data "MarkViewDesktop/ui/ui_docV.py;." `
+            --add-data "MarkViewDesktop/resources/icons_svg/*;resources/icons_svg" `
             MarkViewDesktop/main.py
 
       # 5) Compactar o executável (.exe) em zip

MarkViewDesktop/editor/actions/edit_actions.py

@@ -9,9 +9,10 @@ class EditActionsMixin:
     def init_ui(self):
         self.ui.statusBarMessage()
         self.ui.menu = self.create_menu()
-        self.ui.splitter.setStyleSheet("QSplitter::handle {background-color:#dfe2e5; ...}")
+        # self.ui.splitter.setStyleSheet("QSplitter::handle {background-color:#dfe2e5; height: 30px;}")
         self.ui.editArea.setFocus()
         self.ui.previewArea.setZoomFactor(0.8)
+
         self.setGeometry(100, 100, 800, 600)
         self.setWindowTitle('DocViewer')
         self.ui.file_btn.clicked.connect(self.show_menu)
@@ -38,7 +39,7 @@ def create_menu(self):
         save_file_act.triggered.connect(self.saveFile)
         menu.addAction(save_file_act)
 
-        menu.setFixedWidth(210)
+        # menu.setFixedWidth(180)
         return menu
 
     def show_menu(self):
@@ -142,6 +143,7 @@ def updateCompleteHtml(self):
                     padding: 20px;
                     color: #E6edf3;
                     background-color: #161b22;
+                    border: 1px solid #30363d;
                 }}
                 h1, h2, h3, h4, h5, h6 {{
                     border-bottom: 1px solid #eaecef;

MarkViewDesktop/editor/actions/file_actions.py

@@ -9,8 +9,8 @@ def new_file(self):
         new_tab = QWidget()
         layout = QVBoxLayout()
         text_edit = QTextEdit()
+        # text_edit.setAcceptRichText(False)
         self.actual_text_edit = text_edit
-        text_edit.setStyleSheet("background-color: #DCDCDC; color:black")
         text_edit.setTabStopDistance(32)
         layout.addWidget(text_edit)
         layout.setContentsMargins(4, 4, 4, 4)

MarkViewDesktop/editor/editor_core.py

@@ -8,7 +8,6 @@
 from actions.edit_actions import EditActionsMixin
 from actions.file_actions import FileActionsMixin
 
-# class MarkdownEditor(QMainWindow, EditActionsMixin, FileActionsMixin):
 class MarkdownEditor(MainWindow, EditActionsMixin, FileActionsMixin):
 
     def __init__(self, file_to_open=None):
@@ -39,41 +38,6 @@ def connect_buttons(self):
         self.ui.minimize_btn.clicked.connect(lambda: self.showMinimized())
         self.ui.maxmize_btn.clicked.connect(lambda: self.toggle_maximize_restore())
 
-    # def restore_or_maximize(self):
-    #     self.showNormal() if self.isMaximized() else self.showMaximized()
-
-    # def mousePressEvent(self, event):
-    #     if event.button() == Qt.LeftButton and not self.isMaximized():
-    #         # Verifica se o clique foi na área permitida para arrastar (ex.: barra de título)
-    #         if self.is_draggable_area(event.position().toPoint()):
-    #             self._mousePressPos = event.globalPosition().toPoint()
-    #             self._windowPos = self.pos()
-    #     super().mousePressEvent(event)
-
-    # def is_draggable_area(self, pos):
-    #     # Define a área onde a janela pode ser arrastada (ex.: barra de título)
-    #     # Ajuste conforme o layout da sua UI
-    #     title_bar_height = 40  # Altura da barra de título (ajuste conforme necessário)
-    #     return pos.y() < title_bar_height and pos.x() < self.width()
-
-    # # def mouseMoveEvent(self, event):
-    # #     if self._mousePressPos is not None:
-    # #         self.move(self.geometry().topLeft() + event.position().toPoint() - self._mousePressPos)
-    # def mouseMoveEvent(self, event):
-    #     # Move a janela apenas se o arrastar foi iniciado
-    #     if self._mousePressPos is not None:
-    #         global_pos = event.globalPosition().toPoint()
-    #         delta = global_pos - self._mousePressPos
-    #         self.move(self._windowPos + delta)
-    #     super().mouseMoveEvent(event)
-    # # def mouseMoveEvent(self, event):
-    # #      # Move a janela com base na posição do mouse
-    # #     if self._mousePressPos is not None:
-    # #         self.move(self.pos() +event.position().toPoint() - self._mousePressPos)
-
-    # def mouseReleaseEvent(self, event):
-    #     self._mousePressPos = None
-    
     def keyPressEvent(self, event):
         if event.type() == QEvent.KeyPress:
             match (event.key(), event.modifiers()):
@@ -87,7 +51,6 @@ def keyPressEvent(self, event):
                 case (Qt.Key_J, Qt.ControlModifier): self.removeSyntaxAndHint()
         super().keyPressEvent(event)
 
-
     def onTabChange(self, index):
         self.ui.editArea = self.getCurrentTextEdit(index)
         if(self.ui.editArea is not None):
@@ -130,7 +93,6 @@ def inteliComplete(self):
 
         ##cursor.movePosition(QtGui.QTextCursor.StartOfLine, QtGui.QTextCursor.MoveAnchor)
         self.ui.editArea.setTextCursor(cursor) 
-        
 
     def getCurrentTextEdit(self, current_index):
         """Recupera o QTextEdit da aba atualmente selecionada"""

MarkViewDesktop/main.py

@@ -1,10 +1,19 @@
 import sys
+
+from PySide6.QtCore import QFile, QIODevice
 from PySide6.QtWidgets import QApplication
 from editor.editor_core import MarkdownEditor
 
 def main():
 
     app = QApplication(sys.argv)
+    sytyle_sheet_file = QFile("./ui/dark-high-v0.qss")
+    if sytyle_sheet_file.open(QIODevice.ReadOnly):
+       styleSheet = str(sytyle_sheet_file.readAll(), encoding='utf-8')  # Leitura e conversão para string
+       app.setStyleSheet(styleSheet)
+       sytyle_sheet_file.close()
+    else:
+        print("Falha ao abrir o arquivo de stylesheet.")
     editor = MarkdownEditor()
     editor.show()
     sys.exit(app.exec())