From 03b029c61398bf8c5db5faca44ff58e212454a1c Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 18 Mar 2015 19:35:49 +0100 Subject: - avoiding unnecessary meta.ini saves when checking mods for updates --- src/modinfo.cpp | 29 +++++++++++++++++++++-------- src/modinfo.h | 4 ++++ 2 files changed, 25 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/modinfo.cpp b/src/modinfo.cpp index c7d1101d..ce51ecc6 100644 --- a/src/modinfo.cpp +++ b/src/modinfo.cpp @@ -634,13 +634,14 @@ bool ModInfoRegular::downgradeAvailable() const void ModInfoRegular::nxmDescriptionAvailable(int, QVariant, QVariant resultData) { QVariantMap result = resultData.toMap(); - m_NewestVersion.parse(result["version"].toString()); - m_NexusDescription = result["description"].toString(); + setNewestVersion(VersionInfo(result["version"].toString())); + setNexusDescription(result["description"].toString()); + if ((m_EndorsedState != ENDORSED_NEVER) && (result.contains("voted_by_user"))) { - m_EndorsedState = result["voted_by_user"].toBool() ? ENDORSED_TRUE : ENDORSED_FALSE; + setEndorsedState(result["voted_by_user"].toBool() ? ENDORSED_TRUE : ENDORSED_FALSE); } m_LastNexusQuery = QDateTime::currentDateTime(); - m_MetaInfoChanged = true; + //m_MetaInfoChanged = true; saveMeta(); emit modDetailsUpdated(true); } @@ -774,14 +775,26 @@ void ModInfoRegular::setVersion(const VersionInfo &version) void ModInfoRegular::setNewestVersion(const VersionInfo &version) { - m_NewestVersion = version; - m_MetaInfoChanged = true; + if (version != m_NewestVersion) { + m_NewestVersion = version; + m_MetaInfoChanged = true; + } } void ModInfoRegular::setNexusDescription(const QString &description) { - m_NexusDescription = description; - m_MetaInfoChanged = true; + if (qHash(description) != qHash(m_NexusDescription)) { + m_NexusDescription = description; + m_MetaInfoChanged = true; + } +} + +void ModInfoRegular::setEndorsedState(EEndorsedState endorsedState) +{ + if (endorsedState != m_EndorsedState) { + m_EndorsedState = endorsedState; + m_MetaInfoChanged = true; + } } void ModInfoRegular::setInstallationFile(const QString &fileName) diff --git a/src/modinfo.h b/src/modinfo.h index 33e6ec96..e50561b7 100644 --- a/src/modinfo.h +++ b/src/modinfo.h @@ -934,6 +934,10 @@ public: void readMeta(); +private: + + void setEndorsedState(EEndorsedState endorsedState); + private slots: void nxmDescriptionAvailable(int modID, QVariant userData, QVariant resultData); -- cgit v1.3.1 From f134c7ab4cce6efb1a72bebe599ac0e71e8d0895 Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 18 Mar 2015 19:40:12 +0100 Subject: - plugin list can now be sorted by flags - sorting by mod index now puts the disabled mods to one end of the list --- src/pluginlistsortproxy.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/pluginlistsortproxy.cpp b/src/pluginlistsortproxy.cpp index b8ac220a..342b3744 100644 --- a/src/pluginlistsortproxy.cpp +++ b/src/pluginlistsortproxy.cpp @@ -85,9 +85,24 @@ bool PluginListSortProxy::lessThan(const QModelIndex &left, case PluginList::COL_NAME: { return QString::compare(plugins->getName(left.row()), plugins->getName(right.row()), Qt::CaseInsensitive) < 0; } break; - case PluginList::COL_PRIORITY: + case PluginList::COL_FLAGS: { + QVariantList lhsList = left.data(Qt::UserRole + 1).toList(); + QVariantList rhsList = right.data(Qt::UserRole + 1).toList(); + if (lhsList.size() != rhsList.size()) { + return lhsList.size() < rhsList.size(); + } else { + for (int i = 0; i < lhsList.size(); ++i) { + if (lhsList.at(i) != rhsList.at(i)) { + return lhsList.at(i) < rhsList.at(i); + } + } + return false; + } + } break; case PluginList::COL_MODINDEX: { - return plugins->getPriority(left.row()) < plugins->getPriority(right.row()); + int leftVal = plugins->isEnabled(left.row()) ? plugins->getPriority(left.row()) : -1; + int rightVal = plugins->isEnabled(right.row()) ? plugins->getPriority(right.row()) : -1; + return leftVal < rightVal; } break; default: { return plugins->getPriority(left.row()) < plugins->getPriority(right.row()); -- cgit v1.3.1 From 4a99cfe6ad0d5e68f0a8f6e1057babb7494a8c2d Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 18 Mar 2015 19:41:11 +0100 Subject: bugfix: crash related to bad timing when filtering the mod list --- src/mainwindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 362fffe5..56918759 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -256,6 +256,7 @@ MainWindow::MainWindow(const QString &exeName connect(ui->savegameList, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(saveSelectionChanged(QListWidgetItem*))); connect(ui->modList, SIGNAL(dropModeUpdate(bool)), m_OrganizerCore.modList(), SLOT(dropModeUpdate(bool))); + connect(ui->modList->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(modlistSelectionChanged(QModelIndex,QModelIndex))); connect(m_ModListSortProxy, SIGNAL(filterActive(bool)), this, SLOT(modFilterActive(bool))); connect(ui->modFilterEdit, SIGNAL(textChanged(QString)), m_ModListSortProxy, SLOT(updateFilter(QString))); @@ -674,11 +675,10 @@ void MainWindow::createHelpWidget() buttonMenu->addAction(tr("About Qt"), qApp, SLOT(aboutQt())); } - void MainWindow::modFilterActive(bool filterActive) { if (filterActive) { - m_OrganizerCore.modList()->setOverwriteMarkers(std::set(), std::set()); +// m_OrganizerCore.modList()->setOverwriteMarkers(std::set(), std::set()); ui->modList->setStyleSheet("QTreeView { border: 2px ridge #f00; }"); } else if (ui->groupCombo->currentIndex() != 0) { ui->modList->setStyleSheet("QTreeView { border: 2px ridge #337733; }"); @@ -1818,7 +1818,7 @@ void MainWindow::setESPListSorting(int index) void MainWindow::refresher_progress(int percent) { if (percent == 100) { - m_RefreshProgress->setVisible(false); +// m_RefreshProgress->setVisible(false); } else if (!m_RefreshProgress->isVisible()) { m_RefreshProgress->setVisible(true); m_RefreshProgress->setRange(0, 100); @@ -3784,7 +3784,7 @@ void MainWindow::modDetailsUpdated(bool) break; } } -// m_RefreshProgress->setVisible(false); + m_RefreshProgress->setVisible(false); } else { m_RefreshProgress->setValue(m_RefreshProgress->maximum() - m_ModsToUpdate); } -- cgit v1.3.1 From c6758e47c875ffb0fccdd1a4e478f6a9593dc657 Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 18 Mar 2015 19:41:46 +0100 Subject: minor stuff (slight changes to the visual style, code refactorings, version increment) --- src/modlist.cpp | 7 +- src/modlistsortproxy.cpp | 12 +- src/problemsdialog.ui | 6 +- src/stylesheets/dark.qss | 316 ++++++++++++++++++++++++----------------------- src/version.rc | 4 +- 5 files changed, 175 insertions(+), 170 deletions(-) (limited to 'src') diff --git a/src/modlist.cpp b/src/modlist.cpp index 9ac2622d..863e85fc 100644 --- a/src/modlist.cpp +++ b/src/modlist.cpp @@ -347,9 +347,9 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const } else if ((role == Qt::BackgroundRole) || (role == ViewMarkingScrollBar::DEFAULT_ROLE)) { if (m_Overwrite.find(modIndex) != m_Overwrite.end()) { - return QColor(0, 255, 0, 64); + return QColor(0, 255, 0, 32); } else if (m_Overwritten.find(modIndex) != m_Overwritten.end()) { - return QColor(255, 0, 0, 64); + return QColor(255, 0, 0, 32); } else { return QVariant(); } @@ -917,8 +917,9 @@ void ModList::notifyChange(int rowStart, int rowEnd) beginResetModel(); endResetModel(); } else { - if (rowEnd == -1) + if (rowEnd == -1) { rowEnd = rowStart; + } emit dataChanged(this->index(rowStart, 0), this->index(rowEnd, this->columnCount() - 1)); } } diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp index d62fe00a..56783132 100644 --- a/src/modlistsortproxy.cpp +++ b/src/modlistsortproxy.cpp @@ -54,7 +54,9 @@ void ModListSortProxy::setProfile(Profile *profile) void ModListSortProxy::updateFilterActive() { - m_FilterActive = (m_CategoryFilter.size() > 0) || (m_ContentFilter.size() > 0) || !m_CurrentFilter.isEmpty(); + m_FilterActive = ((m_CategoryFilter.size() > 0) + || (m_ContentFilter.size() > 0) + || !m_CurrentFilter.isEmpty()); emit filterActive(m_FilterActive); } @@ -62,25 +64,23 @@ void ModListSortProxy::setCategoryFilter(const std::vector &categories) { m_CategoryFilter = categories; updateFilterActive(); - this->invalidate(); + invalidate(); } void ModListSortProxy::setContentFilter(const std::vector &content) { m_ContentFilter = content; updateFilterActive(); - this->invalidate(); + invalidate(); } Qt::ItemFlags ModListSortProxy::flags(const QModelIndex &modelIndex) const { Qt::ItemFlags flags = sourceModel()->flags(mapToSource(modelIndex)); -/* if (sortColumn() != ModList::COL_PRIORITY) { - flags &= ~Qt::ItemIsDragEnabled; - }*/ return flags; } + void ModListSortProxy::enableAllVisible() { if (m_Profile == nullptr) return; diff --git a/src/problemsdialog.ui b/src/problemsdialog.ui index 99c3f3aa..313a3c74 100644 --- a/src/problemsdialog.ui +++ b/src/problemsdialog.ui @@ -23,7 +23,7 @@ false - 420 + 350 @@ -49,8 +49,8 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7.8pt;"><br /></p></body></html> diff --git a/src/stylesheets/dark.qss b/src/stylesheets/dark.qss index 56cb2631..bcf445a2 100644 --- a/src/stylesheets/dark.qss +++ b/src/stylesheets/dark.qss @@ -1,56 +1,55 @@ QToolTip { - border: 1px solid black; - color: #D9E6EA; - background-color: #2F3031; - padding: 1px; - border-radius: 3px; - opacity: 255; + border: 1px solid black; + color: #D9E6EA; + background-color: #2F3031; + padding: 1px; + border-radius: 3px; + opacity: 255; } QWidget { - color: #E9E6E4; - background-color: #2F3031; + color: #E9E6E4; + background-color: #2F3031; } - QWidget:disabled { - color: #757676; - background-color: #292A2B; + color: #757676; + background-color: #292A2B; } QAbstractItemView { - background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #484F53, stop: 0.7 #656666, stop: 1 #484F53); + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #484F53, stop: 0.7 #656666, stop: 1 #484F53); } QLineEdit { - background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2D3330, stop: 0.9 #484F53, stop: 1 #2D3330); - padding: 1px; - border-style: solid; - border: 1px solid #1e1e1e; - border-radius: 5; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2D3330, stop: 0.9 #484F53, stop: 1 #2D3330); + padding: 1px; + border-style: solid; + border: 1px solid #1e1e1e; + border-radius: 5; } QPushButton { - color: #D9E6EA; - background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); - border-width: 2px; - border-color: #1F2021; - border-style: solid; - border-radius: 6; - padding: 3px; - padding-left: 15px; - padding-right: 15px; + color: #D9E6EA; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + border-width: 2px; + border-color: #1F2021; + border-style: solid; + border-radius: 6; + padding: 3px; + padding-left: 15px; + padding-right: 15px; } QPushButton:pressed { - background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #484F53, stop: 1 #697670); + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #484F53, stop: 1 #697670); } QPushButton:checked @@ -61,11 +60,11 @@ QPushButton:checked QComboBox { - selection-background-color: #D9E6EA; - background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9AA6A4, stop: 1 #484F53); - border: 2px solid #1D2320; - height: 20px; - border-radius: 5px; + selection-background-color: #D9E6EA; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9AA6A4, stop: 1 #484F53); + border: 2px solid #1D2320; + height: 20px; + border-radius: 5px; } QComboBox:hover,QPushButton:hover @@ -73,13 +72,12 @@ QComboBox:hover,QPushButton:hover border: 2px solid #3EA0CA; } - QComboBox:on { - padding-top: 3px; - padding-left: 4px; - background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); - selection-background-color: #80B5C3; + padding-top: 3px; + padding-left: 4px; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + selection-background-color: #80B5C3; } QComboBox::drop-down @@ -95,36 +93,38 @@ QComboBox::drop-down border-bottom-right-radius: 3px; } -QComboBox::down-arrow { +QComboBox::down-arrow +{ image: url(:/stylesheet/combobox-down.png); } - -/* Scrollbars */ -QScrollBar:horizontal { - border: 1px solid #1F2021; - background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #1D2320, stop: 0.2 #1F2021, stop: 1 #484F53); - height: 14px; - margin: 1px 16px 1px 16px; +QScrollBar:horizontal +{ + border: 1px solid #1F2021; + background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #1D2320, stop: 0.2 #1F2021, stop: 1 #484F53); + height: 14px; + margin: 1px 16px 1px 16px; } QScrollBar::handle:horizontal { - background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #3EA0CA, stop: 0.5 #427683, stop: 1 #3EA0CA); - min-height: 20px; - border-radius: 4px; + background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #3EA0CA, stop: 0.5 #427683, stop: 1 #3EA0CA); + min-height: 20px; + border-radius: 4px; } -QScrollBar::add-line:horizontal { - border: 1px solid #1b1b19; - border-radius: 2px; - background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #3EA0CA, stop: 1 #427683); - width: 14px; - subcontrol-position: right; - subcontrol-origin: margin; +QScrollBar::add-line:horizontal +{ + border: 1px solid #1b1b19; + border-radius: 2px; + background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #3EA0CA, stop: 1 #427683); + width: 14px; + subcontrol-position: right; + subcontrol-origin: margin; } -QScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal +{ border: 1px solid #1b1b19; border-radius: 2px; background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #3EA0CA, stop: 1 #427683); @@ -143,82 +143,81 @@ QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; + background: none; } QScrollBar:vertical { - border: 1px solid #1F2021; - background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #1D2320, stop: 0.2 #1F2021, stop: 1 #484F53); - width: 14px; - margin: 16px 1px 16px 1px; + border: 1px solid #1F2021; + background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #1D2320, stop: 0.2 #1F2021, stop: 1 #484F53); + width: 14px; + margin: 16px 1px 16px 1px; } QScrollBar::handle:vertical { - background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3EA0CA, stop: 0.5 #427683, stop: 1 #3EA0CA); - min-height: 20px; - border-radius: 4px; + background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3EA0CA, stop: 0.5 #427683, stop: 1 #3EA0CA); + min-height: 20px; + border-radius: 4px; } QScrollBar::add-line:vertical { - border: 1px solid #1b1b19; - border-radius: 2px; - background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3EA0CA, stop: 1 #427683); - height: 14px; - subcontrol-position: bottom; - subcontrol-origin: margin; + border: 1px solid #1b1b19; + border-radius: 2px; + background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3EA0CA, stop: 1 #427683); + height: 14px; + subcontrol-position: bottom; + subcontrol-origin: margin; } QScrollBar::sub-line:vertical { - border: 1px solid #1b1b19; - border-radius: 2px; - background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3EA0CA, stop: 1 #427683); - height: 14px; - subcontrol-position: top; - subcontrol-origin: margin; + border: 1px solid #1b1b19; + border-radius: 2px; + background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #3EA0CA, stop: 1 #427683); + height: 14px; + subcontrol-position: top; + subcontrol-origin: margin; } QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { - border: 1px solid black; - width: 1px; - height: 1px; - background: white; + border: 1px solid black; + width: 1px; + height: 1px; + background: white; } - QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; + background: none; } QTextEdit { - background-color: #484F53; + background-color: #484F53; } QPlainTextEdit { - background-color: #484F53; + background-color: #484F53; } QWebView { - background-color: #484F53; + background-color: #484F53; } QHeaderView::section { - background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:0 #484F53, stop:0.5 #757676, stop:1 #484F53); - color: white; - padding-left: 4px; - border: 1px solid #2D3330; - border-radius: 2px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; + background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:0 #484F53, stop:0.5 #757676, stop:1 #484F53); + color: white; + padding-left: 4px; + border: 1px solid #2D3330; + border-radius: 2px; + border-bottom-right-radius: 4px; + border-bottom-left-radius: 4px; } QCheckBox:disabled @@ -228,87 +227,101 @@ QCheckBox:disabled QMenu::separator { - height: 2px; - background-color: #484F53; - color: white; - padding-left: 4px; - margin-left: 10px; - margin-right: 5px; + height: 2px; + background-color: #484F53; + color: white; + padding-left: 4px; + margin-left: 10px; + margin-right: 5px; +} + +QMenu::item +{ + padding: 2px 25px 2px 20px; + border: 1px solid transparent; +} + +QMenu::item:selected +{ + background-color: #3c4b54; + border-color: #3EA0CA; } QProgressBar { - border: 2px solid grey; - border-radius: 5px; - text-align: center; + border: 2px solid grey; + border-radius: 5px; + text-align: center; } QProgressBar::chunk { - background-color: #427683; - width: 20px; + background-color: #427683; + width: 20px; } -QTabBar::tab { - color: #E9E6E4; - border: 1px solid #444; - border-bottom-style: none; - background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:0.8 #1D2320, stop:0.2 #757676); - padding-left: 10px; - padding-right: 10px; - padding-top: 3px; - padding-bottom: 2px; - margin-right: -1px; - border-top-left-radius: 4px; - border-top-right-radius: 4px; +QTabBar::tab +{ + color: #E9E6E4; + border: 1px solid #444; + border-bottom-style: none; + background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:0.8 #1D2320, stop:0.2 #757676); + padding-left: 10px; + padding-right: 10px; + padding-top: 3px; + padding-bottom: 2px; + margin-right: -1px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; } -QTabWidget::pane { - border: 1px solid #444; - top: 1px; +QTabWidget::pane +{ + border: 1px solid #444; + top: 1px; } QTabBar::tab:last { - margin-right: 0; /* the last selected tab has nothing to overlap with on the right */ + margin-right: 0px; } QTabBar::tab:first { - margin-left: 0px; /* the last selected tab has nothing to overlap with on the right */ + margin-left: 0px; } QTabBar::tab:!selected { - color: #E9E6E4; - border-bottom-style: solid; - margin-top: 3px; - background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:0.8 #1D2320, stop:0.4 #484F53); + color: #E9E6E4; + border-bottom-style: solid; + margin-top: 3px; + background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:0.8 #1D2320, stop:0.4 #484F53); } QTabBar::tab:disabled { - color: #757676; - border-bottom-style: solid; - margin-top: 3px; - background-color: #484F53; + color: #757676; + border-bottom-style: solid; + margin-top: 3px; + background-color: #484F53; } QTabBar::tab:selected { - border-top-left-radius: 3px; - border-top-right-radius: 3px; - margin-bottom: 0px; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + margin-bottom: 0px; } QTabBar::tab:!selected:hover { - border-top-left-radius: 6px; - border-top-right-radius: 6px; - background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:1 #212121, stop:0.4 #343434, stop:0.2 #343434, stop:0.1 #3EA0CA); + border-top-left-radius: 6px; + border-top-right-radius: 6px; + background-color: QLinearGradient(x1:0, y1:0, x2:0, y2:1, stop:1 #212121, stop:0.4 #343434, stop:0.2 #343434, stop:0.1 #3EA0CA); } - -QToolButton { +QToolButton +{ border:2px ridge #757676; border-radius: 6px; margin: 3px; @@ -316,10 +329,10 @@ QToolButton { padding-right: 8px; padding-top: 0px; padding-bottom: 2px; - - } -QToolButton:hover { + +QToolButton:hover +{ border: 2px ridge #757676; background-color: #484F53; border-radius: 6px; @@ -330,32 +343,23 @@ QToolButton:hover { padding-bottom: 2px; } - -QTreeView { +QTreeView + { color: #E9E6E4; - background-color: #3F4041; - alternate-background-color: #2F3031; + background-color: #3F4041; + alternate-background-color: #2F3031; } -/* -QTreeView::item:selected { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #3EA0CA, stop: 1 #0B2A39); - } - -QTreeView::item:hover { - background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #1E80AA, stop: 1 #225663); - }*/ - QTreeView::branch:has-children:!has-siblings:closed, -QTreeView::branch:closed:has-children:has-siblings { +QTreeView::branch:closed:has-children:has-siblings +{ border-image: none; image: url(:/stylesheet/branch-closed.png); } QTreeView::branch:open:has-children:!has-siblings, -QTreeView::branch:open:has-children:has-siblings { +QTreeView::branch:open:has-children:has-siblings +{ border-image: none; image: url(:/stylesheet/branch-open.png); } diff --git a/src/version.rc b/src/version.rc index d6fe2f85..9e6492f5 100644 --- a/src/version.rc +++ b/src/version.rc @@ -1,7 +1,7 @@ #include "Winver.h" -#define VER_FILEVERSION 1,3,1,0 -#define VER_FILEVERSION_STR "1,3,1,0\0" +#define VER_FILEVERSION 1,3,2,0 +#define VER_FILEVERSION_STR "1,3,2,0\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION -- cgit v1.3.1