diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt index 78a4f98633..979640ff3c 100644 --- a/mscore/CMakeLists.txt +++ b/mscore/CMakeLists.txt @@ -94,6 +94,7 @@ QT4_WRAP_CPP (mocs inspectorLasso.h inspectorVolta.h inspectorOttava.h inspectorTrill.h inspectorHairpin.h qmlplugin.h palettebox.h workspace.h pluginManager.h inspectorJump.h inspectorMarker.h inspectorGlissando.h inspectorNote.h + paletteBoxButton.h ${OMR_MOCS} ${SCRIPT_MOCS} ) @@ -198,7 +199,7 @@ add_executable ( ${ExecutableName} inspectorHairpin.cpp qmlplugin.cpp editlyrics.cpp musicxmlsupport.cpp exportxml.cpp importxml.cpp importxmlfirstpass.cpp savePositions.cpp pluginManager.cpp inspectorJump.cpp inspectorMarker.cpp - inspectorGlissando.cpp inspectorNote.cpp + inspectorGlissando.cpp inspectorNote.cpp paletteBoxButton.cpp ${OMR_FILES} ${AUDIO} ${SCRIPT_FILES} diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp index 9e1ff62e01..87a00602aa 100644 --- a/mscore/musescore.cpp +++ b/mscore/musescore.cpp @@ -2348,7 +2348,8 @@ int main(int argc, char* av[]) if (!converterMode) { switch(preferences.globalStyle) { case STYLE_DARK: { - QApplication::setStyle(new MgStyle); + MgStyle* st = new MgStyle; + QApplication::setStyle(st); qApp->setStyleSheet(appStyleSheet()); QPalette p(QApplication::palette()); p.setColor(QPalette::Window, QColor(0x52, 0x52, 0x52)); diff --git a/mscore/palette.cpp b/mscore/palette.cpp index 43a288cfd1..6dbfe7f910 100644 --- a/mscore/palette.cpp +++ b/mscore/palette.cpp @@ -37,6 +37,7 @@ #include "libmscore/qzipreader_p.h" #include "libmscore/qzipwriter_p.h" #include "libmscore/slur.h" +#include "paletteBoxButton.h" //--------------------------------------------------------- // needsStaff @@ -515,8 +516,14 @@ void Palette::paintEvent(QPaintEvent* event) QPainter p(this); p.setRenderHint(QPainter::Antialiasing, true); - p.fillRect(event->rect(), p.background().color()); + QColor bgColor(0xf6, 0xf0, 0xda); +#if 1 + p.setBrush(QColor(0xf6, 0xf0, 0xda)); + p.drawRoundedRect(0, 0, width()-3, height(), 2, 2); +#else + p.fillRect(event->rect(), QColor(0xf6, 0xf0, 0xda)); +#endif // // draw grid // @@ -542,16 +549,18 @@ void Palette::paintEvent(QPaintEvent* event) // draw symbols // - QPen pen(palette().color(QPalette::Normal, QPalette::Text)); + // QPen pen(palette().color(QPalette::Normal, QPalette::Text)); + QPen pen(Qt::black); pen.setWidthF(MScore::defaultStyle()->valueS(ST_staffLineWidth).val() * PALETTE_SPATIUM * extraMag); for (int idx = 0; idx < cells.size(); ++idx) { - QRect r = idxRect(idx); + int yoffset = gscore->spatium() * _yOffset; + QRect r = idxRect(idx).translated(0, yoffset); p.setPen(pen); if (idx == selectedIdx) - p.fillRect(r, palette().color(QPalette::Normal, QPalette::Highlight)); + p.fillRect(r, bgColor.light(200)); else if (idx == currentIdx) - p.fillRect(r, p.background().color().light(118)); + p.fillRect(r, bgColor.light(118)); if (cells.isEmpty() || cells[idx] == 0) continue; @@ -837,9 +846,9 @@ void Palette::dropEvent(QDropEvent* event) // write //--------------------------------------------------------- -void Palette::write(Xml& xml, const QString& name) const +void Palette::write(Xml& xml) const { - xml.stag(QString("Palette name=\"%1\"").arg(Xml::xmlString(name))); + xml.stag(QString("Palette name=\"%1\"").arg(Xml::xmlString(_name))); xml.tag("gridWidth", hgrid); xml.tag("gridHeight", vgrid); if (extraMag != 1.0) @@ -1060,7 +1069,7 @@ void Palette::write(const QString& p) Xml xml(&cbuf); xml.header(); xml.stag("museScore version=\"" MSC_VERSION "\""); - write(xml, name()); + write(xml); xml.etag(); cbuf.close(); f.addFile("palette.xml", cbuf.data()); @@ -1218,117 +1227,6 @@ void Palette::actionToggled(bool /*val*/) update(); } -//--------------------------------------------------------- -// PaletteBoxButton -//--------------------------------------------------------- - -PaletteBoxButton::PaletteBoxButton(Palette* p, QWidget* parent) - : QToolButton(parent) - { - palette = p; - setCheckable(true); - setFocusPolicy(Qt::NoFocus); - connect(this, SIGNAL(clicked(bool)), this, SLOT(showPalette(bool))); - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); - setText(qApp->translate("Palette", palette->name().toUtf8())); - setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - // setArrowType(Qt::RightArrow); - showPalette(false); - } - -void PaletteBoxButton::contextMenuEvent(QContextMenuEvent* event) - { - QMenu menu; - - QAction* actionProperties = menu.addAction(tr("Palette Properties...")); - QAction* actionInsert = menu.addAction(tr("Insert New Palette...")); - QAction* actionUp = menu.addAction(tr("Move Palette Up")); - QAction* actionDown = menu.addAction(tr("Move Palette Down")); - QAction* actionEdit = menu.addAction(tr("Enable Editing")); - actionEdit->setChecked(!palette->readOnly()); - bool _systemPalette = palette->systemPalette(); - actionProperties->setDisabled(_systemPalette); - actionInsert->setDisabled(_systemPalette); - actionUp->setDisabled(_systemPalette); - actionDown->setDisabled(_systemPalette); - actionEdit->setDisabled(_systemPalette); - - menu.addSeparator(); - QAction* actionSave = menu.addAction(tr("Save Palette")); - QAction* actionLoad = menu.addAction(tr("Load Palette")); - actionLoad->setDisabled(_systemPalette); - - menu.addSeparator(); - QAction* actionDelete = menu.addAction(tr("Delete Palette")); - actionDelete->setDisabled(_systemPalette); - - QAction* action = menu.exec(mapToGlobal(event->pos())); - if (action == actionProperties) - propertiesTriggered(); - else if (action == actionInsert) - newTriggered(); - else if (action == actionUp) - upTriggered(); - else if (action == actionDown) - downTriggered(); - else if (action == actionEdit) - enableEditing(action->isChecked()); - else if (action == actionSave) - saveTriggered(); - else if (action == actionLoad) - loadTriggered(); - else if (action == actionDelete) - deleteTriggered(); - } - -//--------------------------------------------------------- -// enableEditing -//--------------------------------------------------------- - -void PaletteBoxButton::enableEditing(bool val) - { - palette->setReadOnly(!val); - } - -//--------------------------------------------------------- -// changeEvent -//--------------------------------------------------------- - -void PaletteBoxButton::changeEvent(QEvent* ev) - { - if (ev->type() == QEvent::FontChange) - setFixedHeight(QFontMetrics(font()).height() + 2); - } - -//--------------------------------------------------------- -// showPalette -//--------------------------------------------------------- - -void PaletteBoxButton::showPalette(bool visible) - { - if (visible && preferences.singlePalette) { - // close all palettes - emit closeAll(); - } - palette->setVisible(visible); - setChecked(visible); - setArrowType(visible ? Qt::DownArrow : Qt::RightArrow ); - } - -//--------------------------------------------------------- -// paintEvent -//--------------------------------------------------------- - -void PaletteBoxButton::paintEvent(QPaintEvent*) - { - //remove automatic menu arrow - QStylePainter p(this); - QStyleOptionToolButton opt; - initStyleOption(&opt); - opt.features &= (~QStyleOptionToolButton::HasMenu); - p.drawComplexControl(QStyle::CC_ToolButton, opt); - } - //--------------------------------------------------------- // PaletteProperties //--------------------------------------------------------- diff --git a/mscore/palette.h b/mscore/palette.h index 7e25b0c214..ef3df3d0d6 100644 --- a/mscore/palette.h +++ b/mscore/palette.h @@ -74,54 +74,6 @@ class PaletteCellProperties : public QDialog, private Ui::PaletteCellProperties PaletteCellProperties(PaletteCell* p, QWidget* parent = 0); }; -//--------------------------------------------------------- -// PaletteBoxButton -//--------------------------------------------------------- - -enum PaletteCommand { - PALETTE_DELETE, - PALETTE_SAVE, - PALETTE_LOAD, - PALETTE_EDIT, - PALETTE_UP, - PALETTE_DOWN, - PALETTE_NEW - }; - -class PaletteBoxButton : public QToolButton { - Q_OBJECT - - Palette* palette; - QAction* editAction; - - int id; - - virtual void changeEvent(QEvent*); - virtual void paintEvent( QPaintEvent * ); - virtual void contextMenuEvent(QContextMenuEvent*); - - private slots: - void deleteTriggered() { emit paletteCmd(PALETTE_DELETE, id); } - void saveTriggered() { emit paletteCmd(PALETTE_SAVE, id); } - void loadTriggered() { emit paletteCmd(PALETTE_LOAD, id); } - void propertiesTriggered() { emit paletteCmd(PALETTE_EDIT, id); } - void upTriggered() { emit paletteCmd(PALETTE_UP, id); } - void downTriggered() { emit paletteCmd(PALETTE_DOWN, id); } - void newTriggered() { emit paletteCmd(PALETTE_NEW, id); } - void enableEditing(bool); - - public slots: - void showPalette(bool); - - signals: - void paletteCmd(int, int); - void closeAll(); - - public: - PaletteBoxButton(Palette*, QWidget* parent = 0); - void setId(int v) { id = v; } - }; - //--------------------------------------------------------- // PaletteScrollArea //--------------------------------------------------------- @@ -146,7 +98,6 @@ class Palette : public QWidget { Q_OBJECT QString _name; - QString _tag; QList cells; int hgrid, vgrid; @@ -194,7 +145,7 @@ class Palette : public QWidget { public: Palette(QWidget* parent = 0); - ~Palette(); + virtual ~Palette(); PaletteCell* append(Element*, const QString& name, QString tag = QString(), qreal mag = 1.0); @@ -210,7 +161,7 @@ class Palette : public QWidget { void read(const QString& path); void write(const QString& path); void read(XmlReader&); - void write(Xml&, const QString& name) const; + void write(Xml&) const; bool read(QFile*); void clear(); void setSelectable(bool val) { _selectable = val; } diff --git a/mscore/paletteBoxButton.cpp b/mscore/paletteBoxButton.cpp new file mode 100644 index 0000000000..b896eecc15 --- /dev/null +++ b/mscore/paletteBoxButton.cpp @@ -0,0 +1,146 @@ +//============================================================================= +// MuseScore +// Music Composition & Notation +// +// Copyright (C) 2013 Werner Schweer +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 +// as published by the Free Software Foundation and appearing in +// the file LICENCE.GPL +//============================================================================= + +#include "paletteBoxButton.h" +#include "palette.h" +#include "preferences.h" + +//--------------------------------------------------------- +// PaletteBoxButton +//--------------------------------------------------------- + +PaletteBoxButton::PaletteBoxButton(Palette* p, QWidget* parent) + : QToolButton(parent) + { + palette = p; + editAction = 0; + + setCheckable(true); + setFocusPolicy(Qt::NoFocus); + connect(this, SIGNAL(clicked(bool)), this, SLOT(showPalette(bool))); + setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + setText(qApp->translate("Palette", palette->name().toUtf8())); + setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + setArrowType(Qt::RightArrow); + showPalette(false); + } + +//--------------------------------------------------------- +// contextMenuEvent +//--------------------------------------------------------- + +void PaletteBoxButton::contextMenuEvent(QContextMenuEvent* event) + { + QMenu menu; + + QAction* actionProperties = menu.addAction(tr("Palette Properties...")); + QAction* actionInsert = menu.addAction(tr("Insert New Palette...")); + QAction* actionUp = menu.addAction(tr("Move Palette Up")); + QAction* actionDown = menu.addAction(tr("Move Palette Down")); + QAction* actionEdit = menu.addAction(tr("Enable Editing")); + actionEdit->setCheckable(true); + actionEdit->setChecked(!palette->readOnly()); + + bool _systemPalette = palette->systemPalette(); + actionProperties->setDisabled(_systemPalette); + actionInsert->setDisabled(_systemPalette); + actionUp->setDisabled(_systemPalette); + actionDown->setDisabled(_systemPalette); + actionEdit->setDisabled(_systemPalette); + + menu.addSeparator(); + QAction* actionSave = menu.addAction(tr("Save Palette")); + QAction* actionLoad = menu.addAction(tr("Load Palette")); + actionLoad->setDisabled(_systemPalette); + + menu.addSeparator(); + QAction* actionDelete = menu.addAction(tr("Delete Palette")); + actionDelete->setDisabled(_systemPalette); + + QAction* action = menu.exec(mapToGlobal(event->pos())); + if (action == actionProperties) + propertiesTriggered(); + else if (action == actionInsert) + newTriggered(); + else if (action == actionUp) + upTriggered(); + else if (action == actionDown) + downTriggered(); + else if (action == actionEdit) + enableEditing(action->isChecked()); + else if (action == actionSave) + saveTriggered(); + else if (action == actionLoad) + loadTriggered(); + else if (action == actionDelete) + deleteTriggered(); + } + +//--------------------------------------------------------- +// enableEditing +//--------------------------------------------------------- + +void PaletteBoxButton::enableEditing(bool val) + { + palette->setReadOnly(!val); + } + +//--------------------------------------------------------- +// changeEvent +//--------------------------------------------------------- + +void PaletteBoxButton::changeEvent(QEvent* ev) + { + if (ev->type() == QEvent::FontChange) + setFixedHeight(QFontMetrics(font()).height() + 2); + } + +//--------------------------------------------------------- +// showPalette +//--------------------------------------------------------- + +void PaletteBoxButton::showPalette(bool visible) + { + if (visible && preferences.singlePalette) { + // close all palettes + emit closeAll(); + } + palette->setVisible(visible); + setChecked(visible); + setArrowType(visible ? Qt::DownArrow : Qt::RightArrow ); + } + +//--------------------------------------------------------- +// sizeHint +//--------------------------------------------------------- + +QSize PaletteBoxButton::sizeHint() const + { + QFontMetrics fm(font()); + return QSize(20, fm.lineSpacing() + 6); + } + +//--------------------------------------------------------- +// paintEvent +//--------------------------------------------------------- + +void PaletteBoxButton::paintEvent(QPaintEvent*) + { + //remove automatic menu arrow + QStylePainter p(this); + + QStyleOptionToolButton opt; + initStyleOption(&opt); + opt.features &= (~QStyleOptionToolButton::HasMenu); + p.drawComplexControl(QStyle::CC_ToolButton, opt); + } + diff --git a/mscore/paletteBoxButton.h b/mscore/paletteBoxButton.h new file mode 100644 index 0000000000..c449f0011e --- /dev/null +++ b/mscore/paletteBoxButton.h @@ -0,0 +1,68 @@ +//============================================================================= +// MuseScore +// Music Composition & Notation +// +// Copyright (C) 2013 Werner Schweer +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License version 2 +// as published by the Free Software Foundation and appearing in +// the file LICENCE.GPL +//============================================================================= + +#ifndef __PALETTE_BOX_BUTTON_H__ +#define __PALETTE_BOX_BUTTON_H__ + +class Palette; + +enum PaletteCommand { + PALETTE_DELETE, + PALETTE_SAVE, + PALETTE_LOAD, + PALETTE_EDIT, + PALETTE_UP, + PALETTE_DOWN, + PALETTE_NEW + }; + +//--------------------------------------------------------- +// PaletteBoxButton +//--------------------------------------------------------- + +class PaletteBoxButton : public QToolButton { + Q_OBJECT + + Palette* palette; + QAction* editAction; + + int id; + + virtual void changeEvent(QEvent*); + virtual void paintEvent(QPaintEvent*); + virtual void contextMenuEvent(QContextMenuEvent*); + virtual QSize sizeHint() const; + + private slots: + void deleteTriggered() { emit paletteCmd(PALETTE_DELETE, id); } + void saveTriggered() { emit paletteCmd(PALETTE_SAVE, id); } + void loadTriggered() { emit paletteCmd(PALETTE_LOAD, id); } + void propertiesTriggered() { emit paletteCmd(PALETTE_EDIT, id); } + void upTriggered() { emit paletteCmd(PALETTE_UP, id); } + void downTriggered() { emit paletteCmd(PALETTE_DOWN, id); } + void newTriggered() { emit paletteCmd(PALETTE_NEW, id); } + void enableEditing(bool); + + public slots: + void showPalette(bool); + + signals: + void paletteCmd(int, int); + void closeAll(); + + public: + PaletteBoxButton(Palette*, QWidget* parent = 0); + void setId(int v) { id = v; } + }; + +#endif + diff --git a/mscore/palettebox.cpp b/mscore/palettebox.cpp index 6c18dc05af..43be6d552f 100644 --- a/mscore/palettebox.cpp +++ b/mscore/palettebox.cpp @@ -16,6 +16,7 @@ #include "musescore.h" #include "preferences.h" #include "libmscore/xml.h" +#include "paletteBoxButton.h" //--------------------------------------------------------- // PaletteBox @@ -225,10 +226,8 @@ void PaletteBox::write(Xml& xml) { xml.stag("PaletteBox"); for (int i = 0; i < (vbox->count() - 1); i += 2) { - QLayoutItem* item = vbox->itemAt(i); - PaletteBoxButton* b = static_cast(item->widget()); - Palette* palette = static_cast(vbox->itemAt(i+1)->widget()); - palette->write(xml, b->text()); + Palette* palette = static_cast(vbox->itemAt(i+1)->widget()); + palette->write(xml); } xml.etag(); } diff --git a/mscore/palettebox.h b/mscore/palettebox.h index d2f217ed25..481ba82b7b 100644 --- a/mscore/palettebox.h +++ b/mscore/palettebox.h @@ -25,7 +25,6 @@ class Palette; class PaletteBox : public QDockWidget { Q_OBJECT -// bool _dirty; QVBoxLayout* vbox; virtual void closeEvent(QCloseEvent*); @@ -33,7 +32,6 @@ class PaletteBox : public QDockWidget { private slots: void paletteCmd(int, int); -// void setDirty() { _dirty = true; } void closeAll(); void displayMore(const QString& paletteName); @@ -44,7 +42,6 @@ class PaletteBox : public QDockWidget { public: PaletteBox(QWidget* parent = 0); void addPalette(Palette*); -// bool dirty() const { return _dirty; } void write(Xml&); bool read(XmlReader&); void clear(); diff --git a/mscore/workspace.cpp b/mscore/workspace.cpp index 811926aac8..0a42553b6e 100644 --- a/mscore/workspace.cpp +++ b/mscore/workspace.cpp @@ -448,7 +448,16 @@ Workspace* Workspace::createNewWorkspace(const QString& name) p->setName(name); p->setPath(""); p->setDirty(false); + p->setReadOnly(false); p->write(); + + // all palettes in new workspace are editable + + PaletteBox* paletteBox = mscore->getPaletteBox(); + QList pl = paletteBox->palettes(); + foreach (Palette* p, pl) + p->setSystemPalette(false); + _workspaces.append(p); return p; } diff --git a/mstyle/mstyle.cpp b/mstyle/mstyle.cpp index 8c9c048107..e7cf9655b2 100644 --- a/mstyle/mstyle.cpp +++ b/mstyle/mstyle.cpp @@ -28,6 +28,7 @@ #include "widgetstateengine.h" #include "transitions.h" #include "mconfig.h" +#include "../mscore/paletteBoxButton.h" #define MgStyleConfigData_toolTipTransparent true #define MgStyleConfigData_toolBarDrawItemSeparator true @@ -1754,13 +1755,18 @@ bool MgStyle::drawPanelButtonCommandPrimitive( const QStyleOption* option, QPain // drawPanelButtonToolPrimitive //--------------------------------------------------------- -bool MgStyle::drawPanelButtonToolPrimitive( const QStyleOption* option, QPainter* painter, const QWidget* widget) const { +bool MgStyle::drawPanelButtonToolPrimitive( const QStyleOption* option, QPainter* painter, const QWidget* widget) const + { /* For toolbutton in TabBars, corresponding to expanding arrows, no frame is drawn However one needs to draw the window background, because the button rect might overlap with some tab below. (this is a Qt bug) */ - const bool isInTabBar( widget && qobject_cast( widget->parent() ) ); + bool isInTabBar(widget && qobject_cast( widget->parent())); + + if (qobject_cast(widget)) + isInTabBar = true; + if ( isInTabBar ) { const QPalette& palette( option->palette ); @@ -1828,16 +1834,12 @@ bool MgStyle::drawPanelButtonToolPrimitive( const QStyleOption* option, QPainter // toolbutton engine if ( isInToolBar && !toolBarAnimated ) { - animations().widgetStateEngine().updateState( widget, AnimationHover, mouseOver ); - } else { - // mouseOver has precedence over focus animations().widgetStateEngine().updateState( widget, AnimationHover, mouseOver ); animations().widgetStateEngine().updateState( widget, AnimationFocus, hasFocus && !mouseOver ); - } bool hoverAnimated( animations().widgetStateEngine().isAnimated( widget, AnimationHover ) ); @@ -1850,17 +1852,19 @@ bool MgStyle::drawPanelButtonToolPrimitive( const QStyleOption* option, QPainter QRect slitRect( r ); // non autoraised tool buttons get same slab as regular buttons - if ( widget && !autoRaised ) { - + if (widget && !autoRaised) { StyleOptions opts = 0; slitRect.adjust( -1, 0, 1, 0 ); // "normal" parent, and non "autoraised" (that is: always raised) buttons - if ( flags & (State_On | State_Sunken) ) opts |= Sunken; - if ( flags & State_HasFocus) opts |= Focus; - if ( enabled && (flags & State_MouseOver)) opts |= Hover; + if ( flags & (State_On | State_Sunken) ) + opts |= Sunken; + if ( flags & State_HasFocus) + opts |= Focus; + if ( enabled && (flags & State_MouseOver)) + opts |= Hover; - TileSet::Tiles tiles( TileSet::Ring ); + TileSet::Tiles tiles(TileSet::Ring); // adjust tiles and rect in case of menubutton const QToolButton* t = qobject_cast( widget ); @@ -1897,9 +1901,7 @@ bool MgStyle::drawPanelButtonToolPrimitive( const QStyleOption* option, QPainter // render slab renderButtonSlab( painter, slitRect, buttonColor, opts, opacity, mode, tiles ); - return true; - } //! fine tuning of slitRect geometry @@ -4173,7 +4175,8 @@ bool MgStyle::drawTitleBarComplexControl( const QStyleOptionComplex* option, QPa // drawToolButtonComplexControl //--------------------------------------------------------- -bool MgStyle::drawToolButtonComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const { +bool MgStyle::drawToolButtonComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const + { // check autoRaise state const State flags( option->state ); const bool isInToolBar( widget && qobject_cast(widget->parent()) ); @@ -8608,5 +8611,3 @@ QIcon MgStyle::standardIconImplementation(StandardPixmap standardIcon, } } - - diff --git a/share/styles/appstyle-dark.css b/share/styles/appstyle-dark.css index fb95a4804b..5d9cfcd5b9 100644 --- a/share/styles/appstyle-dark.css +++ b/share/styles/appstyle-dark.css @@ -48,30 +48,13 @@ QGroupBox#changeStops QPushButton#stop_p_15:checked { border: none; background: AboutBoxDialog QLabel#titleLabel { font-size: 28pt } -PaletteBoxButton { - border: 1px solid #787878; - border-style: outset; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #606060, stop: 1 #707070); - color: white; - } -PaletteBoxButton:hover { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #787878, stop: 1 #888888); - } -PaletteBoxButton:checked { - border-style: inset; - } -PaletteBoxButton:disabled { - border-style: inset; - color: #909090; - } PaletteBox { background: #525252; color: white } QMenu#PaletteContext { border: 1px solid #787878; border-style: outset; + border-radius: 3px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #606060, stop: 1 #707070); color: white @@ -90,6 +73,7 @@ VoiceSelector > VoiceButton:checked { VoiceSelector { border-style: outset; border: 1px solid #787878; + border-radius: 3px; } QGroupBox::title { diff --git a/share/styles/appstyle-mac-dark.css b/share/styles/appstyle-mac-dark.css index fb95a4804b..b0583fde45 100644 --- a/share/styles/appstyle-mac-dark.css +++ b/share/styles/appstyle-mac-dark.css @@ -48,24 +48,6 @@ QGroupBox#changeStops QPushButton#stop_p_15:checked { border: none; background: AboutBoxDialog QLabel#titleLabel { font-size: 28pt } -PaletteBoxButton { - border: 1px solid #787878; - border-style: outset; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #606060, stop: 1 #707070); - color: white; - } -PaletteBoxButton:hover { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #787878, stop: 1 #888888); - } -PaletteBoxButton:checked { - border-style: inset; - } -PaletteBoxButton:disabled { - border-style: inset; - color: #909090; - } PaletteBox { background: #525252; color: white } diff --git a/share/styles/appstyle-mac.css b/share/styles/appstyle-mac.css index 5d632f315e..5caea69ca5 100644 --- a/share/styles/appstyle-mac.css +++ b/share/styles/appstyle-mac.css @@ -41,27 +41,6 @@ QGroupBox#changeStops QPushButton#stop_p_15:checked { border: none; background: AboutBoxDialog QLabel#titleLabel { font-size: 28pt } -PaletteBoxButton { - font-size: 11pt; font-family: "FreeSans"; - border: 1px solid #787878; - border-style: outset; - border-radius: 4px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #606060, stop: 1 #707070); - color: white; - } -PaletteBoxButton:hover { - /* border: 1px solid #8080ff; */ - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #787878, stop: 1 #888888); - } -PaletteBoxButton:checked { - border-style: inset; - } -PaletteBoxButton:disabled { - border-style: inset; - color: #909090; - } Palette { color: black; background-color: #c0c0c0; diff --git a/share/styles/appstyle.css b/share/styles/appstyle.css index 51406a4933..81277b8d2e 100644 --- a/share/styles/appstyle.css +++ b/share/styles/appstyle.css @@ -38,27 +38,6 @@ QGroupBox#changeStops QPushButton#stop_p_15:checked { border: none; background: AboutBoxDialog QLabel#titleLabel { font-size: 28pt } -PaletteBoxButton { - font-size: 9pt; font-family: "FreeSans"; - border: 1px solid #787878; - border-style: outset; - border-radius: 4px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #606060, stop: 1 #707070); - color: white; - } -PaletteBoxButton:hover { - /* border: 1px solid #8080ff; */ - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #787878, stop: 1 #888888); - } -PaletteBoxButton:checked { - border-style: inset; - } -PaletteBoxButton:disabled { - border-style: inset; - color: #909090; - } Palette { color: black; background-color: #c0c0c0; diff --git a/share/workspaces/advanced.workspace b/share/workspaces/advanced.workspace index ff1e10e0ea..2522abefb3 100644 Binary files a/share/workspaces/advanced.workspace and b/share/workspaces/advanced.workspace differ diff --git a/share/workspaces/basic.workspace b/share/workspaces/basic.workspace index e41c4c8cfb..b70b3beaf0 100644 Binary files a/share/workspaces/basic.workspace and b/share/workspaces/basic.workspace differ