From 3c7b232361d01f79a1d48ae3d8200cb6a68bbf32 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 11:55:13 -0400 Subject: - always show statusbar, used by the menu and toolbar to display status tips - reduced margins around central widgets to align it with status bar text, removed bottom margins completely because the statusbar is enough - notifications: now always enabled, dialog shows a special item when empty, just change the tooltip and leave the text alone - added all toolbar actions to menu - non functional in menu for now: tools, help and endorse because they're menus - changed some of the action strings to be the same on both toolbar and menu, added missing status tips --- src/mainwindow.cpp | 46 ++++++------ src/mainwindow.h | 3 + src/mainwindow.ui | 195 ++++++++++++++++++++++++++++++++++++++++++++----- src/problemsdialog.cpp | 24 +++++- src/problemsdialog.h | 6 +- 5 files changed, 226 insertions(+), 48 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 0ef9bc80..ff62e05e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -242,7 +242,6 @@ MainWindow::MainWindow(QSettings &initSettings m_RefreshProgress->setVisible(false); statusBar()->addWidget(m_RefreshProgress, 1000); statusBar()->clearMessage(); - statusBar()->hide(); updateProblemsButton(); @@ -674,8 +673,6 @@ void MainWindow::updateProblemsButton() { size_t numProblems = checkForProblems(); if (numProblems > 0) { - ui->actionNotifications->setEnabled(true); - ui->actionNotifications->setIconText(tr("Notifications")); ui->actionNotifications->setToolTip(tr("There are notifications to read")); QPixmap mergedIcon = QPixmap(":/MO/gui/warning").scaled(64, 64); @@ -686,8 +683,6 @@ void MainWindow::updateProblemsButton() } ui->actionNotifications->setIcon(QIcon(mergedIcon)); } else { - ui->actionNotifications->setEnabled(false); - ui->actionNotifications->setIconText(tr("No Notifications")); ui->actionNotifications->setToolTip(tr("There are no notifications")); ui->actionNotifications->setIcon(QIcon(":/MO/gui/warning")); } @@ -975,6 +970,13 @@ void MainWindow::showEvent(QShowEvent *event) void MainWindow::closeEvent(QCloseEvent* event) +{ + if (!exit()) { + event->ignore(); + } +} + +bool MainWindow::exit() { m_closing = true; @@ -982,8 +984,7 @@ void MainWindow::closeEvent(QCloseEvent* event) if (QMessageBox::question(this, tr("Downloads in progress"), tr("There are still downloads in progress, do you really want to quit?"), QMessageBox::Yes | QMessageBox::Cancel) == QMessageBox::Cancel) { - event->ignore(); - return; + return false; } else { m_OrganizerCore.downloadManager()->pauseAll(); } @@ -996,12 +997,12 @@ void MainWindow::closeEvent(QCloseEvent* event) { m_OrganizerCore.waitForApplication(injected_process_still_running); if (!m_closing) { // if operation cancelled - event->ignore(); - return; + return false; } } setCursor(Qt::WaitCursor); + return true; } void MainWindow::cleanup() @@ -2292,11 +2293,9 @@ void MainWindow::refresher_progress(int percent) { if (percent == 100) { m_RefreshProgress->setVisible(false); - statusBar()->hide(); this->setEnabled(true); } else if (!m_RefreshProgress->isVisible()) { this->setEnabled(false); - statusBar()->show(); m_RefreshProgress->setVisible(true); m_RefreshProgress->setRange(0, 100); m_RefreshProgress->setValue(percent); @@ -2309,7 +2308,6 @@ void MainWindow::directory_refreshed() // now refreshDataTreeKeepExpandedNodes(); updateProblemsButton(); - statusBar()->hide(); } void MainWindow::esplist_changed() @@ -2930,7 +2928,6 @@ void MainWindow::untrack_clicked() void MainWindow::validationFailed(const QString &error) { qDebug("Nexus API validation failed: %s", qUtf8Printable(error)); - statusBar()->hide(); } void MainWindow::windowTutorialFinished(const QString &windowName) @@ -4115,7 +4112,6 @@ void MainWindow::checkModsForUpdates() QString apiKey; if (m_OrganizerCore.settings().getNexusApiKey(apiKey)) { m_OrganizerCore.doAfterLogin([this] () { this->checkModsForUpdates(); }); - statusBar()->show(); NexusInterface::instance(&m_PluginContainer)->getAccessManager()->apiCheck(apiKey); } else { qWarning("You are not currently authenticated with Nexus. Please do so under Settings -> Nexus."); @@ -5391,12 +5387,15 @@ void MainWindow::on_conflictsCheckBox_toggled(bool) refreshDataTreeKeepExpandedNodes(); } - void MainWindow::on_actionUpdate_triggered() { m_OrganizerCore.startMOUpdate(); } +void MainWindow::on_actionExit_triggered() +{ + exit(); +} void MainWindow::actionEndorseMO() { @@ -5974,16 +5973,15 @@ void MainWindow::on_actionNotifications_triggered() { updateProblemsButton(); ProblemsDialog problems(m_PluginContainer.plugins(), this); - if (problems.hasProblems()) { - QSettings &settings = m_OrganizerCore.settings().directInterface(); - QString key = QString("geometry/%1").arg(problems.objectName()); - if (settings.contains(key)) { - problems.restoreGeometry(settings.value(key).toByteArray()); - } - problems.exec(); - settings.setValue(key, problems.saveGeometry()); - updateProblemsButton(); + + QSettings &settings = m_OrganizerCore.settings().directInterface(); + QString key = QString("geometry/%1").arg(problems.objectName()); + if (settings.contains(key)) { + problems.restoreGeometry(settings.value(key).toByteArray()); } + problems.exec(); + settings.setValue(key, problems.saveGeometry()); + updateProblemsButton(); } void MainWindow::on_actionChange_Game_triggered() diff --git a/src/mainwindow.h b/src/mainwindow.h index b4ad0bdb..1f0dd5ff 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -153,6 +153,8 @@ public: void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab); + bool exit(); + virtual bool closeWindow(); virtual void setWindowEnabled(bool enabled); @@ -626,6 +628,7 @@ private slots: // ui slots void on_actionNotifications_triggered(); void on_actionSettings_triggered(); void on_actionUpdate_triggered(); + void on_actionExit_triggered(); void on_bsaList_customContextMenuRequested(const QPoint &pos); void on_clearFiltersButton_clicked(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index d876b54a..84d3c9e4 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -31,6 +31,18 @@ + + 6 + + + 6 + + + 6 + + + 0 + @@ -1381,13 +1393,67 @@ p, li { white-space: pre-wrap; } + + + + 0 + 0 + 926 + 21 + + + + + &File + + + + + + + + + + &Tools + + + + + + + + + &Help + + + + + + + + &View + + + + + + &Edit + + + + + + + + + :/MO/gui/resources/system-installer.png:/MO/gui/resources/system-installer.png - Install Mod + Install &Mod... Install &Mod @@ -1395,6 +1461,9 @@ p, li { white-space: pre-wrap; } Install a new mod from an archive + + Install a new mod from an archive + Ctrl+M @@ -1405,13 +1474,16 @@ p, li { white-space: pre-wrap; } :/MO/gui/profiles:/MO/gui/profiles - Profiles + &Profiles... &Profiles - Configure Profiles + Configure profiles + + + Configure profiles Ctrl+P @@ -1423,7 +1495,7 @@ p, li { white-space: pre-wrap; } :/MO/gui/icon_executable:/MO/gui/icon_executable - Executables + &Executables... &Executables @@ -1431,6 +1503,9 @@ p, li { white-space: pre-wrap; } Configure the executables that can be started through Mod Organizer + + Configure the executables that can be started through Mod Organizer + Ctrl+E @@ -1441,7 +1516,7 @@ p, li { white-space: pre-wrap; } :/MO/gui/plugins:/MO/gui/plugins - Tools + &Tools &Tools @@ -1459,7 +1534,7 @@ p, li { white-space: pre-wrap; } :/MO/gui/settings:/MO/gui/settings - Settings + &Settings... &Settings @@ -1467,6 +1542,9 @@ p, li { white-space: pre-wrap; } Configure settings and workarounds + + Configure settings and workarounds + Ctrl+S @@ -1477,10 +1555,16 @@ p, li { white-space: pre-wrap; } :/MO/gui/resources/internet-web-browser.png:/MO/gui/resources/internet-web-browser.png - Nexus + Visit &Nexus + + + Visit &Nexus - Search nexus network for more mods + Visit the Nexus website in your browser for more mods + + + Visit the Nexus website in your browser for more mods Ctrl+N @@ -1495,25 +1579,34 @@ p, li { white-space: pre-wrap; } :/MO/gui/update:/MO/gui/update - Update + &Update Mod Organizer + + + &Update Mod Organizer Mod Organizer is up-to-date + + Mod Organizer is up-to-date + - - false - :/MO/gui/warning:/MO/gui/warning - No Notifications + Notifications... + + + Open the notifications dialog + + + Open the notifications dialog - This button will be highlighted if MO discovered potential problems in your setup and provide tips on how to fix them. + This button will be highlighted on the toolbar if MO discovered potential problems in your setup and provide tips on how to fix them. @@ -1522,7 +1615,10 @@ p, li { white-space: pre-wrap; } :/MO/gui/help:/MO/gui/help - Help + &Help + + + &Help Help @@ -1537,15 +1633,30 @@ p, li { white-space: pre-wrap; } :/MO/gui/icon_favorite:/MO/gui/icon_favorite - Endorse MO + &Endorse ModOrganizer + + + &Endorse ModOrganizer Endorse Mod Organizer + + Endorse Mod Organizer + - Copy Log to Clipboard + Copy &Log + + + Copy &Log + + + Copy log to clipboard + + + Copy log to clipboard @@ -1554,11 +1665,59 @@ p, li { white-space: pre-wrap; } :/MO/gui/instance_switch:/MO/gui/instance_switch - Change Game + &Change Game... + + + &Change Game Open the Instance selection dialog to manage a different Game + + Open the Instance selection dialog to manage a different Game + + + + + E&xit + + + E&xit + + + Exits Mod Organizer + + + Exits Mod Organizer + + + + + false + + + + :/MO/gui/plugins:/MO/gui/plugins + + + &Tools + + + + + false + + + &Help menu + + + + + false + + + Endorse Mod Organizer + diff --git a/src/problemsdialog.cpp b/src/problemsdialog.cpp index 56109d34..1e8e800f 100644 --- a/src/problemsdialog.cpp +++ b/src/problemsdialog.cpp @@ -11,8 +11,9 @@ using namespace MOBase; -ProblemsDialog::ProblemsDialog(std::vector pluginObjects, QWidget *parent) - : QDialog(parent), ui(new Ui::ProblemsDialog), m_PluginObjects(pluginObjects) +ProblemsDialog::ProblemsDialog(std::vector pluginObjects, QWidget *parent) : + QDialog(parent), ui(new Ui::ProblemsDialog), m_PluginObjects(pluginObjects), + m_hasProblems(false) { ui->setupUi(this); @@ -30,7 +31,9 @@ ProblemsDialog::~ProblemsDialog() void ProblemsDialog::runDiagnosis() { + m_hasProblems = false; ui->problemsWidget->clear(); + for(QObject *pluginObj : m_PluginObjects) { IPlugin *plugin = qobject_cast(pluginObj); if (plugin != nullptr && !plugin->isActive()) @@ -47,6 +50,7 @@ void ProblemsDialog::runDiagnosis() newItem->setData(0, Qt::UserRole, diagnose->fullDescription(key)); ui->problemsWidget->addTopLevelItem(newItem); + m_hasProblems = true; if (diagnose->hasGuidedFix(key)) { newItem->setText(1, tr("Fix")); @@ -60,11 +64,25 @@ void ProblemsDialog::runDiagnosis() } } } + + if (!m_hasProblems) { + auto* item = new QTreeWidgetItem; + + item->setText(0, tr("(There are no notifications)")); + item->setText(1, ""); + item->setData(0, Qt::UserRole, QString()); + + QFont font = item->font(0); + font.setItalic(true); + item->setFont(0, font); + + ui->problemsWidget->addTopLevelItem(item); + } } bool ProblemsDialog::hasProblems() const { - return ui->problemsWidget->topLevelItemCount() != 0; + return m_hasProblems; } void ProblemsDialog::selectionChanged() diff --git a/src/problemsdialog.h b/src/problemsdialog.h index a48a5de1..c211e4f5 100644 --- a/src/problemsdialog.h +++ b/src/problemsdialog.h @@ -21,20 +21,20 @@ public: ~ProblemsDialog(); bool hasProblems() const; -private: +private: void runDiagnosis(); private slots: - void selectionChanged(); void urlClicked(const QUrl &url); void startFix(); -private: +private: Ui::ProblemsDialog *ui; std::vector m_PluginObjects; + bool m_hasProblems; }; #endif // PROBLEMSDIALOG_H -- cgit v1.3.1 From 860eb49b45703d939196e92ba6e6d99f54ed3088 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 13:14:21 -0400 Subject: removed actionToToolButton(), which was replacing QAction's in the toolbar with QToolButton's, making it very difficult to have an equivalent in the main menu. QAction's can have a menu, so use that instead. the only place this doesn't work is with the nexus button, which can be replaced by a menu if there are IPluginModPage plugins adding items to it; registerModPage() works fine with the toolbar, but doesn't handle the main menu yet --- src/mainwindow.cpp | 117 ++++++++++++++++++++++------------------------------- src/mainwindow.h | 9 +++-- src/mainwindow.ui | 29 +++---------- 3 files changed, 59 insertions(+), 96 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ff62e05e..462eb5e0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -206,6 +206,7 @@ MainWindow::MainWindow(QSettings &initSettings , m_ContextItem(nullptr) , m_ContextAction(nullptr) , m_ContextRow(-1) + , m_browseModPage(nullptr) , m_CurrentSaveView(nullptr) , m_OrganizerCore(organizerCore) , m_PluginContainer(pluginContainer) @@ -248,17 +249,12 @@ MainWindow::MainWindow(QSettings &initSettings // Setup toolbar QWidget *spacer = new QWidget(ui->toolBar); spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); - QWidget *widget = ui->toolBar->widgetForAction(ui->actionTool); - QToolButton *toolBtn = qobject_cast(widget); - if (toolBtn->menu() == nullptr) { - actionToToolButton(ui->actionTool); - } - - actionToToolButton(ui->actionHelp); - createHelpWidget(); + setupActionMenu(ui->actionTool); + setupActionMenu(ui->actionHelp); + setupActionMenu(ui->actionEndorseMO); - actionToToolButton(ui->actionEndorseMO); + createHelpMenu(); createEndorseWidget(); toggleMO2EndorseState(); @@ -611,28 +607,13 @@ static QModelIndex mapToModel(const QAbstractItemModel *targetModel, QModelIndex return result; } - -void MainWindow::actionToToolButton(QAction *&sourceAction) +void MainWindow::setupActionMenu(QAction* a) { - QToolButton *button = new QToolButton(ui->toolBar); - button->setObjectName(sourceAction->objectName()); - button->setIcon(sourceAction->icon()); - button->setText(sourceAction->text()); - button->setPopupMode(QToolButton::InstantPopup); - button->setToolButtonStyle(ui->toolBar->toolButtonStyle()); - button->setToolTip(sourceAction->toolTip()); - button->setShortcut(sourceAction->shortcut()); - QMenu *buttonMenu = new QMenu(sourceAction->text(), button); - button->setMenu(buttonMenu); - QAction *newAction = ui->toolBar->insertWidget(sourceAction, button); - newAction->setObjectName(sourceAction->objectName()); - newAction->setIcon(sourceAction->icon()); - newAction->setText(sourceAction->text()); - newAction->setToolTip(sourceAction->toolTip()); - newAction->setShortcut(sourceAction->shortcut()); - ui->toolBar->removeAction(sourceAction); - sourceAction->deleteLater(); - sourceAction = newAction; + a->setMenu(new QMenu(this)); + + auto* w = ui->toolBar->widgetForAction(a); + if (auto* tb=dynamic_cast(w)) + tb->setPopupMode(QToolButton::InstantPopup); } void MainWindow::updateToolBar() @@ -760,32 +741,34 @@ void MainWindow::createEndorseWidget() } -void MainWindow::createHelpWidget() +void MainWindow::createHelpMenu() { - QToolButton *toolBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionHelp)); - QMenu *buttonMenu = toolBtn->menu(); - if (buttonMenu == nullptr) { + auto* menu = ui->actionHelp->menu(); + if (!menu) { + // this happens on startup because languageChanged() (which calls this) is + // called before the menus are actually created return; } - buttonMenu->clear(); - QAction *helpAction = new QAction(tr("Help on UI"), buttonMenu); + menu->clear(); + + QAction *helpAction = new QAction(tr("Help on UI"), menu); connect(helpAction, SIGNAL(triggered()), this, SLOT(helpTriggered())); - buttonMenu->addAction(helpAction); + menu->addAction(helpAction); - QAction *wikiAction = new QAction(tr("Documentation"), buttonMenu); + QAction *wikiAction = new QAction(tr("Documentation"), menu); connect(wikiAction, SIGNAL(triggered()), this, SLOT(wikiTriggered())); - buttonMenu->addAction(wikiAction); + menu->addAction(wikiAction); - QAction *discordAction = new QAction(tr("Chat on Discord"), buttonMenu); + QAction *discordAction = new QAction(tr("Chat on Discord"), menu); connect(discordAction, SIGNAL(triggered()), this, SLOT(discordTriggered())); - buttonMenu->addAction(discordAction); + menu->addAction(discordAction); - QAction *issueAction = new QAction(tr("Report Issue"), buttonMenu); + QAction *issueAction = new QAction(tr("Report Issue"), menu); connect(issueAction, SIGNAL(triggered()), this, SLOT(issueTriggered())); - buttonMenu->addAction(issueAction); + menu->addAction(issueAction); - QMenu *tutorialMenu = new QMenu(tr("Tutorials"), buttonMenu); + QMenu *tutorialMenu = new QMenu(tr("Tutorials"), menu); typedef std::vector > ActionList; @@ -823,9 +806,9 @@ void MainWindow::createHelpWidget() tutorialMenu->addAction(iter->second); } - buttonMenu->addMenu(tutorialMenu); - buttonMenu->addAction(tr("About"), this, SLOT(about())); - buttonMenu->addAction(tr("About Qt"), qApp, SLOT(aboutQt())); + menu->addMenu(tutorialMenu); + menu->addAction(tr("About"), this, SLOT(about())); + menu->addAction(tr("About Qt"), qApp, SLOT(aboutQt())); } void MainWindow::modFilterActive(bool filterActive) @@ -1128,21 +1111,20 @@ void MainWindow::modPagePluginInvoke() void MainWindow::registerPluginTool(IPluginTool *tool, QString name, QMenu *menu) { + if (!menu) { + menu = ui->actionTool->menu(); + } + if (name.isEmpty()) name = tool->displayName(); - QAction *action = new QAction(tool->icon(), name, ui->toolBar); + QAction *action = new QAction(tool->icon(), name, menu); action->setToolTip(tool->tooltip()); tool->setParentWidget(this); action->setData(qVariantFromValue((QObject*)tool)); connect(action, SIGNAL(triggered()), this, SLOT(toolPluginInvoke()), Qt::QueuedConnection); - if (menu == nullptr) { - QToolButton *toolBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionTool)); - toolBtn->menu()->addAction(action); - } else { - menu->addAction(action); - } + menu->addAction(action); } void MainWindow::registerPluginTools(std::vector toolPlugins) @@ -1176,8 +1158,7 @@ void MainWindow::registerPluginTools(std::vector toolPlugins) for (auto info : submenuMap[submenuKey]) { registerPluginTool(info.second, info.first, submenu); } - QToolButton *toolBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionTool)); - toolBtn->menu()->addMenu(submenu); + ui->actionTool->menu()->addMenu(submenu); } else { registerPluginTool(submenuMap[submenuKey].front().second); @@ -1188,25 +1169,23 @@ void MainWindow::registerPluginTools(std::vector toolPlugins) void MainWindow::registerModPage(IPluginModPage *modPage) { // turn the browser action into a drop-down menu if necessary - if (ui->actionNexus->menu() == nullptr) { - QAction *nexusAction = ui->actionNexus; - // TODO: use a different icon for nexus! - ui->actionNexus = new QAction(nexusAction->icon(), tr("Browse Mod Page"), ui->toolBar); - ui->toolBar->insertAction(nexusAction, ui->actionNexus); - ui->toolBar->removeAction(nexusAction); - actionToToolButton(ui->actionNexus); + if (!m_browseModPage) { + m_browseModPage = new QAction(ui->actionNexus->icon(), tr("Browse Mod Page"), this); + setupActionMenu(m_browseModPage); - QToolButton *browserBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionNexus)); - browserBtn->menu()->addAction(nexusAction); + m_browseModPage->menu()->addAction(ui->actionNexus); + + ui->toolBar->insertAction(ui->actionNexus, m_browseModPage); + ui->toolBar->removeAction(ui->actionNexus); } - QAction *action = new QAction(modPage->icon(), modPage->displayName(), ui->toolBar); + QAction *action = new QAction(modPage->icon(), modPage->displayName(), this); modPage->setParentWidget(this); action->setData(qVariantFromValue(reinterpret_cast(modPage))); connect(action, SIGNAL(triggered()), this, SLOT(modPagePluginInvoke()), Qt::QueuedConnection); - QToolButton *toolBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionNexus)); - toolBtn->menu()->addAction(action); + + m_browseModPage->menu()->addAction(action); } @@ -5096,7 +5075,7 @@ void MainWindow::languageChange(const QString &newLanguage) ui->profileBox->setItemText(0, QObject::tr("")); - createHelpWidget(); + createHelpMenu(); updateDownloadView(); updateProblemsButton(); diff --git a/src/mainwindow.h b/src/mainwindow.h index 1f0dd5ff..7281aab7 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -206,7 +206,9 @@ private: void cleanup(); - void actionToToolButton(QAction *&sourceAction); + void setupActionMenu(QAction* a); + void createHelpMenu(); + void createEndorseWidget(); void updateToolBar(); void activateSelectedProfile(); @@ -255,9 +257,6 @@ private: // remove invalid category-references from mods void fixCategories(); - void createEndorseWidget(); - void createHelpWidget(); - bool extractProgress(QProgressDialog &extractProgress, int percentage, std::string fileName); size_t checkForProblems(); @@ -343,6 +342,8 @@ private: QTreeWidgetItem *m_ContextItem; QAction *m_ContextAction; + QAction* m_browseModPage; + CategoryFactory &m_CategoryFactory; bool m_LoginAttempted; diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 84d3c9e4..a3eb8504 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1418,14 +1418,14 @@ p, li { white-space: pre-wrap; } - + &Help - + @@ -1621,7 +1621,10 @@ p, li { white-space: pre-wrap; } &Help - Help + Show help options + + + Show help options Ctrl+H @@ -1691,26 +1694,6 @@ p, li { white-space: pre-wrap; } Exits Mod Organizer - - - false - - - - :/MO/gui/plugins:/MO/gui/plugins - - - &Tools - - - - - false - - - &Help menu - - false -- cgit v1.3.1 From 746e9c08e68ed7e44e6ef4e29b250c73b9c21440 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 14:22:24 -0400 Subject: moved notification menu item to tools, was the only thing in view fixed endorse action to also work with the menu fixed changing endorsement integration setting not changing visibility of actions --- src/mainwindow.cpp | 32 +++++++++++++++++--------------- src/mainwindow.h | 2 +- src/mainwindow.ui | 20 ++++---------------- 3 files changed, 22 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 462eb5e0..8e0d2624 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -255,7 +255,7 @@ MainWindow::MainWindow(QSettings &initSettings setupActionMenu(ui->actionEndorseMO); createHelpMenu(); - createEndorseWidget(); + createEndorseMenu(); toggleMO2EndorseState(); @@ -722,22 +722,23 @@ void MainWindow::about() } -void MainWindow::createEndorseWidget() +void MainWindow::createEndorseMenu() { - QToolButton *toolBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionEndorseMO)); - QMenu *buttonMenu = toolBtn->menu(); - if (buttonMenu == nullptr) { + auto* menu = ui->actionEndorseMO->menu(); + if (!menu) { + // shouldn't happen return; } - buttonMenu->clear(); - QAction *endorseAction = new QAction(tr("Endorse"), buttonMenu); + menu->clear(); + + QAction *endorseAction = new QAction(tr("Endorse"), menu); connect(endorseAction, SIGNAL(triggered()), this, SLOT(actionEndorseMO())); - buttonMenu->addAction(endorseAction); + menu->addAction(endorseAction); - QAction *wontEndorseAction = new QAction(tr("Won't Endorse"), buttonMenu); + QAction *wontEndorseAction = new QAction(tr("Won't Endorse"), menu); connect(wontEndorseAction, SIGNAL(triggered()), this, SLOT(actionWontEndorseMO())); - buttonMenu->addAction(wontEndorseAction); + menu->addAction(wontEndorseAction); } @@ -5021,6 +5022,8 @@ void MainWindow::on_actionSettings_triggered() m_OrganizerCore.updateVFSParams(settings.logLevel(), settings.crashDumpsType(), settings.executablesBlacklist()); m_OrganizerCore.cycleDiagnostics(); + + toggleMO2EndorseState(); } @@ -5473,20 +5476,19 @@ void MainWindow::modUpdateCheck(std::multimap IDs) void MainWindow::toggleMO2EndorseState() { - QToolButton *toolBtn = qobject_cast(ui->toolBar->widgetForAction(ui->actionEndorseMO)); if (Settings::instance().endorsementIntegration()) { ui->actionEndorseMO->setVisible(true); if (Settings::instance().directInterface().contains("endorse_state")) { - ui->actionEndorseMO->setEnabled(false); + ui->actionEndorseMO->menu()->setEnabled(false); if (Settings::instance().directInterface().value("endorse_state").toString() == "Endorsed") { ui->actionEndorseMO->setToolTip(tr("Thank you for endorsing MO2! :)")); - toolBtn->setToolTip(tr("Thank you for endorsing MO2! :)")); + ui->actionEndorseMO->setStatusTip(tr("Thank you for endorsing MO2! :)")); } else if (Settings::instance().directInterface().value("endorse_state").toString() == "Abstained") { ui->actionEndorseMO->setToolTip(tr("Please reconsider endorsing MO2 on Nexus!")); - toolBtn->setToolTip(tr("Please reconsider endorsing MO2 on Nexus!")); + ui->actionEndorseMO->setStatusTip(tr("Please reconsider endorsing MO2 on Nexus!")); } } else { - ui->actionEndorseMO->setEnabled(true); + ui->actionEndorseMO->menu()->setEnabled(true); } } else ui->actionEndorseMO->setVisible(false); diff --git a/src/mainwindow.h b/src/mainwindow.h index 7281aab7..96660aeb 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -208,7 +208,7 @@ private: void setupActionMenu(QAction* a); void createHelpMenu(); - void createEndorseWidget(); + void createEndorseMenu(); void updateToolBar(); void activateSelectedProfile(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index a3eb8504..03cb9ab7 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1417,8 +1417,11 @@ p, li { white-space: pre-wrap; } &Tools + + + @@ -1427,13 +1430,7 @@ p, li { white-space: pre-wrap; } - - - - - &View - - + @@ -1443,7 +1440,6 @@ p, li { white-space: pre-wrap; } - @@ -1694,14 +1690,6 @@ p, li { white-space: pre-wrap; } Exits Mod Organizer - - - false - - - Endorse Mod Organizer - - -- cgit v1.3.1 From 41ef9813dd7b3b7587afe8dfe3a16f2711200edb Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 15:22:11 -0400 Subject: moved links to a new dedicated toolbar --- src/mainwindow.cpp | 56 ++++++++++++++++++++++++++++++------------------------ src/mainwindow.h | 4 +--- src/mainwindow.ui | 43 +++++++++++++++++++++++------------------ 3 files changed, 57 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8e0d2624..09ecc3f9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -247,8 +247,6 @@ MainWindow::MainWindow(QSettings &initSettings updateProblemsButton(); // Setup toolbar - QWidget *spacer = new QWidget(ui->toolBar); - spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); setupActionMenu(ui->actionTool); setupActionMenu(ui->actionHelp); @@ -259,16 +257,6 @@ MainWindow::MainWindow(QSettings &initSettings toggleMO2EndorseState(); - for (QAction *action : ui->toolBar->actions()) { - if (action->isSeparator()) { - // insert spacers - ui->toolBar->insertWidget(action, spacer); - m_Sep = action; - // m_Sep would only use the last separator anyway, and we only have the one anyway? - break; - } - } - TaskProgressManager::instance().tryCreateTaskbar(); // set up mod list @@ -407,7 +395,7 @@ MainWindow::MainWindow(QSettings &initSettings connect(&TutorialManager::instance(), SIGNAL(windowTutorialFinished(QString)), this, SLOT(windowTutorialFinished(QString))); connect(ui->tabWidget, SIGNAL(currentChanged(int)), &TutorialManager::instance(), SIGNAL(tabChanged(int))); connect(ui->modList->header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(modListSortIndicatorChanged(int,Qt::SortOrder))); - connect(ui->toolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(toolBar_customContextMenuRequested(QPoint))); + connect(ui->linksToolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(linksToolBar_customContextMenuRequested(QPoint))); connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this, &MainWindow::modInstalled); connect(&m_OrganizerCore, &OrganizerCore::close, this, &QMainWindow::close); @@ -618,29 +606,36 @@ void MainWindow::setupActionMenu(QAction* a) void MainWindow::updateToolBar() { - for (QAction *action : ui->toolBar->actions()) { - if (action->objectName().startsWith("custom__")) { - ui->toolBar->removeAction(action); - action->deleteLater(); - } + for (auto* a : ui->linksToolBar->actions()) { + ui->linksToolBar->removeAction(a); + a->deleteLater(); } + bool hasLinks = false; + std::vector::iterator begin, end; m_OrganizerCore.executablesList()->getExecutables(begin, end); + for (auto iter = begin; iter != end; ++iter) { if (iter->isShownOnToolbar()) { + hasLinks = true; + QAction *exeAction = new QAction(iconForExecutable(iter->m_BinaryInfo.filePath()), iter->m_Title, ui->toolBar); + exeAction->setObjectName(QString("custom__") + iter->m_Title); if (!connect(exeAction, SIGNAL(triggered()), this, SLOT(startExeAction()))) { qDebug("failed to connect trigger?"); } - ui->toolBar->insertAction(m_Sep, exeAction); + + ui->linksToolBar->addAction(exeAction); } } -} + // don't show the toolbar if there are no links + ui->linksToolBar->setVisible(hasLinks); +} void MainWindow::scheduleUpdateButton() { @@ -649,7 +644,6 @@ void MainWindow::scheduleUpdateButton() } } - void MainWindow::updateProblemsButton() { size_t numProblems = checkForProblems(); @@ -1834,6 +1828,10 @@ void MainWindow::readSettings() restoreGeometry(settings.value("window_geometry").toByteArray()); } + if (settings.contains("window_state")) { + restoreState(settings.value("window_state").toByteArray()); + } + if (settings.contains("window_split")) { ui->splitter->restoreState(settings.value("window_split").toByteArray()); } @@ -1910,6 +1908,7 @@ void MainWindow::storeSettings(QSettings &settings) { if (settings.value("reset_geometry", false).toBool()) { settings.remove("window_geometry"); + settings.remove("window_state"); settings.remove("window_split"); settings.remove("log_split"); settings.remove("filters_visible"); @@ -1918,6 +1917,7 @@ void MainWindow::storeSettings(QSettings &settings) { settings.remove("reset_geometry"); } else { settings.setValue("window_geometry", saveGeometry()); + settings.setValue("window_state", saveState()); settings.setValue("window_split", ui->splitter->saveState()); settings.setValue("log_split", ui->topLevelSplitter->saveState()); settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry()); @@ -6062,17 +6062,23 @@ void MainWindow::removeFromToolbar() } -void MainWindow::toolBar_customContextMenuRequested(const QPoint &point) +void MainWindow::linksToolBar_customContextMenuRequested(const QPoint &point) { - QAction *action = ui->toolBar->actionAt(point); + QAction *action = ui->linksToolBar->actionAt(point); + if (action != nullptr) { if (action->objectName().startsWith("custom_")) { m_ContextAction = action; QMenu menu; - menu.addAction(tr("Remove"), this, SLOT(removeFromToolbar())); - menu.exec(ui->toolBar->mapToGlobal(point)); + menu.addAction(tr("Remove '%1' from the toolbar").arg(action->text()), this, SLOT(removeFromToolbar())); + menu.exec(ui->linksToolBar->mapToGlobal(point)); + return; } } + + // did not click a link button, show the default context menu + auto* m = createPopupMenu(); + m->exec(ui->linksToolBar->mapToGlobal(point)); } void MainWindow::on_espList_customContextMenuRequested(const QPoint &pos) diff --git a/src/mainwindow.h b/src/mainwindow.h index 96660aeb..8e50fa2e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -316,8 +316,6 @@ private: Ui::MainWindow *ui; - QAction *m_Sep; // Executable Shortcuts are added after this. Non owning. - bool m_WasVisible; MOBase::TutorialControl m_Tutorial; @@ -594,7 +592,7 @@ private slots: */ void allowListResize(); - void toolBar_customContextMenuRequested(const QPoint &point); + void linksToolBar_customContextMenuRequested(const QPoint &point); void removeFromToolbar(); void overwriteClosed(int); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 03cb9ab7..59d30a09 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1349,17 +1349,8 @@ p, li { white-space: pre-wrap; } - - true - - - Qt::CustomContextMenu - - Tool Bar - - - false + Main ToolBar @@ -1367,12 +1358,6 @@ p, li { white-space: pre-wrap; } 36 - - Qt::ToolButtonIconOnly - - - false - TopToolBarArea @@ -1380,9 +1365,11 @@ p, li { white-space: pre-wrap; } false - - + + + + @@ -1443,6 +1430,26 @@ p, li { white-space: pre-wrap; } + + + Qt::CustomContextMenu + + + Links ToolBar + + + + 42 + 36 + + + + TopToolBarArea + + + false + + -- cgit v1.3.1 From fab357ef4d1b65e2737fa2db93a42ede38653a59 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 15:57:52 -0400 Subject: toolbar size and button style are now configurable and remembered --- src/mainwindow.cpp | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/mainwindow.h | 3 +++ 2 files changed, 74 insertions(+) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 09ecc3f9..642b0c99 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -189,6 +189,9 @@ along with Mod Organizer. If not, see . using namespace MOBase; using namespace MOShared; +const QSize SmallToolbarSize(24, 24); +const QSize LargeToolbarSize(42, 36); + MainWindow::MainWindow(QSettings &initSettings , OrganizerCore &organizerCore @@ -637,6 +640,61 @@ void MainWindow::updateToolBar() ui->linksToolBar->setVisible(hasLinks); } +QMenu* MainWindow::createPopupMenu() +{ + auto* m = QMainWindow::createPopupMenu(); + + m->addSeparator(); + + auto* a = new QAction(tr("Small Icons"), m); + connect(a, &QAction::triggered, [&]{ setToolbarSize(SmallToolbarSize); }); + a->setCheckable(true); + a->setChecked(ui->toolBar->iconSize() == SmallToolbarSize); + m->addAction(a); + + a = new QAction(tr("Large Icons"), m); + connect(a, &QAction::triggered, [&]{ setToolbarSize(LargeToolbarSize); }); + a->setCheckable(true); + a->setChecked(ui->toolBar->iconSize() == LargeToolbarSize); + m->addAction(a); + + m->addSeparator(); + + a = new QAction(tr("Icons only"), m); + connect(a, &QAction::triggered, [&]{ setToolbarButtonStyle(Qt::ToolButtonIconOnly); }); + a->setCheckable(true); + a->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonIconOnly); + m->addAction(a); + + a = new QAction(tr("Text only"), m); + connect(a, &QAction::triggered, [&]{ setToolbarButtonStyle(Qt::ToolButtonTextOnly); }); + a->setCheckable(true); + a->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextOnly); + m->addAction(a); + + a = new QAction(tr("Text and Icons"), m); + connect(a, &QAction::triggered, [&]{ setToolbarButtonStyle(Qt::ToolButtonTextUnderIcon); }); + a->setCheckable(true); + a->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextUnderIcon); + m->addAction(a); + + return m; +} + +void MainWindow::setToolbarSize(const QSize& s) +{ + for (auto* tb : findChildren()) { + tb->setIconSize(s); + } +} + +void MainWindow::setToolbarButtonStyle(Qt::ToolButtonStyle s) +{ + for (auto* tb : findChildren()) { + tb->setToolButtonStyle(s); + } +} + void MainWindow::scheduleUpdateButton() { if (!m_UpdateProblemsTimer.isActive()) { @@ -1832,6 +1890,15 @@ void MainWindow::readSettings() restoreState(settings.value("window_state").toByteArray()); } + if (settings.contains("toolbar_size")) { + setToolbarSize(settings.value("toolbar_size").toSize()); + } + + if (settings.contains("toolbar_button_style")) { + setToolbarButtonStyle(static_cast( + settings.value("toolbar_button_style").toInt())); + } + if (settings.contains("window_split")) { ui->splitter->restoreState(settings.value("window_split").toByteArray()); } @@ -1909,6 +1976,8 @@ void MainWindow::storeSettings(QSettings &settings) { if (settings.value("reset_geometry", false).toBool()) { settings.remove("window_geometry"); settings.remove("window_state"); + settings.remove("toolbar_size"); + settings.remove("toolbar_button_style"); settings.remove("window_split"); settings.remove("log_split"); settings.remove("filters_visible"); @@ -1918,6 +1987,8 @@ void MainWindow::storeSettings(QSettings &settings) { } else { settings.setValue("window_geometry", saveGeometry()); settings.setValue("window_state", saveState()); + settings.setValue("toolbar_size", ui->toolBar->iconSize()); + settings.setValue("toolbar_button_style", static_cast(ui->toolBar->toolButtonStyle())); settings.setValue("window_split", ui->splitter->saveState()); settings.setValue("log_split", ui->topLevelSplitter->saveState()); settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry()); diff --git a/src/mainwindow.h b/src/mainwindow.h index 8e50fa2e..fa5912b8 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -211,6 +211,9 @@ private: void createEndorseMenu(); void updateToolBar(); + void setToolbarSize(const QSize& s); + void setToolbarButtonStyle(Qt::ToolButtonStyle s); + QMenu* createPopupMenu() override; void activateSelectedProfile(); void setExecutableIndex(int index); -- cgit v1.3.1 From e6706c7a5b82e68443de6ca262c77e1543986b1e Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 16:28:09 -0400 Subject: the toolbar menu is now in the ui file instead of being created by hand it's also shared between the main menu and the context menu --- src/mainwindow.cpp | 82 +++++++++++++++++++++++++++++------------------ src/mainwindow.h | 10 ++++++ src/mainwindow.ui | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 153 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 642b0c99..3da571f9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -399,6 +399,7 @@ MainWindow::MainWindow(QSettings &initSettings connect(ui->tabWidget, SIGNAL(currentChanged(int)), &TutorialManager::instance(), SIGNAL(tabChanged(int))); connect(ui->modList->header(), SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(modListSortIndicatorChanged(int,Qt::SortOrder))); connect(ui->linksToolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(linksToolBar_customContextMenuRequested(QPoint))); + connect(ui->menuToolbars, &QMenu::aboutToShow, [&]{ toolbarMenu_aboutToShow(); }); connect(&m_OrganizerCore, &OrganizerCore::modInstalled, this, &MainWindow::modInstalled); connect(&m_OrganizerCore, &OrganizerCore::close, this, &QMainWindow::close); @@ -640,45 +641,66 @@ void MainWindow::updateToolBar() ui->linksToolBar->setVisible(hasLinks); } -QMenu* MainWindow::createPopupMenu() +void MainWindow::toolbarMenu_aboutToShow() { - auto* m = QMainWindow::createPopupMenu(); + // well, this is a bit of a hack to allow the same toolbar menu to be shown + // in both the main menu and the context menu + // + // the toolbar menu is returned by createPopupMenu(), but Qt takes ownership + // of it and deletes it by setting the WA_DeleteOnClose attribute on it + // + // to avoid deleting the menu, the attribute is removed here + ui->menuToolbars->setAttribute(Qt::WA_DeleteOnClose, false); - m->addSeparator(); + ui->actionToolBarMainToggle->setChecked(ui->toolBar->isVisible()); + ui->actionToolBarLinksToggle->setChecked(ui->linksToolBar->isVisible()); - auto* a = new QAction(tr("Small Icons"), m); - connect(a, &QAction::triggered, [&]{ setToolbarSize(SmallToolbarSize); }); - a->setCheckable(true); - a->setChecked(ui->toolBar->iconSize() == SmallToolbarSize); - m->addAction(a); + ui->actionToolBarLargeIcons->setChecked(ui->toolBar->iconSize() == LargeToolbarSize); + ui->actionToolBarSmallIcons->setChecked(ui->toolBar->iconSize() == SmallToolbarSize); - a = new QAction(tr("Large Icons"), m); - connect(a, &QAction::triggered, [&]{ setToolbarSize(LargeToolbarSize); }); - a->setCheckable(true); - a->setChecked(ui->toolBar->iconSize() == LargeToolbarSize); - m->addAction(a); + ui->actionToolBarIconsOnly->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonIconOnly); + ui->actionToolBarTextOnly->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextOnly); + ui->actionToolBarIconsAndText->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextUnderIcon); +} - m->addSeparator(); +QMenu* MainWindow::createPopupMenu() +{ + return ui->menuToolbars; +} - a = new QAction(tr("Icons only"), m); - connect(a, &QAction::triggered, [&]{ setToolbarButtonStyle(Qt::ToolButtonIconOnly); }); - a->setCheckable(true); - a->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonIconOnly); - m->addAction(a); +void MainWindow::on_actionToolBarMainToggle_triggered() +{ + ui->toolBar->setVisible(!ui->toolBar->isVisible()); +} - a = new QAction(tr("Text only"), m); - connect(a, &QAction::triggered, [&]{ setToolbarButtonStyle(Qt::ToolButtonTextOnly); }); - a->setCheckable(true); - a->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextOnly); - m->addAction(a); +void MainWindow::on_actionToolBarLinksToggle_triggered() +{ + ui->linksToolBar->setVisible(!ui->linksToolBar->isVisible()); +} - a = new QAction(tr("Text and Icons"), m); - connect(a, &QAction::triggered, [&]{ setToolbarButtonStyle(Qt::ToolButtonTextUnderIcon); }); - a->setCheckable(true); - a->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextUnderIcon); - m->addAction(a); +void MainWindow::on_actionToolBarLargeIcons_triggered() +{ + setToolbarSize(LargeToolbarSize); +} + +void MainWindow::on_actionToolBarSmallIcons_triggered() +{ + setToolbarSize(SmallToolbarSize); +} - return m; +void MainWindow::on_actionToolBarIconsOnly_triggered() +{ + setToolbarButtonStyle(Qt::ToolButtonIconOnly); +} + +void MainWindow::on_actionToolBarTextOnly_triggered() +{ + setToolbarButtonStyle(Qt::ToolButtonTextOnly); +} + +void MainWindow::on_actionToolBarIconsAndText_triggered() +{ + setToolbarButtonStyle(Qt::ToolButtonTextUnderIcon); } void MainWindow::setToolbarSize(const QSize& s) diff --git a/src/mainwindow.h b/src/mainwindow.h index fa5912b8..18aa525e 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -213,6 +213,8 @@ private: void updateToolBar(); void setToolbarSize(const QSize& s); void setToolbarButtonStyle(Qt::ToolButtonStyle s); + void toolbarMenu_aboutToShow(); + QMenu* createPopupMenu() override; void activateSelectedProfile(); @@ -631,6 +633,14 @@ private slots: // ui slots void on_actionSettings_triggered(); void on_actionUpdate_triggered(); void on_actionExit_triggered(); + void on_actionToolBarMainToggle_triggered(); + void on_actionToolBarLinksToggle_triggered(); + void on_actionToolBarLargeIcons_triggered(); + void on_actionToolBarSmallIcons_triggered(); + void on_actionToolBarIconsOnly_triggered(); + void on_actionToolBarTextOnly_triggered(); + void on_actionToolBarIconsAndText_triggered(); + void on_bsaList_customContextMenuRequested(const QPoint &pos); void on_clearFiltersButton_clicked(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 59d30a09..a4bd2888 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1358,6 +1358,9 @@ p, li { white-space: pre-wrap; } 36 + + Qt::ToolButtonTextUnderIcon + TopToolBarArea @@ -1405,10 +1408,8 @@ p, li { white-space: pre-wrap; } - - @@ -1425,8 +1426,30 @@ p, li { white-space: pre-wrap; } + + + View + + + + Toolbars + + + + + + + + + + + + + + + @@ -1697,6 +1720,72 @@ p, li { white-space: pre-wrap; } Exits Mod Organizer + + + Toolbar Size + + + + + Toolbar Buttons + + + + + true + + + &Main + + + + + true + + + &Links + + + + + true + + + &Small Icons + + + + + true + + + Lar&ge Icons + + + + + true + + + &Icons Only + + + + + true + + + &Text Only + + + + + true + + + I&cons and Text + + -- cgit v1.3.1 From 71a9f085138bf8f9dc75a27abd9b54cdb89a0876 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 16:45:58 -0400 Subject: added medium toolbar icon size --- src/mainwindow.cpp | 17 ++++++++++++----- src/mainwindow.h | 3 ++- src/mainwindow.ui | 9 ++++++--- 3 files changed, 20 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3da571f9..753b6a5d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -190,6 +190,7 @@ using namespace MOBase; using namespace MOShared; const QSize SmallToolbarSize(24, 24); +const QSize MediumToolbarSize(32, 32); const QSize LargeToolbarSize(42, 36); @@ -655,8 +656,9 @@ void MainWindow::toolbarMenu_aboutToShow() ui->actionToolBarMainToggle->setChecked(ui->toolBar->isVisible()); ui->actionToolBarLinksToggle->setChecked(ui->linksToolBar->isVisible()); - ui->actionToolBarLargeIcons->setChecked(ui->toolBar->iconSize() == LargeToolbarSize); ui->actionToolBarSmallIcons->setChecked(ui->toolBar->iconSize() == SmallToolbarSize); + ui->actionToolBarMediumIcons->setChecked(ui->toolBar->iconSize() == MediumToolbarSize); + ui->actionToolBarLargeIcons->setChecked(ui->toolBar->iconSize() == LargeToolbarSize); ui->actionToolBarIconsOnly->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonIconOnly); ui->actionToolBarTextOnly->setChecked(ui->toolBar->toolButtonStyle() == Qt::ToolButtonTextOnly); @@ -678,14 +680,19 @@ void MainWindow::on_actionToolBarLinksToggle_triggered() ui->linksToolBar->setVisible(!ui->linksToolBar->isVisible()); } -void MainWindow::on_actionToolBarLargeIcons_triggered() +void MainWindow::on_actionToolBarSmallIcons_triggered() { - setToolbarSize(LargeToolbarSize); + setToolbarSize(SmallToolbarSize); } -void MainWindow::on_actionToolBarSmallIcons_triggered() +void MainWindow::on_actionToolBarMediumIcons_triggered() { - setToolbarSize(SmallToolbarSize); + setToolbarSize(MediumToolbarSize); +} + +void MainWindow::on_actionToolBarLargeIcons_triggered() +{ + setToolbarSize(LargeToolbarSize); } void MainWindow::on_actionToolBarIconsOnly_triggered() diff --git a/src/mainwindow.h b/src/mainwindow.h index 18aa525e..a0cce858 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -635,8 +635,9 @@ private slots: // ui slots void on_actionExit_triggered(); void on_actionToolBarMainToggle_triggered(); void on_actionToolBarLinksToggle_triggered(); - void on_actionToolBarLargeIcons_triggered(); void on_actionToolBarSmallIcons_triggered(); + void on_actionToolBarMediumIcons_triggered(); + void on_actionToolBarLargeIcons_triggered(); void on_actionToolBarIconsOnly_triggered(); void on_actionToolBarTextOnly_triggered(); void on_actionToolBarIconsAndText_triggered(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index a4bd2888..29a8ac76 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1358,9 +1358,6 @@ p, li { white-space: pre-wrap; } 36 - - Qt::ToolButtonTextUnderIcon - TopToolBarArea @@ -1438,6 +1435,7 @@ p, li { white-space: pre-wrap; } + @@ -1786,6 +1784,11 @@ p, li { white-space: pre-wrap; } I&cons and Text + + + M&edium Icons + + -- cgit v1.3.1 From 3c69f1e54ab1eb99b2d1b30e5dfa5f28239e4314 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 21:50:52 -0400 Subject: update styles to handle the new menu bar also formatted the Transparent styles, all the css was on one line added a separator before the settings menu item fixed medium icon item not being checkable --- src/mainwindow.ui | 4 + src/stylesheets/Night Eyes.qss | 50 +- src/stylesheets/Paper Automata.qss | 10 + src/stylesheets/Paper Dark by 6788.qss | 12 + src/stylesheets/Paper Light by 6788.qss | 12 + src/stylesheets/Parchment v1.1 by Bob.qss | 68 ++- src/stylesheets/Transparent-Style-101-Green.qss | 490 +++++++++++++++- src/stylesheets/Transparent-Style-BOS.qss | 743 +++++++++++++++++++++++- src/stylesheets/Transparent-Style-Skyrim.qss | 743 +++++++++++++++++++++++- src/stylesheets/dark.qss | 5 + src/stylesheets/skyrim.qss | 8 + 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, 2135 insertions(+), 94 deletions(-) (limited to 'src') diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 29a8ac76..05d64bdf 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1407,6 +1407,7 @@ p, li { white-space: pre-wrap; } + @@ -1785,6 +1786,9 @@ p, li { white-space: pre-wrap; } + + true + M&edium Icons diff --git a/src/stylesheets/Night Eyes.qss b/src/stylesheets/Night Eyes.qss index 6c6b0629..f2f193c4 100644 --- a/src/stylesheets/Night Eyes.qss +++ b/src/stylesheets/Night Eyes.qss @@ -106,15 +106,15 @@ QTreeView::item:selected color: #FFCC88; } -QTreeView::branch:has-children:!has-siblings:closed, +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 +QTreeView::branch:open:has-children:!has-siblings, +QTreeView::branch:open:has-children:has-siblings { image: url(:/stylesheet/branch-open.png); border: 0px; @@ -342,41 +342,41 @@ 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 { background: #242424; } -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 { background: #181818; } -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 { background: transparent; } -QScrollBar::up-arrow:vertical, +QScrollBar::up-arrow:vertical, QScrollBar::right-arrow:horizontal, -QScrollBar::down-arrow:vertical, +QScrollBar::down-arrow:vertical, QScrollBar::left-arrow:horizontal { height: 1px; - width: 1px; + width: 1px; border: 1px solid #181818; } @@ -426,6 +426,16 @@ QHeaderView::down-arrow /* Context Menus, Toolbar Dropdowns, & Tooltips ------------------------------- */ +QMenuBar { + background: #181818; + border: 1px solid #181818; +} + +QMenuBar::item:selected { + background: #242424; + color: #FFCC88; +} + QMenu { background: #141414; @@ -615,8 +625,8 @@ QWidget#downloadTab QAbstractScrollArea background: #242424; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ @@ -641,7 +651,7 @@ DownloadListWidget QFrame:clicked /* compact downloads view */ -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index d72aa7e2..c9830331 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -593,6 +593,16 @@ QHeaderView::section:last { /* Right Click Menus, Toolbar Dropdown Menus, & Tooltips */ +QMenuBar { + background: #DAD4BB; + border: 2px solid #CDC8B0; +} + +QMenuBar::item:selected { + background: #B4AF9A; + border: none; +} + QMenu { /* right click menu */ background: #DAD4BB; diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss index 9abd8086..cde25733 100644 --- a/src/stylesheets/Paper Dark by 6788.qss +++ b/src/stylesheets/Paper Dark by 6788.qss @@ -588,6 +588,18 @@ QHeaderView::down-arrow { /* Right Click Menus, Toolbar Dropdown Menus, & Tooltips */ +QMenuBar { + background: #242424; + border: 1px solid #242424; +} + +QMenuBar::item:selected { + background: #006868; + color: #FFFFFF; + border: 0px; + border-radius: 4px; +} + QMenu { /* right click menu */ background: #141414; diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss index 4aad55a8..54af277a 100644 --- a/src/stylesheets/Paper Light by 6788.qss +++ b/src/stylesheets/Paper Light by 6788.qss @@ -590,6 +590,18 @@ QHeaderView::down-arrow { /* Right Click Menus, Toolbar Dropdown Menus, & Tooltips */ +QMenuBar { + background: #EBEBEB; + border: 1px solid #EBEBEB; +} + +QMenuBar::item:selected { + background: #008484; + color: #FFFFFF; + border: 0px; + border-radius: 4px; +} + QMenu { /* right click menu */ background: #FFFFFF; diff --git a/src/stylesheets/Parchment v1.1 by Bob.qss b/src/stylesheets/Parchment v1.1 by Bob.qss index da3546d1..45c1d57b 100644 --- a/src/stylesheets/Parchment v1.1 by Bob.qss +++ b/src/stylesheets/Parchment v1.1 by Bob.qss @@ -95,7 +95,7 @@ QTreeView { } QTreeView::branch:hover { - background: #008F8F; + background: #008F8F; color: #F7F6CF; } @@ -109,13 +109,13 @@ QTreeView::item:selected { color: #F7F6CF; } -QTreeView::branch:has-children:!has-siblings:closed, -QTreeView::branch:closed:has-children:has-siblings { +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, QTreeView::branch:open:has-children:has-siblings { image: url(:/stylesheet/branch-open.png); border: 0px; @@ -168,7 +168,7 @@ QCheckBox::indicator { background-color: transparent; border: none; width: 14px; - height: 14px; + height: 14px; } QGroupBox::indicator:checked, QGroupBox::indicator:indeterminate, @@ -177,7 +177,7 @@ QTreeView::indicator:indeterminate, QCheckBox::indicator:checked, QCheckBox::indicator:indeterminate { - image: url(./Parchment/checkbox-checked.png); + image: url(./Parchment/checkbox-checked.png); } QGroupBox::indicator:checked:hover, QGroupBox::indicator:indeterminate:hover, @@ -186,7 +186,7 @@ QTreeView::indicator:indeterminate:hover, QCheckBox::indicator:checked:hover, QCheckBox::indicator:indeterminate:hover { - image: url(./Parchment/checkbox-checked-hover.png); + image: url(./Parchment/checkbox-checked-hover.png); } QGroupBox::indicator:checked:disabled, QGroupBox::indicator:indeterminate:disabled, @@ -195,28 +195,28 @@ QCheckBox::indicator:indeterminate:hover { QCheckBox::indicator:checked:disabled, QCheckBox::indicator:indeterminate:disabled { - image: url(./Parchment/checkbox-checked-disabled.png); + image: url(./Parchment/checkbox-checked-disabled.png); } QGroupBox::indicator:unchecked, QTreeView::indicator:unchecked, QCheckBox::indicator:unchecked { - image: url(./Parchment/checkbox.png); + image: url(./Parchment/checkbox.png); } QGroupBox::indicator:unchecked:hover, QTreeView::indicator:unchecked:hover, QCheckBox::indicator:unchecked:hover { - image: url(./Parchment/checkbox-hover.png); + image: url(./Parchment/checkbox-hover.png); } QGroupBox::indicator:unchecked:disabled, QTreeView::indicator:unchecked:disabled, QCheckBox::indicator:unchecked:disabled { - image: url(./Parchment/checkbox-disabled.png); + image: url(./Parchment/checkbox-disabled.png); } /* Search Boxes */ @@ -323,7 +323,7 @@ QScrollBar::add-line:horizontal { margin: 0px -2px -2px 0px; } -QScrollBar::sub-line:horizontal { +QScrollBar::sub-line:horizontal { background: #F7F6CF; width: 23px; subcontrol-position: left; @@ -359,7 +359,7 @@ QScrollBar::add-line:vertical { margin: 0px -2px -2px 0px; } -QScrollBar::sub-line:vertical { +QScrollBar::sub-line:vertical { background: #F7F6CF; height: 23px; subcontrol-position: top; @@ -371,37 +371,37 @@ 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 { background: #008F8F; } -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 { background: #0CA6FF; } -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 { background: transparent; } -QScrollBar::up-arrow:vertical, +QScrollBar::up-arrow:vertical, QScrollBar::right-arrow:horizontal, -QScrollBar::down-arrow:vertical, +QScrollBar::down-arrow:vertical, QScrollBar::left-arrow:horizontal { height: 1px; - width: 1px; + width: 1px; border: 1px solid #DBD399; } @@ -443,6 +443,16 @@ QHeaderView::down-arrow { /* Context Menus, Toolbar Dropdowns, & Tooltips */ +QMenuBar { + background: #DBD399; + border: 1px solid #DBD399; +} + +QMenuBar::item:selected { + background: #008F8F; + color: #F7F6CF; +} + QMenu { background: #F7F6CF; selection-color: #F7F6CF; @@ -465,7 +475,7 @@ QMenu::item:disabled { color: #444444; } -QMenu::separator { +QMenu::separator { background: #DBD399; height: 2px; } @@ -483,7 +493,7 @@ QToolTip { /* Progress Bars (Downloads) */ -QProgressBar { +QProgressBar { background: #F7F6CF; text-align: center; border: 0px; diff --git a/src/stylesheets/Transparent-Style-101-Green.qss b/src/stylesheets/Transparent-Style-101-Green.qss index f7bf16b6..7dbf6157 100644 --- a/src/stylesheets/Transparent-Style-101-Green.qss +++ b/src/stylesheets/Transparent-Style-101-Green.qss @@ -1 +1,489 @@ -#centralWidget { border-image: url(./Transparent-Style/Green/vault-101.png) 0 0 0 0 stretch stretch; } QDialog,Qmenu { border: none; } QWidget { color: #fff; background-color: rgb(0, 204, 0, 5); alternate-background-color: rgb(0, 204, 0, 10); } QAbstractItemView { color: #fff; background-color: rgb(0, 204, 0, 5); alternate-background-color: rgb(0, 204, 0, 10); border: 1px solid #001a00; border-style:outset; border-radius: 3px; selection-color: #001a00; outline: none; } #ProblemsDialog,#TransferSavesDialog,#SettingsDialog,#ProblemsDialog, #ModInfoDialog,#TextViewer,#PyCfgDialog,#InstallDialog { border-image:url(./Transparent-Style/Green/vault-tec-full.png) 0 0 0 0 stretch stretch; } #EditExecutablesDialog { border-image: url(./Transparent-Style/Green/vault-tec.png) 0 0 0 0 stretch stretch; } #SimpleInstallDialog,#LockedDialog,QMenu { border-image: url(./Transparent-Style/Green/vault-tec-small.png) 0 0 0 0 stretch stretch; } #nameLabel { background-color: rgb(0, 0, 0, 20); border-top:1px solid black; border-bottom:1px solid black; } #ProfilesDialog,#FomodInstallerDialog { border-image: url(./Transparent-Style/Green/vault-tec-profiles.png) 0 0 0 0 stretch stretch; } #filesView { border-image: url(./Transparent-Style/Green/vault-tec-overwrite.png) 0 0 0 0 stretch stretch; } /* ******************************************** */ /* Main Navigation Button Bar at top of window */ /* ******************************************** */ QToolBar { border: none; } QToolBar::separator { image: url(./Transparent-Style/Green/Vault-101-vault-boy.png); } QToolButton { border:2px ridge None; border-radius: 6px; margin: 3px; padding-left: 8px; padding-right: 8px; padding-top: 0px; padding-bottom: 2px; } QToolButton:hover { border: 2px ridge #fff; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); } QToolButton:pressed { background: black; } QTabWidget::pane { background-color: transparent; border:transparent; } QTabWidget::tab-bar { alignment: center; } /* **************************************** */ /* Tabs on top of Treeview */ /* **************************************** */ QTabBar { text-transform: uppercase; max-height: 22px; padding-bottom: 5px; } QTabBar::tab { border: none; border-bottom-style: none; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); padding-left: 15px; padding-right: 15px; padding-top: 3px; padding-bottom: 3px; margin-right: 2px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; } QTabBar::tab:selected { color: #fff; background-color: #00cc00; } QTabBar::tab:!selected { color: #00cc00; margin-top: 0px; } QTabBar::tab:disabled { color: #bbbbbb; border-bottom-style: none; margin-top: 0px; background-color: #000; } #deactivateESP,#activateESP { border:px #00cc00; background:QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); } QToolButton::menu-indicator:pressed,QToolButton::menu-indicator:open { border:2px ridge #00cc00; image: url(./Transparent-Style/Green/arrow-right.png); } QTabBar QToolButton { border:2px ridge #00cc00; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); padding: 1px; margin: 0; } QTabBar QToolButton::right-arrow { image: url(./Transparent-Style/Green/arrow-right.png); } QTabBar QToolButton::left-arrow { image: url(./Transparent-Style/Green/arrow-left.png); } /* **************************************** */ /* Column names of TreeView */ /* **************************************** */ QTableView { color:#fff; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); } QHeaderView::section { color: #00cc00; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); border-radius: 6px; padding: 4px; padding-left: 5px; padding-right: 0px; } QHeaderView::section:hover { background: #121212; border: 2px solid #ff0000; padding: 0px; } QHeaderView::up-arrow,QHeaderView::down-arrow { subcontrol-origin: content; subcontrol-position: center right; width: 7px; height: 7px; margin-right: 7px; } QHeaderView::up-arrow { image: url(./Transparent-Style/Green/arrow-up.png); } QHeaderView::down-arrow { image: url(./Transparent-Style/Green/arrow-down.png); } /* **************************************** */ /* Hover */ /* **************************************** */ QMenu:item:hover,QTreeView#espList::item:hover,QTreeWidget#categoriesList::item:hover,QListView::item:hover,QTreeWidget::item:hover { color:#fff; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:#000; } QAbstractItemView::item:hover { border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:#000; padding: 3px; } #deactivateESP:hover,#activateESP:hover,QPushButton:hover,QTableView:hover,QHeaderView::selected:hover,QTabBar::tab:!selected:hover,QComboBox:hover { border: 1px solid #ff0000; padding: 1px; text-align: center; } /* **************************************** */ /* Context menus, toolbar dropdowns #QMenu */ /* **************************************** */ QMenu { border-width: 3px; border-style: solid; } QMenu::item { padding: 6px 20px; } QMenu::item:selected { color:#fff; background-color: #001a00; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; } QMenu::right-arrow { image: url(./Transparent-Style/Green/arrow-right.png); subcontrol-origin: padding; subcontrol-position: center right; padding-right: 0.5em; } /* ********************* */ /* LCD Counter */ /* ********************* */ QLCDNumber { Background:#000; border-color: #00cc00; border-style: solid; border-width: 1px; border-radius: 5px; } /* **************************************** */ /* Launch application Drop down Box */ /* **************************************** */ QComboBox { background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); border:1px outset #00cc00; height: 20px; width: 15px; padding: 3px; padding-left:3px; border-radius: 5px; } QComboBox::drop-down{ subcontrol-origin: padding; subcontrol-position: top right; width: 15px; padding:4px; border-radius: 5px; } QComboBox::down-arrow{ image:url(./Transparent-Style/Green/arrow-down.png); } QComboBox::item{ border:3px;padding: 3px; } /* **************************************************************** */ /* Action Buttons */ /* */ /* Open list, Rextore Backup, Create Backup, RUN, Shortcut Button */ /* Sort, Load order backup, Load Order Restore */ /* **************************************************************** */ QPushButton { color: #00cc00; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); border-width: 1px; border-color: 1px outset #00cc00; border-style: solid; border-radius: 4px; padding:5px; padding-right: 10px; padding-left: 5px; } QDialog QPushButton { min-width: 3em; min-height: 1em; padding-left: 1em; padding-right: 1em; } QPushButton::menu-indicator { image: url(./Transparent-Style/Green/arrow-down.png); background: transparent; subcontrol-origin: padding; subcontrol-position: center right; padding-right: 5%; } QPushButton:open { background-color: rgb(0, 204, 0, 100); } QPushButton:!enabled { border: 1px grey; color: grey; background: black; } QPushButton#displayCategoriesBtn { min-width: 20px; } /* **************************************** */ /* Scroll bar */ /* **************************************** */ QScrollBar { height:20px; width:20px; background-color:transparent; } QScrollBar::handle { border: 1px solid #aaa; border-radius: 4px; } QScrollBar::handle:vertical { margin: 1px 4px; min-height:20px; min-width: 10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #33ff33, stop:1 #000000); } QScrollBar::handle:vertical:hover { background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #000000, stop:1 #33ff33); } QScrollBar::handle:horizontal { min-height:10px;min-width:20px;margin:4px 1px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #33ff33, stop:1 #000000); } QScrollBar::handle:horizontal:hover { background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #000000, stop:1 #33ff33); } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical,QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { background-color: transparent; } QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical,QScrollBar::add-line:horizontal,QScrollBar::sub-line:horizontal { height:0; width:0; } /* ******************************************************** */ /* Main Tree View Inherated from QAbstractItemView */ /* ******************************************************** */ QTreeView { } QTreeView:item { padding:4px; } QTreeView:item:selected { color: #001a00; border: none;outline: none; border-radius: 5px; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color: rgb(0, 204, 0, 100); } QTreeView::branch:has-siblings:!adjoins-item { background:url(Vault-101/Vault-101-item-line-v.png) center center no-repeat; } QTreeView::branch:has-siblings { background:url(Vault-101/Vault-101-itemB-line.png) center center no-repeat; } QTreeView::branch:!has-children:!has-siblings:adjoins-item { background:url(Vault-101/Vault-101-itemB-end.png) center center no-repeat; } QTreeView::branch:closed:has-children:has-siblings { background:url(Vault-101/Vault-101-itemB-close.png) center center no-repeat; } QTreeView::branch:closed:has-children:!has-siblings { background:url(Vault-101/Vault-101-itemB-close-last.png) center center no-repeat; } QTreeView::branch:open:has-children:has-siblings { background:url(Vault-101/Vault-101-itemB-open.png) center center no-repeat; } QTreeView::branch:open:has-children:!has-siblings { background:url(Vault-101/Vault-101-itemB-open-last.png) center center no-repeat; } /* **************************************************************** */ /* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ /* common */ /* **************************************************************** */ QGroupBox::indicator,QTreeView::indicator,QCheckBox::indicator { outline: none; border: none; width: 20px; height: 20px; } QGroupBox::indicator:checked,QGroupBox::indicator:indeterminate,QTreeView::indicator:checked,QTreeView::indicator:indeterminate,QCheckBox::indicator:checked,QCheckBox::indicator:indeterminate { image: url(./Transparent-Style/Green/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(./Transparent-Style/Green/checkbox-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(./Transparent-Style/Green/checkbox-checked-disabled.png); } QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QCheckBox::indicator:unchecked { image: url(./Transparent-Style/Green/checkbox.png); } QGroupBox::indicator:unchecked:hover,QTreeView::indicator:unchecked:hover,QCheckBox::indicator:unchecked:hover { image: url(./Transparent-Style/Green/checkbox-checked-hover.png); } QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QCheckBox::indicator:unchecked:disabled { image: url(./Transparent-Style/Green/checkbox-checked-disabled.png); } QTreeWidget#categoriesList::item:has-children { background-image: url(./Transparent-Style/Green/arrow-right.png); } QTreeWidget#categoriesList::item:has-children:open { background-image: url(./Transparent-Style/Green/branch-opened.png); } /* ******************************** */ /* Special styles */ /* increase categories tab width */ /* ******************************** */ QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item { padding: .3em 0; } QTreeWidget#categoriesGroup,QTreeWidget#categoriesList { min-width: 200px; } QTreeWidget#categoriesList::item { background-position: center left; background-repeat: no-repeat; padding: 0.35em 4px; } /* ********************* */ /* Display Radio Button */ /* ********************* */ QRadioButton::indicator { width: 16px; height: 16px; } QRadioButton::indicator::checked { image: url(./Transparent-Style/Green/radio-checked.png); } QRadioButton::indicator::unchecked { image: url(./Transparent-Style/Green/radio.png); } QRadioButton::indicator::unchecked:hover { image: url(./Transparent-Style/Green/radio-hover.png); } /* **************************************** */ /* Spinners #QSpinBox, #QDoubleSpinBox */ /* **************************************** */ QAbstractSpinBox { min-height: 24px; } QAbstractSpinBox::up-button,QAbstractSpinBox::down-button { border-style: solid; border-width: 1px; subcontrol-origin: padding; } QAbstractSpinBox::up-button:hover,QAbstractSpinBox::down-button:hover { background-color: #141414; } QAbstractSpinBox::up-button { subcontrol-position: top right; } QAbstractSpinBox::down-button { subcontrol-position: bottom right; } QAbstractSpinBox::up-arrow { image: url(./Transparent-Style/Green/arrow-up.png); } QAbstractSpinBox::down-arrow { image: url(./Transparent-Style/Green/arrow-down.png); } /* **************************************** */ /* Tooltips #QToolTip, #SaveGameInfoWidget */ /* **************************************** */ QToolTip { background-color:transparent; color:#C0C0C0; padding:0px; border-width:7px; border-style:solid; border-color:transparent; border-image:url(./Transparent-Style/Green/border-image.png) 27 repeat repeat; } SaveGameInfoWidget { background-color:#121212; color:#C0C0C0; } /* **************************** */ /* Handles Web, Nexus info tab */ /* **************************** */ QWebView { background-color: Black; } QLineEdit { font-family: Source Sans Pro; background:#000; border-width: 1px; border-radius:5px; margin: 0px; padding-left:2px; selection-background-color: rgb(0, 204, 0, 10); } /* Font size */ QLabel, QMenu, QPushButton, QTabBar, QTextEdit, QLineEdit, QWebView, QComboBox, QComboBox:editable, QAbstractSpinBox, QGroupBox, QCheckBox, QRadioButton { color: #cccccc; font-family: Source Sans Pro; font-size: 14px; } QAbstractItemView { color: #cccccc; font-family: Source Sans Pro; font-size: 14px; } \ No newline at end of file +#centralWidget { + border-image: url(./Transparent-Style/Green/vault-101.png) 0 0 0 0 stretch stretch; +} + QDialog,Qmenu { + border: none; +} + QWidget { + color: #fff; + background-color: rgb(0, 204, 0, 5); + alternate-background-color: rgb(0, 204, 0, 10); +} + QAbstractItemView { + color: #fff; + background-color: rgb(0, 204, 0, 5); + alternate-background-color: rgb(0, 204, 0, 10); + border: 1px solid #001a00; + border-style:outset; + border-radius: 3px; + selection-color: #001a00; + outline: none; +} + #ProblemsDialog,#TransferSavesDialog,#SettingsDialog,#ProblemsDialog, #ModInfoDialog,#TextViewer,#PyCfgDialog,#InstallDialog { + border-image:url(./Transparent-Style/Green/vault-tec-full.png) 0 0 0 0 stretch stretch; +} + #EditExecutablesDialog { + border-image: url(./Transparent-Style/Green/vault-tec.png) 0 0 0 0 stretch stretch; +} + #SimpleInstallDialog,#LockedDialog,QMenu { + border-image: url(./Transparent-Style/Green/vault-tec-small.png) 0 0 0 0 stretch stretch; +} + #nameLabel { + background-color: rgb(0, 0, 0, 20); + border-top:1px solid black; + border-bottom:1px solid black; +} + #ProfilesDialog,#FomodInstallerDialog { + border-image: url(./Transparent-Style/Green/vault-tec-profiles.png) 0 0 0 0 stretch stretch; +} + #filesView { + border-image: url(./Transparent-Style/Green/vault-tec-overwrite.png) 0 0 0 0 stretch stretch; +} +/* ******************************************** */ +/* Main Navigation Button Bar at top of window */ +/* ******************************************** */ + QToolBar { + border: none; +} + QToolBar::separator { + image: url(./Transparent-Style/Green/Vault-101-vault-boy.png); +} + QToolButton { + border:2px ridge None; + border-radius: 6px; + margin: 3px; + padding-left: 8px; + padding-right: 8px; + padding-top: 0px; + padding-bottom: 2px; +} + QToolButton:hover { + border: 2px ridge #fff; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); +} + QToolButton:pressed { + background: black; +} + QTabWidget::pane { + background-color: transparent; + border:transparent; +} + QTabWidget::tab-bar { + alignment: center; +} +/* **************************************** */ +/* Tabs on top of Treeview */ +/* **************************************** */ + QTabBar { + text-transform: uppercase; + max-height: 22px; + padding-bottom: 5px; +} + QTabBar::tab { + border: none; + border-bottom-style: none; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + padding-left: 15px; + padding-right: 15px; + padding-top: 3px; + padding-bottom: 3px; + margin-right: 2px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + QTabBar::tab:selected { + color: #fff; + background-color: #00cc00; +} + QTabBar::tab:!selected { + color: #00cc00; + margin-top: 0px; +} + QTabBar::tab:disabled { + color: #bbbbbb; + border-bottom-style: none; + margin-top: 0px; + background-color: #000; +} + #deactivateESP,#activateESP { + border:px #00cc00; + background:QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); +} + QToolButton::menu-indicator:pressed,QToolButton::menu-indicator:open { + border:2px ridge #00cc00; + image: url(./Transparent-Style/Green/arrow-right.png); +} + QTabBar QToolButton { + border:2px ridge #00cc00; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + padding: 1px; + margin: 0; +} + QTabBar QToolButton::right-arrow { + image: url(./Transparent-Style/Green/arrow-right.png); +} + QTabBar QToolButton::left-arrow { + image: url(./Transparent-Style/Green/arrow-left.png); +} +/* **************************************** */ +/* Column names of TreeView */ +/* **************************************** */ + QTableView { + color:#fff; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); +} + QHeaderView::section { + color: #00cc00; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + border-radius: 6px; + padding: 4px; + padding-left: 5px; + padding-right: 0px; +} + QHeaderView::section:hover { + background: #121212; + border: 2px solid #ff0000; + padding: 0px; +} + QHeaderView::up-arrow,QHeaderView::down-arrow { + subcontrol-origin: content; + subcontrol-position: center right; + width: 7px; + height: 7px; + margin-right: 7px; +} + QHeaderView::up-arrow { + image: url(./Transparent-Style/Green/arrow-up.png); +} + QHeaderView::down-arrow { + image: url(./Transparent-Style/Green/arrow-down.png); +} +/* **************************************** */ +/* Hover */ +/* **************************************** */ + QMenu:item:hover,QMenuBar:item:selected,QTreeView#espList::item:hover,QTreeWidget#categoriesList::item:hover,QListView::item:hover,QTreeWidget::item:hover { + color:#fff; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:#000; +} + QAbstractItemView::item:hover { + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:#000; + padding: 3px; +} + #deactivateESP:hover,#activateESP:hover,QPushButton:hover,QTableView:hover,QHeaderView::selected:hover,QTabBar::tab:!selected:hover,QComboBox:hover { + border: 1px solid #ff0000; + padding: 1px; + text-align: center; +} +/* **************************************** */ +/* Context menus, toolbar dropdowns #QMenu */ +/* **************************************** */ + QMenu { + border-width: 3px; + border-style: solid; +} + QMenu::item { + padding: 6px 20px; +} + QMenu::item:selected { + color:#fff; + background-color: #001a00; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; +} + QMenu::right-arrow { + image: url(./Transparent-Style/Green/arrow-right.png); + subcontrol-origin: padding; + subcontrol-position: center right; + padding-right: 0.5em; +} +/* ********************* */ +/* LCD Counter */ +/* ********************* */ + QLCDNumber { + Background:#000; + border-color: #00cc00; + border-style: solid; + border-width: 1px; + border-radius: 5px; +} +/* **************************************** */ +/* Launch application Drop down Box */ +/* **************************************** */ + QComboBox { + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + border:1px outset #00cc00; + height: 20px; + width: 15px; + padding: 3px; + padding-left:3px; + border-radius: 5px; +} + QComboBox::drop-down{ + subcontrol-origin: padding; + subcontrol-position: top right; + width: 15px; + padding:4px; + border-radius: 5px; +} + QComboBox::down-arrow{ + image:url(./Transparent-Style/Green/arrow-down.png); +} + QComboBox::item{ + border:3px; + padding: 3px; +} +/* **************************************************************** */ +/* Action Buttons */ +/* */ +/* Open list, Rextore Backup, Create Backup, RUN, Shortcut Button */ +/* Sort, Load order backup, Load Order Restore */ +/* **************************************************************** */ + QPushButton { + color: #00cc00; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #697670, stop: 1 #484F53); + border-width: 1px; + border-color: 1px outset #00cc00; + border-style: solid; + border-radius: 4px; + padding:5px; + padding-right: 10px; + padding-left: 5px; +} + QDialog QPushButton { + min-width: 3em; + min-height: 1em; + padding-left: 1em; + padding-right: 1em; +} + QPushButton::menu-indicator { + image: url(./Transparent-Style/Green/arrow-down.png); + background: transparent; + subcontrol-origin: padding; + subcontrol-position: center right; + padding-right: 5%; +} + QPushButton:open { + background-color: rgb(0, 204, 0, 100); +} + QPushButton:!enabled { + border: 1px grey; + color: grey; + background: black; +} + QPushButton#displayCategoriesBtn { + min-width: 20px; +} +/* **************************************** */ +/* Scroll bar */ +/* **************************************** */ + QScrollBar { + height:20px; + width:20px; + background-color:transparent; +} + QScrollBar::handle { + border: 1px solid #aaa; + border-radius: 4px; +} + QScrollBar::handle:vertical { + margin: 1px 4px; + min-height:20px; + min-width: 10px; + background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #33ff33, stop:1 #000000); +} + QScrollBar::handle:vertical:hover { + background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #000000, stop:1 #33ff33); +} + QScrollBar::handle:horizontal { + min-height:10px; + min-width:20px; + margin:4px 1px; + background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #33ff33, stop:1 #000000); +} + QScrollBar::handle:horizontal:hover { + background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #000000, stop:1 #33ff33); +} + QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical,QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { + background-color: transparent; +} + QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical,QScrollBar::add-line:horizontal,QScrollBar::sub-line:horizontal { + height:0; + width:0; +} +/* ******************************************************** */ +/* Main Tree View Inherated from QAbstractItemView */ +/* ******************************************************** */ + QTreeView { +} + QTreeView:item { + padding:4px; +} + QTreeView:item:selected { + color: #001a00; + border: none; + outline: none; + border-radius: 5px; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color: rgb(0, 204, 0, 100); +} + QTreeView::branch:has-siblings:!adjoins-item { + background:url(Vault-101/Vault-101-item-line-v.png) center center no-repeat; +} + QTreeView::branch:has-siblings { + background:url(Vault-101/Vault-101-itemB-line.png) center center no-repeat; +} + QTreeView::branch:!has-children:!has-siblings:adjoins-item { + background:url(Vault-101/Vault-101-itemB-end.png) center center no-repeat; +} + QTreeView::branch:closed:has-children:has-siblings { + background:url(Vault-101/Vault-101-itemB-close.png) center center no-repeat; +} + QTreeView::branch:closed:has-children:!has-siblings { + background:url(Vault-101/Vault-101-itemB-close-last.png) center center no-repeat; +} + QTreeView::branch:open:has-children:has-siblings { + background:url(Vault-101/Vault-101-itemB-open.png) center center no-repeat; +} + QTreeView::branch:open:has-children:!has-siblings { + background:url(Vault-101/Vault-101-itemB-open-last.png) center center no-repeat; +} +/* **************************************************************** */ +/* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ +/* common */ +/* **************************************************************** */ + QGroupBox::indicator,QTreeView::indicator,QCheckBox::indicator { + outline: none; + border: none; + width: 20px; + height: 20px; +} + QGroupBox::indicator:checked,QGroupBox::indicator:indeterminate,QTreeView::indicator:checked,QTreeView::indicator:indeterminate,QCheckBox::indicator:checked,QCheckBox::indicator:indeterminate { + image: url(./Transparent-Style/Green/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(./Transparent-Style/Green/checkbox-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(./Transparent-Style/Green/checkbox-checked-disabled.png); +} + QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QCheckBox::indicator:unchecked { + image: url(./Transparent-Style/Green/checkbox.png); +} + QGroupBox::indicator:unchecked:hover,QTreeView::indicator:unchecked:hover,QCheckBox::indicator:unchecked:hover { + image: url(./Transparent-Style/Green/checkbox-checked-hover.png); +} + QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QCheckBox::indicator:unchecked:disabled { + image: url(./Transparent-Style/Green/checkbox-checked-disabled.png); +} + QTreeWidget#categoriesList::item:has-children { + background-image: url(./Transparent-Style/Green/arrow-right.png); +} + QTreeWidget#categoriesList::item:has-children:open { + background-image: url(./Transparent-Style/Green/branch-opened.png); +} +/* ******************************** */ +/* Special styles */ +/* increase categories tab width */ +/* ******************************** */ + QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item { + padding: .3em 0; +} + QTreeWidget#categoriesGroup,QTreeWidget#categoriesList { + min-width: 200px; +} + QTreeWidget#categoriesList::item { + background-position: center left; + background-repeat: no-repeat; + padding: 0.35em 4px; +} +/* ********************* */ +/* Display Radio Button */ +/* ********************* */ + QRadioButton::indicator { + width: 16px; + height: 16px; +} + QRadioButton::indicator::checked { + image: url(./Transparent-Style/Green/radio-checked.png); +} + QRadioButton::indicator::unchecked { + image: url(./Transparent-Style/Green/radio.png); +} + QRadioButton::indicator::unchecked:hover { + image: url(./Transparent-Style/Green/radio-hover.png); +} +/* **************************************** */ +/* Spinners #QSpinBox, #QDoubleSpinBox */ +/* **************************************** */ + QAbstractSpinBox { + min-height: 24px; +} + QAbstractSpinBox::up-button,QAbstractSpinBox::down-button { + border-style: solid; + border-width: 1px; + subcontrol-origin: padding; +} + QAbstractSpinBox::up-button:hover,QAbstractSpinBox::down-button:hover { + background-color: #141414; +} + QAbstractSpinBox::up-button { + subcontrol-position: top right; +} + QAbstractSpinBox::down-button { + subcontrol-position: bottom right; +} + QAbstractSpinBox::up-arrow { + image: url(./Transparent-Style/Green/arrow-up.png); +} + QAbstractSpinBox::down-arrow { + image: url(./Transparent-Style/Green/arrow-down.png); +} +/* **************************************** */ +/* Tooltips #QToolTip, #SaveGameInfoWidget */ +/* **************************************** */ + QToolTip { + background-color:transparent; + color:#C0C0C0; + padding:0px; + border-width:7px; + border-style:solid; + border-color:transparent; + border-image:url(./Transparent-Style/Green/border-image.png) 27 repeat repeat; +} + SaveGameInfoWidget { + background-color:#121212; + color:#C0C0C0; +} +/* **************************** */ +/* Handles Web, Nexus info tab */ +/* **************************** */ + QWebView { + background-color: Black; +} + QLineEdit { + font-family: Source Sans Pro; + background:#000; + border-width: 1px; + border-radius:5px; + margin: 0px; + padding-left:2px; + selection-background-color: rgb(0, 204, 0, 10); +} +/* Font size */ + QLabel, QMenu, QPushButton, QTabBar, QTextEdit, QLineEdit, QWebView, QComboBox, QComboBox:editable, QAbstractSpinBox, QGroupBox, QCheckBox, QRadioButton { + color: #cccccc; + font-family: Source Sans Pro; + font-size: 14px; +} + QAbstractItemView { + color: #cccccc; + font-family: Source Sans Pro; + font-size: 14px; +} diff --git a/src/stylesheets/Transparent-Style-BOS.qss b/src/stylesheets/Transparent-Style-BOS.qss index cda40e9f..2c1eb3de 100644 --- a/src/stylesheets/Transparent-Style-BOS.qss +++ b/src/stylesheets/Transparent-Style-BOS.qss @@ -1 +1,742 @@ -#centralWidget { border-image: url(./Transparent-Style/Fallout-BOS.png) 0 0 0 0 stretch stretch; } QWidget#TextViewer{ } QWidget{ color: #fff; background-color: rgba(45,45,48,30); alternate-background-color: rgba(38,38,38,30); } QWidget:disabled{ } QAbstractItemView{ color: #dcdcdc; background-color: rgb(45,45,48,30); alternate-background-color: rgb(38,38,38,50); border: 1px solid #3F3F46; /* Grey - Blue*/ border-style:outset; border-radius: 3px; selection-color: #3F3F46; /* Grey - Blue*/ outline: none; padding-left:0; } #problemsWidget,#TransferSavesDialog,#SettingsDialog,#ProblemsDialog,#ModInfoDialog,#TextViewer,#PyCfgDialog,#InstallDialog { border-image:url(./Transparent-Style/Vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #toolBarArea{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #EditExecutablesDialog{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #SimpleInstallDialog,#LockedDialog,QMenu{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #nameLabel{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:rgba(154,154,0,0.3); color:#fff; } #ProfilesDialog,#FomodInstallerDialog{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #filesView{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } /* ******************************************** */ /* Main Navigation Button Bar at top of window */ /* ******************************************** */ QToolBar{ /*border: none;*/ } QToolBar::separator{ /*image: url(./Transparent-Style/Vault-101-vault-logo.png);*/ } QToolButton{ border:2px solid None; border-radius: 6px; margin: 3px; padding-left: 8px; padding-right: 8px; padding-top: 0px; padding-bottom: 2px; } QToolButton:hover{ border-radius: 3px; border: 0px; padding: 0px; background: trANSPARENT; border: 0px ridge #9A9A00; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9A9A00, stop: 1 #484F53); } QToolButton:pressed{ background: black; } /* **************************************** */ /* Tabs on top of Treeview */ /* **************************************** */ QTabWidget::pane{ border-color:#3F3F46; /* Grey - Blue*/ /* border-top-color:#9A9A00; */ top: 0px; border-style:hidden; border-width:1px; } QTabWidget::tab-bar{ alignment: center; } QTabBar{ color: #cccccc; font-family: Segoe UI; font-size: 16px; text-transform: none; min-height:auto; padding-bottom: 5px; } QTabBar::tab{ border: none; border-bottom-style: none; background-color: rgba(154,154,0,0.3); padding-left: 9px; padding-right: 9px; padding-top: 3px; padding-bottom: 3px; margin-right: 2px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; } QTabBar::tab:disabled{ color: #404040; background-color: #000; margin-top: 0px; } QTabBar::tab:selected{ color: #dcdcdc; background-color: #9A9A00; /*Yellow opaque*/ } QTabBar::tab:!selected:hover{ border-radius: 3px; border-top:3px double #9A9A00; border-bottom:3px double #9A9A00; padding: 1px; text-align: center; background-color: #9A9A00; color:#fff; Height: 20%; } /* QTabBar::tab:!selected{ color: #808080; background-color: #404040; margin-top: 0px; } */ #deactivateESP,#activateESP{ border:#b30000; background:#333337; } /* **************************************** */ /* on top of Treeview */ /* **************************************** */ QTabBar QToolButton{ border-radius: 0px; border: 0px; padding: 0px; background: transparent; } QToolButton::menu-indicator:pressed,QToolButton::menu-indicator:open{ image: url(./Transparent-Style/arrow-up.png); } QToolButton::menu-indicator:!pressed,QToolButton::menu-indicator:!open{ image: url(./Transparent-Style/arrow-down.png); } QTabBar QToolButton::right-arrow{ image: url(./Transparent-Style/narrow-arrow-right.png); } QTabBar QToolButton::left-arrow{ image: url(./Transparent-Style/narrow-arrow-left.png); } /* **************************************** */ /* Column names of TreeView */ /* **************************************** */ QTableView{ gridline-color:#3F3F46; selection-background-color:#9A9A00; selection-color:#F1F1F1; /* White */ text-align: center; min-height:24px; } QHeaderView{ min-height:24px; /*Top Bar on menus*/ padding: 3px; } QHeaderView::section{ /* color: #cc3333; */ background-color: #252526; border-radius: 0px; padding: 0px; padding-left: 5px; } QHeaderView::section:hover{ background: rgba(154,154,0,0.3); border: 1px solid #9a9a00; padding: 0px; padding-left: 5px; } QHeaderView::up-arrow,QHeaderView::down-arrow{ min-height:Auto; min-width:Auto; } QHeaderView::up-arrow{ image: url(./Transparent-Style/arrow-up.png); min-height:25px; min-width:15px; padding-right: 0px; }QHeaderView::down-arrow{ image: url(./Transparent-Style/arrow-down.png); } /* **************************************** */ /* Hover */ /* **************************************** */ QMenu:item:hover,QTreeView#espList::item:hover,QTreeWidget#categoriesList::item:hover,QListView::item:hover,QTreeWidget::item:hover{ color:#fff; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:rgba(154,154,0,0.3); } QAbstractItemView::item:hover{ border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:rgba(154,154,0,0.3); padding: 3px; } /*#DownloadListWidget{ }*/ #DownloadListWidget{ outline: 1px solid #e8e8e8; border: 0px solid #9a9a00; } #deactivateESP:hover,#activateESP:hover,QTableView:hover,QHeaderView::selected:hover{ border: 1px solid #9a9a00; padding: 1px; text-align: center; color:#fff; } /* **************************************** */ /* Context menus, toolbar dropdowns #QMenu */ /* **************************************** */ QMenu{ border-width: 3px; border-style: solid; }QMenu::item{ padding: 6px 20px; }QMenu::item:selected{ color:#fff; background-color: #3F3F46; /* Grey - Blue*/ border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QMenu::right-arrow{ image: url(./Transparent-Style/arrow-right.png); /* right click main menu top option*/ subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; border:0px outset #3F3F46; /* Grey - Blue*/ } /* ********************* */ /* LCD Counter */ /* ********************* */ QLCDNumber{ color: #9A9A00; Background: #000; border-color: #3F3F46; /* Grey - Blue*/ border-style: solid; border-width: 1px; border-radius: 5px; } /* **************************************** */ /* Launch application Drop down Box */ /* **************************************** */ QComboBox{ background-color: #333337; padding: 3px 5px 5px 5px; height: 26px; border-radius: 5px; border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QComboBox:on{ padding: 3px 5px 5px 5px; color: white; background-color: #3F3F46; /* Grey - Blue*/ } QComboBox:hover{ border-radius: 3px; border-top:3px double #9A9A00; border-bottom:3px double #9A9A00; /* padding: 0px; */ } QComboBox::drop-down{ /* Down arrow in combo box */ outline: none; border: none; border-width: 1px; } QComboBox::menu-indicator{ image: url(./Transparent-Style/arrow-down.png); subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; border:1px outset #3F3F46; /* Grey - Blue*/ } /* ************************* */ /* QComboBox::down-arrow:on, */ /* ************************* */ QComboBox::down-arrow:hover,QComboBox::down-arrow:focus { image: url(./Transparent-Style/arrow-down-hover.png); } QComboBox::up-arrow:hover,QComboBox::up-arrow:focus { image: url(./Transparent-Style/arrow-up-hover.png); } QComboBox::down-arrow{ image:url(./Transparent-Style/arrow-down.png); subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; } QComboBox::down-arrow:on{ image:url(./Transparent-Style/arrow-up.png); } QComboBox:editable { background: black; /* color: pink; */ } QComboBox::item{ } QComboBox QAbstractItemView{ selection-color:#fff; outline: 1px solid #9a9a00; selection-background-color:#3F3F46; /* Grey - Blue*/ border-top:1px solid #9a9a00; border-bottom:1px solid #9a9a00; padding: 5px; } /* **************************************************************** */ /* Action Buttons */ /* */ /* Open list, Restore Backup, Create Backup, RUN, Shortcut Button */ /* Sort, Load order backup, Load Order Restore */ /* **************************************************************** */ QPushButton{ background-color: #333337; min-height:26px; padding:1px 5%; text-align: center; border-radius: 5px; border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QPushButton::menu-indicator{ image: url(./Transparent-Style/arrow-down.png); subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; border:1px hidden #3F3F46; /* Grey - Blue*/ } QPushButton::menu-indicator:Hover{ image: url(./Transparent-Style/arrow-down-hover.png); } QPushButton:focus{ } QPushButton:on,QPushButton:checked,QPushButton:pressed,QPushButton:checked:hover{ background: #3F3F46; /* Grey - Blue*/ border-radius: 1px; border: 1px solid #9a9a00; } QPushButton:hover{ border-radius: 3px; border-top:3px double #9A9A00; border-bottom:3px double #9A9A00; } QDialog QPushButton,QSlider::handle:horizontal,QSlider::handle:vertical{ color:#fff; border-color:#707070; border-style:solid; border-width:1px; } QPushButton:disabled{ } QPushButton:open{ } QPushButton:!enabled{ } /* **************************************** */ /* Filter Button */ /* **************************************** */ QPushButton#displayCategoriesBtn{ min-width: 20px; background:transparent; color: transparent; border: 1px hidden #9a9a00; } QPushButton#displayCategoriesBtn:checked{ image: url(./Transparent-Style/arrow-left.png); } QPushButton#displayCategoriesBtn:!checked{ image: url(./Transparent-Style/arrow-right.png); } QPushButton#displayCategoriesBtn:checked:hover{ image: url(./Transparent-Style/arrow-left-hover.png); } QPushButton#displayCategoriesBtn:!checked:hover{ image: url(./Transparent-Style/arrow-right-hover.png); } /* **************************************** */ /* Scroll bar */ /* **************************************** */ QScrollBar{ height:20px; width:20px; background-color:transparent; } QScrollBar::handle{ border: 1px solid #aaa; border-radius: 4px; } QScrollBar::handle:vertical{ margin: 1px 4px; min-height:20px; min-width: 10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #9A9A00, stop:1 #000000); } QScrollBar::handle:vertical:hover{ background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #000000, stop:1 #9A9A00); } QScrollBar::handle:horizontal{ min-height:10px;min-width:20px;margin:4px 1px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #9A9A00, stop:1 #000000); } QScrollBar::handle:horizontal:hover{ background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #000000, stop:1 #9A9A00); } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical,QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal{ background-color: transparent; } QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical,QScrollBar::add-line:horizontal,QScrollBar::sub-line:horizontal{ height:0; width:0; } /* ******************************************************** */ /* Main Tree View Inherited from QAbstractItemView */ /* ******************************************************** */ QTreeView { } QTreeView:item{ padding: 3px; font-size: 16px; height: 18px; /*Bottom text Box*/ } QTreeView:item:selected{ color:#fff; padding: 0px; background-color: #3F3F46; /* Grey - Blue*/ border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QTreeView:item QLineEdit{ outline: none; border: none; padding: 0px; margin: 0px; } QTreeView::branch:has-siblings:!adjoins-item{ background:url(Transparent-Style/vault-101-item-line-v.png) center center no-repeat; } QTreeView::branch:has-siblings{ background:url(Transparent-Style/vault-101-itemB-line.png) center center no-repeat; } QTreeView::branch:!has-children:!has-siblings:adjoins-item{ background:url(Transparent-Style/vault-101-itemB-end.png) center center no-repeat; } QTreeView::branch:closed:has-children:has-siblings{ background:url(Transparent-Style/vault-101-itemB-close.png) center center no-repeat; } QTreeView::branch:closed:has-children:!has-siblings{ background:url(Transparent-Style/vault-101-itemB-close-last.png) center center no-repeat; } QTreeView::branch:open:has-children:has-siblings{ background:url(Transparent-Style/vault-101-itemB-open.png) center center no-repeat; } QTreeView::branch:open:has-children:!has-siblings{ background:url(Transparent-Style/vault-101-itemB-open-last.png) center center no-repeat; } /* **************************************************************** */ /* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ /* common */ /* **************************************************************** */ QTreeView::indicator,QCheckBox::indicator{ outline: none; border: none; padding: 0px; width: 24px; height: 24px; } QGroupBox::indicator:checked,QGroupBox::indicator:indeterminate,QTreeView::indicator:checked,QTreeView::indicator:indeterminate,QCheckBox::indicator:checked,QCheckBox::indicator:indeterminate{ image: url(./Transparent-Style/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(./Transparent-Style/checkbox-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(./Transparent-Style/checkbox-checked-disabled.png); } QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QCheckBox::indicator:unchecked{ image: url(./Transparent-Style/checkbox.png); } QGroupBox::indicator:unchecked:hover,QTreeView::indicator:unchecked:hover,QCheckBox::indicator:unchecked:hover{ image: url(./Transparent-Style/checkbox-checked-hover.png); } QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QCheckBox::indicator:unchecked:disabled{ image: url(./Transparent-Style/checkbox-checked-disabled.png); } QTreeWidget#categoriesList::item:has-children{ background-image: url(./Transparent-Style/arrow-right-small.png); } QTreeWidget#categoriesList::item:has-children:open{ background-image: url(./Transparent-Style/branch-opened.png); } /* ******************************** */ /* Special styles */ /* increase categories tab width */ /* ******************************** */ QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ padding: .3em 0em; } QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ padding: .3em 0em; } QTreeWidget#categoriesGroup,QTreeWidget#categoriesList{ min-width: 200px; } QTreeWidget#categoriesList::item { background-position: center left; background-repeat: no-repeat; padding: 0.35em 4px; } /* ********************* */ /* Display Radio Button */ /* ********************* */ QRadioButton::indicator{ width: 16px; height: 16px; } QRadioButton::indicator::checked{ image: url(./Transparent-Style/radio-BOS-checked.png); } QRadioButton::indicator::unchecked{ image: url(./Transparent-Style/radio-BOS.png); } QRadioButton::indicator::unchecked:hover{ image: url(./Transparent-Style/radio-BOS-hover.png); } /* **************************************** */ /* Spinners #QSpinBox, #QDoubleSpinBox */ /* **************************************** */ QAbstractSpinBox{ padding: 5px; background-color: transparent; color: #eff0f1; border-radius: 2px; min-width: Auto; } QAbstractSpinBox::up-button,QAbstractSpinBox::down-button{ border-style: solid; border-width: 1px; subcontrol-origin: border; } QAbstractSpinBox::up-button:hover,QAbstractSpinBox::down-button:hover{ background-color: transparent; } QAbstractSpinBox::up-button{ background-color: transparent; subcontrol-origin: border; subcontrol-position: center right; padding-right: 5px; /* subcontrol-position: top right; */ } QAbstractSpinBox::down-button{ background-color: transparent; subcontrol-origin: border; subcontrol-position: center left; padding-left: 5px; /* subcontrol-position: bottom right; */ } QAbstractSpinBox::up-arrow{ border-image: url(./Transparent-Style/narrow-arrow-right.png); }QAbstractSpinBox::down-arrow{ border-image: url(./Transparent-Style/narrow-arrow-left.png); }/* QTextEdit,QWebView,QLineEdit,QComboBox{ border-color:#3F3F46; /* Grey - Blue*/ /*}*/ /* **************************************** */ /* Tooltips #QToolTip, #SaveGameInfoWidget */ /* **************************************** */ QToolTip{ background-color:#121212; color:#C0C0C0; padding:0px; border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } SaveGameInfoWidget{ font-size: 16px; background-color:#121212; color:#C0C0C0; padding:0px; border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } /* **************************** */ /* Handles Web, Nexus info tab */ /* **************************** */ QWebView{ background-color: Black; } QLineEdit{ font-family: Segoe UI; min-height: 20px; font-size: 16px; background-color:#3F3F46; selection-background-color: rgba(154,154,0,0.6);border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } QTextEdit{ color: #cccccc; font-family: Segoe UI; font-size: 16px; /* background-color:#000; */ selection-background-color: rgba(154,154,0,0.6); border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } /* Font size */ QLabel,QMenu,QPushButton,QAbstractSpinBox,QGroupBox,QCheckBox,QRadioButton{ color: #cccccc; font-family: Segoe UI; font-size: 16px; /* was 14px Profile font size */ } QAbstractItemView{ color: #cccccc; font-family: Segoe UI; /* font-family: Source Sans Pro; */ font-size: 16px; /* Body font size*/ } QRadioButton{ color: #cccccc; font-family: Segoe UI; /* font-family: Source Sans Pro; */ font-size: 16px; } QWebView,QComboBox,QComboBox:editable{ font-family:Segoe UI; font-style: normal; font-weight: normal; font-size: 16px; background-color:#000; /* border-color:#3F3F46; /* Grey - Blue*/ color: #cccccc; font-family: Arial; font-size: 16px; /* Filter Name*/ } QHeaderView::section{ /* font-family: Source Sans Pro; */ font-family: Segoe UI; font-size: 16px; /*Top Bar on menus font*/ } QListView::item{ color:#F1F1F1; /* White */ } QGroupBox { } QGroupBox::title { subcontrol-origin: margin; subcontrol-position: top center; } QGroupBox::indicator { subcontrol-origin: margin; subcontrol-position: top center; } QLabel { color: #cccccc; /* color: #F1F1F1; /* White */ /* border: none;outline: none; border-radius: 5px; border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00;*/ } \ No newline at end of file +#centralWidget { + border-image: url(./Transparent-Style/Fallout-BOS.png) 0 0 0 0 stretch stretch; +} + QWidget#TextViewer{ +} + QWidget{ + color: #fff; + background-color: rgba(45,45,48,30); + alternate-background-color: rgba(38,38,38,30); +} + QWidget:disabled{ +} + QAbstractItemView{ + color: #dcdcdc; + background-color: rgb(45,45,48,30); + alternate-background-color: rgb(38,38,38,50); + border: 1px solid #3F3F46; + /* Grey - Blue*/ + border-style:outset; + border-radius: 3px; + selection-color: #3F3F46; + /* Grey - Blue*/ + outline: none; + padding-left:0; +} + #problemsWidget,#TransferSavesDialog,#SettingsDialog,#ProblemsDialog,#ModInfoDialog,#TextViewer,#PyCfgDialog,#InstallDialog { + border-image:url(./Transparent-Style/Vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #toolBarArea{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #EditExecutablesDialog{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #SimpleInstallDialog,#LockedDialog,QMenu{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #nameLabel{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:rgba(154,154,0,0.3); + color:#fff; +} + #ProfilesDialog,#FomodInstallerDialog{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #filesView{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} +/* ******************************************** */ +/* Main Navigation Button Bar at top of window */ +/* ******************************************** */ + QToolBar{ + /*border: none; + */ +} + QToolBar::separator{ + /*image: url(./Transparent-Style/Vault-101-vault-logo.png); + */ +} + QToolButton{ + border:2px solid None; + border-radius: 6px; + margin: 3px; + padding-left: 8px; + padding-right: 8px; + padding-top: 0px; + padding-bottom: 2px; +} + QToolButton:hover{ + border-radius: 3px; + border: 0px; + padding: 0px; + background: trANSPARENT; + border: 0px ridge #9A9A00; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9A9A00, stop: 1 #484F53); +} + QToolButton:pressed{ + background: black; +} +/* **************************************** */ +/* Tabs on top of Treeview */ +/* **************************************** */ + QTabWidget::pane{ + border-color:#3F3F46; + /* Grey - Blue*/ + /* border-top-color:#9A9A00; + */ + top: 0px; + border-style:hidden; + border-width:1px; +} + QTabWidget::tab-bar{ + alignment: center; +} + QTabBar{ + color: #cccccc; + font-family: Segoe UI; + font-size: 16px; + text-transform: none; + min-height:auto; + padding-bottom: 5px; +} + QTabBar::tab{ + border: none; + border-bottom-style: none; + background-color: rgba(154,154,0,0.3); + padding-left: 9px; + padding-right: 9px; + padding-top: 3px; + padding-bottom: 3px; + margin-right: 2px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + QTabBar::tab:disabled{ + color: #404040; + background-color: #000; + margin-top: 0px; +} + QTabBar::tab:selected{ + color: #dcdcdc; + background-color: #9A9A00; + /*Yellow opaque*/ +} + QTabBar::tab:!selected:hover{ + border-radius: 3px; + border-top:3px double #9A9A00; + border-bottom:3px double #9A9A00; + padding: 1px; + text-align: center; + background-color: #9A9A00; + color:#fff; + Height: 20%; +} +/* QTabBar::tab:!selected{ + color: #808080; + background-color: #404040; + margin-top: 0px; +} + */ + #deactivateESP,#activateESP{ + border:#b30000; + background:#333337; +} +/* **************************************** */ +/* on top of Treeview */ +/* **************************************** */ + QTabBar QToolButton{ + border-radius: 0px; + border: 0px; + padding: 0px; + background: transparent; +} + QToolButton::menu-indicator:pressed,QToolButton::menu-indicator:open{ + image: url(./Transparent-Style/arrow-up.png); +} + QToolButton::menu-indicator:!pressed,QToolButton::menu-indicator:!open{ + image: url(./Transparent-Style/arrow-down.png); +} + QTabBar QToolButton::right-arrow{ + image: url(./Transparent-Style/narrow-arrow-right.png); +} + QTabBar QToolButton::left-arrow{ + image: url(./Transparent-Style/narrow-arrow-left.png); +} +/* **************************************** */ +/* Column names of TreeView */ +/* **************************************** */ + QTableView{ + gridline-color:#3F3F46; + selection-background-color:#9A9A00; + selection-color:#F1F1F1; + /* White */ + text-align: center; + min-height:24px; +} + QHeaderView{ + min-height:24px; + /*Top Bar on menus*/ + padding: 3px; +} + QHeaderView::section{ + /* color: #cc3333; + */ + background-color: #252526; + border-radius: 0px; + padding: 0px; + padding-left: 5px; +} + QHeaderView::section:hover{ + background: rgba(154,154,0,0.3); + border: 1px solid #9a9a00; + padding: 0px; + padding-left: 5px; +} + QHeaderView::up-arrow,QHeaderView::down-arrow{ + min-height:Auto; + min-width:Auto; +} + QHeaderView::up-arrow{ + image: url(./Transparent-Style/arrow-up.png); + min-height:25px; + min-width:15px; + padding-right: 0px; +} +QHeaderView::down-arrow{ + image: url(./Transparent-Style/arrow-down.png); +} +/* **************************************** */ +/* Hover */ +/* **************************************** */ + QMenu:item:hover,QMenuBar::item:selected,QTreeView#espList::item:hover,QTreeWidget#categoriesList::item:hover,QListView::item:hover,QTreeWidget::item:hover{ + color:#fff; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:rgba(154,154,0,0.3); +} + QAbstractItemView::item:hover{ + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:rgba(154,154,0,0.3); + padding: 3px; +} +/*#DownloadListWidget{ +} +*/ + #DownloadListWidget{ + outline: 1px solid #e8e8e8; + border: 0px solid #9a9a00; +} + #deactivateESP:hover,#activateESP:hover,QTableView:hover,QHeaderView::selected:hover{ + border: 1px solid #9a9a00; + padding: 1px; + text-align: center; + color:#fff; +} +/* **************************************** */ +/* Context menus, toolbar dropdowns #QMenu */ +/* **************************************** */ + QMenu{ + border-width: 3px; + border-style: solid; +} +QMenu::item{ + padding: 6px 20px; +} +QMenu::item:selected{ + color:#fff; + background-color: #3F3F46; + /* Grey - Blue*/ + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QMenu::right-arrow{ + image: url(./Transparent-Style/arrow-right.png); + /* right click main menu top option*/ + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; + border:0px outset #3F3F46; + /* Grey - Blue*/ +} +/* ********************* */ +/* LCD Counter */ +/* ********************* */ + QLCDNumber{ + color: #9A9A00; + Background: #000; + border-color: #3F3F46; + /* Grey - Blue*/ + border-style: solid; + border-width: 1px; + border-radius: 5px; +} +/* **************************************** */ +/* Launch application Drop down Box */ +/* **************************************** */ + QComboBox{ + background-color: #333337; + padding: 3px 5px 5px 5px; + height: 26px; + border-radius: 5px; + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QComboBox:on{ + padding: 3px 5px 5px 5px; + color: white; + background-color: #3F3F46; + /* Grey - Blue*/ +} + QComboBox:hover{ + border-radius: 3px; + border-top:3px double #9A9A00; + border-bottom:3px double #9A9A00; + /* padding: 0px; + */ +} + QComboBox::drop-down{ + /* Down arrow in combo box */ + outline: none; + border: none; + border-width: 1px; +} + QComboBox::menu-indicator{ + image: url(./Transparent-Style/arrow-down.png); + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; + border:1px outset #3F3F46; + /* Grey - Blue*/ +} +/* ************************* */ +/* QComboBox::down-arrow:on, */ +/* ************************* */ + QComboBox::down-arrow:hover,QComboBox::down-arrow:focus { + image: url(./Transparent-Style/arrow-down-hover.png); +} + QComboBox::up-arrow:hover,QComboBox::up-arrow:focus { + image: url(./Transparent-Style/arrow-up-hover.png); +} + QComboBox::down-arrow{ + image:url(./Transparent-Style/arrow-down.png); + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; +} + QComboBox::down-arrow:on{ + image:url(./Transparent-Style/arrow-up.png); +} + QComboBox:editable { + background: black; + /* color: pink; + */ +} + QComboBox::item{ +} + QComboBox QAbstractItemView{ + selection-color:#fff; + outline: 1px solid #9a9a00; + selection-background-color:#3F3F46; + /* Grey - Blue*/ + border-top:1px solid #9a9a00; + border-bottom:1px solid #9a9a00; + padding: 5px; +} +/* **************************************************************** */ +/* Action Buttons */ +/* */ +/* Open list, Restore Backup, Create Backup, RUN, Shortcut Button */ +/* Sort, Load order backup, Load Order Restore */ +/* **************************************************************** */ + QPushButton{ + background-color: #333337; + min-height:26px; + padding:1px 5%; + text-align: center; + border-radius: 5px; + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QPushButton::menu-indicator{ + image: url(./Transparent-Style/arrow-down.png); + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; + border:1px hidden #3F3F46; + /* Grey - Blue*/ +} + QPushButton::menu-indicator:Hover{ + image: url(./Transparent-Style/arrow-down-hover.png); +} + QPushButton:focus{ +} + QPushButton:on,QPushButton:checked,QPushButton:pressed,QPushButton:checked:hover{ + background: #3F3F46; + /* Grey - Blue*/ + border-radius: 1px; + border: 1px solid #9a9a00; +} + QPushButton:hover{ + border-radius: 3px; + border-top:3px double #9A9A00; + border-bottom:3px double #9A9A00; +} + QDialog QPushButton,QSlider::handle:horizontal,QSlider::handle:vertical{ + color:#fff; + border-color:#707070; + border-style:solid; + border-width:1px; +} + QPushButton:disabled{ +} + QPushButton:open{ +} + QPushButton:!enabled{ +} +/* **************************************** */ +/* Filter Button */ +/* **************************************** */ + QPushButton#displayCategoriesBtn{ + min-width: 20px; + background:transparent; + color: transparent; + border: 1px hidden #9a9a00; +} + QPushButton#displayCategoriesBtn:checked{ + image: url(./Transparent-Style/arrow-left.png); +} + QPushButton#displayCategoriesBtn:!checked{ + image: url(./Transparent-Style/arrow-right.png); +} + QPushButton#displayCategoriesBtn:checked:hover{ + image: url(./Transparent-Style/arrow-left-hover.png); +} + QPushButton#displayCategoriesBtn:!checked:hover{ + image: url(./Transparent-Style/arrow-right-hover.png); +} +/* **************************************** */ +/* Scroll bar */ +/* **************************************** */ + QScrollBar{ + height:20px; + width:20px; + background-color:transparent; +} + QScrollBar::handle{ + border: 1px solid #aaa; + border-radius: 4px; +} + QScrollBar::handle:vertical{ + margin: 1px 4px; + min-height:20px; + min-width: 10px; + background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #9A9A00, stop:1 #000000); +} + QScrollBar::handle:vertical:hover{ + background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #000000, stop:1 #9A9A00); +} + QScrollBar::handle:horizontal{ + min-height:10px; + min-width:20px; + margin:4px 1px; + background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #9A9A00, stop:1 #000000); +} + QScrollBar::handle:horizontal:hover{ + background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #000000, stop:1 #9A9A00); +} + QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical,QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal{ + background-color: transparent; +} + QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical,QScrollBar::add-line:horizontal,QScrollBar::sub-line:horizontal{ + height:0; + width:0; +} +/* ******************************************************** */ +/* Main Tree View Inherited from QAbstractItemView */ +/* ******************************************************** */ + QTreeView { +} + QTreeView:item{ + padding: 3px; + font-size: 16px; + height: 18px; + /*Bottom text Box*/ +} + QTreeView:item:selected{ + color:#fff; + padding: 0px; + background-color: #3F3F46; + /* Grey - Blue*/ + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QTreeView:item QLineEdit{ + outline: none; + border: none; + padding: 0px; + margin: 0px; +} + QTreeView::branch:has-siblings:!adjoins-item{ + background:url(Transparent-Style/vault-101-item-line-v.png) center center no-repeat; +} + QTreeView::branch:has-siblings{ + background:url(Transparent-Style/vault-101-itemB-line.png) center center no-repeat; +} + QTreeView::branch:!has-children:!has-siblings:adjoins-item{ + background:url(Transparent-Style/vault-101-itemB-end.png) center center no-repeat; +} + QTreeView::branch:closed:has-children:has-siblings{ + background:url(Transparent-Style/vault-101-itemB-close.png) center center no-repeat; +} + QTreeView::branch:closed:has-children:!has-siblings{ + background:url(Transparent-Style/vault-101-itemB-close-last.png) center center no-repeat; +} + QTreeView::branch:open:has-children:has-siblings{ + background:url(Transparent-Style/vault-101-itemB-open.png) center center no-repeat; +} + QTreeView::branch:open:has-children:!has-siblings{ + background:url(Transparent-Style/vault-101-itemB-open-last.png) center center no-repeat; +} +/* **************************************************************** */ +/* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ +/* common */ +/* **************************************************************** */ + QTreeView::indicator,QCheckBox::indicator{ + outline: none; + border: none; + padding: 0px; + width: 24px; + height: 24px; +} + QGroupBox::indicator:checked,QGroupBox::indicator:indeterminate,QTreeView::indicator:checked,QTreeView::indicator:indeterminate,QCheckBox::indicator:checked,QCheckBox::indicator:indeterminate{ + image: url(./Transparent-Style/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(./Transparent-Style/checkbox-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(./Transparent-Style/checkbox-checked-disabled.png); +} + QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QCheckBox::indicator:unchecked{ + image: url(./Transparent-Style/checkbox.png); +} + QGroupBox::indicator:unchecked:hover,QTreeView::indicator:unchecked:hover,QCheckBox::indicator:unchecked:hover{ + image: url(./Transparent-Style/checkbox-checked-hover.png); +} + QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QCheckBox::indicator:unchecked:disabled{ + image: url(./Transparent-Style/checkbox-checked-disabled.png); +} + QTreeWidget#categoriesList::item:has-children{ + background-image: url(./Transparent-Style/arrow-right-small.png); +} + QTreeWidget#categoriesList::item:has-children:open{ + background-image: url(./Transparent-Style/branch-opened.png); +} +/* ******************************** */ +/* Special styles */ +/* increase categories tab width */ +/* ******************************** */ + QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ + padding: .3em 0em; +} + QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ + padding: .3em 0em; +} + QTreeWidget#categoriesGroup,QTreeWidget#categoriesList{ + min-width: 200px; +} + QTreeWidget#categoriesList::item { + background-position: center left; + background-repeat: no-repeat; + padding: 0.35em 4px; +} +/* ********************* */ +/* Display Radio Button */ +/* ********************* */ + QRadioButton::indicator{ + width: 16px; + height: 16px; +} + QRadioButton::indicator::checked{ + image: url(./Transparent-Style/radio-BOS-checked.png); +} + QRadioButton::indicator::unchecked{ + image: url(./Transparent-Style/radio-BOS.png); +} + QRadioButton::indicator::unchecked:hover{ + image: url(./Transparent-Style/radio-BOS-hover.png); +} +/* **************************************** */ +/* Spinners #QSpinBox, #QDoubleSpinBox */ +/* **************************************** */ + QAbstractSpinBox{ + padding: 5px; + background-color: transparent; + color: #eff0f1; + border-radius: 2px; + min-width: Auto; +} + QAbstractSpinBox::up-button,QAbstractSpinBox::down-button{ + border-style: solid; + border-width: 1px; + subcontrol-origin: border; +} + QAbstractSpinBox::up-button:hover,QAbstractSpinBox::down-button:hover{ + background-color: transparent; +} + QAbstractSpinBox::up-button{ + background-color: transparent; + subcontrol-origin: border; + subcontrol-position: center right; + padding-right: 5px; + /* subcontrol-position: top right; + */ +} + QAbstractSpinBox::down-button{ + background-color: transparent; + subcontrol-origin: border; + subcontrol-position: center left; + padding-left: 5px; + /* subcontrol-position: bottom right; + */ +} + QAbstractSpinBox::up-arrow{ + border-image: url(./Transparent-Style/narrow-arrow-right.png); +} +QAbstractSpinBox::down-arrow{ + border-image: url(./Transparent-Style/narrow-arrow-left.png); +} +/* QTextEdit,QWebView,QLineEdit,QComboBox{ + border-color:#3F3F46; + /* Grey - Blue*/ + /* +} +*/ +/* **************************************** */ +/* Tooltips #QToolTip, #SaveGameInfoWidget */ +/* **************************************** */ + QToolTip{ + background-color:#121212; + color:#C0C0C0; + padding:0px; + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} + SaveGameInfoWidget{ + font-size: 16px; + background-color:#121212; + color:#C0C0C0; + padding:0px; + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} +/* **************************** */ +/* Handles Web, Nexus info tab */ +/* **************************** */ + QWebView{ + background-color: Black; +} + QLineEdit{ + font-family: Segoe UI; + min-height: 20px; + font-size: 16px; + background-color:#3F3F46; + selection-background-color: rgba(154,154,0,0.6); + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} + QTextEdit{ + color: #cccccc; + font-family: Segoe UI; + font-size: 16px; + /* background-color:#000; + */ + selection-background-color: rgba(154,154,0,0.6); + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} +/* Font size */ + QLabel,QMenu,QPushButton,QAbstractSpinBox,QGroupBox,QCheckBox,QRadioButton{ + color: #cccccc; + font-family: Segoe UI; + font-size: 16px; + /* was 14px Profile font size */ +} + QAbstractItemView{ + color: #cccccc; + font-family: Segoe UI; + /* font-family: Source Sans Pro; + */ + font-size: 16px; + /* Body font size*/ +} + QRadioButton{ + color: #cccccc; + font-family: Segoe UI; + /* font-family: Source Sans Pro; + */ + font-size: 16px; +} + QWebView,QComboBox,QComboBox:editable{ + font-family:Segoe UI; + font-style: normal; + font-weight: normal; + font-size: 16px; + background-color:#000; + /* border-color:#3F3F46; + /* Grey - Blue*/ + color: #cccccc; + font-family: Arial; + font-size: 16px; + /* Filter Name*/ +} + QHeaderView::section{ + /* font-family: Source Sans Pro; + */ + font-family: Segoe UI; + font-size: 16px; + /*Top Bar on menus font*/ +} + QListView::item{ + color:#F1F1F1; + /* White */ +} + QGroupBox { +} + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; +} + QGroupBox::indicator { + subcontrol-origin: margin; + subcontrol-position: top center; +} + QLabel { + color: #cccccc; + /* color: #F1F1F1; + /* White */ + /* border: none; + outline: none; + border-radius: 5px; + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; + */ +} diff --git a/src/stylesheets/Transparent-Style-Skyrim.qss b/src/stylesheets/Transparent-Style-Skyrim.qss index b5fd7473..e95dcfc5 100644 --- a/src/stylesheets/Transparent-Style-Skyrim.qss +++ b/src/stylesheets/Transparent-Style-Skyrim.qss @@ -1 +1,742 @@ -#centralWidget { border-image: url(./Transparent-Style/Background-skyrim.png) 0 0 0 0 stretch stretch; } QWidget#TextViewer{ } QWidget{ color: #fff; background-color: rgba(45,45,48,30); alternate-background-color: rgba(38,38,38,30); } QWidget:disabled{ } QAbstractItemView{ color: #dcdcdc; background-color: rgb(45,45,48,30); alternate-background-color: rgb(38,38,38,50); border: 1px solid #3F3F46; /* Grey - Blue*/ border-style:outset; border-radius: 3px; selection-color: #3F3F46; /* Grey - Blue*/ outline: none; padding-left:0; } #problemsWidget,#TransferSavesDialog,#SettingsDialog,#ProblemsDialog,#ModInfoDialog,#TextViewer,#PyCfgDialog,#InstallDialog { border-image:url(./Transparent-Style/Vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #toolBarArea{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #EditExecutablesDialog{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #SimpleInstallDialog,#LockedDialog,QMenu{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #nameLabel{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:rgba(154,154,0,0.3); color:#fff; } #ProfilesDialog,#FomodInstallerDialog{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } #filesView{ border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; } /* ******************************************** */ /* Main Navigation Button Bar at top of window */ /* ******************************************** */ QToolBar{ /*border: none;*/ } QToolBar::separator{ /*image: url(./Transparent-Style/Vault-101-vault-logo.png);*/ } QToolButton{ border:2px solid None; border-radius: 6px; margin: 3px; padding-left: 8px; padding-right: 8px; padding-top: 0px; padding-bottom: 2px; } QToolButton:hover{ border-radius: 3px; border: 0px; padding: 0px; background: trANSPARENT; border: 0px ridge #9A9A00; background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9A9A00, stop: 1 #484F53); } QToolButton:pressed{ background: black; } /* **************************************** */ /* Tabs on top of Treeview */ /* **************************************** */ QTabWidget::pane{ border-color:#3F3F46; /* Grey - Blue*/ /* border-top-color:#9A9A00; */ top: 0px; border-style:hidden; border-width:1px; } QTabWidget::tab-bar{ alignment: center; } QTabBar{ color: #cccccc; font-family: Segoe UI; font-size: 16px; text-transform: none; min-height:auto; padding-bottom: 5px; } QTabBar::tab{ border: none; border-bottom-style: none; background-color: rgba(154,154,0,0.3); padding-left: 9px; padding-right: 9px; padding-top: 3px; padding-bottom: 3px; margin-right: 2px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; } QTabBar::tab:disabled{ color: #404040; background-color: #000; margin-top: 0px; } QTabBar::tab:selected{ color: #dcdcdc; background-color: #9A9A00; /*Yellow opaque*/ } QTabBar::tab:!selected:hover{ border-radius: 3px; border-top:3px double #9A9A00; border-bottom:3px double #9A9A00; padding: 1px; text-align: center; background-color: #9A9A00; color:#fff; Height: 20%; } /* QTabBar::tab:!selected{ color: #808080; background-color: #404040; margin-top: 0px; } */ #deactivateESP,#activateESP{ border:#b30000; background:#333337; } /* **************************************** */ /* on top of Treeview */ /* **************************************** */ QTabBar QToolButton{ border-radius: 0px; border: 0px; padding: 0px; background: transparent; } QToolButton::menu-indicator:pressed,QToolButton::menu-indicator:open{ image: url(./Transparent-Style/arrow-up.png); } QToolButton::menu-indicator:!pressed,QToolButton::menu-indicator:!open{ image: url(./Transparent-Style/arrow-down.png); } QTabBar QToolButton::right-arrow{ image: url(./Transparent-Style/narrow-arrow-right.png); } QTabBar QToolButton::left-arrow{ image: url(./Transparent-Style/narrow-arrow-left.png); } /* **************************************** */ /* Column names of TreeView */ /* **************************************** */ QTableView{ gridline-color:#3F3F46; selection-background-color:#9A9A00; selection-color:#F1F1F1; /* White */ text-align: center; min-height:24px; } QHeaderView{ min-height:24px; /*Top Bar on menus*/ padding: 3px; } QHeaderView::section{ /* color: #cc3333; */ background-color: #252526; border-radius: 0px; padding: 0px; padding-left: 5px; } QHeaderView::section:hover{ background: rgba(154,154,0,0.3); border: 1px solid #9a9a00; padding: 0px; padding-left: 5px; } QHeaderView::up-arrow,QHeaderView::down-arrow{ min-height:Auto; min-width:Auto; } QHeaderView::up-arrow{ image: url(./Transparent-Style/arrow-up.png); min-height:25px; min-width:15px; padding-right: 0px; }QHeaderView::down-arrow{ image: url(./Transparent-Style/arrow-down.png); } /* **************************************** */ /* Hover */ /* **************************************** */ QMenu:item:hover,QTreeView#espList::item:hover,QTreeWidget#categoriesList::item:hover,QListView::item:hover,QTreeWidget::item:hover{ color:#fff; border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:rgba(154,154,0,0.3); } QAbstractItemView::item:hover{ border-top:1px solid #b9d7fc; border-bottom:1px solid #b9d7fc; background-color:rgba(154,154,0,0.3); padding: 3px; } /*#DownloadListWidget{ }*/ #DownloadListWidget{ outline: 1px solid #e8e8e8; border: 0px solid #9a9a00; } #deactivateESP:hover,#activateESP:hover,QTableView:hover,QHeaderView::selected:hover{ border: 1px solid #9a9a00; padding: 1px; text-align: center; color:#fff; } /* **************************************** */ /* Context menus, toolbar dropdowns #QMenu */ /* **************************************** */ QMenu{ border-width: 3px; border-style: solid; }QMenu::item{ padding: 6px 20px; }QMenu::item:selected{ color:#fff; background-color: #3F3F46; /* Grey - Blue*/ border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QMenu::right-arrow{ image: url(./Transparent-Style/arrow-right.png); /* right click main menu top option*/ subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; border:0px outset #3F3F46; /* Grey - Blue*/ } /* ********************* */ /* LCD Counter */ /* ********************* */ QLCDNumber{ color: #9A9A00; Background: #000; border-color: #3F3F46; /* Grey - Blue*/ border-style: solid; border-width: 1px; border-radius: 5px; } /* **************************************** */ /* Launch application Drop down Box */ /* **************************************** */ QComboBox{ background-color: #333337; padding: 3px 5px 5px 5px; height: 26px; border-radius: 5px; border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QComboBox:on{ padding: 3px 5px 5px 5px; color: white; background-color: #3F3F46; /* Grey - Blue*/ } QComboBox:hover{ border-radius: 3px; border-top:3px double #9A9A00; border-bottom:3px double #9A9A00; /* padding: 0px; */ } QComboBox::drop-down{ /* Down arrow in combo box */ outline: none; border: none; border-width: 1px; } QComboBox::menu-indicator{ image: url(./Transparent-Style/arrow-down.png); subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; border:1px outset #3F3F46; /* Grey - Blue*/ } /* ************************* */ /* QComboBox::down-arrow:on, */ /* ************************* */ QComboBox::down-arrow:hover,QComboBox::down-arrow:focus { image: url(./Transparent-Style/arrow-down-hover.png); } QComboBox::up-arrow:hover,QComboBox::up-arrow:focus { image: url(./Transparent-Style/arrow-up-hover.png); } QComboBox::down-arrow{ image:url(./Transparent-Style/arrow-down.png); subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; } QComboBox::down-arrow:on{ image:url(./Transparent-Style/arrow-up.png); } QComboBox:editable { background: black; /* color: pink; */ } QComboBox::item{ } QComboBox QAbstractItemView{ selection-color:#fff; outline: 1px solid #9a9a00; selection-background-color:#3F3F46; /* Grey - Blue*/ border-top:1px solid #9a9a00; border-bottom:1px solid #9a9a00; padding: 5px; } /* **************************************************************** */ /* Action Buttons */ /* */ /* Open list, Restore Backup, Create Backup, RUN, Shortcut Button */ /* Sort, Load order backup, Load Order Restore */ /* **************************************************************** */ QPushButton{ background-color: #333337; min-height:26px; padding:1px 5%; text-align: center; border-radius: 5px; border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QPushButton::menu-indicator{ image: url(./Transparent-Style/arrow-down.png); subcontrol-origin: padding; subcontrol-position: center right; width: 18px; height: 18px; border:1px hidden #3F3F46; /* Grey - Blue*/ } QPushButton::menu-indicator:Hover{ image: url(./Transparent-Style/arrow-down-hover.png); } QPushButton:focus{ } QPushButton:on,QPushButton:checked,QPushButton:pressed,QPushButton:checked:hover{ background: #3F3F46; /* Grey - Blue*/ border-radius: 1px; border: 1px solid #9a9a00; } QPushButton:hover{ border-radius: 3px; border-top:3px double #9A9A00; border-bottom:3px double #9A9A00; } QDialog QPushButton,QSlider::handle:horizontal,QSlider::handle:vertical{ color:#fff; border-color:#707070; border-style:solid; border-width:1px; } QPushButton:disabled{ } QPushButton:open{ } QPushButton:!enabled{ } /* **************************************** */ /* Filter Button */ /* **************************************** */ QPushButton#displayCategoriesBtn{ min-width: 20px; background:transparent; color: transparent; border: 1px hidden #9a9a00; } QPushButton#displayCategoriesBtn:checked{ image: url(./Transparent-Style/arrow-left.png); } QPushButton#displayCategoriesBtn:!checked{ image: url(./Transparent-Style/arrow-right.png); } QPushButton#displayCategoriesBtn:checked:hover{ image: url(./Transparent-Style/arrow-left-hover.png); } QPushButton#displayCategoriesBtn:!checked:hover{ image: url(./Transparent-Style/arrow-right-hover.png); } /* **************************************** */ /* Scroll bar */ /* **************************************** */ QScrollBar{ height:20px; width:20px; background-color:transparent; } QScrollBar::handle{ border: 1px solid #aaa; border-radius: 4px; } QScrollBar::handle:vertical{ margin: 1px 4px; min-height:20px; min-width: 10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #9A9A00, stop:1 #000000); } QScrollBar::handle:vertical:hover{ background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #000000, stop:1 #9A9A00); } QScrollBar::handle:horizontal{ min-height:10px;min-width:20px;margin:4px 1px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #9A9A00, stop:1 #000000); } QScrollBar::handle:horizontal:hover{ background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #000000, stop:1 #9A9A00); } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical,QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal{ background-color: transparent; } QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical,QScrollBar::add-line:horizontal,QScrollBar::sub-line:horizontal{ height:0; width:0; } /* ******************************************************** */ /* Main Tree View Inherited from QAbstractItemView */ /* ******************************************************** */ QTreeView { } QTreeView:item{ padding: 3px; font-size: 16px; height: 18px; /*Bottom text Box*/ } QTreeView:item:selected{ color:#fff; padding: 0px; background-color: #3F3F46; /* Grey - Blue*/ border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00; } QTreeView:item QLineEdit{ outline: none; border: none; padding: 0px; margin: 0px; } QTreeView::branch:has-siblings:!adjoins-item{ background:url(Transparent-Style/vault-101-item-line-v.png) center center no-repeat; } QTreeView::branch:has-siblings{ background:url(Transparent-Style/vault-101-itemB-line.png) center center no-repeat; } QTreeView::branch:!has-children:!has-siblings:adjoins-item{ background:url(Transparent-Style/vault-101-itemB-end.png) center center no-repeat; } QTreeView::branch:closed:has-children:has-siblings{ background:url(Transparent-Style/vault-101-itemB-close.png) center center no-repeat; } QTreeView::branch:closed:has-children:!has-siblings{ background:url(Transparent-Style/vault-101-itemB-close-last.png) center center no-repeat; } QTreeView::branch:open:has-children:has-siblings{ background:url(Transparent-Style/vault-101-itemB-open.png) center center no-repeat; } QTreeView::branch:open:has-children:!has-siblings{ background:url(Transparent-Style/vault-101-itemB-open-last.png) center center no-repeat; } /* **************************************************************** */ /* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ /* common */ /* **************************************************************** */ QTreeView::indicator,QCheckBox::indicator{ outline: none; border: none; padding: 0px; width: 24px; height: 24px; } QGroupBox::indicator:checked,QGroupBox::indicator:indeterminate,QTreeView::indicator:checked,QTreeView::indicator:indeterminate,QCheckBox::indicator:checked,QCheckBox::indicator:indeterminate{ image: url(./Transparent-Style/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(./Transparent-Style/checkbox-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(./Transparent-Style/checkbox-checked-disabled.png); } QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QCheckBox::indicator:unchecked{ image: url(./Transparent-Style/checkbox.png); } QGroupBox::indicator:unchecked:hover,QTreeView::indicator:unchecked:hover,QCheckBox::indicator:unchecked:hover{ image: url(./Transparent-Style/checkbox-checked-hover.png); } QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QCheckBox::indicator:unchecked:disabled{ image: url(./Transparent-Style/checkbox-checked-disabled.png); } QTreeWidget#categoriesList::item:has-children{ background-image: url(./Transparent-Style/arrow-right-small.png); } QTreeWidget#categoriesList::item:has-children:open{ background-image: url(./Transparent-Style/branch-opened.png); } /* ******************************** */ /* Special styles */ /* increase categories tab width */ /* ******************************** */ QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ padding: .3em 0em; } QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ padding: .3em 0em; } QTreeWidget#categoriesGroup,QTreeWidget#categoriesList{ min-width: 200px; } QTreeWidget#categoriesList::item { background-position: center left; background-repeat: no-repeat; padding: 0.35em 4px; } /* ********************* */ /* Display Radio Button */ /* ********************* */ QRadioButton::indicator{ width: 16px; height: 16px; } QRadioButton::indicator::checked{ image: url(./Transparent-Style/radio-BOS-checked.png); } QRadioButton::indicator::unchecked{ image: url(./Transparent-Style/radio-BOS.png); } QRadioButton::indicator::unchecked:hover{ image: url(./Transparent-Style/radio-BOS-hover.png); } /* **************************************** */ /* Spinners #QSpinBox, #QDoubleSpinBox */ /* **************************************** */ QAbstractSpinBox{ padding: 5px; background-color: transparent; color: #eff0f1; border-radius: 2px; min-width: Auto; } QAbstractSpinBox::up-button,QAbstractSpinBox::down-button{ border-style: solid; border-width: 1px; subcontrol-origin: border; } QAbstractSpinBox::up-button:hover,QAbstractSpinBox::down-button:hover{ background-color: transparent; } QAbstractSpinBox::up-button{ background-color: transparent; subcontrol-origin: border; subcontrol-position: center right; padding-right: 5px; /* subcontrol-position: top right; */ } QAbstractSpinBox::down-button{ background-color: transparent; subcontrol-origin: border; subcontrol-position: center left; padding-left: 5px; /* subcontrol-position: bottom right; */ } QAbstractSpinBox::up-arrow{ border-image: url(./Transparent-Style/narrow-arrow-right.png); }QAbstractSpinBox::down-arrow{ border-image: url(./Transparent-Style/narrow-arrow-left.png); }/* QTextEdit,QWebView,QLineEdit,QComboBox{ border-color:#3F3F46; /* Grey - Blue*/ /*}*/ /* **************************************** */ /* Tooltips #QToolTip, #SaveGameInfoWidget */ /* **************************************** */ QToolTip{ background-color:#121212; color:#C0C0C0; padding:0px; border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } SaveGameInfoWidget{ font-size: 16px; background-color:#121212; color:#C0C0C0; padding:0px; border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } /* **************************** */ /* Handles Web, Nexus info tab */ /* **************************** */ QWebView{ background-color: Black; } QLineEdit{ font-family: Segoe UI; min-height: 20px; font-size: 16px; background-color:#3F3F46; selection-background-color: rgba(154,154,0,0.6);border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } QTextEdit{ color: #cccccc; font-family: Segoe UI; font-size: 16px; /* background-color:#000; */ selection-background-color: rgba(154,154,0,0.6); border-color:#9A9A00; border-radius: 3px; border-width:1px; border-style:solid; } /* Font size */ QLabel,QMenu,QPushButton,QAbstractSpinBox,QGroupBox,QCheckBox,QRadioButton{ color: #cccccc; font-family: Segoe UI; font-size: 16px; /* was 14px Profile font size */ } QAbstractItemView{ color: #cccccc; font-family: Segoe UI; /* font-family: Source Sans Pro; */ font-size: 16px; /* Body font size*/ } QRadioButton{ color: #cccccc; font-family: Segoe UI; /* font-family: Source Sans Pro; */ font-size: 16px; } QWebView,QComboBox,QComboBox:editable{ font-family:Segoe UI; font-style: normal; font-weight: normal; font-size: 16px; background-color:#000; /* border-color:#3F3F46; /* Grey - Blue*/ color: #cccccc; font-family: Arial; font-size: 16px; /* Filter Name*/ } QHeaderView::section{ /* font-family: Source Sans Pro; */ font-family: Segoe UI; font-size: 16px; /*Top Bar on menus font*/ } QListView::item{ color:#F1F1F1; /* White */ } QGroupBox { } QGroupBox::title { subcontrol-origin: margin; subcontrol-position: top center; } QGroupBox::indicator { subcontrol-origin: margin; subcontrol-position: top center; } QLabel { color: #cccccc; /* color: #F1F1F1; /* White */ /* border: none;outline: none; border-radius: 5px; border-top:1px solid #9A9A00; border-bottom:1px solid #9A9A00;*/ } \ No newline at end of file +#centralWidget { + border-image: url(./Transparent-Style/Background-skyrim.png) 0 0 0 0 stretch stretch; +} + QWidget#TextViewer{ +} + QWidget{ + color: #fff; + background-color: rgba(45,45,48,30); + alternate-background-color: rgba(38,38,38,30); +} + QWidget:disabled{ +} + QAbstractItemView{ + color: #dcdcdc; + background-color: rgb(45,45,48,30); + alternate-background-color: rgb(38,38,38,50); + border: 1px solid #3F3F46; + /* Grey - Blue*/ + border-style:outset; + border-radius: 3px; + selection-color: #3F3F46; + /* Grey - Blue*/ + outline: none; + padding-left:0; +} + #problemsWidget,#TransferSavesDialog,#SettingsDialog,#ProblemsDialog,#ModInfoDialog,#TextViewer,#PyCfgDialog,#InstallDialog { + border-image:url(./Transparent-Style/Vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #toolBarArea{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #EditExecutablesDialog{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #SimpleInstallDialog,#LockedDialog,QMenu{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #nameLabel{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:rgba(154,154,0,0.3); + color:#fff; +} + #ProfilesDialog,#FomodInstallerDialog{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} + #filesView{ + border-image: url(./Transparent-Style/vault-BOS-Main.png) 0 0 0 0 stretch stretch; +} +/* ******************************************** */ +/* Main Navigation Button Bar at top of window */ +/* ******************************************** */ + QToolBar{ + /*border: none; + */ +} + QToolBar::separator{ + /*image: url(./Transparent-Style/Vault-101-vault-logo.png); + */ +} + QToolButton{ + border:2px solid None; + border-radius: 6px; + margin: 3px; + padding-left: 8px; + padding-right: 8px; + padding-top: 0px; + padding-bottom: 2px; +} + QToolButton:hover{ + border-radius: 3px; + border: 0px; + padding: 0px; + background: trANSPARENT; + border: 0px ridge #9A9A00; + background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9A9A00, stop: 1 #484F53); +} + QToolButton:pressed{ + background: black; +} +/* **************************************** */ +/* Tabs on top of Treeview */ +/* **************************************** */ + QTabWidget::pane{ + border-color:#3F3F46; + /* Grey - Blue*/ + /* border-top-color:#9A9A00; + */ + top: 0px; + border-style:hidden; + border-width:1px; +} + QTabWidget::tab-bar{ + alignment: center; +} + QTabBar{ + color: #cccccc; + font-family: Segoe UI; + font-size: 16px; + text-transform: none; + min-height:auto; + padding-bottom: 5px; +} + QTabBar::tab{ + border: none; + border-bottom-style: none; + background-color: rgba(154,154,0,0.3); + padding-left: 9px; + padding-right: 9px; + padding-top: 3px; + padding-bottom: 3px; + margin-right: 2px; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + QTabBar::tab:disabled{ + color: #404040; + background-color: #000; + margin-top: 0px; +} + QTabBar::tab:selected{ + color: #dcdcdc; + background-color: #9A9A00; + /*Yellow opaque*/ +} + QTabBar::tab:!selected:hover{ + border-radius: 3px; + border-top:3px double #9A9A00; + border-bottom:3px double #9A9A00; + padding: 1px; + text-align: center; + background-color: #9A9A00; + color:#fff; + Height: 20%; +} +/* QTabBar::tab:!selected{ + color: #808080; + background-color: #404040; + margin-top: 0px; +} + */ + #deactivateESP,#activateESP{ + border:#b30000; + background:#333337; +} +/* **************************************** */ +/* on top of Treeview */ +/* **************************************** */ + QTabBar QToolButton{ + border-radius: 0px; + border: 0px; + padding: 0px; + background: transparent; +} + QToolButton::menu-indicator:pressed,QToolButton::menu-indicator:open{ + image: url(./Transparent-Style/arrow-up.png); +} + QToolButton::menu-indicator:!pressed,QToolButton::menu-indicator:!open{ + image: url(./Transparent-Style/arrow-down.png); +} + QTabBar QToolButton::right-arrow{ + image: url(./Transparent-Style/narrow-arrow-right.png); +} + QTabBar QToolButton::left-arrow{ + image: url(./Transparent-Style/narrow-arrow-left.png); +} +/* **************************************** */ +/* Column names of TreeView */ +/* **************************************** */ + QTableView{ + gridline-color:#3F3F46; + selection-background-color:#9A9A00; + selection-color:#F1F1F1; + /* White */ + text-align: center; + min-height:24px; +} + QHeaderView{ + min-height:24px; + /*Top Bar on menus*/ + padding: 3px; +} + QHeaderView::section{ + /* color: #cc3333; + */ + background-color: #252526; + border-radius: 0px; + padding: 0px; + padding-left: 5px; +} + QHeaderView::section:hover{ + background: rgba(154,154,0,0.3); + border: 1px solid #9a9a00; + padding: 0px; + padding-left: 5px; +} + QHeaderView::up-arrow,QHeaderView::down-arrow{ + min-height:Auto; + min-width:Auto; +} + QHeaderView::up-arrow{ + image: url(./Transparent-Style/arrow-up.png); + min-height:25px; + min-width:15px; + padding-right: 0px; +} +QHeaderView::down-arrow{ + image: url(./Transparent-Style/arrow-down.png); +} +/* **************************************** */ +/* Hover */ +/* **************************************** */ + QMenu:item:hover,QMenuBar::item:selected,QTreeView#espList::item:hover,QTreeWidget#categoriesList::item:hover,QListView::item:hover,QTreeWidget::item:hover{ + color:#fff; + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:rgba(154,154,0,0.3); +} + QAbstractItemView::item:hover{ + border-top:1px solid #b9d7fc; + border-bottom:1px solid #b9d7fc; + background-color:rgba(154,154,0,0.3); + padding: 3px; +} +/*#DownloadListWidget{ +} +*/ + #DownloadListWidget{ + outline: 1px solid #e8e8e8; + border: 0px solid #9a9a00; +} + #deactivateESP:hover,#activateESP:hover,QTableView:hover,QHeaderView::selected:hover{ + border: 1px solid #9a9a00; + padding: 1px; + text-align: center; + color:#fff; +} +/* **************************************** */ +/* Context menus, toolbar dropdowns #QMenu */ +/* **************************************** */ + QMenu{ + border-width: 3px; + border-style: solid; +} +QMenu::item{ + padding: 6px 20px; +} +QMenu::item:selected{ + color:#fff; + background-color: #3F3F46; + /* Grey - Blue*/ + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QMenu::right-arrow{ + image: url(./Transparent-Style/arrow-right.png); + /* right click main menu top option*/ + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; + border:0px outset #3F3F46; + /* Grey - Blue*/ +} +/* ********************* */ +/* LCD Counter */ +/* ********************* */ + QLCDNumber{ + color: #9A9A00; + Background: #000; + border-color: #3F3F46; + /* Grey - Blue*/ + border-style: solid; + border-width: 1px; + border-radius: 5px; +} +/* **************************************** */ +/* Launch application Drop down Box */ +/* **************************************** */ + QComboBox{ + background-color: #333337; + padding: 3px 5px 5px 5px; + height: 26px; + border-radius: 5px; + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QComboBox:on{ + padding: 3px 5px 5px 5px; + color: white; + background-color: #3F3F46; + /* Grey - Blue*/ +} + QComboBox:hover{ + border-radius: 3px; + border-top:3px double #9A9A00; + border-bottom:3px double #9A9A00; + /* padding: 0px; + */ +} + QComboBox::drop-down{ + /* Down arrow in combo box */ + outline: none; + border: none; + border-width: 1px; +} + QComboBox::menu-indicator{ + image: url(./Transparent-Style/arrow-down.png); + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; + border:1px outset #3F3F46; + /* Grey - Blue*/ +} +/* ************************* */ +/* QComboBox::down-arrow:on, */ +/* ************************* */ + QComboBox::down-arrow:hover,QComboBox::down-arrow:focus { + image: url(./Transparent-Style/arrow-down-hover.png); +} + QComboBox::up-arrow:hover,QComboBox::up-arrow:focus { + image: url(./Transparent-Style/arrow-up-hover.png); +} + QComboBox::down-arrow{ + image:url(./Transparent-Style/arrow-down.png); + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; +} + QComboBox::down-arrow:on{ + image:url(./Transparent-Style/arrow-up.png); +} + QComboBox:editable { + background: black; + /* color: pink; + */ +} + QComboBox::item{ +} + QComboBox QAbstractItemView{ + selection-color:#fff; + outline: 1px solid #9a9a00; + selection-background-color:#3F3F46; + /* Grey - Blue*/ + border-top:1px solid #9a9a00; + border-bottom:1px solid #9a9a00; + padding: 5px; +} +/* **************************************************************** */ +/* Action Buttons */ +/* */ +/* Open list, Restore Backup, Create Backup, RUN, Shortcut Button */ +/* Sort, Load order backup, Load Order Restore */ +/* **************************************************************** */ + QPushButton{ + background-color: #333337; + min-height:26px; + padding:1px 5%; + text-align: center; + border-radius: 5px; + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QPushButton::menu-indicator{ + image: url(./Transparent-Style/arrow-down.png); + subcontrol-origin: padding; + subcontrol-position: center right; + width: 18px; + height: 18px; + border:1px hidden #3F3F46; + /* Grey - Blue*/ +} + QPushButton::menu-indicator:Hover{ + image: url(./Transparent-Style/arrow-down-hover.png); +} + QPushButton:focus{ +} + QPushButton:on,QPushButton:checked,QPushButton:pressed,QPushButton:checked:hover{ + background: #3F3F46; + /* Grey - Blue*/ + border-radius: 1px; + border: 1px solid #9a9a00; +} + QPushButton:hover{ + border-radius: 3px; + border-top:3px double #9A9A00; + border-bottom:3px double #9A9A00; +} + QDialog QPushButton,QSlider::handle:horizontal,QSlider::handle:vertical{ + color:#fff; + border-color:#707070; + border-style:solid; + border-width:1px; +} + QPushButton:disabled{ +} + QPushButton:open{ +} + QPushButton:!enabled{ +} +/* **************************************** */ +/* Filter Button */ +/* **************************************** */ + QPushButton#displayCategoriesBtn{ + min-width: 20px; + background:transparent; + color: transparent; + border: 1px hidden #9a9a00; +} + QPushButton#displayCategoriesBtn:checked{ + image: url(./Transparent-Style/arrow-left.png); +} + QPushButton#displayCategoriesBtn:!checked{ + image: url(./Transparent-Style/arrow-right.png); +} + QPushButton#displayCategoriesBtn:checked:hover{ + image: url(./Transparent-Style/arrow-left-hover.png); +} + QPushButton#displayCategoriesBtn:!checked:hover{ + image: url(./Transparent-Style/arrow-right-hover.png); +} +/* **************************************** */ +/* Scroll bar */ +/* **************************************** */ + QScrollBar{ + height:20px; + width:20px; + background-color:transparent; +} + QScrollBar::handle{ + border: 1px solid #aaa; + border-radius: 4px; +} + QScrollBar::handle:vertical{ + margin: 1px 4px; + min-height:20px; + min-width: 10px; + background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #9A9A00, stop:1 #000000); +} + QScrollBar::handle:vertical:hover{ + background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #000000, stop:1 #9A9A00); +} + QScrollBar::handle:horizontal{ + min-height:10px; + min-width:20px; + margin:4px 1px; + background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #9A9A00, stop:1 #000000); +} + QScrollBar::handle:horizontal:hover{ + background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #000000, stop:1 #9A9A00); +} + QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical,QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal{ + background-color: transparent; +} + QScrollBar::add-line:vertical,QScrollBar::sub-line:vertical,QScrollBar::add-line:horizontal,QScrollBar::sub-line:horizontal{ + height:0; + width:0; +} +/* ******************************************************** */ +/* Main Tree View Inherited from QAbstractItemView */ +/* ******************************************************** */ + QTreeView { +} + QTreeView:item{ + padding: 3px; + font-size: 16px; + height: 18px; + /*Bottom text Box*/ +} + QTreeView:item:selected{ + color:#fff; + padding: 0px; + background-color: #3F3F46; + /* Grey - Blue*/ + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; +} + QTreeView:item QLineEdit{ + outline: none; + border: none; + padding: 0px; + margin: 0px; +} + QTreeView::branch:has-siblings:!adjoins-item{ + background:url(Transparent-Style/vault-101-item-line-v.png) center center no-repeat; +} + QTreeView::branch:has-siblings{ + background:url(Transparent-Style/vault-101-itemB-line.png) center center no-repeat; +} + QTreeView::branch:!has-children:!has-siblings:adjoins-item{ + background:url(Transparent-Style/vault-101-itemB-end.png) center center no-repeat; +} + QTreeView::branch:closed:has-children:has-siblings{ + background:url(Transparent-Style/vault-101-itemB-close.png) center center no-repeat; +} + QTreeView::branch:closed:has-children:!has-siblings{ + background:url(Transparent-Style/vault-101-itemB-close-last.png) center center no-repeat; +} + QTreeView::branch:open:has-children:has-siblings{ + background:url(Transparent-Style/vault-101-itemB-open.png) center center no-repeat; +} + QTreeView::branch:open:has-children:!has-siblings{ + background:url(Transparent-Style/vault-101-itemB-open-last.png) center center no-repeat; +} +/* **************************************************************** */ +/* Checkboxes and Radio buttons common #QCheckBox, #QRadioButton */ +/* common */ +/* **************************************************************** */ + QTreeView::indicator,QCheckBox::indicator{ + outline: none; + border: none; + padding: 0px; + width: 24px; + height: 24px; +} + QGroupBox::indicator:checked,QGroupBox::indicator:indeterminate,QTreeView::indicator:checked,QTreeView::indicator:indeterminate,QCheckBox::indicator:checked,QCheckBox::indicator:indeterminate{ + image: url(./Transparent-Style/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(./Transparent-Style/checkbox-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(./Transparent-Style/checkbox-checked-disabled.png); +} + QGroupBox::indicator:unchecked,QTreeView::indicator:unchecked,QCheckBox::indicator:unchecked{ + image: url(./Transparent-Style/checkbox.png); +} + QGroupBox::indicator:unchecked:hover,QTreeView::indicator:unchecked:hover,QCheckBox::indicator:unchecked:hover{ + image: url(./Transparent-Style/checkbox-checked-hover.png); +} + QGroupBox::indicator:unchecked:disabled,QTreeView::indicator:unchecked:disabled,QCheckBox::indicator:unchecked:disabled{ + image: url(./Transparent-Style/checkbox-checked-disabled.png); +} + QTreeWidget#categoriesList::item:has-children{ + background-image: url(./Transparent-Style/arrow-right-small.png); +} + QTreeWidget#categoriesList::item:has-children:open{ + background-image: url(./Transparent-Style/branch-opened.png); +} +/* ******************************** */ +/* Special styles */ +/* increase categories tab width */ +/* ******************************** */ + QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ + padding: .3em 0em; +} + QTreeView#modList::item,QTreeWidget#categoriesTree::item,#tabConflicts QTreeWidget::item,QListView::item,QTreeView#espList::item,QTreeView#treeContent::item{ + padding: .3em 0em; +} + QTreeWidget#categoriesGroup,QTreeWidget#categoriesList{ + min-width: 200px; +} + QTreeWidget#categoriesList::item { + background-position: center left; + background-repeat: no-repeat; + padding: 0.35em 4px; +} +/* ********************* */ +/* Display Radio Button */ +/* ********************* */ + QRadioButton::indicator{ + width: 16px; + height: 16px; +} + QRadioButton::indicator::checked{ + image: url(./Transparent-Style/radio-BOS-checked.png); +} + QRadioButton::indicator::unchecked{ + image: url(./Transparent-Style/radio-BOS.png); +} + QRadioButton::indicator::unchecked:hover{ + image: url(./Transparent-Style/radio-BOS-hover.png); +} +/* **************************************** */ +/* Spinners #QSpinBox, #QDoubleSpinBox */ +/* **************************************** */ + QAbstractSpinBox{ + padding: 5px; + background-color: transparent; + color: #eff0f1; + border-radius: 2px; + min-width: Auto; +} + QAbstractSpinBox::up-button,QAbstractSpinBox::down-button{ + border-style: solid; + border-width: 1px; + subcontrol-origin: border; +} + QAbstractSpinBox::up-button:hover,QAbstractSpinBox::down-button:hover{ + background-color: transparent; +} + QAbstractSpinBox::up-button{ + background-color: transparent; + subcontrol-origin: border; + subcontrol-position: center right; + padding-right: 5px; + /* subcontrol-position: top right; + */ +} + QAbstractSpinBox::down-button{ + background-color: transparent; + subcontrol-origin: border; + subcontrol-position: center left; + padding-left: 5px; + /* subcontrol-position: bottom right; + */ +} + QAbstractSpinBox::up-arrow{ + border-image: url(./Transparent-Style/narrow-arrow-right.png); +} +QAbstractSpinBox::down-arrow{ + border-image: url(./Transparent-Style/narrow-arrow-left.png); +} +/* QTextEdit,QWebView,QLineEdit,QComboBox{ + border-color:#3F3F46; + /* Grey - Blue*/ + /* +} +*/ +/* **************************************** */ +/* Tooltips #QToolTip, #SaveGameInfoWidget */ +/* **************************************** */ + QToolTip{ + background-color:#121212; + color:#C0C0C0; + padding:0px; + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} + SaveGameInfoWidget{ + font-size: 16px; + background-color:#121212; + color:#C0C0C0; + padding:0px; + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} +/* **************************** */ +/* Handles Web, Nexus info tab */ +/* **************************** */ + QWebView{ + background-color: Black; +} + QLineEdit{ + font-family: Segoe UI; + min-height: 20px; + font-size: 16px; + background-color:#3F3F46; + selection-background-color: rgba(154,154,0,0.6); + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} + QTextEdit{ + color: #cccccc; + font-family: Segoe UI; + font-size: 16px; + /* background-color:#000; + */ + selection-background-color: rgba(154,154,0,0.6); + border-color:#9A9A00; + border-radius: 3px; + border-width:1px; + border-style:solid; +} +/* Font size */ + QLabel,QMenu,QPushButton,QAbstractSpinBox,QGroupBox,QCheckBox,QRadioButton{ + color: #cccccc; + font-family: Segoe UI; + font-size: 16px; + /* was 14px Profile font size */ +} + QAbstractItemView{ + color: #cccccc; + font-family: Segoe UI; + /* font-family: Source Sans Pro; + */ + font-size: 16px; + /* Body font size*/ +} + QRadioButton{ + color: #cccccc; + font-family: Segoe UI; + /* font-family: Source Sans Pro; + */ + font-size: 16px; +} + QWebView,QComboBox,QComboBox:editable{ + font-family:Segoe UI; + font-style: normal; + font-weight: normal; + font-size: 16px; + background-color:#000; + /* border-color:#3F3F46; + /* Grey - Blue*/ + color: #cccccc; + font-family: Arial; + font-size: 16px; + /* Filter Name*/ +} + QHeaderView::section{ + /* font-family: Source Sans Pro; + */ + font-family: Segoe UI; + font-size: 16px; + /*Top Bar on menus font*/ +} + QListView::item{ + color:#F1F1F1; + /* White */ +} + QGroupBox { +} + QGroupBox::title { + subcontrol-origin: margin; + subcontrol-position: top center; +} + QGroupBox::indicator { + subcontrol-origin: margin; + subcontrol-position: top center; +} + QLabel { + color: #cccccc; + /* color: #F1F1F1; + /* White */ + /* border: none; + outline: none; + border-radius: 5px; + border-top:1px solid #9A9A00; + border-bottom:1px solid #9A9A00; + */ +} diff --git a/src/stylesheets/dark.qss b/src/stylesheets/dark.qss index 5bbb0f0c..1ad534a1 100644 --- a/src/stylesheets/dark.qss +++ b/src/stylesheets/dark.qss @@ -247,6 +247,11 @@ QMenu::item:selected border-color: #3EA0CA; } +QMenuBar::item:selected { + background-color: #3c4b54; + border-color: #3EA0CA; +} + QProgressBar { border: 2px solid grey; diff --git a/src/stylesheets/skyrim.qss b/src/stylesheets/skyrim.qss index d36eac57..d69fa173 100644 --- a/src/stylesheets/skyrim.qss +++ b/src/stylesheets/skyrim.qss @@ -488,6 +488,14 @@ QHeaderView { image: url(./skyrim/arrow-down.png); } /* Context menus, toolbar drop-downs #QMenu */ +QMenuBar { + background-color: #000; +} + +QMenuBar::item:selected { + background-color: #121212; +} + QMenu { background-color: transparent; } QMenu::item, diff --git a/src/stylesheets/vs15 Dark-Green.qss b/src/stylesheets/vs15 Dark-Green.qss index 10f923cb..1fa9dcef 100644 --- a/src/stylesheets/vs15 Dark-Green.qss +++ b/src/stylesheets/vs15 Dark-Green.qss @@ -435,13 +435,13 @@ QScrollBar::sub-line { background-color: #3E3E42; border: none; } -/*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, -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 { }*/ QScrollBar::handle:hover { background: #9E9E9E; } @@ -551,7 +551,7 @@ QMenu::item { background: transparent; padding: 4px 20px; } -QMenu::item:selected { +QMenu::item:selected, QMenuBar::item:selected { background-color: #333334; } QMenu::item:disabled { diff --git a/src/stylesheets/vs15 Dark-Orange.qss b/src/stylesheets/vs15 Dark-Orange.qss index bbde1f82..e02d895d 100644 --- a/src/stylesheets/vs15 Dark-Orange.qss +++ b/src/stylesheets/vs15 Dark-Orange.qss @@ -436,13 +436,13 @@ QScrollBar::sub-line { background-color: #3E3E42; border: none; } -/*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, -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 { }*/ QScrollBar::handle:hover { background: #9E9E9E; } @@ -552,7 +552,7 @@ QMenu::item { background: transparent; padding: 4px 20px; } -QMenu::item:selected { +QMenu::item:selected, QMenuBar::item:selected { background-color: #333334; } QMenu::item:disabled { diff --git a/src/stylesheets/vs15 Dark-Purple.qss b/src/stylesheets/vs15 Dark-Purple.qss index faad7297..24ad5c35 100644 --- a/src/stylesheets/vs15 Dark-Purple.qss +++ b/src/stylesheets/vs15 Dark-Purple.qss @@ -436,13 +436,13 @@ QScrollBar::sub-line { background-color: #3E3E42; border: none; } -/*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, -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 { }*/ QScrollBar::handle:hover { background: #9E9E9E; } @@ -552,7 +552,7 @@ QMenu::item { background: transparent; padding: 4px 20px; } -QMenu::item:selected { +QMenu::item:selected, QMenuBar::item:selected { background-color: #333334; } QMenu::item:disabled { diff --git a/src/stylesheets/vs15 Dark-Red.qss b/src/stylesheets/vs15 Dark-Red.qss index 2ffcff68..9f286335 100644 --- a/src/stylesheets/vs15 Dark-Red.qss +++ b/src/stylesheets/vs15 Dark-Red.qss @@ -436,13 +436,13 @@ QScrollBar::sub-line { background-color: #3E3E42; border: none; } -/*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, -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 { }*/ QScrollBar::handle:hover { background: #9E9E9E; } @@ -552,7 +552,7 @@ QMenu::item { background: transparent; padding: 4px 20px; } -QMenu::item:selected { +QMenu::item:selected, QMenuBar::item:selected { background-color: #333334; } QMenu::item:disabled { diff --git a/src/stylesheets/vs15 Dark-Yellow.qss b/src/stylesheets/vs15 Dark-Yellow.qss index 24afe005..fc9143ea 100644 --- a/src/stylesheets/vs15 Dark-Yellow.qss +++ b/src/stylesheets/vs15 Dark-Yellow.qss @@ -436,13 +436,13 @@ QScrollBar::sub-line { background-color: #3E3E42; border: none; } -/*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, -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 { }*/ QScrollBar::handle:hover { background: #9E9E9E; } @@ -552,7 +552,7 @@ QMenu::item { background: transparent; padding: 4px 20px; } -QMenu::item:selected { +QMenu::item:selected, QMenuBar::item:selected { background-color: #333334; } QMenu::item:disabled { diff --git a/src/stylesheets/vs15 Dark.qss b/src/stylesheets/vs15 Dark.qss index 6a551775..202c74d8 100644 --- a/src/stylesheets/vs15 Dark.qss +++ b/src/stylesheets/vs15 Dark.qss @@ -435,13 +435,13 @@ QScrollBar::sub-line { background-color: #3E3E42; border: none; } -/*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, -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 { }*/ QScrollBar::handle:hover { background: #9E9E9E; } @@ -551,7 +551,7 @@ QMenu::item { background: transparent; padding: 4px 20px; } -QMenu::item:selected { +QMenu::item:selected, QMenuBar::item:selected { background-color: #333334; } QMenu::item:disabled { -- cgit v1.3.1 From 471d76832a7ec42b148b4eab3e466432a7042e93 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 22:01:40 -0400 Subject: reduced the padding of toolbar icons in the vs15 themes --- src/stylesheets/vs15 Dark-Green.qss | 3 +-- src/stylesheets/vs15 Dark-Orange.qss | 3 +-- src/stylesheets/vs15 Dark-Purple.qss | 3 +-- src/stylesheets/vs15 Dark-Red.qss | 3 +-- src/stylesheets/vs15 Dark-Yellow.qss | 3 +-- src/stylesheets/vs15 Dark.qss | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/stylesheets/vs15 Dark-Green.qss b/src/stylesheets/vs15 Dark-Green.qss index 1fa9dcef..5edcab9c 100644 --- a/src/stylesheets/vs15 Dark-Green.qss +++ b/src/stylesheets/vs15 Dark-Green.qss @@ -201,8 +201,7 @@ QToolBar::separator { width: 0; } QToolButton { - margin: 0 4px 0 4px; - padding: 5px; } + padding: 4px; } QToolButton:hover, QToolButton:focus { background-color: #3E3E40; } QToolButton:pressed { diff --git a/src/stylesheets/vs15 Dark-Orange.qss b/src/stylesheets/vs15 Dark-Orange.qss index e02d895d..5d3bcd94 100644 --- a/src/stylesheets/vs15 Dark-Orange.qss +++ b/src/stylesheets/vs15 Dark-Orange.qss @@ -202,8 +202,7 @@ QToolBar::separator { width: 0; } QToolButton { - margin: 0 4px 0 4px; - padding: 5px; } + padding: 4px; } QToolButton:hover, QToolButton:focus { background-color: #3E3E40; } QToolButton:pressed { diff --git a/src/stylesheets/vs15 Dark-Purple.qss b/src/stylesheets/vs15 Dark-Purple.qss index 24ad5c35..0ace4f23 100644 --- a/src/stylesheets/vs15 Dark-Purple.qss +++ b/src/stylesheets/vs15 Dark-Purple.qss @@ -202,8 +202,7 @@ QToolBar::separator { width: 0; } QToolButton { - margin: 0 4px 0 4px; - padding: 5px; } + padding: 4px; } QToolButton:hover, QToolButton:focus { background-color: #3E3E40; } QToolButton:pressed { diff --git a/src/stylesheets/vs15 Dark-Red.qss b/src/stylesheets/vs15 Dark-Red.qss index 9f286335..3a0a645c 100644 --- a/src/stylesheets/vs15 Dark-Red.qss +++ b/src/stylesheets/vs15 Dark-Red.qss @@ -202,8 +202,7 @@ QToolBar::separator { width: 0; } QToolButton { - margin: 0 4px 0 4px; - padding: 5px; } + padding: 4px; } QToolButton:hover, QToolButton:focus { background-color: #3E3E40; } QToolButton:pressed { diff --git a/src/stylesheets/vs15 Dark-Yellow.qss b/src/stylesheets/vs15 Dark-Yellow.qss index fc9143ea..b833c37e 100644 --- a/src/stylesheets/vs15 Dark-Yellow.qss +++ b/src/stylesheets/vs15 Dark-Yellow.qss @@ -202,8 +202,7 @@ QToolBar::separator { width: 0; } QToolButton { - margin: 0 4px 0 4px; - padding: 5px; } + padding: 4px; } QToolButton:hover, QToolButton:focus { background-color: #3E3E40; } QToolButton:pressed { diff --git a/src/stylesheets/vs15 Dark.qss b/src/stylesheets/vs15 Dark.qss index 202c74d8..9a571ab9 100644 --- a/src/stylesheets/vs15 Dark.qss +++ b/src/stylesheets/vs15 Dark.qss @@ -201,8 +201,7 @@ QToolBar::separator { width: 0; } QToolButton { - margin: 0 4px 0 4px; - padding: 5px; } + padding: 4px; } QToolButton:hover, QToolButton:focus { background-color: #3E3E40; } QToolButton:pressed { -- cgit v1.3.1 From 1fcd8f0e09363a0103df116e137ea9eb16bbf0db Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Sun, 2 Jun 2019 22:37:36 -0400 Subject: missed some mnemonics in the main menu --- src/mainwindow.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 05d64bdf..9656cbf2 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1426,11 +1426,11 @@ p, li { white-space: pre-wrap; } - View + &View - Toolbars + &Toolbars @@ -1622,7 +1622,7 @@ p, li { white-space: pre-wrap; } :/MO/gui/warning:/MO/gui/warning - Notifications... + &Notifications... Open the notifications dialog -- cgit v1.3.1