Commit 048fa032 authored by dmMaze's avatar dmMaze
Browse files

update stylesheets

parent 579b6770
Loading
Loading
Loading
Loading
+25 −8
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ Widget {

CustomGV {
    background-color: #e6e9f0;

    border-color: #b3b6bf;
    border-style: solid;
    border-width: 1px;
@@ -253,8 +252,11 @@ TextEditListScrollArea {
    border-style: none;
}

PageListView {
    background-color: #e1e4eb
QListWidget {
    background-color: #e1e4eb;
    border-color: #b3b6bf;
    border-style: solid;
    border-width: 1px;
}

QAction {
@@ -675,11 +677,7 @@ QLabel#angleLabel {
    color: rgba(255, 255, 255, 150);
}

.EffectBtn {
    font-size: 22px;
}

.EffectBtn::hover {
.ClickableLabel::hover {
    background-color: rgba(30, 147, 229, 20%);
}

@@ -744,5 +742,24 @@ DrawToolCheckBox#DrawRectTool::indicator:checked {
    image: url(data/icons/bottombar_textblock_activate.svg);
}

QTreeView {
    border-color: #b3b6bf;
    border-style: solid;
    border-width: 1px;
}

QScrollArea {
    border-color: #b3b6bf;
    border-style: solid;
    border-width: 1px;
}

TextEditListScrollArea {
    border-left: 0px;
    border-right: 0px;
    border-bottom: 0px;
}

PresetListWidget {
    min-height: 280px;
}
 No newline at end of file
+0 −21
Original line number Diff line number Diff line
@@ -267,15 +267,6 @@ class ConfigTable(QTreeView):
            self.tableitem_pressed.emit(idx0, idx1)


class GeneralPanel(QWidget):
    def __init__(self, *args, **kwargs) -> None:
        super().__init__(*args, **kwargs)


        layout = QVBoxLayout(self)
        


class ConfigPanel(Widget):

    save_config = Signal()
@@ -303,7 +294,6 @@ class ConfigPanel(Widget):
        label_inpaint = self.tr('Inpaint')
        label_translator = self.tr('Translator')
        label_startup = self.tr('Startup')
        # label_sources = self.tr('Sources')
        label_lettering = self.tr('Lettering')
    
        dltableitem.appendRows([
@@ -314,7 +304,6 @@ class ConfigPanel(Widget):
        ])
        generalTableItem.appendRows([
            TableItem(label_startup, CONFIG_FONTSIZE_TABLE),
            # TableItem(label_sources, CONFIG_FONTSIZE_TABLE),
            TableItem(label_lettering, CONFIG_FONTSIZE_TABLE)
        ])

@@ -338,16 +327,6 @@ class ConfigPanel(Widget):
        self.open_on_startup_checker = generalConfigPanel.addCheckBox(self.tr('Reopen last project on startup'))
        self.open_on_startup_checker.stateChanged.connect(self.on_open_onstartup_changed)

        # generalConfigPanel.addTextLabel(label_sources)
        # src_manual_str = self.tr('manual')
        # src_nhentai_str = self.tr('nhentai')
        # self.src_choice_combox = generalConfigPanel.addCombobox([src_manual_str, src_nhentai_str], self.tr('source'))
        # self.src_choice_combox.currentIndexChanged.connect(self.on_source_flag_changed)
        # self.src_link_textbox = generalConfigPanel.addLineEdit('source url')
        # self.src_link_textbox.textChanged.connect(self.on_source_link_changed)
        # self.src_force_download_checker = generalConfigPanel.addCheckBox(self.tr('Force download/redownload'))
        # self.src_force_download_checker.stateChanged.connect(self.on_source_force_download_changed)

        generalConfigPanel.addTextLabel(label_lettering)
        dec_program_str = self.tr('decide by program')
        use_global_str = self.tr('use global setting')
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from utils.logger import logger as LOGGER
from .stylewidgets import ConfigComboBox
from .constants import CONFIG_FONTSIZE_CONTENT, CONFIG_COMBOBOX_MIDEAN, CONFIG_COMBOBOX_SHORT, CONFIG_COMBOBOX_HEIGHT

from qtpy.QtWidgets import QHBoxLayout, QVBoxLayout, QWidget, QLabel, QComboBox, QListView, QToolBar, QMenu, QSpacerItem, QPushButton, QCheckBox, QToolButton, QSplitter, QStylePainter, QStyleOption, QStyle, QScrollArea, QLineEdit, QGroupBox, QGraphicsSimpleTextItem
from qtpy.QtWidgets import QHBoxLayout, QVBoxLayout, QWidget, QLabel, QComboBox, QCheckBox, QLineEdit
from qtpy.QtCore import Qt, Signal
from qtpy.QtGui import QFontMetricsF

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ from .scenetext_manager import SceneTextManager
from .mainwindowbars import TitleBar, LeftBar, RightBar, BottomBar
from .io_thread import ImgSaveThread
from .stylewidgets import FrameLessMessageBox
from .preset_widget import PresetPanel, PresetListWidget
from .preset_widget import PresetPanel
from .constants import STYLESHEET_PATH, CONFIG_PATH
from . import constants as C

+10 −4
Original line number Diff line number Diff line
from qtpy.QtWidgets import QMenu, QAbstractItemView, QListWidget, QListWidgetItem, QWidget, QGridLayout, QPushButton, QVBoxLayout
from qtpy.QtCore import Qt, Signal, QModelIndex, QEvent, QObject
from qtpy.QtCore import Qt, Signal
from qtpy.QtGui import QContextMenuEvent, QShowEvent, QHideEvent
from typing import List, Union

@@ -77,8 +77,7 @@ class PresetListWidget(QListWidget):

    def add_new_preset(self, preset_name: str = None):
        if preset_name is None:
            preset_num = self.count() + 1
            preset_name = self.default_preset_name + '_' + str(preset_num).zfill(3)
            preset_name = self.default_preset_name + '_' + str(self.count() + 1).zfill(3)
            preset_name = self.handle_duplicate_name(preset_name)
        item = QListWidgetItem(preset_name)
        item.setFlags(item.flags() | Qt.ItemFlag.ItemIsEditable)
@@ -86,6 +85,12 @@ class PresetListWidget(QListWidget):
        self.presets[preset_name] = self.current_fmt.copy()
        self.editItem(item)

    def addItem(self, item: QListWidgetItem) -> None:
        font = item.font()
        font.setPointSizeF(12)
        item.setFont(font)
        return super().addItem(item)

    def editItem(self, item: QListWidgetItem) -> None:
        self.last_editing_item = item
        return super().editItem(item)
@@ -98,8 +103,9 @@ class PresetPanel(Widget):

    def __init__(self, parent: QWidget = None, *args, **kwargs) -> None:
        super().__init__(parent, *args, **kwargs)
        self.list_widget = PresetListWidget(self)

        self.setWindowTitle(self.tr('Presets'))
        self.list_widget = PresetListWidget(self)
        self.new_btn = QPushButton(self.tr('New'))
        self.new_tip = self.tr('Create new preset: ')
        self.new_btn.clicked.connect(self.on_new_clicked)