From 412a0620820d26294ddbc306b137692c65e8e980 Mon Sep 17 00:00:00 2001 From: Krzysztof Starecki Date: Mon, 31 Dec 2018 16:08:47 +0100 Subject: Tweak styling options for downloads tab, port Paper Light theme for reference --- src/stylesheets/Paper Light by 6788.qss | 39 +++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'src/stylesheets') diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss index 36585291..3193b817 100644 --- a/src/stylesheets/Paper Light by 6788.qss +++ b/src/stylesheets/Paper Light by 6788.qss @@ -680,10 +680,9 @@ QToolTip { border-radius: 6px; } -/* Progress Bars (Downloads) */ +/* Progress Bars */ QProgressBar { - /* progress bars when downloading */ background: #FFFFFF; text-align: center; border: 0px; @@ -929,29 +928,35 @@ QSlider::handle:hover { background: #EBEBEB; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ - background: #FFFFFF; +DownloadListWidget[downloadView=standard]::item { + padding: 15px; + border-bottom: 2px solid #BBBBBB; } -DownloadListWidget #frame { - /* outer box of an entry on the Downloads tab */ - border: none; +QProgressBar[downloadView=standard] { + background: transparent; + border: 2px solid gray; + border-radius: 8px; + margin: 4px 0px 6px 0px; } -#installLabel { - /* installed/done label */ - color: none; +QLabel[downloadProgress] { + qproperty-alignment: AlignCenter; + padding-bottom: 3px; } /* Compact Downloads View */ -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ - background: #FFFFFF; +DownloadListWidget[downloadView=compact]::item { + padding: 3px; + border-bottom: 2px solid #BBBBBB; +} + +QProgressBar[downloadView=compact] { + background: transparent; + border: 2px solid gray; + border-radius: 8px; + margin: 1px 0px 3px 0px; } /* Categories Filter */ -- cgit v1.3.1 From b8babae78a452071c3a707347d21a06fef759bab Mon Sep 17 00:00:00 2001 From: Krzysztof Starecki Date: Mon, 31 Dec 2018 18:48:53 +0100 Subject: Fix download layout bug, port most of remaining themes --- src/downloadlist.cpp | 66 ++++++++++++--------------------- src/downloadlist.h | 1 - src/downloadlistwidget.cpp | 63 ++++++++++++++++--------------- src/downloadlistwidget.h | 2 - src/mainwindow.cpp | 1 + src/stylesheets/Paper Automata.qss | 27 +++++++------- src/stylesheets/Paper Dark by 6788.qss | 35 ++++++++--------- src/stylesheets/Paper Light by 6788.qss | 5 --- src/stylesheets/dark.qss | 9 ++++- src/stylesheets/dracula.qss | 22 ++++++++++- src/stylesheets/skyrim.qss | 10 ++++- src/stylesheets/vs15 Dark-Green.qss | 14 +++++-- src/stylesheets/vs15 Dark-Orange.qss | 14 +++++-- src/stylesheets/vs15 Dark-Purple.qss | 14 +++++-- src/stylesheets/vs15 Dark-Red.qss | 14 +++++-- src/stylesheets/vs15 Dark-Yellow.qss | 14 +++++-- src/stylesheets/vs15 Dark.qss | 14 +++++-- 17 files changed, 191 insertions(+), 134 deletions(-) (limited to 'src/stylesheets') diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp index 6d79b0f5..fa2cc077 100644 --- a/src/downloadlist.cpp +++ b/src/downloadlist.cpp @@ -28,7 +28,6 @@ along with Mod Organizer. If not, see . DownloadList::DownloadList(DownloadManager *manager, QObject *parent) : QAbstractTableModel(parent), m_Manager(manager) - , m_FontMetrics(QFont()) { connect(m_Manager, SIGNAL(update(int)), this, SLOT(update(int))); connect(m_Manager, SIGNAL(aboutToUpdate()), this, SLOT(aboutToUpdate())); @@ -81,50 +80,35 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const if (pendingDownload) { std::tuple nexusids = m_Manager->getPendingDownload(index.row() - m_Manager->numTotalDownloads()); switch (index.column()) { - case COL_NAME: - return tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids)); - case COL_SIZE: - return tr("Unknown"); - case COL_STATUS: - return tr("Pending"); + case COL_NAME: return tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids)); + case COL_SIZE: return tr("Unknown"); + case COL_STATUS: return tr("Pending"); } } else { switch (index.column()) { - case COL_NAME: - return m_Manager->getFileName(index.row()); - case COL_SIZE: - return sizeFormat(m_Manager->getFileSize(index.row())); + case COL_NAME: return m_Manager->getFileName(index.row()); + case COL_SIZE: return sizeFormat(m_Manager->getFileSize(index.row())); case COL_STATUS: switch (m_Manager->getState(index.row())) { - case DownloadManager::STATE_STARTED: - return tr("Started"); - case DownloadManager::STATE_CANCELING: - return tr("Canceling"); - case DownloadManager::STATE_PAUSING: - return tr("Pausing"); - case DownloadManager::STATE_CANCELED: - return tr("Canceled"); - case DownloadManager::STATE_PAUSED: - return tr("Paused"); - case DownloadManager::STATE_ERROR: - return tr("Error"); - case DownloadManager::STATE_FETCHINGMODINFO: - return tr("Fetching Info 1"); - case DownloadManager::STATE_FETCHINGFILEINFO: - return tr("Fetching Info 2"); - case DownloadManager::STATE_READY: - return tr("Downloaded"); - case DownloadManager::STATE_INSTALLED: - return tr("Installed"); - case DownloadManager::STATE_UNINSTALLED: - return tr("Uninstalled"); + // STATE_DOWNLOADING handled by DownloadProgressDelegate + case DownloadManager::STATE_STARTED: return tr("Started"); + case DownloadManager::STATE_CANCELING: return tr("Canceling"); + case DownloadManager::STATE_PAUSING: return tr("Pausing"); + case DownloadManager::STATE_CANCELED: return tr("Canceled"); + case DownloadManager::STATE_PAUSED: return tr("Paused"); + case DownloadManager::STATE_ERROR: return tr("Error"); + case DownloadManager::STATE_FETCHINGMODINFO: return tr("Fetching Info 1"); + case DownloadManager::STATE_FETCHINGFILEINFO: return tr("Fetching Info 2"); + case DownloadManager::STATE_READY: return tr("Downloaded"); + case DownloadManager::STATE_INSTALLED: return tr("Installed"); + case DownloadManager::STATE_UNINSTALLED: return tr("Uninstalled"); } } } - } else if (role == Qt::ForegroundRole) { + } else if (role == Qt::ForegroundRole && index.column() == COL_STATUS) { if (pendingDownload) { return QColor(Qt::darkBlue); - } else if (index.column() == COL_STATUS) { + } else { DownloadManager::DownloadState state = m_Manager->getState(index.row()); if (state == DownloadManager::STATE_READY) return QColor(Qt::darkGreen); @@ -135,7 +119,7 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const } } else if (role == Qt::ToolTipRole) { if (pendingDownload) { - return tr("pending download"); + return tr("Pending download"); } else { QString text = m_Manager->getFileName(index.row()) + "\n"; if (m_Manager->isInfoIncomplete(index.row())) { @@ -168,13 +152,12 @@ void DownloadList::aboutToUpdate() void DownloadList::update(int row) { - if (row < 0) { + if (row < 0) emit endResetModel(); - } else if (row < this->rowCount()) { + else if (row < this->rowCount()) emit dataChanged(this->index(row, 0, QModelIndex()), this->index(row, this->columnCount(QModelIndex())-1, QModelIndex())); - } else { + else qCritical("invalid row %d in download list, update failed", row); - } } QString DownloadList::sizeFormat(quint64 size) const @@ -187,8 +170,7 @@ QString DownloadList::sizeFormat(quint64 size) const QString unit("KB"); calc /= 1024.0; - while (calc >= 1024.0 && i.hasNext()) - { + while (calc >= 1024.0 && i.hasNext()) { unit = i.next(); calc /= 1024.0; } diff --git a/src/downloadlist.h b/src/downloadlist.h index 3b33fc40..4e0b5ef4 100644 --- a/src/downloadlist.h +++ b/src/downloadlist.h @@ -90,7 +90,6 @@ public slots: private: DownloadManager *m_Manager; - QFontMetrics m_FontMetrics; QString sizeFormat(quint64 size) const; }; diff --git a/src/downloadlistwidget.cpp b/src/downloadlistwidget.cpp index ac327f7b..f69f9e9f 100644 --- a/src/downloadlistwidget.cpp +++ b/src/downloadlistwidget.cpp @@ -34,13 +34,17 @@ void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewIt bool pendingDownload = sourceIndex.row() >= m_Manager->numTotalDownloads(); QProgressBar progressBar; progressBar.setProperty("downloadView", option.widget->property("downloadView")); + progressBar.setProperty("downloadProgress", true); progressBar.resize(option.rect.width(), option.rect.height()); - progressBar.setTextVisible(false); + progressBar.setTextVisible(true); + progressBar.setAlignment(Qt::AlignCenter); progressBar.setMinimum(0); progressBar.setMaximum(100); progressBar.setValue(m_Manager->getProgress(sourceIndex.row()).first); + progressBar.setFormat(m_Manager->getProgress(sourceIndex.row()).second); progressBar.setStyle(QApplication::style()); + /* QLabel progressText; progressText.setProperty("downloadView", option.widget->property("downloadView")); progressText.setProperty("downloadProgress", true); @@ -49,6 +53,7 @@ void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewIt progressText.setAlignment(Qt::AlignCenter); progressText.setText(m_Manager->getProgress(sourceIndex.row()).second); progressText.setStyle(QApplication::style()); + */ // paint the background with default delegate first to preserve table cell styling QStyledItemDelegate::paint(painter, option, index); @@ -56,7 +61,7 @@ void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewIt painter->save(); painter->translate(option.rect.topLeft()); progressBar.render(painter); - progressText.render(painter); + //progressText.render(painter); painter->restore(); } else { QStyledItemDelegate::paint(painter, option, index); @@ -82,11 +87,11 @@ void DownloadListWidget::setManager(DownloadManager *manager) void DownloadListWidget::onDoubleClick(const QModelIndex &index) { QModelIndex sourceIndex = qobject_cast(model())->mapToSource(index); - if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) { + if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) emit installDownload(sourceIndex.row()); - } else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) { + else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) + || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) emit resumeDownload(sourceIndex.row()); - } } void DownloadListWidget::onCustomContextMenu(const QPoint &point) @@ -94,38 +99,34 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point) QMenu menu(this); QModelIndex index = indexAt(point); bool hidden = false; + if (index.row() >= 0) { m_ContextRow = qobject_cast(model())->mapToSource(index).row(); DownloadManager::DownloadState state = m_Manager->getState(m_ContextRow); hidden = m_Manager->isHidden(m_ContextRow); + if (state >= DownloadManager::STATE_READY) { menu.addAction(tr("Install"), this, SLOT(issueInstall())); - if (m_Manager->isInfoIncomplete(m_ContextRow)) { + if (m_Manager->isInfoIncomplete(m_ContextRow)) menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo())); - } - else { + else menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus())); - } - menu.addAction(tr("Open File"), this, SLOT(issueOpenFile())); menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder())); menu.addSeparator(); menu.addAction(tr("Delete"), this, SLOT(issueDelete())); - if (hidden) { + if (hidden) menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView())); - } - else { + else menu.addAction(tr("Hide"), this, SLOT(issueRemoveFromView())); - } - } - else if (state == DownloadManager::STATE_DOWNLOADING) { + } else if (state == DownloadManager::STATE_DOWNLOADING) { menu.addAction(tr("Cancel"), this, SLOT(issueCancel())); menu.addAction(tr("Pause"), this, SLOT(issuePause())); menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder())); - } - else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) { + } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) + || (state == DownloadManager::STATE_PAUSING)) { menu.addAction(tr("Delete"), this, SLOT(issueDelete())); menu.addAction(tr("Resume"), this, SLOT(issueResume())); menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder())); @@ -137,14 +138,12 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point) menu.addAction(tr("Delete Uninstalled..."), this, SLOT(issueDeleteUninstalled())); menu.addAction(tr("Delete All..."), this, SLOT(issueDeleteAll())); + menu.addSeparator(); if (!hidden) { - menu.addSeparator(); menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted())); menu.addAction(tr("Hide Uninstalled..."), this, SLOT(issueRemoveFromViewUninstalled())); menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll())); - } - if (hidden) { - menu.addSeparator(); + } else { menu.addAction(tr("Un-Hide All..."), this, SLOT(issueRestoreToViewAll())); } @@ -163,11 +162,11 @@ void DownloadListWidget::issueQueryInfo() void DownloadListWidget::issueDelete() { - if (QMessageBox::question(nullptr, tr("Delete Files?"), - tr("This will permanently delete the selected download."), - QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { - emit removeDownload(m_ContextRow, true); - } + if (QMessageBox::question(nullptr, tr("Delete Files?"), + tr("This will permanently delete the selected download."), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + emit removeDownload(m_ContextRow, true); + } } void DownloadListWidget::issueRemoveFromView() @@ -178,7 +177,7 @@ void DownloadListWidget::issueRemoveFromView() void DownloadListWidget::issueRestoreToView() { - emit restoreDownload(m_ContextRow); + emit restoreDownload(m_ContextRow); } void DownloadListWidget::issueRestoreToViewAll() @@ -237,8 +236,8 @@ void DownloadListWidget::issueDeleteCompleted() void DownloadListWidget::issueDeleteUninstalled() { if (QMessageBox::question(nullptr, tr("Delete Files?"), - tr("This will remove all uninstalled downloads from this list and from disk."), - QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + tr("This will remove all uninstalled downloads from this list and from disk."), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { emit removeDownload(-3, true); } } @@ -264,8 +263,8 @@ void DownloadListWidget::issueRemoveFromViewCompleted() void DownloadListWidget::issueRemoveFromViewUninstalled() { if (QMessageBox::question(nullptr, tr("Are you sure?"), - tr("This will remove all uninstalled downloads from this list (but NOT from disk)."), - QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { + tr("This will remove all uninstalled downloads from this list (but NOT from disk)."), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) { emit removeDownload(-3, false); } } diff --git a/src/downloadlistwidget.h b/src/downloadlistwidget.h index c19e4473..93ece07a 100644 --- a/src/downloadlistwidget.h +++ b/src/downloadlistwidget.h @@ -34,8 +34,6 @@ namespace Ui { class DownloadListWidget; } -class DownloadManager; - class DownloadProgressDelegate : public QStyledItemDelegate { Q_OBJECT diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b4d77085..f20665eb 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -5184,6 +5184,7 @@ void MainWindow::updateDownloadView() ui->downloadView->setProperty("downloadView", "standard"); ui->downloadView->style()->unpolish(ui->downloadView); ui->downloadView->style()->polish(ui->downloadView); + m_OrganizerCore.downloadManager()->refreshList(); } void MainWindow::modDetailsUpdated(bool) diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index 748e589e..572d3313 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -893,29 +893,28 @@ DownloadListWidget { background: transparent; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ +DownloadListWidget::item:!selected { background: #DAD4BB; } -DownloadListWidget QFrame#frame { - /* outer box of an entry on the Downloads tab */ - border: 2px solid #DAD4BB; +DownloadListWidget[downloadView=standard]::item { + padding: 15px; + margin-bottom: 2px; } -DownloadListWidget QLabel#installLabel { - /* installed/done label */ - color: none; +QProgressBar[downloadView=standard] { + margin: 4px 0px 6px 0px; } /* Compact Downloads View */ -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ - background: #DAD4BB; +DownloadListWidget[downloadView=compact]::item { + padding: 4px 4px 6px 4px; + margin-bottom: 2px; +} + +QProgressBar[downloadView=compact] { + margin: 1px 0px 3px 0px; } /* Categories Filter */ diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss index 9f4db66f..ae6ea77b 100644 --- a/src/stylesheets/Paper Dark by 6788.qss +++ b/src/stylesheets/Paper Dark by 6788.qss @@ -919,29 +919,30 @@ QSlider::handle:hover { background: #242424; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ - background: #141414; +DownloadListWidget[downloadView=standard]::item { + padding: 15px; + border-bottom: 2px solid #666666; } -DownloadListWidget#frame { - /* outer box of an entry on the Downloads tab */ - border: none; -} - -#installLabel { - /* installed/done label */ - color: none; +QProgressBar[downloadView=standard] { + background: transparent; + border: 2px solid #666666; + border-radius: 8px; + margin: 4px 0px 6px 0px; } /* Compact Downloads View */ -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ - background: #141414; +DownloadListWidget[downloadView=compact]::item { + padding: 3px; + border-bottom: 2px solid #666666; +} + +QProgressBar[downloadView=compact] { + background: transparent; + border: 2px solid gray; + border-radius: 8px; + margin: 1px 0px 3px 0px; } /* Categories Filter */ diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss index 3193b817..5e69b79d 100644 --- a/src/stylesheets/Paper Light by 6788.qss +++ b/src/stylesheets/Paper Light by 6788.qss @@ -940,11 +940,6 @@ QProgressBar[downloadView=standard] { margin: 4px 0px 6px 0px; } -QLabel[downloadProgress] { - qproperty-alignment: AlignCenter; - padding-bottom: 3px; -} - /* Compact Downloads View */ DownloadListWidget[downloadView=compact]::item { diff --git a/src/stylesheets/dark.qss b/src/stylesheets/dark.qss index d5a7aedf..5bbb0f0c 100644 --- a/src/stylesheets/dark.qss +++ b/src/stylesheets/dark.qss @@ -257,7 +257,6 @@ QProgressBar QProgressBar::chunk { background-color: #427683; - width: 20px; } QTabBar::tab @@ -366,4 +365,12 @@ QTreeView::branch:open:has-children:has-siblings DownloadListWidget QLabel#installLabel { color: none; +} + +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; } \ No newline at end of file diff --git a/src/stylesheets/dracula.qss b/src/stylesheets/dracula.qss index 99cf918d..33ce5f66 100644 --- a/src/stylesheets/dracula.qss +++ b/src/stylesheets/dracula.qss @@ -394,4 +394,24 @@ SaveGameInfoWidget { DownloadListWidget QLabel#installLabel { color: none; -} \ No newline at end of file +} + +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + +QProgressBar +{ + border: 2px solid grey; + border-radius: 5px; + text-align: center; +} + +QProgressBar::chunk +{ + background-color: #427683; +} diff --git a/src/stylesheets/skyrim.qss b/src/stylesheets/skyrim.qss index e4d87499..d36eac57 100644 --- a/src/stylesheets/skyrim.qss +++ b/src/stylesheets/skyrim.qss @@ -534,7 +534,7 @@ QProgressBar { background-color: transparent; color: transparent; height: 14px; - margin: 0 10px; + margin: 0 0px; border-width: 4px 21px; border-style: solid; border-color: transparent; @@ -542,6 +542,14 @@ QProgressBar { QProgressBar::chunk { background: url(./skyrim/progress-bar-chunk.png) center center repeat-x qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 #95BED9, stop:0.78781 #6EB9CE); } +DownloadListWidget[downloadView=standard]::item { + padding: 15px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border: none; diff --git a/src/stylesheets/vs15 Dark-Green.qss b/src/stylesheets/vs15 Dark-Green.qss index 5427b38a..10f923cb 100644 --- a/src/stylesheets/vs15 Dark-Green.qss +++ b/src/stylesheets/vs15 Dark-Green.qss @@ -532,8 +532,8 @@ QHeaderView::up-arrow { image: url(./vs15/sort-asc.png); margin-bottom: -37px; } -QTreeView#downloadView QHeaderView::up-arrow { - margin-bottom: -32px; } +DownloadListWidget QHeaderView::up-arrow { + margin-bottom: -47px; } QHeaderView::down-arrow { image: url(./vs15/sort-desc.png); @@ -599,11 +599,19 @@ QProgressBar { text-align: center; border-style: solid; border-width: 1px; - margin: 0 10px; } + margin: 0 0px; } QProgressBar::chunk { background: #06B025; } +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border-color: #3F3F46; diff --git a/src/stylesheets/vs15 Dark-Orange.qss b/src/stylesheets/vs15 Dark-Orange.qss index fe65ece0..bbde1f82 100644 --- a/src/stylesheets/vs15 Dark-Orange.qss +++ b/src/stylesheets/vs15 Dark-Orange.qss @@ -533,8 +533,8 @@ QHeaderView::up-arrow { image: url(./vs15/sort-asc.png); margin-bottom: -37px; } -QTreeView#downloadView QHeaderView::up-arrow { - margin-bottom: -32px; } +DownloadListWidget QHeaderView::up-arrow { + margin-bottom: -47px; } QHeaderView::down-arrow { image: url(./vs15/sort-desc.png); @@ -600,11 +600,19 @@ QProgressBar { text-align: center; border-style: solid; border-width: 1px; - margin: 0 10px; } + margin: 0 0px; } QProgressBar::chunk { background: #06B025; } +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border-color: #3F3F46; diff --git a/src/stylesheets/vs15 Dark-Purple.qss b/src/stylesheets/vs15 Dark-Purple.qss index eb2e8b82..faad7297 100644 --- a/src/stylesheets/vs15 Dark-Purple.qss +++ b/src/stylesheets/vs15 Dark-Purple.qss @@ -533,8 +533,8 @@ QHeaderView::up-arrow { image: url(./vs15/sort-asc.png); margin-bottom: -37px; } -QTreeView#downloadView QHeaderView::up-arrow { - margin-bottom: -32px; } +DownloadListWidget QHeaderView::up-arrow { + margin-bottom: -47px; } QHeaderView::down-arrow { image: url(./vs15/sort-desc.png); @@ -600,11 +600,19 @@ QProgressBar { text-align: center; border-style: solid; border-width: 1px; - margin: 0 10px; } + margin: 0px 0px; } QProgressBar::chunk { background: #06B025; } +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border-color: #3F3F46; diff --git a/src/stylesheets/vs15 Dark-Red.qss b/src/stylesheets/vs15 Dark-Red.qss index ee363e0b..2ffcff68 100644 --- a/src/stylesheets/vs15 Dark-Red.qss +++ b/src/stylesheets/vs15 Dark-Red.qss @@ -533,8 +533,8 @@ QHeaderView::up-arrow { image: url(./vs15/sort-asc.png); margin-bottom: -37px; } -QTreeView#downloadView QHeaderView::up-arrow { - margin-bottom: -32px; } +DownloadListWidget QHeaderView::up-arrow { + margin-bottom: -47px; } QHeaderView::down-arrow { image: url(./vs15/sort-desc.png); @@ -600,11 +600,19 @@ QProgressBar { text-align: center; border-style: solid; border-width: 1px; - margin: 0 10px; } + margin: 0 0px; } QProgressBar::chunk { background: #06B025; } +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border-color: #3F3F46; diff --git a/src/stylesheets/vs15 Dark-Yellow.qss b/src/stylesheets/vs15 Dark-Yellow.qss index 08dbe758..24afe005 100644 --- a/src/stylesheets/vs15 Dark-Yellow.qss +++ b/src/stylesheets/vs15 Dark-Yellow.qss @@ -533,8 +533,8 @@ QHeaderView::up-arrow { image: url(./vs15/sort-asc.png); margin-bottom: -37px; } -QTreeView#downloadView QHeaderView::up-arrow { - margin-bottom: -32px; } +DownloadListWidget QHeaderView::up-arrow { + margin-bottom: -47px; } QHeaderView::down-arrow { image: url(./vs15/sort-desc.png); @@ -600,11 +600,19 @@ QProgressBar { text-align: center; border-style: solid; border-width: 1px; - margin: 0 10px; } + margin: 0 0px; } QProgressBar::chunk { background: #06B025; } +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border-color: #3F3F46; diff --git a/src/stylesheets/vs15 Dark.qss b/src/stylesheets/vs15 Dark.qss index 8c4d354e..6a551775 100644 --- a/src/stylesheets/vs15 Dark.qss +++ b/src/stylesheets/vs15 Dark.qss @@ -532,8 +532,8 @@ QHeaderView::up-arrow { image: url(./vs15/sort-asc.png); margin-bottom: -37px; } -QTreeView#downloadView QHeaderView::up-arrow { - margin-bottom: -32px; } +DownloadListWidget QHeaderView::up-arrow { + margin-bottom: -47px; } QHeaderView::down-arrow { image: url(./vs15/sort-desc.png); @@ -599,11 +599,19 @@ QProgressBar { text-align: center; border-style: solid; border-width: 1px; - margin: 0 10px; } + margin: 0 0px; } QProgressBar::chunk { background: #06B025; } +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + /* Right Pane and Tab Bars #QTabWidget, #QTabBar */ QTabWidget::pane { border-color: #3F3F46; -- cgit v1.3.1 From f3ee7a0566a92037223c8528340d697a6ef2499e Mon Sep 17 00:00:00 2001 From: Krzysztof Starecki Date: Mon, 31 Dec 2018 19:35:52 +0100 Subject: Port the 'Night Eyes' theme --- src/stylesheets/Night Eyes.qss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/stylesheets') diff --git a/src/stylesheets/Night Eyes.qss b/src/stylesheets/Night Eyes.qss index e9bb6c44..860f1283 100644 --- a/src/stylesheets/Night Eyes.qss +++ b/src/stylesheets/Night Eyes.qss @@ -648,3 +648,19 @@ DownloadListWidgetCompact QLabel background: #141414; padding: 4px; } + +DownloadListWidget[downloadView=standard]::item { + padding: 16px; +} + +DownloadListWidget[downloadView=compact]::item { + padding: 4px; +} + +QProgressBar +{ + border: 2px solid grey; + border-radius: 5px; + text-align: center; + margin: 0px; +} \ No newline at end of file -- cgit v1.3.1 From ad752182bc6d25512c94a47b48aa02e845466f27 Mon Sep 17 00:00:00 2001 From: Krzysztof Starecki Date: Tue, 1 Jan 2019 18:31:17 +0100 Subject: Fix download entry padding issues --- src/stylesheets/Night Eyes.qss | 8 ++++++++ src/stylesheets/dracula.qss | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/stylesheets') diff --git a/src/stylesheets/Night Eyes.qss b/src/stylesheets/Night Eyes.qss index 860f1283..6c6b0629 100644 --- a/src/stylesheets/Night Eyes.qss +++ b/src/stylesheets/Night Eyes.qss @@ -657,6 +657,14 @@ DownloadListWidget[downloadView=compact]::item { padding: 4px; } +DownloadListWidget::item:hover { + padding: 0px; +} + +DownloadListWidget::item:selected { + padding: 0px; +} + QProgressBar { border: 2px solid grey; diff --git a/src/stylesheets/dracula.qss b/src/stylesheets/dracula.qss index 33ce5f66..385fca16 100644 --- a/src/stylesheets/dracula.qss +++ b/src/stylesheets/dracula.qss @@ -397,11 +397,19 @@ SaveGameInfoWidget { } DownloadListWidget[downloadView=standard]::item { - padding: 16px; + padding: 16px; } DownloadListWidget[downloadView=compact]::item { - padding: 4px; + padding: 4px; +} + +DownloadListWidget::item:hover { + padding: 0px; +} + +DownloadListWidget::item:selected { + padding: 0px; } QProgressBar -- cgit v1.3.1 From aa934e5fb31b74fcf2820b3b055188d80746062d Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Fri, 11 Jan 2019 08:10:53 -0600 Subject: Update Paper Automata theme to A2-2.0 --- src/stylesheets/Paper Automata.qss | 138 +++++++++++++++++++++++++------------ 1 file changed, 95 insertions(+), 43 deletions(-) (limited to 'src/stylesheets') diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index 572d3313..3c20e940 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -1,5 +1,5 @@ -/* v1.1 Paper Automata by 6788-00 */ -/* https://6788-00.tumblr.com/ */ +/* v2.0 Paper Automata by 6788-00 */ +/* https://6788-00.tumblr.com/ */ /* Color Palette */ /* Background - Main | #CDC8B0 */ @@ -55,6 +55,10 @@ QAbstractItemView { selection-color: #4E4B42; } +QAbstractItemView::item { + min-height: 22px; +} + QAbstractItemView::item:hover { /* rows on left and right pane when moused-over */ background: #B4AF9A; @@ -233,7 +237,7 @@ QGroupBox::title { background: transparent; subcontrol-origin: padding; subcontrol-position: top left; - padding: 8px; + padding: 4px 8px; } /* Text Fields */ @@ -335,90 +339,90 @@ QPushButton::menu-indicator { /* Icons */ -QPushButton#listOptionsBtn { +#listOptionsBtn { /* Options button */ qproperty-icon: url(./Paper/Automata/dots.svg); qproperty-iconSize: 16px; padding-left: 2px; } -QPushButton#openFolderMenu { +#openFolderMenu { /* Open Folder button */ qproperty-icon: url(./Paper/Automata/folder.svg); qproperty-iconSize: 14px; padding-left: 4px; } -QPushButton#restoreModsButton, -QPushButton#restoreButton { +#restoreModsButton, +#restoreButton { /* Restore Backup buttons */ qproperty-icon: url(./Paper/Automata/restore.svg); qproperty-iconSize: 14px; } -QPushButton#saveModsButton, -QPushButton#saveButton { +#saveModsButton, +#saveButton { /* Backup buttons */ qproperty-icon: url(./Paper/Automata/backup.svg); qproperty-iconSize: 14px; } -QPushButton#bossButton { +#bossButton { /* Sort button */ qproperty-icon: url(./Paper/Automata/sort.svg); qproperty-iconSize: 14px; } -QPushButton#linkButton { +#linkButton { /* Shortcuts button */ qproperty-icon: url(./Paper/Automata/shortcut.svg); qproperty-iconSize: 14px; } -QPushButton#btnRefreshData, -QPushButton#refreshButton { +#btnRefreshData, +#refreshButton { /* Refresh buttons */ qproperty-icon: url(./Paper/Automata/refresh.svg); qproperty-iconSize: 14px; } -QPushButton#endorseBtn { +#endorseBtn { /* Endorse button on the Nexus Info tab of the Information window */ qproperty-icon: url(./Paper/Automata/heart.svg); qproperty-iconSize: 14px; } -QPushButton#clearCacheButton { +#clearCacheButton { /* Clear Cache button on the Nexus tab of the Settings window */ qproperty-icon: url(./Paper/Automata/cross.svg); qproperty-iconSize: 14px; } -QToolButton#deactivateESP, -QToolButton#activateESP { +#deactivateESP, +#activateESP { /* activate and deactivate ESP buttons */ background: #DAD4BB; } -QToolButton:hover#deactivateESP, -QToolButton:hover#activateESP { +#deactivateESP:hover, +#activateESP:hover { /* activate and deactivate ESP buttons when moused-over */ background: #B4AF9A; } -QToolButton#deactivateESP { +#deactivateESP { /* icon for the deactivate ESP button */ qproperty-icon: url(./Paper/Automata/backup.svg); } -QToolButton#activateESP { +#activateESP { /* icon for the activate ESP button */ qproperty-icon: url(./Paper/Automata/restore-alt.svg); } /* Run button */ -QPushButton#startButton { +#startButton { /* Run button */ background: #4E4B42; color: #DAD4BB; @@ -427,7 +431,7 @@ QPushButton#startButton { padding: 6px; } -QPushButton:hover#startButton { +#startButton:hover { /* Run button when moused-over*/ background: #B4AF9A; color: #4E4B42; @@ -671,7 +675,7 @@ QToolTip { QProgressBar { /* progress bars when downloading */ - background: #DAD4BB; + background: transparent; text-align: center; border: 0px; margin: 0px 10px; @@ -747,7 +751,7 @@ QTabBar QToolButton:disabled { QLCDNumber { /* LCD number on the Conflicts tab */ background: #DAD4BB; - color: #CD664D; + color: #4E4B42; border: none; } @@ -791,7 +795,7 @@ QRadioButton::indicator:unchecked:hover { QTreeView::indicator:unchecked:selected, QRadioButton::indicator:unchecked:selected { /* a checkbox that is unchecked when clicked */ - image: url(./Paper/Automata/unchecked-alt.svg); + border: 2px solid #DAD4BB; } QTreeView::indicator:checked, @@ -887,52 +891,100 @@ QSlider::handle:hover { /* Downloads Tab */ -QWidget#downloadTab QAbstractScrollArea, +#downloadTab QAbstractScrollArea, DownloadListWidget { /* background of the entire downloads tab */ - background: transparent; + background: #DAD4BB; } -DownloadListWidget::item:!selected { +DownloadListWidget QFrame, +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab */ background: #DAD4BB; } -DownloadListWidget[downloadView=standard]::item { - padding: 15px; - margin-bottom: 2px; +DownloadListWidget#frame { + /* outer box of an entry on the Downloads tab */ + border: 2px solid #DAD4BB; } -QProgressBar[downloadView=standard] { - margin: 4px 0px 6px 0px; +#installLabel { + /* installed/done label */ + color: none; +} + +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab */ + background: #DAD4BB; } -/* Compact Downloads View */ +/* New Downloads View */ + +DownloadListWidget[downloadView=standard]::item { + /* Entries on the Standard Downloads View */ + min-height: 44px; + margin: -16px 0; +} DownloadListWidget[downloadView=compact]::item { - padding: 4px 4px 6px 4px; - margin-bottom: 2px; + /* Entries on the Compact Downloads View */ + min-height: 22px; + margin: -4px 0; +} + +QProgressBar[downloadView=standard] { + /* Progress Bars on the Standard Downloads View */ + background: transparent; + margin: 11px 0; } QProgressBar[downloadView=compact] { - margin: 1px 0px 3px 0px; + /* Progress Bars on the Compact Downloads View */ + background: transparent; } /* Categories Filter */ -QPushButton#displayCategoriesBtn { +#displayCategoriesBtn { /* Filter button */ min-width: 12px; } -QTreeWidget#categoriesList { +#categoriesList { /* Categories panel */ min-width: 200px; margin-bottom: 4px; } -QGroupBox#categoriesGroup { +#categoriesGroup { /* Categories group box */ - padding-bottom: 0px; + padding-bottom: 0; + margin-top: 3px; +} + +/* Fixes */ + +#executablesListBox { + /* Increase right margin of the select executables box */ + margin-right: 8px; +} + +#stepsStack QWidget { + /* Groupboxes on the FOMOD Installer Dialog */ + background: #CDC8B0; + border: none; +} + +#stepsStack QGroupBox { + /* Fix to reimplement styling for Groupboxes on the FOMOD Installer dialog */ + border: 2px solid #4E4B42; +} + +#activeModslabel, #activePluginsLabel { + /* Increase the left margin of the counters */ + padding-left: 6px; } -/* For the Glory of Mankind */ \ No newline at end of file +/* For the Glory of Mankind */ -- cgit v1.3.1 From 9c721c08ebd28250afcfb00abcfeaac1693dca36 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Fri, 11 Jan 2019 08:11:13 -0600 Subject: Update Paper Dark and Paper Light themes to 5.0 --- src/stylesheets/Paper Dark by 6788.qss | 101 ++++++++++----- src/stylesheets/Paper Light by 6788.qss | 98 +++++++++------ src/stylesheets/Paper/Dark/check.svg | 10 +- src/stylesheets/Paper/Dark/highlight.svg | 205 +++++++++++++++++++++++++++++++ 4 files changed, 341 insertions(+), 73 deletions(-) create mode 100644 src/stylesheets/Paper/Dark/highlight.svg (limited to 'src/stylesheets') diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss index ae6ea77b..9b07e3fb 100644 --- a/src/stylesheets/Paper Dark by 6788.qss +++ b/src/stylesheets/Paper Dark by 6788.qss @@ -1,4 +1,4 @@ -/* v4.3 Paper Dark by 6788-00 */ +/* v5.0 Paper Dark by 6788-00 */ /* https://6788-00.tumblr.com/ */ /* Color Palette */ @@ -39,7 +39,7 @@ QAbstractItemView { } QAbstractItemView::item { - padding: 1px; + min-height: 22px; } QAbstractItemView::item:hover { @@ -190,14 +190,14 @@ QListView::item:hover { /* a row on the saves tab when moused-over */ background: #3D3D3D; color: #FFFFFF; - padding: 2px 0px; + padding: 0; } QListView::item:selected { /* a row on the saves tab when clicked */ background: #006868; color: #FFFFFF; - padding: 2px 0px; + padding: 0; } QTextEdit { @@ -206,12 +206,6 @@ QTextEdit { border-radius: 6px; } -QWebView { - /* Nexus Info window */ - background: #141414; - border-radius: 6px; -} - /* Group Boxes */ QGroupBox { @@ -682,6 +676,7 @@ QToolTip { QProgressBar { /* progress bars when downloading */ background: #141414; + color: #FFFFFF; text-align: center; border: 2px solid #242424; border-radius: 6px; @@ -705,10 +700,6 @@ QTabWidget::pane { border-radius: 10px; } -QTabWidget QAbstractScrollArea::item { - padding: 2px; -} - QTabWidget::tab-bar { /* tabs */ alignment: center; @@ -781,6 +772,7 @@ QLCDNumber { background: #141414; color: #006868; border-radius: 6px; + } /* Tables (Configure Mod Categories) */ @@ -912,37 +904,65 @@ QSlider::handle:hover { background: #3D3D3D; } -/* Downloads Tab */ +/* Pre-v2.1.7 Downloads Tab */ #downloadTab QAbstractScrollArea { /* background of the entire downloads tab */ - background: #242424; + background: #141414; +} + +DownloadListWidget QFrame, +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab */ + background: #141414; +} + +DownloadListWidget#frame { + /* outer box of an entry on the Downloads tab */ + border: none; +} + +#installLabel { + /* installed/done label */ + color: none; +} + +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab in Compact View */ + background: #141414; } +/* New Downloads View */ + DownloadListWidget[downloadView=standard]::item { - padding: 15px; - border-bottom: 2px solid #666666; + /* Entries on the Standard Downloads View */ + min-height: 44px; + margin: -16px 0; +} + +DownloadListWidget[downloadView=compact]::item { + /* Entries on the Compact Downloads View */ + min-height: 22px; + margin: -4px 0; } QProgressBar[downloadView=standard] { + /* Progress Bars on the Standard Downloads View */ background: transparent; - border: 2px solid #666666; - border-radius: 8px; - margin: 4px 0px 6px 0px; + margin: 11px 0; } -/* Compact Downloads View */ - -DownloadListWidget[downloadView=compact]::item { - padding: 3px; - border-bottom: 2px solid #666666; +QProgressBar[downloadView=standard]::chunk, +QProgressBar[downloadView=compact]::chunk { + /* The Loading Portion of Progress Bars on the Downloads View */ + border-right: 2px solid #242424; } QProgressBar[downloadView=compact] { + /* Progress Bars on the Compact Downloads View */ background: transparent; - border: 2px solid gray; - border-radius: 8px; - margin: 1px 0px 3px 0px; } /* Categories Filter */ @@ -965,7 +985,28 @@ QProgressBar[downloadView=compact] { /* Fixes */ +#executablesListBox { + /* Increase right margin of the select executables box */ + margin-right: 8px; +} + #executablesListBox::item { /* fixes the black text problem on the Modify Executables window */ color: #D3D3D3; -} \ No newline at end of file +} + +#stepsStack QWidget { + /* Groupboxes on the FOMOD Installer Dialog */ + border: none; +} + +#stepsStack QGroupBox { + /* Fix to reimplement styling for Groupboxes on the FOMOD Installer dialog */ + border: 2px solid #141414; + border-radius: 10px; +} + +#activeModslabel, #activePluginsLabel { + /* Increase the left margin of the counters */ + padding-left: 6px; +} diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss index 5e69b79d..d78c26ea 100644 --- a/src/stylesheets/Paper Light by 6788.qss +++ b/src/stylesheets/Paper Light by 6788.qss @@ -1,4 +1,4 @@ -/* v4.3 Paper Light by 6788-00 */ +/* v5.0 Paper Light by 6788-00 */ /* https://6788-00.tumblr.com/ */ /* Color Palette */ @@ -38,6 +38,10 @@ QAbstractItemView { selection-color: #FFFFFF; } +QAbstractItemView::item { + min-height: 22px; +} + QAbstractItemView::item:hover { /* rows on left and right pane when moused-over */ background: #C2C2C2; @@ -187,22 +191,17 @@ QListView { border-radius: 6px; } -QListView::item { - /* Increases the line height of the Saves tab */ - padding: 2px 0px; -} - QListView::item:hover { /* uncertain, assumed: rows on the saves window when moused-over */ background: #C2C2C2; - padding: 2px 0px; + padding: 0; } QListView::item:selected { /*uncertain, assumed: rows on the saves window when clicked */ background: #008484; color: #FFFFFF; - padding: 2px 0px; + padding: 0; } QTextEdit { @@ -211,12 +210,6 @@ QTextEdit { border-radius: 6px; } -QWebView { - /* Nexus Info window */ - background: #FFFFFF; - border-radius: 6px; -} - /* Group Boxes */ QGroupBox { @@ -680,9 +673,10 @@ QToolTip { border-radius: 6px; } -/* Progress Bars */ +/* Progress Bars (Downloads) */ QProgressBar { + /* progress bars when downloading */ background: #FFFFFF; text-align: center; border: 0px; @@ -707,10 +701,6 @@ QTabWidget::pane { border-radius: 10px; } -QTabWidget QAbstractScrollArea::item { - padding: 2px; -} - QTabWidget::tab-bar { /* tabs */ alignment: center; @@ -921,37 +911,46 @@ QSlider::handle:hover { background: #008484; } -/* Downloads Tab */ +/* Pre-v2.1.7 Downloads Tab */ #downloadTab QAbstractScrollArea { /* background of the entire downloads tab */ - background: #EBEBEB; + background: #FFFFFF; } -DownloadListWidget[downloadView=standard]::item { - padding: 15px; - border-bottom: 2px solid #BBBBBB; +DownloadListWidget QFrame, +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab */ + background: #FFFFFF; } -QProgressBar[downloadView=standard] { - background: transparent; - border: 2px solid gray; - border-radius: 8px; - margin: 4px 0px 6px 0px; +DownloadListWidget #frame { + /* outer box of an entry on the Downloads tab */ + border: none; +} + +#installLabel { + /* installed/done label */ + color: none; } -/* Compact Downloads View */ +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab in Compacts View*/ + background: #FFFFFF; +} -DownloadListWidget[downloadView=compact]::item { - padding: 3px; - border-bottom: 2px solid #BBBBBB; +/* New Downloads View */ + +DownloadListWidget[downloadView=standard]::item { + /* an entry on the Downloads view */ + min-height: 44px; } -QProgressBar[downloadView=compact] { - background: transparent; - border: 2px solid gray; - border-radius: 8px; - margin: 1px 0px 3px 0px; +QProgressBar[downloadView=standard] { + /* a progress bar on the Downloads view */ + margin: 11px 0; } /* Categories Filter */ @@ -970,4 +969,27 @@ QProgressBar[downloadView=compact] { #categoriesGroup { /* Categories group box */ padding-bottom: 0px; +} + +/* Fixes */ + +#executablesListBox { + /* Increase right margin of the select executables box */ + margin-right: 8px; +} + +#stepsStack QWidget { + /* Groupboxes on the FOMOD Installer Dialog */ + border: none; +} + +#stepsStack QGroupBox { + /* Fix to reimplement styling for Groupboxes on the FOMOD Installer dialog */ + border: 2px solid #EBEBEB; + border-radius: 10px; +} + +#activeModslabel, #activePluginsLabel { + /* Increase the left margin of the counters */ + padding-left: 6px; } \ No newline at end of file diff --git a/src/stylesheets/Paper/Dark/check.svg b/src/stylesheets/Paper/Dark/check.svg index 101ee45e..2d113294 100644 --- a/src/stylesheets/Paper/Dark/check.svg +++ b/src/stylesheets/Paper/Dark/check.svg @@ -17,7 +17,7 @@ inkscape:export-filename="D:\Bethesda Game Modding\Mod Organizer 2\stylesheets\Paper\Dark\dots.png" inkscape:export-xdpi="307.20001" inkscape:export-ydpi="307.20001" - inkscape:version="0.92.1 r15371" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="check.svg"> @@ -28,9 +28,9 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="24.357491" - inkscape:cx="1.6266143" - inkscape:cy="5.0770231" + inkscape:zoom="11.625" + inkscape:cx="-3.537598" + inkscape:cy="-2.9645926" inkscape:document-units="px" inkscape:current-layer="layer25" showgrid="false" @@ -42,7 +42,7 @@ inkscape:bbox-nodes="true" inkscape:snap-bbox-edge-midpoints="true" inkscape:snap-bbox-midpoints="true" - showguides="true" + showguides="false" inkscape:guide-bbox="true" inkscape:window-width="1920" inkscape:window-height="1027" diff --git a/src/stylesheets/Paper/Dark/highlight.svg b/src/stylesheets/Paper/Dark/highlight.svg new file mode 100644 index 00000000..9dee51d8 --- /dev/null +++ b/src/stylesheets/Paper/Dark/highlight.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + -- cgit v1.3.1 From 029da32412da206ee263634a071a8c90ef64b584 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 12 Jan 2019 11:48:36 +0100 Subject: Added Parchment theme by TheBobAbides. --- src/stylesheets/Parchment v1.1 by Bob.qss | 587 +++++++++++++++++++++ .../Parchment/checkbox-alt-unchecked-hover.png | Bin 0 -> 283 bytes .../Parchment/checkbox-alt-unchecked.png | Bin 0 -> 253 bytes .../Parchment/checkbox-checked-disabled.png | Bin 0 -> 309 bytes .../Parchment/checkbox-checked-hover.png | Bin 0 -> 339 bytes src/stylesheets/Parchment/checkbox-checked.png | Bin 0 -> 319 bytes src/stylesheets/Parchment/checkbox-disabled.png | Bin 0 -> 259 bytes src/stylesheets/Parchment/checkbox-hover.png | Bin 0 -> 339 bytes src/stylesheets/Parchment/checkbox.png | Bin 0 -> 259 bytes 9 files changed, 587 insertions(+) create mode 100644 src/stylesheets/Parchment v1.1 by Bob.qss create mode 100644 src/stylesheets/Parchment/checkbox-alt-unchecked-hover.png create mode 100644 src/stylesheets/Parchment/checkbox-alt-unchecked.png create mode 100644 src/stylesheets/Parchment/checkbox-checked-disabled.png create mode 100644 src/stylesheets/Parchment/checkbox-checked-hover.png create mode 100644 src/stylesheets/Parchment/checkbox-checked.png create mode 100644 src/stylesheets/Parchment/checkbox-disabled.png create mode 100644 src/stylesheets/Parchment/checkbox-hover.png create mode 100644 src/stylesheets/Parchment/checkbox.png (limited to 'src/stylesheets') diff --git a/src/stylesheets/Parchment v1.1 by Bob.qss b/src/stylesheets/Parchment v1.1 by Bob.qss new file mode 100644 index 00000000..da3546d1 --- /dev/null +++ b/src/stylesheets/Parchment v1.1 by Bob.qss @@ -0,0 +1,587 @@ +/* v1.1 Parchment by Bob */ + + +/* Special Thanks */ + +/* Parchment is based on Paper Themes for Mod Organizer 2 by 6788 +https://www.nexusmods.com/skyrim/mods/64439 +https://6788-00.tumblr.com/ + +and + +************************************* + Skyrim +**************************************** + Author: chintsu_kun + Version: 1.1.2 + Licence: GNU General Public License v3.0 (https://www.gnu.org/licenses/gpl-3.0.en.html) + Url: http://www.nexusmods.com/skyrim/mods/73817/? + +**************************************** + +For the Checkbox Coding and for the Picture Files which I Edited in Paint 3D */ + +/* Main Window */ + +QWidget { + background: #DBD399; + color: #000000; +} + +QWidget:disabled { + background: #DBD399; + color: #baae94; +} + +QMainWindow::separator { + border: 0px; +} + +QAbstractItemView { + background: #F7F6CF; + alternate-background-color: #EFE9BA; + show-decoration-selected: 1; + selection-background-color: #0CA6FF; + selection-color: #F7F6CF; +} + +QAbstractItemView::item:hover { + background: #008F8F; + color: #F7F6CF; +} + +QAbstractItemView::item:selected { + background: #0CA6FF; + color: #F7F6CF; +} + +QAbstractScrollArea::corner { + background: #F7F6CF; + border: 2px solid #DBD399; + border-bottom-right-radius: 6px; + margin: 0px -2px -2px 0px; +} + +/* Toolbar */ + +QToolBar { + background: #DBD399; + border: 1px solid #DBD399; +} + +QToolBar::separator { + background: #DBD399; +} + +QToolButton { + background: #F7F6CF; + padding: 4px 6px; + border-radius: 6px; + margin: 4px 4px 0px 4px; +} + +QToolButton:hover { + background: #008F8F; +} + +QToolButton:pressed { + background: #0CA6FF; +} + +/* Left Pane & File Trees */ + +QTreeView { + border-radius: 6px; +} + +QTreeView::branch:hover { + background: #008F8F; + color: #F7F6CF; +} + +QTreeView::branch:selected { + background: #0CA6FF; + color: #F7F6CF; +} + +QTreeView::item:selected { + background: #0CA6FF; + color: #F7F6CF; +} + +QTreeView::branch:has-children:!has-siblings:closed, +QTreeView::branch:closed:has-children:has-siblings { + image: url(:/stylesheet/branch-closed.png); + border: 0px; +} + +QTreeView::branch:open:has-children:!has-siblings, +QTreeView::branch:open:has-children:has-siblings { + image: url(:/stylesheet/branch-open.png); + border: 0px; +} + +QListView { + border-radius: 6px; +} + +QListView::item:hover { + background: #008F8F; + color: #F7F6CF; +} + +QListView::item:selected { + background: #0CA6FF; + color: #F7F6CF; +} + +QTextEdit { + background: #F7F6CF; + border-radius: 6px; +} + +QWebView { + background: #F7F6CF; + border-radius: 6px; +} + +/* Group Boxes */ + +QGroupBox { + padding: 24px 4px; + border: 2px solid #F7F6CF; + border-radius: 10px; +} + +QGroupBox::title { + subcontrol-origin: padding; + subcontrol-position: top left; + padding: 8px; +} + +/* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ +/*common*/ +QGroupBox::indicator, +QTreeView::indicator, + +QCheckBox::indicator { + background-color: transparent; + border: none; + width: 14px; + height: 14px; +} + +QGroupBox::indicator:checked, QGroupBox::indicator:indeterminate, +QTreeView::indicator:checked, +QTreeView::indicator:indeterminate, +QCheckBox::indicator:checked, + +QCheckBox::indicator:indeterminate { + image: url(./Parchment/checkbox-checked.png); +} + +QGroupBox::indicator:checked:hover, QGroupBox::indicator:indeterminate:hover, +QTreeView::indicator:checked:hover, +QTreeView::indicator:indeterminate:hover, +QCheckBox::indicator:checked:hover, + +QCheckBox::indicator:indeterminate:hover { + image: url(./Parchment/checkbox-checked-hover.png); +} + + QGroupBox::indicator:checked:disabled, QGroupBox::indicator:indeterminate:disabled, + QTreeView::indicator:checked:disabled, + QTreeView::indicator:indeterminate:disabled, + QCheckBox::indicator:checked:disabled, + + QCheckBox::indicator:indeterminate:disabled { + image: url(./Parchment/checkbox-checked-disabled.png); +} + + QGroupBox::indicator:unchecked, + QTreeView::indicator:unchecked, + + QCheckBox::indicator:unchecked { + image: url(./Parchment/checkbox.png); +} + + QGroupBox::indicator:unchecked:hover, + QTreeView::indicator:unchecked:hover, + + QCheckBox::indicator:unchecked:hover { + image: url(./Parchment/checkbox-hover.png); +} + + QGroupBox::indicator:unchecked:disabled, + QTreeView::indicator:unchecked:disabled, + + QCheckBox::indicator:unchecked:disabled { + image: url(./Parchment/checkbox-disabled.png); +} + +/* Search Boxes */ + +QLineEdit { + background: #F7F6CF; + min-height: 14px; + padding: 2px; + border: 2px solid #F7F6CF; + border-radius: 6px; + margin-top: 3px; +} + +QLineEdit:hover { + border: 2px solid #008F8F; +} + +/* Most Dropdowns */ + +QComboBox { + background: #F7F6CF; + min-height: 20px; + padding-left: 5px; + border: 2px solid #F7F6CF; + border-radius: 6px; + margin: 3px 0px 1px 0px; +} + +QComboBox:hover { + border: 2px solid #008F8F; +} + +QComboBox:on { + background: #0CA6FF; + color: #F7F6CF; + border: 2px solid #0CA6FF; +} + +QComboBox::drop-down { + width: 20px; + subcontrol-origin: padding; + subcontrol-position: top right; + border: none; +} + +QComboBox QAbstractItemView { + border: 0px; +} + +QComboBox::down-arrow { + image: url(:/stylesheet/combobox-down.png); +} + +/* Most Buttons */ + +QPushButton { + background: #F7F6CF; + color: #000000; + min-height: 28px; + padding: 4px 22px; + border-radius: 9px; +} + +QPushButton:hover { + background: #008F8F; + color: #F7F6CF; +} + +QPushButton:pressed { + background: #0CA6FF; + color: #F7F6CF; +} + +QPushButton:checked { + background: #0CA6FF; + color: #0CA6FF; + margin: 4px; +} + +/* Scroll Bars */ + +/* Horizontal */ + +QScrollBar:horizontal { + background: #F7F6CF; + height: 20px; + border: 2px solid #DBD399; + margin: 0px 23px -2px 23px; +} + +QScrollBar::handle:horizontal { + background: #DBD399; + min-width: 32px; + border-radius: 6px; + margin: 2px; +} + +QScrollBar::add-line:horizontal { + background: #F7F6CF; + width: 23px; + subcontrol-position: right; + subcontrol-origin: margin; + border: 2px solid #DBD399; + margin: 0px -2px -2px 0px; +} + +QScrollBar::sub-line:horizontal { + background: #F7F6CF; + width: 23px; + subcontrol-position: left; + subcontrol-origin: margin; + border: 2px solid #DBD399; + border-bottom-left-radius: 6px; + margin: 0px 0px -2px -2px; +} + +/* Vertical */ + +QScrollBar:vertical { + background: #F7F6CF; + width: 20px; + border: 2px solid #DBD399; + margin: 23px -2px 23px 0px; +} + +QScrollBar::handle:vertical { + background: #DBD399; + min-height: 32px; + border-radius: 6px; + margin: 2px; +} + +QScrollBar::add-line:vertical { + background: #F7F6CF; + height: 23px; + subcontrol-position: bottom; + subcontrol-origin: margin; + border: 2px solid #DBD399; + border-bottom-right-radius: 6px; + margin: 0px -2px -2px 0px; +} + +QScrollBar::sub-line:vertical { + background: #F7F6CF; + height: 23px; + subcontrol-position: top; + subcontrol-origin: margin; + border: 2px solid #DBD399; + border-top-right-radius: 6px; + margin: -2px -2px 0px 0px; +} + +/* Combined */ + +QScrollBar::handle:horizontal:hover, +QScrollBar::handle:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, +QScrollBar::sub-line:vertical:hover { + background: #008F8F; +} + +QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, +QScrollBar::sub-line:vertical:pressed { + background: #0CA6FF; +} + +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, +QScrollBar::sub-page:vertical { + background: transparent; +} + +QScrollBar::up-arrow:vertical, +QScrollBar::right-arrow:horizontal, +QScrollBar::down-arrow:vertical, +QScrollBar::left-arrow:horizontal { + height: 1px; + width: 1px; + border: 1px solid #DBD399; +} + +/* Header Rows */ + +QHeaderView { + background: #DBD399; +} + +QHeaderView::section { + background: #F7F6CF; + color: #000000; + height: 22px; + padding: 0px 5px; + border: 0px; + border-bottom: 2px solid #DBD399; + border-right: 2px solid #DBD399; +} + +QHeaderView::section:first { + border-top-left-radius: 6px; +} + +QHeaderView::section:last { + border-right: 0px; + border-top-right-radius: 6px; +} + +QHeaderView::section:hover { + background: #008F8F; + color: #F7F6CF; +} + +QHeaderView::down-arrow { + padding-right: 4px; + height: 10px; + width: 10px; +} + +/* Context Menus, Toolbar Dropdowns, & Tooltips */ + +QMenu { + background: #F7F6CF; + selection-color: #F7F6CF; + border: 0px; +} + +QMenu::item { + background: #F7F6CF; + selection-background-color: #008F8F; + padding: 4px 20px; +} + +QMenu::item:selected { + background: #008F8F; + color: #F7F6CF; +} + +QMenu::item:disabled { + background: #F7F6CF; + color: #444444; +} + +QMenu::separator { + background: #DBD399; + height: 2px; +} + +QMenu::icon { + margin: 1px; +} + +QToolTip { + background: #F7F6CF; + color: #000000; + padding: 1px; + border: 0px; +} + +/* Progress Bars (Downloads) */ + +QProgressBar { + background: #F7F6CF; + text-align: center; + border: 0px; + border-radius: 6px; + margin: 0px 10px; +} + +QProgressBar::chunk { + background: #008F8F; +} + +/* Right Pane and Tab Bars */ + +QTabWidget::pane { + top: 1px; + padding: 2px 2px 10px 2px; + border: 2px solid #F7F6CF; + border-radius: 10px; +} + +QTabWidget::tab-bar { + alignment: center; +} + +QTabBar::tab { + background: #F7F6CF; + color: #000000; + padding: 4px 1em; + border: 1px solid #DBD399; + border-top: 0px; + border-bottom: 0px; +} + +QTabBar::tab:!selected { + background: #F7F6CF; + color: #000000; +} + +QTabBar::tab:disabled { + background: #DBD399; + color: #444444; +} + +QTabBar::tab:selected { + color: #0CA6FF; + +} + +QTabBar::tab:!selected:hover { + background: #0CA6FF; + color: #F7F6CF; +} + +QTabBar::tab:first { + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; +} + +QTabBar::tab:last { + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; +} + +QTabBar QToolButton { + background: #008F8F; + padding: 1px; + border-radius: 6px; + margin: 1px; +} + +QTabBar QToolButton:disabled { + background: transparent; +} + +/* Sliders (Configurator) */ + +/* QSlider::groove:horizontal { + background: #F7F6CF; + height: 1px; + border: 1px solid #F7F6CF; +} + +QSlider::handle:horizontal { + background: #008F8F; + width: 10px; + border: 2px solid #008F8F; + border-radius: 6px; + margin: -10px 0px; +} + +QSlider::handle:horizontal:hover { + background: #0CA6FF; + border: 2px solid #0CA6FF; +} */ + +/* Tables (Configure Mod Categories) */ + +QTableView { + gridline-color: #DBD399; + border: 0px; +} \ No newline at end of file diff --git a/src/stylesheets/Parchment/checkbox-alt-unchecked-hover.png b/src/stylesheets/Parchment/checkbox-alt-unchecked-hover.png new file mode 100644 index 00000000..bf4cb027 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-alt-unchecked-hover.png differ diff --git a/src/stylesheets/Parchment/checkbox-alt-unchecked.png b/src/stylesheets/Parchment/checkbox-alt-unchecked.png new file mode 100644 index 00000000..35073ad7 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-alt-unchecked.png differ diff --git a/src/stylesheets/Parchment/checkbox-checked-disabled.png b/src/stylesheets/Parchment/checkbox-checked-disabled.png new file mode 100644 index 00000000..21e7e057 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-checked-disabled.png differ diff --git a/src/stylesheets/Parchment/checkbox-checked-hover.png b/src/stylesheets/Parchment/checkbox-checked-hover.png new file mode 100644 index 00000000..6603a99e Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-checked-hover.png differ diff --git a/src/stylesheets/Parchment/checkbox-checked.png b/src/stylesheets/Parchment/checkbox-checked.png new file mode 100644 index 00000000..0f098137 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-checked.png differ diff --git a/src/stylesheets/Parchment/checkbox-disabled.png b/src/stylesheets/Parchment/checkbox-disabled.png new file mode 100644 index 00000000..d1d5a887 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-disabled.png differ diff --git a/src/stylesheets/Parchment/checkbox-hover.png b/src/stylesheets/Parchment/checkbox-hover.png new file mode 100644 index 00000000..92df6af4 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-hover.png differ diff --git a/src/stylesheets/Parchment/checkbox.png b/src/stylesheets/Parchment/checkbox.png new file mode 100644 index 00000000..e02aa21d Binary files /dev/null and b/src/stylesheets/Parchment/checkbox.png differ -- cgit v1.3.1 From 37e1009d9472a86c228eea0347d4306a75c3fd65 Mon Sep 17 00:00:00 2001 From: Al Date: Sat, 12 Jan 2019 12:12:04 +0100 Subject: Added missing Parchment theme file --- src/stylesheets/Parchment/checkbox-alt-checked.png | Bin 0 -> 301 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/stylesheets/Parchment/checkbox-alt-checked.png (limited to 'src/stylesheets') diff --git a/src/stylesheets/Parchment/checkbox-alt-checked.png b/src/stylesheets/Parchment/checkbox-alt-checked.png new file mode 100644 index 00000000..b2f32952 Binary files /dev/null and b/src/stylesheets/Parchment/checkbox-alt-checked.png differ -- cgit v1.3.1 From c1210714f801d69a31397a6254901a00407f6da4 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Sat, 9 Mar 2019 01:37:57 -0600 Subject: Update tutorials and stylesheets for problems->notifications change --- src/stylesheets/Paper Automata.qss | 36 +++++++++++++++---------------- src/stylesheets/Paper Dark by 6788.qss | 34 ++++++++++++++--------------- src/stylesheets/Paper Light by 6788.qss | 36 +++++++++++++++---------------- src/tutorials/tutorial_firststeps_main.js | 10 ++++----- src/tutorials/tutorial_primer_main.js | 2 +- 5 files changed, 59 insertions(+), 59 deletions(-) (limited to 'src/stylesheets') diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index 3c20e940..d72aa7e2 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -4,8 +4,8 @@ /* Color Palette */ /* Background - Main | #CDC8B0 */ /* Background - Content | #DAD4BB */ -/* Hover | #B4AF9A */ -/* Selected | #4E4B42 */ +/* Hover | #B4AF9A */ +/* Selected | #4E4B42 */ /* Accent | #CD664D */ /* All */ @@ -145,7 +145,7 @@ QToolButton QMenu { qproperty-icon: url(./Paper/Automata/Toolbar/settings.svg); } -#actionProblems { +#actionNotifications { qproperty-icon: url(./Paper/Automata/Toolbar/problems.svg); } @@ -508,7 +508,7 @@ QScrollBar::add-line:vertical { } QScrollBar::sub-line:vertical { - /* scroll up button */ + /* scroll up button */ background: #B4AF9A; image: url(./Paper/Automata/Arrows/up.svg); height: 23px; @@ -521,29 +521,29 @@ QScrollBar::sub-line:vertical { /* Combined */ -QScrollBar::handle:horizontal:hover, +QScrollBar::handle:horizontal:hover, QScrollBar::handle:vertical:hover, -QScrollBar::add-line:horizontal:hover, -QScrollBar::sub-line:horizontal:hover, -QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover { /* buttons and handles when moused-over */ background: #B4AF9A; } -QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:horizontal:pressed, QScrollBar::handle:vertical:pressed, -QScrollBar::add-line:horizontal:pressed, -QScrollBar::sub-line:horizontal:pressed, -QScrollBar::add-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed { /* buttons and handles when clicked */ background: #4E4B42; } -QScrollBar::add-page:horizontal, -QScrollBar::sub-page:horizontal, -QScrollBar::add-page:vertical, +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { /* area on scroll bars where clicking it scrolls to where you clicked */ background: transparent; @@ -897,8 +897,8 @@ DownloadListWidget { background: #DAD4BB; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #DAD4BB; @@ -914,7 +914,7 @@ DownloadListWidget#frame { color: none; } -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #DAD4BB; diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss index 9b07e3fb..9abd8086 100644 --- a/src/stylesheets/Paper Dark by 6788.qss +++ b/src/stylesheets/Paper Dark by 6788.qss @@ -24,7 +24,7 @@ QWidget { } QWidget:disabled { - /* disabled parts of the window like the update button when there are no updates */ + /* disabled parts of the window like the update button when there are no updates */ background: #242424; color: #808080; } @@ -133,7 +133,7 @@ QToolButton:menu-indicator { qproperty-icon: url(./Paper/Dark/Toolbar/settings.svg); } -#actionProblems { +#actionNotifications { qproperty-icon: url(./Paper/Dark/Toolbar/problems.svg); } @@ -494,7 +494,7 @@ QScrollBar::add-line:vertical { } QScrollBar::sub-line:vertical { - /* scroll up button */ + /* scroll up button */ background: #141414; image: url(./Paper/Dark/Arrows/up.svg); height: 23px; @@ -507,29 +507,29 @@ QScrollBar::sub-line:vertical { /* Combined */ -QScrollBar::handle:horizontal:hover, +QScrollBar::handle:horizontal:hover, QScrollBar::handle:vertical:hover, -QScrollBar::add-line:horizontal:hover, -QScrollBar::sub-line:horizontal:hover, -QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover { /* buttons and handles when moused-over */ background: #006868; } -QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:horizontal:pressed, QScrollBar::handle:vertical:pressed, -QScrollBar::add-line:horizontal:pressed, -QScrollBar::sub-line:horizontal:pressed, -QScrollBar::add-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed { /* buttons and handles when clicked */ background: #006868; } -QScrollBar::add-page:horizontal, -QScrollBar::sub-page:horizontal, -QScrollBar::add-page:vertical, +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { /* area on scroll bars where clicking it scrolls to where you clicked */ background: transparent; @@ -911,8 +911,8 @@ QSlider::handle:hover { background: #141414; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #141414; @@ -928,7 +928,7 @@ DownloadListWidget#frame { color: none; } -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab in Compact View */ background: #141414; diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss index d78c26ea..4aad55a8 100644 --- a/src/stylesheets/Paper Light by 6788.qss +++ b/src/stylesheets/Paper Light by 6788.qss @@ -24,7 +24,7 @@ QWidget { } QWidget:disabled { - /* disabled parts of the window like the update button when there are no updates */ + /* disabled parts of the window like the update button when there are no updates */ background: #EBEBEB; color: #808080; } @@ -132,7 +132,7 @@ QToolButton:menu-indicator { qproperty-icon: url(./Paper/Light/Toolbar/settings.svg); } -#actionProblems { +#actionNotifications { qproperty-icon: url(./Paper/Light/Toolbar/problems.svg); } @@ -497,7 +497,7 @@ QScrollBar::add-line:vertical { } QScrollBar::sub-line:vertical { - /* scroll up button */ + /* scroll up button */ background: #FFFFFF; image: url(./Paper/Light/Arrows/up.svg); height: 23px; @@ -510,29 +510,29 @@ QScrollBar::sub-line:vertical { /* Combined */ -QScrollBar::handle:horizontal:hover, +QScrollBar::handle:horizontal:hover, QScrollBar::handle:vertical:hover, -QScrollBar::add-line:horizontal:hover, -QScrollBar::sub-line:horizontal:hover, -QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover { /* buttons and handles when moused-over */ background: #008484; } -QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:horizontal:pressed, QScrollBar::handle:vertical:pressed, -QScrollBar::add-line:horizontal:pressed, -QScrollBar::sub-line:horizontal:pressed, -QScrollBar::add-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed { /* buttons and handles when clicked */ background: #008484; } -QScrollBar::add-page:horizontal, -QScrollBar::sub-page:horizontal, -QScrollBar::add-page:vertical, +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { /* area on scroll bars where clicking it scrolls to where you clicked */ background: transparent; @@ -918,8 +918,8 @@ QSlider::handle:hover { background: #FFFFFF; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #FFFFFF; @@ -935,7 +935,7 @@ DownloadListWidget #frame { color: none; } -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab in Compacts View*/ background: #FFFFFF; @@ -992,4 +992,4 @@ QProgressBar[downloadView=standard] { #activeModslabel, #activePluginsLabel { /* Increase the left margin of the counters */ padding-left: 6px; -} \ No newline at end of file +} diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js index c47b5c0d..ee97766b 100644 --- a/src/tutorials/tutorial_firststeps_main.js +++ b/src/tutorials/tutorial_firststeps_main.js @@ -14,12 +14,12 @@ function getTutorialSteps() }, function() { - tutorial.text = qsTr("The highlighted button provides hints on solving problems MO recognized automatically.") - if (tutorialControl.waitForAction("actionProblems")) { - tutorial.text += qsTr("\nThere IS a problem now but you may want to hold off on fixing it until after completing the tutorial.") - highlightAction("actionProblems", true) + tutorial.text = qsTr("The highlighted button provides hints on solving potential problems MO recognized automatically.") + if (tutorialControl.waitForAction("actionNotifications")) { + tutorial.text += qsTr("\nThere IS a notification now but you may want to hold off on clearing it until after completing the tutorial.") + highlightAction("actionNotifications", true) } else { - highlightAction("actionProblems", false) + highlightAction("actionNotifications", false) waitForClick() } }, diff --git a/src/tutorials/tutorial_primer_main.js b/src/tutorials/tutorial_primer_main.js index 5d5597c1..5af99237 100644 --- a/src/tutorials/tutorial_primer_main.js +++ b/src/tutorials/tutorial_primer_main.js @@ -81,7 +81,7 @@ function setupTooptips() { tooltipWidget("logList", qsTr("Log messages produced by MO. Please note that messages with a light bulb usually don't require your attention.")) tooltipAction("actionSettings", qsTr("Configure Mod Organizer.")) - tooltipAction("actionProblems", qsTr("Reports potential Problems about the current setup.")) + tooltipAction("actionNotifications", qsTr("Notifications about the current setup.")) tooltipAction("actionUpdate", qsTr("Activates if there is an update for MO. Please note that if, for any reason, MO can't communicate with NMM, this will not work either.")) switch (manager.findControl("tabWidget").currentIndex) { -- cgit v1.3.1