From b0eb3c2e48325817c58e76d271d86982b5c46fa1 Mon Sep 17 00:00:00 2001 From: Maurycy Liebner Date: Thu, 25 Feb 2021 14:54:59 +0100 Subject: [PATCH] New interface theme. --- src/app/GUI/BoxesList/boxsinglewidget.cpp | 1 + src/app/GUI/BrushWidgets/brushlabel.cpp | 1 - src/app/GUI/RenderWidgets/renderwidget.cpp | 1 - src/app/GUI/Settings/settingsdialog.cpp | 2 +- src/app/GUI/animationdockwidget.cpp | 4 +- src/app/GUI/animationwidgetscrollbar.cpp | 23 +- src/app/GUI/bookmarkedwidget.cpp | 2 - src/app/GUI/changewidthwidget.cpp | 4 +- src/app/GUI/keysview.cpp | 4 +- src/app/GUI/mainwindow.cpp | 14 +- src/app/GUI/mainwindow.h | 18 - src/app/GUI/timelinewidget.cpp | 14 +- src/app/GUI/tipswidget.cpp | 4 +- src/app/icons/capFlat.svg | 14 +- src/app/icons/capRound.svg | 12 +- src/app/icons/capSquare.svg | 12 +- src/app/icons/childRecording.svg | 14 +- src/app/icons/close.svg | 18 +- src/app/icons/dockClose.svg | 80 ++++ ...{left-arrow-black.svg => dockMaximize.svg} | 48 +- src/app/icons/joinBevel.svg | 16 +- src/app/icons/joinMiter.svg | 16 +- src/app/icons/joinRound.svg | 18 +- src/app/icons/noInterpolation/fill_brush.png | Bin 345 -> 309 bytes src/app/icons/noInterpolation/fill_flat.png | Bin 179 -> 140 bytes .../icons/noInterpolation/fill_gradient.png | Bin 214 -> 175 bytes .../noInterpolation/fill_gradient_radial.png | Bin 334 -> 272 bytes .../icons/noInterpolation/graphDisabled.png | Bin 192 -> 179 bytes .../icons/noInterpolation/graphEnabled.png | Bin 180 -> 167 bytes .../icons/noInterpolation/graphProperty.png | Bin 225 -> 255 bytes .../icons/noInterpolation/properties_fill.png | Bin 179 -> 140 bytes .../properties_stroke_paint.png | Bin 193 -> 155 bytes .../icons/noInterpolation/settings_dots.png | Bin 151 -> 158 bytes src/app/icons/noInterpolation/split_h.png | Bin 182 -> 170 bytes src/app/icons/noInterpolation/split_v.png | Bin 184 -> 169 bytes src/app/icons/notRecording.svg | 14 +- src/app/icons/recording.svg | 16 +- src/app/icons/right-arrow-black.svg | 64 --- src/app/icons/toolbarButtons/checkedBg.svg | 58 +-- .../icons/toolbarButtons/plain/newEmpty.svg | 26 +- .../toolbarButtons/plain/nodeConnect.svg | 40 +- .../toolbarButtons/plain/nodeDisconnect.svg | 30 +- .../icons/toolbarButtons/plain/nodeNew.svg | 33 +- src/app/icons/toolbarButtons/uncheckedBg.svg | 25 +- src/app/pixmaps/down-arrow.png | Bin 179 -> 181 bytes src/app/pixmaps/up-arrow.png | Bin 185 -> 178 bytes src/app/stylesheet.qss | 415 ++++++------------ 47 files changed, 481 insertions(+), 580 deletions(-) create mode 100755 src/app/icons/dockClose.svg rename src/app/icons/{left-arrow-black.svg => dockMaximize.svg} (53%) delete mode 100644 src/app/icons/right-arrow-black.svg diff --git a/src/app/GUI/BoxesList/boxsinglewidget.cpp b/src/app/GUI/BoxesList/boxsinglewidget.cpp index 078335d3d..b91ead2e4 100755 --- a/src/app/GUI/BoxesList/boxsinglewidget.cpp +++ b/src/app/GUI/BoxesList/boxsinglewidget.cpp @@ -251,6 +251,7 @@ BoxSingleWidget::BoxSingleWidget(BoxScroller * const parent) : mBlendModeCombo = createCombo(this); mMainLayout->addWidget(mBlendModeCombo); + mBlendModeCombo->setObjectName("blendModeCombo"); for(int modeId = int(SkBlendMode::kSrcOver); modeId <= int(SkBlendMode::kLastMode); modeId++) { diff --git a/src/app/GUI/BrushWidgets/brushlabel.cpp b/src/app/GUI/BrushWidgets/brushlabel.cpp index 65a758146..12b4a54a5 100755 --- a/src/app/GUI/BrushWidgets/brushlabel.cpp +++ b/src/app/GUI/BrushWidgets/brushlabel.cpp @@ -38,7 +38,6 @@ BrushLabel::BrushLabel(BrushesContext* const ctxt) : TriggerLabel(nullptr) { }); setStyleSheet("QWidget {" "background: white;" - "border: 1px solid black;" "}"); setFixedSize(48, 48); } diff --git a/src/app/GUI/RenderWidgets/renderwidget.cpp b/src/app/GUI/RenderWidgets/renderwidget.cpp index 1148438a1..47d0687cd 100755 --- a/src/app/GUI/RenderWidgets/renderwidget.cpp +++ b/src/app/GUI/RenderWidgets/renderwidget.cpp @@ -69,7 +69,6 @@ RenderWidget::RenderWidget(QWidget *parent) : QWidget(parent) { mContLayout->setSpacing(0); mContWidget->setLayout(mContLayout); mScrollArea = new ScrollArea(this); - mScrollArea->setStyleSheet("QScrollArea { border-top: 1px solid black; }"); mScrollArea->setWidget(mContWidget); mScrollArea->setWidgetResizable(true); mScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/src/app/GUI/Settings/settingsdialog.cpp b/src/app/GUI/Settings/settingsdialog.cpp index 8f58c199e..80c439375 100755 --- a/src/app/GUI/Settings/settingsdialog.cpp +++ b/src/app/GUI/Settings/settingsdialog.cpp @@ -84,7 +84,7 @@ SettingsDialog::SettingsDialog(QWidget * const parent) : } catch(const std::exception& e) { gPrintExceptionCritical(e); } - statusBar->showMessage("Settings Applied", 1500); + statusBar->showMessage("Settings Applied, you might have to restart", 1500); }); updateSettings(); diff --git a/src/app/GUI/animationdockwidget.cpp b/src/app/GUI/animationdockwidget.cpp index bddd8f76d..45ce79d8b 100755 --- a/src/app/GUI/animationdockwidget.cpp +++ b/src/app/GUI/animationdockwidget.cpp @@ -93,9 +93,9 @@ AnimationDockWidget::AnimationDockWidget(QWidget *parent, addWidget(selectedVisible); setStyleSheet("QToolBar {" - "border: 1px solid black;" "padding: 10px;" - "margin-bottom: -1px" + "margin-bottom: -1px;" + "border: 3px solid rgb(25, 25, 25);" "}"); } diff --git a/src/app/GUI/animationwidgetscrollbar.cpp b/src/app/GUI/animationwidgetscrollbar.cpp index b6142db51..07ca8f28e 100755 --- a/src/app/GUI/animationwidgetscrollbar.cpp +++ b/src/app/GUI/animationwidgetscrollbar.cpp @@ -47,7 +47,7 @@ void FrameScrollBar::setCurrentCanvas(Canvas * const canvas) { void FrameScrollBar::paintEvent(QPaintEvent *) { QPainter p(this); - p.fillRect(rect(), QColor(60, 60, 60)); + p.fillRect(rect(), QColor(25, 25, 25)); const int dFrame = mFrameRange.fMax - mFrameRange.fMin + (mRange ? 0 : 1); if(dFrame <= 0) return; @@ -62,23 +62,6 @@ void FrameScrollBar::paintEvent(QPaintEvent *) { const int maxFrame = mFrameRange.fMax + f1; const qreal w1 = width() - 1.5*eSizesUI::widget + f1*pixPerFrame - x0; - QRect canvasMinRect; - canvasMinRect.setLeft(qRound(x0)); - canvasMinRect.setTop(0); - const int cRightFrames = mCanvasRange.fMin - minFrame; - canvasMinRect.setRight(qRound(x0 + cRightFrames*pixPerFrame)); - canvasMinRect.setBottom(height()); - p.fillRect(canvasMinRect, QColor(30, 30, 30)); - - QRect canvasMaxRect; - const int cLeftFrames = mCanvasRange.fMax - minFrame + (mRange ? 0 : 1); - const qreal left = cLeftFrames*pixPerFrame + x0; - canvasMaxRect.setLeft(qMax(0, qRound(left))); - canvasMaxRect.setTop(0); - canvasMaxRect.setWidth(width()); - canvasMaxRect.setBottom(height()); - p.fillRect(canvasMaxRect, QColor(30, 30, 30)); - QColor col = mHandleColor; if(mPressed) { col.setHsv(col.hue(), col.saturation(), qMin(255, col.value() + 40)); @@ -139,10 +122,6 @@ void FrameScrollBar::paintEvent(QPaintEvent *) { QString::number(mFirstViewedFrame)); } - p.setPen(QPen(Qt::black, 1)); - if(mRange) p.drawLine(0, 0, width(), 0); - else p.drawLine(0, height() - 1, width(), height() - 1); - p.end(); } diff --git a/src/app/GUI/bookmarkedwidget.cpp b/src/app/GUI/bookmarkedwidget.cpp index 1de410cad..f2f2ff0d8 100755 --- a/src/app/GUI/bookmarkedwidget.cpp +++ b/src/app/GUI/bookmarkedwidget.cpp @@ -8,8 +8,6 @@ BookmarkedWidget::BookmarkedWidget(const bool vertical, QWidget(parent), mVertical(vertical), mDimension(dimension) { mUpArrow = new QPushButton(this); mDownArrow = new QPushButton(this); - mUpArrow->setObjectName("darkButton"); - mDownArrow->setObjectName("darkButton"); if(mVertical) { setFixedWidth(dimension); mUpArrow->setFixedWidth(dimension); diff --git a/src/app/GUI/changewidthwidget.cpp b/src/app/GUI/changewidthwidget.cpp index c50f6d040..70df24143 100755 --- a/src/app/GUI/changewidthwidget.cpp +++ b/src/app/GUI/changewidthwidget.cpp @@ -46,8 +46,8 @@ void ChangeWidthWidget::paintEvent(QPaintEvent *) { } void ChangeWidthWidget::mouseMoveEvent(QMouseEvent *event) { - int newWidth = mCurrentWidth + event->x() - mPressX; - mCurrentWidth = clamp(newWidth, 10*eSizesUI::widget, 20*eSizesUI::widget); + const int newWidth = mCurrentWidth + event->x() - mPressX; + mCurrentWidth = clamp(newWidth, 10*eSizesUI::widget, 40*eSizesUI::widget); emit widthSet(mCurrentWidth); //mBoxesList->setFixedWidth(newWidth); updatePos(); diff --git a/src/app/GUI/keysview.cpp b/src/app/GUI/keysview.cpp index 4ac525917..9a0d84701 100755 --- a/src/app/GUI/keysview.cpp +++ b/src/app/GUI/keysview.cpp @@ -458,7 +458,7 @@ void KeysView::paintEvent(QPaintEvent *) { else p.fillRect(rect(), QColor(60, 60, 60)); if(mPixelsPerFrame < 0.001) return; - if(!mGraphViewed) { + if(!mGraphViewed) { int currY = eSizesUI::widget; p.setPen(QPen(QColor(40, 40, 40), 1)); while(currY < height()) { @@ -515,7 +515,7 @@ void KeysView::paintEvent(QPaintEvent *) { drawKeys(&p, mPixelsPerFrame, viewedFrameRange); p.restore(); if(mSelecting) { - p.setPen(QPen(Qt::blue, 2, Qt::DotLine)); + p.setPen(QPen(Qt::white, 1.5, Qt::DotLine)); p.setBrush(Qt::NoBrush); p.drawRect(QRectF((mSelectionRect.x() - mMinViewedFrame)*mPixelsPerFrame, mSelectionRect.y() - mViewedTop, diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp index 90f2115d8..54e6de9a8 100755 --- a/src/app/GUI/mainwindow.cpp +++ b/src/app/GUI/mainwindow.cpp @@ -111,10 +111,17 @@ MainWindow::MainWindow(Document& document, setWindowIcon(QIcon(iconDir + "/enve.png")); const auto downArr = iconDir + "/down-arrow.png"; const auto upArr = iconDir + "/up-arrow.png"; + const auto dockClose = iconDir + "/dockClose.png"; + const auto dockMaximize = iconDir + "/dockMaximize.png"; + const QString iconSS = - "QComboBox::down-arrow { image: url(" + downArr + "); }" + - "QScrollBar::sub-line { image: url(" + upArr + "); }" + - "QScrollBar::add-line { image: url(" + downArr + "); }"; + "QComboBox::down-arrow { image: url(" + downArr + "); }" + "QScrollBar::sub-line { image: url(" + upArr + "); }" + "QScrollBar::add-line { image: url(" + downArr + "); }" + "QDockWidget {" + "titlebar-close-icon: url(" + dockClose + ");" + "titlebar-normal-icon: url(" + dockMaximize + ");" + "}"; QFile customSS(eSettings::sSettingsDir() + "/stylesheet.qss"); if(customSS.exists()) { @@ -835,7 +842,6 @@ void MainWindow::updateSettingsForCurrentCanvas(Canvas* const scene) { #include void MainWindow::setupStatusBar() { mUsageWidget = new UsageWidget(this); - mUsageWidget->setStyleSheet("QStatusBar { border-top: 1px solid black; }"); setStatusBar(mUsageWidget); } diff --git a/src/app/GUI/mainwindow.h b/src/app/GUI/mainwindow.h index 1d3724f24..dcec258be 100755 --- a/src/app/GUI/mainwindow.h +++ b/src/app/GUI/mainwindow.h @@ -57,24 +57,6 @@ class CloseSignalingDockWidget; class PaintColorWidget; //class SoundComposition; -const QString MENU_STYLESHEET = - "QMenu {\ - background-color: rgb(255, 255, 255);\ - border: 1px solid black;\ - }\ - \ - QMenu::item {\ - spacing: 3px;\ - padding: 2px 25px 2px 25px;\ - background: transparent;\ - color: black;\ - }\ - \ - QMenu::item:selected {\ - background-color: rgb(200, 200, 200);\ - color: black;\ - };"; - class MainWindow : public QMainWindow { Q_OBJECT public: diff --git a/src/app/GUI/timelinewidget.cpp b/src/app/GUI/timelinewidget.cpp index 46e735e37..e5594df5d 100755 --- a/src/app/GUI/timelinewidget.cpp +++ b/src/app/GUI/timelinewidget.cpp @@ -170,23 +170,15 @@ TimelineWidget::TimelineWidget(Document &document, connect(mGraphAct, &QAction::toggled, this, &TimelineWidget::setGraphEnabled); - mCornerMenuBar->setStyleSheet("QWidget#menuBarWidget {" - "border-right: 1px solid black;" - "}"); mCornerMenuBar->setContentsMargins(0, 0, 1, 0); mSearchLine = new QLineEdit("", mBoxesListMenuBar); mSearchLine->setMinimumHeight(0); mSearchLine->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); MainWindow::sGetInstance()->installLineFilter(mSearchLine); - mSearchLine->setStyleSheet("background-color: white;" - "color: black;" - "border-radius: 0;" - "border: 0;" - "border-right: 1px solid black;" - "border-left: 1px solid black;" - "border-bottom: 1px solid black;" - "margin: 0;"); + mSearchLine->setStyleSheet("border-radius: 0;" + "border: 0;"); + mSearchLine->setPlaceholderText("search"); connect(mSearchLine, &QLineEdit::textChanged, this, &TimelineWidget::setSearchText); mSearchLine->setFocusPolicy(Qt::ClickFocus); diff --git a/src/app/GUI/tipswidget.cpp b/src/app/GUI/tipswidget.cpp index 0a31492d6..b0e4a526e 100644 --- a/src/app/GUI/tipswidget.cpp +++ b/src/app/GUI/tipswidget.cpp @@ -31,7 +31,7 @@ TipsWidget::TipsWidget(QWidget* const parent) : QWidget(parent) { const QString iconsDir = eSettings::sIconsDir(); - const QIcon leftIcon(iconsDir + "/left-arrow-black.png"); + const QIcon leftIcon(iconsDir + "/left-arrow.png"); const auto leftButton = new QPushButton(leftIcon, ""); leftButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); connect(leftButton, &QPushButton::released, @@ -42,7 +42,7 @@ TipsWidget::TipsWidget(QWidget* const parent) : QWidget(parent) { mNumber->setAlignment(Qt::AlignCenter); titleLayout->addWidget(mNumber); - const QIcon rightIcon(iconsDir + "/right-arrow-black.png"); + const QIcon rightIcon(iconsDir + "/right-arrow.png"); const auto rightButton = new QPushButton(rightIcon, ""); rightButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); connect(rightButton, &QPushButton::released, diff --git a/src/app/icons/capFlat.svg b/src/app/icons/capFlat.svg index f9444354a..86babce37 100755 --- a/src/app/icons/capFlat.svg +++ b/src/app/icons/capFlat.svg @@ -14,7 +14,7 @@ viewBox="0 0 4.4979169 4.4979168" version="1.1" id="svg1500" - inkscape:version="0.92.4 (unknown)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="capFlat.svg"> @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="-0.28272344" - inkscape:cy="2.4649131" + inkscape:cx="-16.175581" + inkscape:cy="2.1077702" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -73,7 +73,7 @@ x="899.5" y="158.25" /> @@ -26,7 +26,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="-0.28272344" + inkscape:cx="-16.354152" inkscape:cy="2.4649131" inkscape:document-units="mm" inkscape:current-layer="layer1" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -73,7 +73,7 @@ x="899.5" y="158.25" /> @@ -26,7 +26,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="-0.28272344" + inkscape:cx="-16.354152" inkscape:cy="2.4649131" inkscape:document-units="mm" inkscape:current-layer="layer1" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -78,7 +78,7 @@ height="12.830889" width="18.121752" id="rect5834" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.25763988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.25763988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/src/app/icons/childRecording.svg b/src/app/icons/childRecording.svg index a57106979..3f0935a0e 100755 --- a/src/app/icons/childRecording.svg +++ b/src/app/icons/childRecording.svg @@ -14,7 +14,7 @@ viewBox="0 0 5.2916669 5.2916668" version="1.1" id="svg1500" - inkscape:version="0.92.4 (unknown)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="childRecording.svg"> @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="8.857244" - inkscape:cy="13.148408" + inkscape:cx="-2.267756" + inkscape:cy="12.898408" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -59,7 +59,7 @@ id="layer1" transform="translate(-48.702232,-29.95982)"> @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.4" - inkscape:cx="-1.4660076" - inkscape:cy="7.7227616" + inkscape:cx="0.30498671" + inkscape:cy="10.108056" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -61,12 +61,12 @@ @@ -74,7 +74,7 @@ inkscape:connector-curvature="0" id="path1459" d="m 245.30817,-468.90379 -5.1875,5.1875" - style="fill:none;stroke:#000000;stroke-width:0.93706161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#ffffff;stroke-width:0.93706161;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> diff --git a/src/app/icons/dockClose.svg b/src/app/icons/dockClose.svg new file mode 100755 index 000000000..aed8f5741 --- /dev/null +++ b/src/app/icons/dockClose.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/app/icons/left-arrow-black.svg b/src/app/icons/dockMaximize.svg similarity index 53% rename from src/app/icons/left-arrow-black.svg rename to src/app/icons/dockMaximize.svg index 817d4d651..aadf90312 100644 --- a/src/app/icons/left-arrow-black.svg +++ b/src/app/icons/dockMaximize.svg @@ -9,15 +9,15 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="5" - height="7" - viewBox="0 0 1.3229166 1.8520834" + width="15" + height="16" + viewBox="0 0 3.9687502 4.2333334" version="1.1" - id="svg1468" + id="svg1500" inkscape:version="0.92.3 (2405546, 2018-03-11)" - sodipodi:docname="left-arrow-black.svg"> + sodipodi:docname="dockMaximize.svg"> + id="defs1494" /> + id="metadata1497"> image/svg+xml - + @@ -53,12 +57,20 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-295.1479)"> - + transform="translate(-48.702232,-31.018153)"> + + + diff --git a/src/app/icons/joinBevel.svg b/src/app/icons/joinBevel.svg index 27c0501b5..957139f48 100755 --- a/src/app/icons/joinBevel.svg +++ b/src/app/icons/joinBevel.svg @@ -14,7 +14,7 @@ viewBox="0 0 4.4979169 4.4979168" version="1.1" id="svg1500" - inkscape:version="0.92.4 (unknown)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="joinBevel.svg"> @@ -26,18 +26,18 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.4" - inkscape:cx="-1.4660076" - inkscape:cy="7.7227616" + inkscape:cx="-9.4124362" + inkscape:cy="7.5441902" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="g5801" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -73,7 +73,7 @@ id="rect5797" style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99951541;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> diff --git a/src/app/icons/joinMiter.svg b/src/app/icons/joinMiter.svg index 2b7f71203..0d388b86e 100755 --- a/src/app/icons/joinMiter.svg +++ b/src/app/icons/joinMiter.svg @@ -14,7 +14,7 @@ viewBox="0 0 4.4979169 4.4979168" version="1.1" id="svg1500" - inkscape:version="0.92.4 (unknown)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="joinMiter.svg"> @@ -26,18 +26,18 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.4" - inkscape:cx="-1.4660076" - inkscape:cy="7.7227616" + inkscape:cx="-9.4124362" + inkscape:cy="7.5441902" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="ink_join_miter" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -73,7 +73,7 @@ x="899.5" y="158.25" /> diff --git a/src/app/icons/joinRound.svg b/src/app/icons/joinRound.svg index 45c35cb07..48db50054 100755 --- a/src/app/icons/joinRound.svg +++ b/src/app/icons/joinRound.svg @@ -14,7 +14,7 @@ viewBox="0 0 4.4979169 4.4979168" version="1.1" id="svg1500" - inkscape:version="0.92.4 (unknown)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="joinRound.svg"> @@ -25,19 +25,19 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8" - inkscape:cx="-0.21257552" - inkscape:cy="-26.176757" + inkscape:zoom="15.839192" + inkscape:cx="-5.8869361" + inkscape:cy="2.7879313" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="g5814" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -76,7 +76,7 @@ inkscape:connector-curvature="0" id="path5812" d="m 911.41737,164.65644 c -7.16078,-0.12674 -10.87733,8.36833 -10.87733,8.36833 l 5.67507,5.74258 5.20226,-5.26414 5.20226,5.26414 5.67508,-5.74258 c 0,0 -3.71656,-8.24159 -10.87734,-8.36833 z" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.34493458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.34493458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" sodipodi:nodetypes="zcccccz" /> diff --git a/src/app/icons/noInterpolation/fill_brush.png b/src/app/icons/noInterpolation/fill_brush.png index eed99c2f3baf6171632d162ae29b11027a4beb37..ebbc8bcb035539e54f9a602441e71b4247acc2ea 100755 GIT binary patch delta 261 zcmV+g0s8*g0<{8=Bo78+OGiWi000000Qp0^e~~d5e+P6)O+^Rg0u~Y|C5#kyK>z>% z!bwCyR2b8BkUNTmKmbHb?L`(>5KIIE6Tz?p58|o3jj`YbJc4)%VFPh`{k+Xg#wn=m zL47;`eNY_7+j*Y8bI$W6>AJ2*TWi0!Z3}@f0i5Ug=6Rkm#vq9>4F4X%aU3a%0!h?$ zO`4{^Yd5&>JAL2NG!4G*ljk{Y+p?}J00Nk%32QBqsH%#t>u}E92{%}lC6Xx1l4V)m zssJd8qD>N#7>40-7=Vm1ha|Er<2a6wpz%EKl_UwyIR!!R^XdG5`K9~4!NdER00000 LNkvXXu0mjfl$CJb delta 318 zcmV-E0m1&Y0@(tPB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01Y|-01Y|;10o)U0000P zbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Q)=5M`R2Y?YP&u)+wm0sDGdGJntDr(Hl27j>9v? zSm${vh{(ej!#h@0MF3Pvy}t_Qd8Xqy1VG>Sf33U7aU4X0t-lJD>$*Qd5Kt)v+qTW!3){BYe|_Q8FFv%Z QBme*a07*qoM6N<$g3@b&S^xk5 diff --git a/src/app/icons/noInterpolation/fill_flat.png b/src/app/icons/noInterpolation/fill_flat.png index d393e038b66ad5d142d29f690ff0fbfc6d6e79a3..1d3e615865a4fbb7e4612f7b0389278d50daca06 100755 GIT binary patch delta 91 zcmdnY*uywMg`X|S+uel$41PNAuAgWq;mBU%>Fdh=lu1lT-6YY*s|F}3>FMGaB5^tS p&;S4b>)DhTgqbHMgeaDZFfnA#Vi8!QT~`1y!PC{xWt~$(699u`8TS|Iv5xjI14-?iy0Vrtw5NOSxK%HC@5Lt8c`CQpH@mmtT}V`<;yxP?3SBi(`ny)Z~=Z)W2uWpZ`Cdk^je!kIKf) xGiKaq|Ig9@q}bJJ)D)X1uADIO1_L|8)XzGR0+;3O`$tx4R1i82ohJT|d!KB89!g)7O>#DU+Cx7Jur@yP`lz8&4O<5Q)pl zJ{}%F^c55iD1fkv$`J((jSf*`Lxslw|NlQeqQUi%@so&=ky03tR Yp@~=bx6qf>OF@=+y85}Sb4q9e0JZ%pp#T5? delta 186 zcmZ3_c#Uy_N1$}5Xy875`gDCtl7g|&gk=IZYi}4lRTFya*0mm- jfwYvAlpjAnDjPGH8}ZjOUJ!f=G@rrK)z4*}Q$iB}g~UYJ diff --git a/src/app/icons/noInterpolation/fill_gradient_radial.png b/src/app/icons/noInterpolation/fill_gradient_radial.png index 6894e90457ff792c41f1d26c7a9dceee4d1c3f9d..67861f6cd061f553a968e91e7e35e5be460e3f6f 100755 GIT binary patch delta 224 zcmV<603ZL(0+0fbBo78+OGiWiU;tnMU}Y3$N|7-be+P6)O+^Rg0u~Z02;$~>_W%F@ zok>JNR2b8ZkRcAlAP_}gHzkNMlL~_7FdVuksp0^L27@37Dw?*tYWvlQm;WKW-*OTCTM6o^!*>igT06#urLIyg3*3EG}=1k?BA~d6@T~vkS758gg@R5aH#5M zO6j(3+qJbe09b3!5W*f~yo<FpKo9~4a|PIclWql$f1|g{j|3Q^Uckw}3e`;j)q{c7s}oa_7? k*PUMgNwN!#an<1J0p^k>$T5a+_y7O^07*qoM6N<$g5cgYcK`qY delta 164 zcmdnYcz|(&N5y!6t1dkt_!<4mxl`-w=(8q1)9X* M>FVdQ&MBb@00R^?-T(jq diff --git a/src/app/icons/noInterpolation/graphEnabled.png b/src/app/icons/noInterpolation/graphEnabled.png index 7a82b27b504f4c836be7780abe3f109a91208d8a..9fec01807234262d064319f959e380572ebf2462 100755 GIT binary patch delta 118 zcmdnOxSVl<3O`$tx4R3&e-K=-clqRrh7vLCC7!;n>`$4*c=RNu%oAS2z`$VQ>Eak7 zarx@mje-mcJck`xlNr9nPs&lSvf|KPRr@|b-N0h{ia53vW^!F#x9;?p%bsvL&3dCy WYuk@i2d@D2GkCiCxvX#-0(5s)7!gFX4`BQWD5)KzLxJ?0MyOk>FVdQ&MBb@04a+# A_y7O^ diff --git a/src/app/icons/noInterpolation/graphProperty.png b/src/app/icons/noInterpolation/graphProperty.png index 6ba895f904b15f8d8591bb6d4a4c431eb3c0a8e4..90dcf74be96e3285848d3b1cf3d73d22020667ca 100755 GIT binary patch delta 182 zcmV;n07?Jh0sjGzQGewE7ZDIM)upD_0001tNklnmtl+caNUhI`- zt$ixkV@vWj89HL;$hM(KHD#3B;|oW4r36RjFx?cAh`!adpf8zuz;!Add?FCgx*UZA kvetUFeVvClhO3#l1K>t7p@6DEq5uE@07*qoM6N<$fQi%dM?;q1CqU!OjipoCppy+6=gr2v+O-zME znT4K0NiU=-euW6%>|r<*z_LPe68)}+R`qb}{tw$n-U0A2ClNU~G>KsV000021sKV=dV(iZvlTy+Nn1B0Zei(`ny s<>WvA|NpONQ(_Qio|q7#SSrHAkU5J*V2yTN0ZmdKI;Vst0K0J;3IG5A delta 151 zcmeBS+{`#ZrJkkO$uool2x>S|Iv5xjI14-?iy0Vrtw5NOSxK%HC@5Lt8c`CQpH@mmtT}V`<;yxP?3SBi(`ny)Z~=Z)W2uWpZ`Cdk^je!kIKf) xGiKaq|Ig9@q}bJJ)D)X1uADIO1_L|8)XzGR0+;{XE)7O>#DU+Cxwzfkf z2S`Z6)5S4F;&Sqz|NsBjvneqMGf!+_J(iG?l5%7jLz?nMH9pqXo)CU_2Kx{mUgIMb R`+#~FJYD@<);T3K0RSV6ApigX delta 159 zcmbQuc#v^|R{ehlAY8C_`D6wL2F?PH$YKTtUMmo0WLA=E1q!m4c>21sKjz@#ma)=* z&a4g;^7C|Y43W6Jc7h>ag98VPc0yLVz)78&q Iol`;+06)Mv5&!@I diff --git a/src/app/icons/noInterpolation/settings_dots.png b/src/app/icons/noInterpolation/settings_dots.png index 67356fb660d3a92979a723c571f37edd5f01ed8e..3e06df2fe8e3da46a0bde261ef93a1b9cf001748 100755 GIT binary patch delta 84 zcmV-a0IUC(0iFSnQBCCn77Q&J$h2_z0000hNklf7IXu|EctrNA)~BJpUsl h0vLTJG5Q)aGnDLNXSf}CRtl(|!PC{xWt~$(6952$8HE4< diff --git a/src/app/icons/noInterpolation/split_h.png b/src/app/icons/noInterpolation/split_h.png index ebbf8b5b9c8cb0942feabffbe776b324eae3caec..05d540ab5185a02adda3d7ddfb41d7fd4317d703 100755 GIT binary patch delta 121 zcmdnSxQcOt3O`$tx4R3&e-K=-clqRrh7$4YC7!;n>`$4*c=XuvChDDMU|=x!ba4!k zxO{iQMotC=fg_778h-1qY`x39QPgpRS!`d(^eb#3?@F%R5HFRJo5}vKkINvWKfmlf ZcWI;4QT^~2CxJ#Vc)I$ztaD0e0sxn#Ev*0m delta 154 zcmZ3*xQ%gwNCsGq^p)z4*}Q$iB}ACfV0 diff --git a/src/app/icons/noInterpolation/split_v.png b/src/app/icons/noInterpolation/split_v.png index a8c814386d1815965816eb4d4f0d9e064a50dc0a..3c7fdf87b2eb28d988345476345cd19441367802 100755 GIT binary patch delta 120 zcmdnNxRP;#3O`$tx4R3&e-K=-clqRrh7xh?C7!;n>`$4*c=UvseNL$`Fff>Tx;TbN zT;AKalb1n3puyrX!@K=UwlkKM*|kob#p3kVA=!7)F2MlZm=AtkmoLlwHjitxQ7L9{ XcrABSzge~cXaa+$tDnm{r-UW|3kNGb delta 156 zcmZ3#sAf}q^}&k zX=NgC;)9~R*{6$d`@)OF7+y5D-Rk6D5m=+xbz0P-;h@05Tc5R70!?7>boFyt=akR{ E0N@8U=>Px# diff --git a/src/app/icons/notRecording.svg b/src/app/icons/notRecording.svg index 9914c0e3c..a489e9dff 100755 --- a/src/app/icons/notRecording.svg +++ b/src/app/icons/notRecording.svg @@ -14,7 +14,7 @@ viewBox="0 0 5.2916669 5.2916668" version="1.1" id="svg1500" - inkscape:version="0.92.4 (unknown)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="notRecording.svg"> @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="8.857244" - inkscape:cy="13.148408" + inkscape:cx="-2.267756" + inkscape:cy="12.898408" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -59,7 +59,7 @@ id="layer1" transform="translate(-48.702232,-29.95982)"> @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="7.7472143" - inkscape:cy="28.298054" + inkscape:zoom="8" + inkscape:cx="-9.0622981" + inkscape:cy="6.402742" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -36,8 +36,8 @@ fit-margin-right="0" fit-margin-bottom="0" units="px" - inkscape:window-width="1918" - inkscape:window-height="1055" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" /> @@ -49,7 +49,7 @@ image/svg+xml - + @@ -59,7 +59,7 @@ id="layer1" transform="translate(-48.702232,-29.95982)"> - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/src/app/icons/toolbarButtons/checkedBg.svg b/src/app/icons/toolbarButtons/checkedBg.svg index 60fa71631..9c9246516 100644 --- a/src/app/icons/toolbarButtons/checkedBg.svg +++ b/src/app/icons/toolbarButtons/checkedBg.svg @@ -5,7 +5,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="25" @@ -13,33 +12,10 @@ viewBox="0 0 6.6145832 6.6145835" version="1.1" id="svg1468" - inkscape:version="1.0.2 (1.0.2+r75+1)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="checkedBg.svg"> - - - - - - + id="defs1462" /> image/svg+xml - + @@ -85,12 +61,20 @@ id="layer1" transform="translate(0.13229161,-290.5177)"> + + style="opacity:1;fill:#191919;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25116685;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> diff --git a/src/app/icons/toolbarButtons/plain/newEmpty.svg b/src/app/icons/toolbarButtons/plain/newEmpty.svg index d206e9b77..5304b8ce3 100644 --- a/src/app/icons/toolbarButtons/plain/newEmpty.svg +++ b/src/app/icons/toolbarButtons/plain/newEmpty.svg @@ -12,7 +12,7 @@ viewBox="0 0 6.6145832 6.6145835" version="1.1" id="svg1468" - inkscape:version="1.0.2 (1.0.2+r75+1)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="newEmpty.svg"> @@ -23,15 +23,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="21.72" - inkscape:cx="12.5" - inkscape:cy="12.5" + inkscape:zoom="4" + inkscape:cx="-91.159147" + inkscape:cy="35.472549" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="1366" - inkscape:window-height="737" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -44,7 +44,7 @@ image/svg+xml - + @@ -53,9 +53,17 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-290.3854)"> + + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58329964px;line-height:1.25;font-family:Chilanka;-inkscape-font-specification:Chilanka;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#f9f9f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.22490107;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" + d="m 4.3614841,293.52636 c -0.078934,0 -0.1461819,0.0277 -0.2017426,0.0833 -0.055561,0.0556 -0.083328,0.12279 -0.083328,0.20174 v 0.68198 H 3.3944354 c -0.078943,0 -0.1461903,0.0277 -0.2017427,0.0833 -0.055552,0.0555 -0.083328,0.1228 -0.083328,0.20174 0,0.0789 0.027776,0.14619 0.083328,0.20175 0.055552,0.0556 0.1227998,0.0833 0.2017427,0.0833 H 4.076413 v 0.68198 c 0,0.0789 0.027768,0.14618 0.083328,0.20174 0.05555,0.0556 0.1227979,0.0833 0.2017425,0.0833 0.078934,0 0.1461821,-0.0277 0.2017427,-0.0833 0.055561,-0.0556 0.083328,-0.12279 0.083328,-0.20174 v -0.68198 h 0.6819776 c 0.078943,0 0.1461904,-0.0277 0.2017427,-0.0833 0.055553,-0.0556 0.083328,-0.1228 0.083328,-0.20175 0,-0.0789 -0.027776,-0.14618 -0.083328,-0.20174 -0.055552,-0.0556 -0.1228001,-0.0833 -0.2017427,-0.0833 H 4.6465553 v -0.68198 c 0,-0.0789 -0.027768,-0.14619 -0.083328,-0.20174 -0.055549,-0.0556 -0.1227978,-0.0833 -0.2017432,-0.0833 z m 5.7e-6,0.11222 c -0.052576,0 -0.086082,0.0132 -0.1227999,0.05 -0.036768,0.0367 -0.049558,0.0698 -0.049558,0.12236 v 0.79425 h -0.794252 c -0.052589,0 -0.085655,0.0146 -0.1223614,0.0513 -0.036662,0.0367 -0.049997,0.0703 -0.049997,0.1228 0,0.0525 0.013275,0.0843 0.049997,0.12104 0.036706,0.0367 0.069773,0.0514 0.1223614,0.0514 h 0.7942518 v 0.59645 h 0.3447166 v -0.59645 h 0.6240864 v -0.34648 H 4.5338481 V 293.811 c 0,-0.0525 -0.01328,-0.0856 -0.049997,-0.12236 -0.036701,-0.0367 -0.06977,-0.05 -0.1223614,-0.05 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="scscscscscscscscscscscscsccscscscscccccccsccc" /> diff --git a/src/app/icons/toolbarButtons/plain/nodeConnect.svg b/src/app/icons/toolbarButtons/plain/nodeConnect.svg index 91bd7eb78..0f550f1e7 100644 --- a/src/app/icons/toolbarButtons/plain/nodeConnect.svg +++ b/src/app/icons/toolbarButtons/plain/nodeConnect.svg @@ -12,7 +12,7 @@ viewBox="0 0 6.6145832 6.6145835" version="1.1" id="svg1468" - inkscape:version="1.0.2 (1.0.2+r75+1)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="nodeConnect.svg"> @@ -24,14 +24,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="16" - inkscape:cx="4.0843754" - inkscape:cy="14.815761" + inkscape:cx="-7.0406246" + inkscape:cy="14.565761" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="1366" - inkscape:window-height="737" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -44,7 +44,7 @@ image/svg+xml - + @@ -53,10 +53,28 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-290.3854)"> - + + + + + diff --git a/src/app/icons/toolbarButtons/plain/nodeDisconnect.svg b/src/app/icons/toolbarButtons/plain/nodeDisconnect.svg index cb41789d3..7d22c892a 100644 --- a/src/app/icons/toolbarButtons/plain/nodeDisconnect.svg +++ b/src/app/icons/toolbarButtons/plain/nodeDisconnect.svg @@ -12,7 +12,7 @@ viewBox="0 0 6.6145832 6.6145835" version="1.1" id="svg1468" - inkscape:version="1.0.2 (1.0.2+r75+1)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="nodeDisconnect.svg"> @@ -24,14 +24,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="12.624874" - inkscape:cy="15.858504" + inkscape:cx="3.6481189" + inkscape:cy="1.8108162" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="1366" - inkscape:window-height="737" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -44,7 +44,7 @@ image/svg+xml - + @@ -53,10 +53,24 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-290.3854)"> + + + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccc" /> diff --git a/src/app/icons/toolbarButtons/plain/nodeNew.svg b/src/app/icons/toolbarButtons/plain/nodeNew.svg index 0797c990f..e2d350655 100644 --- a/src/app/icons/toolbarButtons/plain/nodeNew.svg +++ b/src/app/icons/toolbarButtons/plain/nodeNew.svg @@ -12,7 +12,7 @@ viewBox="0 0 6.6145832 6.6145835" version="1.1" id="svg1468" - inkscape:version="1.0.2 (1.0.2+r75+1)" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="nodeNew.svg"> @@ -24,14 +24,14 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="15.839192" - inkscape:cx="12.706377" - inkscape:cy="12.233989" + inkscape:cx="-11.194986" + inkscape:cy="8.1172093" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" units="px" - inkscape:window-width="1366" - inkscape:window-height="737" + inkscape:window-width="1920" + inkscape:window-height="1054" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -44,7 +44,7 @@ image/svg+xml - + @@ -55,7 +55,24 @@ transform="translate(0,-290.3854)"> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58329964px;line-height:1.25;font-family:Chilanka;-inkscape-font-specification:Chilanka;letter-spacing:0px;word-spacing:0px;fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:0.19299006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 4.2445538,292.55963 c -0.067734,0 -0.1254402,0.0238 -0.1731174,0.0715 -0.047677,0.0477 -0.071505,0.10537 -0.071505,0.17312 v 0.58521 H 3.4147188 c -0.067742,0 -0.1254475,0.0238 -0.1731176,0.0715 -0.04767,0.0476 -0.071505,0.10538 -0.071505,0.17312 0,0.0677 0.023835,0.12545 0.071505,0.17313 0.04767,0.0477 0.1053759,0.0715 0.1731176,0.0715 h 0.5852125 v 0.58521 c 0,0.0677 0.023828,0.12544 0.071505,0.17312 0.047667,0.0477 0.1053741,0.0715 0.1731174,0.0715 0.067734,0 0.1254404,-0.0238 0.1731176,-0.0715 0.047677,-0.0477 0.071505,-0.10537 0.071505,-0.17312 v -0.58521 h 0.5852125 c 0.067742,0 0.1254475,-0.0238 0.1731176,-0.0715 0.04767,-0.0477 0.071505,-0.10539 0.071505,-0.17313 0,-0.0677 -0.023835,-0.12544 -0.071505,-0.17312 -0.04767,-0.0477 -0.1053761,-0.0715 -0.1731176,-0.0715 h -0.585212 v -0.58521 c 0,-0.0677 -0.023828,-0.12545 -0.071505,-0.17312 -0.047667,-0.0477 -0.1053742,-0.0715 -0.173118,-0.0715 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="scscscscscscscscssscscscs" /> + + + + diff --git a/src/app/icons/toolbarButtons/uncheckedBg.svg b/src/app/icons/toolbarButtons/uncheckedBg.svg index be2a5fbdf..c5b81726d 100644 --- a/src/app/icons/toolbarButtons/uncheckedBg.svg +++ b/src/app/icons/toolbarButtons/uncheckedBg.svg @@ -24,8 +24,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.4" - inkscape:cx="-4.291524" - inkscape:cy="12.842407" + inkscape:cx="2.5140824" + inkscape:cy="16.33536" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -60,13 +60,18 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0.13229161,-290.5177)"> - + + + diff --git a/src/app/pixmaps/down-arrow.png b/src/app/pixmaps/down-arrow.png index 6e34ccc4041f1698522a34f336c8c53278418d79..bf76a5372ec82ee8962e8b789f241e972e2b52eb 100644 GIT binary patch delta 107 zcmV-x0F?i;0kr{;QDo%;7Y#QF+)$Sk0000&NklE*TKUB?d>900000 LNkvXXu0mjf%$Oz= diff --git a/src/app/pixmaps/up-arrow.png b/src/app/pixmaps/up-arrow.png index e3aed75f3b09fa172833ccc57ceb6d87b033d54f..d5e8ece3ece54bbf11aa16614b1435f51e6065c4 100644 GIT binary patch delta 104 zcmV-u0GI!{0kQ#*QDNl*7Y#QJ+dWea0000#NklJA5CFhWC=AokyO=YW z=m;)F$0`<{g;+?u_98kY9LO=k;<1lWaQ3_~zcHcuYRG}rzwHKL7h8&B8aZYF0000< KMNUMnLSTaRL@0^? delta 111 zcmV-#0FeK(0l5K?QE2209}N-{cp3Ym0000+NklKYgJve#+2a=yMUhE?*xGO$b8%#JWv|UI61>5j6BYx;Q3%kXq Rr?CJ4002ovPDHLkV1kj{C*c49 diff --git a/src/app/stylesheet.qss b/src/app/stylesheet.qss index bd8955cee..4380294a3 100755 --- a/src/app/stylesheet.qss +++ b/src/app/stylesheet.qss @@ -10,16 +10,15 @@ QWidget#transparentWidget { QWidget#colorLabel { background: black; - border: 1px solid black; padding-left: -1px; } QLineEdit#comboEdit { - background: rgb(200, 200, 200); + background: rgb(75, 75, 75); } QLineEdit#comboEdit:focus { - background: rgb(255, 255, 255); + background: rgb(100, 100, 100); } QMainWindow::separator { @@ -28,12 +27,8 @@ QMainWindow::separator { height: 8px; } -/*QCheckBox { - border: 1px solid white; -}*/ - QCheckBox::indicator, QGroupBox::indicator { - border: 1px solid rgb(255, 255, 255); + border: 1px solid white; border-radius: 2px; } @@ -56,88 +51,81 @@ QCheckBox::indicator:disabled, QGroupBox::indicator:disabled { } QWidget#darkWidget { - background: rgb(45, 45, 45); + background: rgb(50, 50, 50); } QWidget#menuBarWidget { - border-top: 0; - border-bottom: 1px solid black; - color: black; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 lightgray, stop:1 darkgray); + color: white; + background-color: rgb(25, 25, 25); } QComboBox { - background-color: rgb(200, 200, 200); - border: 1px solid black; + background-color: rgb(25, 25, 25); border-radius: 5px; -/* border-top-right-radius: 8px */ -/* border-bottom-right-radius: 8px */ - /*min-width: 6em;*/ - color: black; - padding: 0px 5px 0px 5px; + color: white; + padding: 0px 10px 0px 10px; +} + +QComboBox#blendModeCombo { + border-bottom-left-radius: 0px; + border-top-left-radius: 0px; } -QComboBox:on { /* shift the text when the popup opens */ +QComboBox:on { border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; } QComboBox:disabled { - background-color: rgb(180, 180, 180); - border: 1px solid rgb(60, 60, 60); - color: rgb(60, 60, 60); + background-color: rgb(75, 75, 75); + color: rgb(150, 150, 150); } QComboBox::drop-down { margin: -1 -1 -1 -1; - background-color: rgb(50, 50, 50); + background-color: rgb(25, 25, 25); width: 1em; - border: 1px solid black; - border-left-width: 1px; - border-left-color: black; - border-left-style: solid; /* just a single line */ - border-top-right-radius: 5px; /* same radius as the QComboBox */ + border-top-right-radius: 5px; border-bottom-right-radius: 5px; } QComboBox::drop-down:hover { - background-color: rgb(70, 70, 70); + background-color: rgb(75, 75, 75); } QComboBox::drop-down:pressed { - background-color: rgb(30, 30, 30); + background-color: rgb(100, 100, 100); } QComboBox::drop-down:on { border-bottom-right-radius: 0px; } +QComboBox::item:selected { + border: 0; + background-color: rgb(75, 75, 75); +} + QAbstractItemView { - background-color: rgb(255, 255, 255); - color: black; - border: 1px solid black; - selection-background-color: rgb(200, 200, 200); - selection-color: black; + border: 0; + background-color: rgb(50, 50, 50); + color: white; + selection-background-color: rgb(75, 75, 75); } QMenu { - background-color: rgb(255, 255, 255); - border: 1px solid black; -/* margin-top: -1px;*/ -/* padding-top: -1px;*/ + background-color: rgb(50, 50, 50); } QMenu::item { padding: 2px 25px 2px 25px; background: transparent; - color: black; + color: white; } QMenu::item:selected { - background-color: rgb(200, 200, 200); - color: black; + background-color: rgb(100, 100, 100); } QMenu::item:disabled { @@ -145,10 +133,8 @@ QMenu::item:disabled { } QMenuBar { - color: black; - border-bottom: 1px solid black; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 lightgray, stop:1 darkgray); + color: white; + background-color: rgb(25, 25, 25); } QMenuBar::item, @@ -159,40 +145,36 @@ QPushButton#QActionButton { } QMenuBar::item:selected, -QPushButton#QActionButton:hover { /* when selected using mouse or keyboard */ - background: #a8a8a8; +QPushButton#QActionButton:hover { + background: rgb(75, 75, 75); } QMenuBar::item:disabled, QPushButton#QActionButton:disabled { - color: rgb(60, 60, 60); + color: rgb(75, 75, 75); } QMenuBar::item:pressed, QPushButton#QActionButton:pressed { - background: #888888; + background: rgb(100, 100, 100); } QComboBox QScrollBar { - border-top: 0px solid black; - border-bottom: 0px solid black; - background-color: rgb(170, 170, 170); + border: 0; + background-color: rgb(175, 175, 175); } QComboBox:focus { - color: black; - background-color: rgb(255, 255, 255); + background-color: rgb(50, 50, 50); padding: 0px 5px 0px 5px; } QComboBox QScrollBar::sub-line { - border-right: 0px solid black; - border-top: 0px solid black; + border-right: 0; } QComboBox QScrollBar::add-line { - border-right: 0px solid black; - border-bottom: 0px solid black; + border-right: 0; } QLabel { @@ -204,9 +186,8 @@ QLabel#errorLabel { } QLabel#messageLabel { - background: rgb(60, 60, 60); + background: rgb(50, 50, 50); color: white; - border: 1px solid black; font-size: 15pt; padding: 1em; } @@ -217,37 +198,35 @@ QWidget:disabled { QLabel#dockLabel { border: 0; - border-bottom: 1px solid black; padding-bottom: 1px; padding-top: 1px; - color: black; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 lightgray, stop:1 darkgray); + color: white; + background-color: rgb(25, 25, 25); } QDockWidget { - color: black; + border: 0; + color: white; } QDockWidget::title { text-align: center; border: 0; - border-bottom: 1px solid black; padding-bottom: 1px; padding-top: 1px; - color: black; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 lightgray, stop:1 darkgray); + color: white; + background-color: rgb(25, 25, 25); } -QLabel#blackTextLabel { - color: black; +QDockWidget::close-button, QDockWidget::float-button { + border: none; background: transparent; + padding: 1px; +} + +QDockWidget::close-button:hover, QDockWidget::float-button:hover { + background: rgb(50, 50, 50); } -/*QMenuBar { - color: white; - background-color: rgb(50, 50, 50); -}*/ QTabBar { qproperty-drawBase: 0; @@ -255,64 +234,54 @@ QTabBar { QTabBar::tab { color: white; - border: 1px solid black; - border-bottom: 1px transparent black; - background-color: rgb(88, 88, 88); + background-color: rgb(50, 50, 50); padding: 5px; min-width: 50px; border-top-left-radius: 2px; border-top-right-radius: 2px; } +QTabBar::tab:hover { + background-color: rgb(75, 75, 75); +} + QTabBar::tab:selected { - color: black; - background-color: rgb(144, 144, 144); - border: 1px solid black; - border-bottom: 1px transparent black; + background-color: rgb(100, 100, 100); border-top-left-radius: 2px; border-top-right-radius: 2px; } QTabBar::tab:disabled:selected { color: darkgray; - background-color: rgb(120, 120, 120); - border: 1px solid rgb(60, 60, 60); + background-color: rgb(125, 125, 125); } QTabBar::tab:disabled:!selected { background-color: rgb(100, 100, 100); - border: 1px solid rgb(60, 60, 60); color: gray; } -QTabBar::tab:hover:!selected { - background-color: rgb(100, 100, 100); -} - QTabWidget { - border: 0px transparent black; + border: 0; } QTabWidget::pane { - border: 1px solid #76797C; + border: 0; padding: 5px; margin: 0px; } QSpinBox, QDoubleSpinBox, QLineEdit { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(200, 200, 200), - stop:0.5 rgb(188, 188, 188)); - border: 1px solid black; + background: rgb(75, 75, 75); border-radius: 5px; - color: black; + color: white; outline: none; padding: 2px 2px 2px 2px } QComboBox > QLineEdit { border: 0; + padding: 0; } QAbstractSpinBox:up-button, @@ -345,15 +314,28 @@ QSpinBox::down-arrow, QDoubleSpinBox::down-arrow { QPushButton { qproperty-iconSize: 17px; - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(200, 200, 200), - stop:0.5 rgb(188, 188, 188)); - border: 1px solid black; + background: rgb(50, 50, 50); border-radius: 5px; - color: black; + color: white; outline: none; - padding: 2px 2px 2px 2px + padding: 2px 10px 2px 10px +} + +QPushButton:hover { + background: rgb(75, 75, 75); +} + +QPushButton:pressed { + background: rgb(100, 100, 100); +} + +QPushButton:checked { + background: rgb(100, 100, 100); + color: white; +} + +QPushButton:disabled { + color: rgb(150, 150, 150); } QPushButton#dialogButton { @@ -368,8 +350,6 @@ QPushButton#iconButton { QPushButton#addCanvasButton { border-top-right-radius: 0; border-bottom-right-radius: 0; - border-right: 0px solid black; - border-left: 0px solid black; } QPushButton#addCanvasButton, @@ -382,14 +362,13 @@ QPushButton#removeCanvasButton { QPushButton#complexTaskCancel { border-radius: 0; border: 0; - border-right: 1px solid black; - background: rgb(40, 40, 40); + background: rgb(50, 50, 50); color: white; } QPushButton#complexTaskCancel:hover { - background: white; - color: black; + background: rgb(75, 75, 75); + color: white; } QPushButton#topButton { @@ -419,79 +398,6 @@ QComboBox#currentLayoutComboBox::drop-down { border-bottom-left-radius: 5px; } -QPushButton:hover { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(215, 215, 215), - stop:0.8 rgb(188, 188, 188)); -} - -QPushButton:pressed { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(235, 235, 235), - stop:0.8 rgb(208, 208, 208)); -} - -QPushButton:hover:checked { -background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(80, 80, 80), - stop:0.8 rgb(50, 50, 50)); -} - -QPushButton:checked { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(70, 70, 70), - stop:0.5 rgb(50, 50, 50)); - color: white; -} - -QPushButton:disabled { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(160, 160, 160), - stop:0.5 rgb(148, 148, 148)); - color: rgb(65, 65, 65); -} - -QPushButton#darkButton { - color: white; - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(125, 125, 125), - stop:0.5 rgb(60, 60, 60)); -} - -QPushButton#darkButton:disabled { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(160, 160, 160), - stop:0.5 rgb(148, 148, 148)); - color: rgb(200, 200, 200); -} - -QPushButton#middleButton, -QPushButton#rightButton, -QPushButton#leftButton { - color: white; - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(70, 70, 70), - stop:0.5 rgb(50, 50, 50)); -} - -QPushButton#middleButton:disabled, -QPushButton#rightButton:disabled, -QPushButton#leftButton:disabled { - color: rgb(200, 200, 200) ; - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(110, 110, 110), - stop:0.5 rgb(80, 80, 80)); -} - QPushButton#middleButton { border-radius: 0px; border-right: 0; @@ -508,26 +414,6 @@ QPushButton#leftButton { border-right: 0; } -QPushButton#middleButton:checked, -QPushButton#rightButton:checked, -QPushButton#leftButton:checked { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(85, 175, 235), - stop:0.5 rgb(60, 150, 200)); - color: black; -} - -QPushButton#middleButton:checked:disabled, -QPushButton#rightButton:checked:disabled, -QPushButton#leftButton:checked:disabled { - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0 rgb(85, 125, 180), - stop:0.5 rgb(60, 120, 160)); - color: rgb(60, 60, 60); -} - QPushButton#renderSettings { color: lightblue; background: transparent; @@ -539,23 +425,19 @@ QPushButton#renderSettings:hover { } QToolBar { + border: 0; spacing: 4; - background: qlineargradient(x1:0, y1:0, - x2:0, y2:1, - stop:0.5 rgb(110, 110, 110), - stop:1 rgb(90, 90, 90)); - border-bottom: 1px solid black; } QToolBar::separator { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 rgba(0, 0, 0, 0), - stop:0.5 black, - stop:1 rgba(0, 0, 0, 0)); + stop:0 rgba(255, 255, 255, 0), + stop:0.5 rgba(255, 255, 255, 50), + stop:1 rgba(255, 255, 255, 0)); width: 1px; /* when vertical */ height: 1px; /* when horizontal */ - margin: 4px 4px 4px 4px + margin: 10px 10px 10px 10px } QScrollBar::add-page, QScrollBar::sub-page { @@ -569,7 +451,6 @@ QScrollBar { QComboBox QScrollBar { background-color: rgb(50, 50, 50); - border-right: 0px solid black; } QScrollBar::sub-line { @@ -650,37 +531,25 @@ QScrollBar::sub-line:horizontal { } QProgressBar { - border: 1px solid black; + border: 0; color: transparent; } QProgressBar::chunk { - background-color: green; + background-color: rgb(125, 125, 125); + background-color: white; width: 5px; } -QProgressBar#task, -QProgressBar#hardwareUsage { - border: 0; - background-color: rgb(40, 40, 40); -} - QProgressBar#hardwareUsage::chunk { - background-color: white; - width: 5px; margin: 0.5px; } -QProgressBar#task::chunk { - background-color: white; - width: 5px; -} - QToolButton { padding: 1px 4px; - background: transparent; + background: rgb(50, 50, 50); border-radius: 4px; - color: black; + color: white; margin-top: 10; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px; @@ -689,64 +558,66 @@ QToolButton { } QToolButton:hover { - background: rgba(0, 0, 0, 30); + background: rgb(75, 75, 75); } QToolButton:pressed { - background: rgba(0, 0, 0, 50); + background: rgb(100, 100, 100); } QToolButton:checked { - background: rgb(60, 60, 60); - color: white; + background: rgb(100, 100, 100); } -/*QToolButton#customToolButton { - padding: 1px 4px; - background: transparent; - border-radius: 4px; - color: black; - margin-top: 10; - border-bottom-right-radius: 0px; - border-bottom-left-radius: 0px; - padding-bottom: 9; - margin-bottom: 1; +QToolButton:disabled { + color: white; } -/*QToolButton#inactiveToolButton { - padding: 1px 4px; +QToolButton#inactiveToolButton, +QToolButton#emptyToolButton { background: transparent; - border-radius: 4px; - color: black; - margin-top: 10; - border-bottom-right-radius: 0px; - border-bottom-left-radius: 0px; - padding-bottom: 9; - margin-bottom: 1; -}*/ +} QToolButton#emptyToolButton { height: 1px; } -QToolButton#inactiveToolButton:hover, -QToolButton#emptyToolButton:hover { - background: transparent; +QToolTip { + border: 0; + background: rgb(25, 25, 25); + color: white; + padding: 0.1em; } -QToolButton#inactiveToolButton:pressed, -QToolButton#emptyToolButton:pressed { - background: transparent; +QMainWindow > QStatusBar { + background: rgb(50, 50, 50); } -QToolButton#inactiveToolButton:checked, -QToolButton#emptyToolButton:checked { - background: transparent; +QSlider { + border: 0; + border-radius: 7px; + background: rgb(100, 100, 100); } -QToolTip { - background: rgb(60, 60, 60); - color: white; - border: 1px solid black; - padding: 0.1em; +QSlider:disabled { + background: rgb(150, 150, 150); +} + +QSlider::groove { + border: 0; +} + +QSlider::handle { + background: rgb(175, 175, 175); + border-radius: 7px; + height: 15px; + width: 15px; +} + +QSlider::handle:hover { + background: rgb(200, 200, 200); +} + +QSlider::handle:pressed { + background: white; }