diff --git a/resources/css/choiceBox.css b/resources/css/choiceBox.css index 20d85de..0c6b180 100644 --- a/resources/css/choiceBox.css +++ b/resources/css/choiceBox.css @@ -1,4 +1,5 @@ QListWidget::item { + color: #666666; padding: 0; padding-top: 6px; padding-bottom: 6px; @@ -15,6 +16,11 @@ QListWidget::item::selected { background-color: transparent; } +QListWidget::item::hover { + color: white; + background-color: #4e63ad; +} + QLineEdit { padding: 4px; border: 0; diff --git a/resources/css/contentmanagerside.css b/resources/css/contentmanagerside.css index fc84864..df16f70 100644 --- a/resources/css/contentmanagerside.css +++ b/resources/css/contentmanagerside.css @@ -8,3 +8,16 @@ height: 32px; line-height: 24px; } + +QScrollArea { + border: 0; +} + +#allFileButton, #localFileButton, #contentTypeButton { + padding-left: 2px; +} + +#allFileButton::indicator, #localFileButton::indicator, #contentTypeButton::indicator { + height: 0; + width: 0; +} diff --git a/resources/style.qrc b/resources/style.qrc index 1dfa31e..bb0bef4 100644 --- a/resources/style.qrc +++ b/resources/style.qrc @@ -5,5 +5,6 @@ css/localServer.css css/confirmBox.css css/contentmanagerside.css + css/choiceBox.css diff --git a/src/choiceitem.cpp b/src/choiceitem.cpp index 755eae1..8748527 100644 --- a/src/choiceitem.cpp +++ b/src/choiceitem.cpp @@ -9,6 +9,10 @@ ChoiceItem::ChoiceItem(QString key, QString value, QWidget *parent) : m_value(value) { ui->setupUi(this); + QFile file(QString::fromUtf8(":/css/choiceBox.css")); + file.open(QFile::ReadOnly); + QString styleSheet = QString(file.readAll()); + this->setStyleSheet(styleSheet); ui->itemLabel->setText(key); ui->itemLabel->setToolTip(key); connect(ui->closeButton, &QPushButton::clicked, [=](){ diff --git a/src/contentmanagerside.cpp b/src/contentmanagerside.cpp index 7e633a8..b84d48a 100644 --- a/src/contentmanagerside.cpp +++ b/src/contentmanagerside.cpp @@ -50,8 +50,6 @@ ContentManagerSide::ContentManagerSide(QWidget *parent) : connect(mp_contentTypeButton, &QCheckBox::toggled, this, [=](bool checked) { mp_ui->contentTypeSelector->setHidden(!checked); - mp_ui->contentTypeButton->setIcon(checked ? QIcon(":/icons/caret-down-solid.svg") : QIcon(":/icons/caret-right-solid.svg")); - }); mp_ui->contentTypeSelector->setHidden(true); diff --git a/src/contentmanagerside.ui b/src/contentmanagerside.ui index 90d65be..a7fa509 100644 --- a/src/contentmanagerside.ui +++ b/src/contentmanagerside.ui @@ -62,6 +62,9 @@ + + 9 + @@ -82,6 +85,12 @@ buttonGroup + + + 0 + 0 + + diff --git a/src/kiwixchoicebox.cpp b/src/kiwixchoicebox.cpp index fd2ff39..0191854 100644 --- a/src/kiwixchoicebox.cpp +++ b/src/kiwixchoicebox.cpp @@ -18,6 +18,11 @@ KiwixChoiceBox::KiwixChoiceBox(QWidget *parent) : { m_defaultItem = nullptr; ui->setupUi(this); + + QFile file(QString::fromUtf8(":/css/choiceBox.css")); + file.open(QFile::ReadOnly); + QString styleSheet = QString(file.readAll()); + this->setStyleSheet(styleSheet); ui->clearButton->setText(gt("clear")); ui->clearButton->setToolTip(gt("clear-filter")); @@ -32,6 +37,7 @@ KiwixChoiceBox::KiwixChoiceBox(QWidget *parent) : choiceSelector->setVerticalScrollMode(QAbstractItemView::ScrollMode::ScrollPerPixel); choiceSelector->setFocusPolicy(Qt::FocusPolicy::NoFocus); choiceSelector->setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff); + choiceSelector->setStyleSheet(styleSheet); choiceSelector->setSelectionMode(QAbstractItemView::SelectionMode::MultiSelection); currentChoicesLayout = new FlowLayout(ui->currentChoices, 2, 2, 2); diff --git a/ui/kiwixchoicebox.ui b/ui/kiwixchoicebox.ui index 302bdce..140154b 100644 --- a/ui/kiwixchoicebox.ui +++ b/ui/kiwixchoicebox.ui @@ -16,6 +16,12 @@ 0 + + + 0 + 0 + + Form