Unverified Commit fe883698 authored by dmMaze's avatar dmMaze Committed by GitHub
Browse files

Merge pull request #311 from dmMaze/textstylepanel

Text Style Panel Rework
parents e2f7f36c 6650a923
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ data/testpacks/eng_dontupload
data/testpacks/testpacks
data/*.png
data/testpacks
ballontranslator/ui/pagesources/gallery-dl
ballontranslator/gallery-dl
config/textstyles
release
libs
icons
+78 −10
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Widget {
    background-color: @widgetBackgroundColor;
}


ConfigTextLabel {
    background-color : @emptyContentBackgroundColor;
}
@@ -681,11 +682,6 @@ QScrollBar::add-line {
}


.IncrementalBtn {
    border-radius: 0px;
    height: 13px;
    width: 13px;
}
.IncrementalBtn#FsizeIncrementUp {
    border-image: url(icons/incre_up.svg) 0 0 0 0 stretch stretch;
}
@@ -726,10 +722,16 @@ QLabel#angleLabel {
    background-color: rgba(30, 147, 229, 20%);
}

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

.ExpandLabel {
    border-bottom: 1px;
    border-color: @borderColor;
    border-style: solid;
}

DrawToolCheckBox::indicator {
    height: 34px;
    width: 34px;
@@ -890,14 +892,14 @@ ClickableLabel#ReplaceAllBtn {

ClickableLabel#SalaDict {
    image: url(icons/saladict.png);
    min-width: 24px;
    min-height: 24px;
    max-width: 24px;
    height: 24px;
}

ClickableLabel#SearchInternet {
    image: url(icons/search.svg);
    min-width: 24px;
    min-height: 24px;
    max-width: 24px;
    height: 24px;
}

TitleBarToolBtn {
@@ -929,3 +931,69 @@ QProgressBar::chunk {
}


TextAreaStyleButton {
    width: 15px;
    height: 15px;
    border-radius: 10px;
    padding: 5px;
    background-color: @widgetBackgroundColor;
    
}

TextAreaStyleButton#NewTextStyleButton {
    image: url(icons/add.svg);
}

TextAreaStyleButton#ClearTextStyleButton {
    image: url(icons/titlebar_close.svg);
}

TextAreaStyleButton#ClearTextStyleButton::hover {
    background-color: #FF605C;
}

TextAreaStyleButton::hover {
    background-color: #cad7ed;
}

Widget#TextStyleAreaContent {
    background-color : @emptyContentBackgroundColor;
    border-radius: 7px;
    border: none;
    border-width: 0px;
}

TextStyleArea {
    background-color : @emptyContentBackgroundColor;
    border-radius: 7px;
    border: none;
    border-width: 0px;
}

TextStyleLabel {
    border-radius: 7px;
}

ArrowLeftButton {
    image: url(icons/arrow-left.svg);
    border: none;
    background-color: rgba(0, 0, 0, 0);
    border-radius: 7px;
}

ArrowRightButton {
    image: url(icons/arrow-right.svg);
    border: none;
    background-color: rgba(0, 0, 0, 0);
    border-radius: 7px;
}

DeleteStyleButton {
    border: none;
    background-color: rgba(0, 0, 0, 0);
    border-radius: 7px;
}

DeleteStyleButton::hover {
    background-color: #FF605C;
}
 No newline at end of file

icons/add.svg

0 → 100644
+3 −0
Original line number Diff line number Diff line
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.0001 7V8H8.00012V14H7.00012V8H1.00012V7H7.00012V1H8.00012V7H14.0001Z" fill="#697187"/>
</svg>

icons/arrow-left.svg

0 → 100644
+3 −0
Original line number Diff line number Diff line
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.99999 3.0929L2 8.09288L2 8.79999L6.99999 13.8L7.7071 13.0929L3.56066 8.94644L14 8.94644L14 7.94644L3.56066 7.94644L7.7071 3.8L6.99999 3.0929Z" fill="#697187"/>
</svg>

icons/arrow-right.svg

0 → 100644
+3 −0
Original line number Diff line number Diff line
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.00001 13.8871L14 8.8871L14 8.17999L9.00001 3.17999L8.2929 3.8871L12.4393 8.03354L2 8.03354L2 9.03354L12.4393 9.03354L8.2929 13.18L9.00001 13.8871Z" fill="#697187"/>
</svg>
Loading