From b8babae78a452071c3a707347d21a06fef759bab Mon Sep 17 00:00:00 2001 From: Krzysztof Starecki Date: Mon, 31 Dec 2018 18:48:53 +0100 Subject: Fix download layout bug, port most of remaining themes --- src/stylesheets/Paper Automata.qss | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'src/stylesheets/Paper Automata.qss') diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index 748e589e..572d3313 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -893,29 +893,28 @@ DownloadListWidget { background: transparent; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ +DownloadListWidget::item:!selected { background: #DAD4BB; } -DownloadListWidget QFrame#frame { - /* outer box of an entry on the Downloads tab */ - border: 2px solid #DAD4BB; +DownloadListWidget[downloadView=standard]::item { + padding: 15px; + margin-bottom: 2px; } -DownloadListWidget QLabel#installLabel { - /* installed/done label */ - color: none; +QProgressBar[downloadView=standard] { + margin: 4px 0px 6px 0px; } /* Compact Downloads View */ -DownloadListWidgetCompact, -DownloadListWidgetCompact QLabel { - /* an entry on the Downloads tab */ - background: #DAD4BB; +DownloadListWidget[downloadView=compact]::item { + padding: 4px 4px 6px 4px; + margin-bottom: 2px; +} + +QProgressBar[downloadView=compact] { + margin: 1px 0px 3px 0px; } /* Categories Filter */ -- cgit v1.3.1 From aa934e5fb31b74fcf2820b3b055188d80746062d Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Fri, 11 Jan 2019 08:10:53 -0600 Subject: Update Paper Automata theme to A2-2.0 --- src/stylesheets/Paper Automata.qss | 138 +++++++++++++++++++++++++------------ 1 file changed, 95 insertions(+), 43 deletions(-) (limited to 'src/stylesheets/Paper Automata.qss') diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index 572d3313..3c20e940 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -1,5 +1,5 @@ -/* v1.1 Paper Automata by 6788-00 */ -/* https://6788-00.tumblr.com/ */ +/* v2.0 Paper Automata by 6788-00 */ +/* https://6788-00.tumblr.com/ */ /* Color Palette */ /* Background - Main | #CDC8B0 */ @@ -55,6 +55,10 @@ QAbstractItemView { selection-color: #4E4B42; } +QAbstractItemView::item { + min-height: 22px; +} + QAbstractItemView::item:hover { /* rows on left and right pane when moused-over */ background: #B4AF9A; @@ -233,7 +237,7 @@ QGroupBox::title { background: transparent; subcontrol-origin: padding; subcontrol-position: top left; - padding: 8px; + padding: 4px 8px; } /* Text Fields */ @@ -335,90 +339,90 @@ QPushButton::menu-indicator { /* Icons */ -QPushButton#listOptionsBtn { +#listOptionsBtn { /* Options button */ qproperty-icon: url(./Paper/Automata/dots.svg); qproperty-iconSize: 16px; padding-left: 2px; } -QPushButton#openFolderMenu { +#openFolderMenu { /* Open Folder button */ qproperty-icon: url(./Paper/Automata/folder.svg); qproperty-iconSize: 14px; padding-left: 4px; } -QPushButton#restoreModsButton, -QPushButton#restoreButton { +#restoreModsButton, +#restoreButton { /* Restore Backup buttons */ qproperty-icon: url(./Paper/Automata/restore.svg); qproperty-iconSize: 14px; } -QPushButton#saveModsButton, -QPushButton#saveButton { +#saveModsButton, +#saveButton { /* Backup buttons */ qproperty-icon: url(./Paper/Automata/backup.svg); qproperty-iconSize: 14px; } -QPushButton#bossButton { +#bossButton { /* Sort button */ qproperty-icon: url(./Paper/Automata/sort.svg); qproperty-iconSize: 14px; } -QPushButton#linkButton { +#linkButton { /* Shortcuts button */ qproperty-icon: url(./Paper/Automata/shortcut.svg); qproperty-iconSize: 14px; } -QPushButton#btnRefreshData, -QPushButton#refreshButton { +#btnRefreshData, +#refreshButton { /* Refresh buttons */ qproperty-icon: url(./Paper/Automata/refresh.svg); qproperty-iconSize: 14px; } -QPushButton#endorseBtn { +#endorseBtn { /* Endorse button on the Nexus Info tab of the Information window */ qproperty-icon: url(./Paper/Automata/heart.svg); qproperty-iconSize: 14px; } -QPushButton#clearCacheButton { +#clearCacheButton { /* Clear Cache button on the Nexus tab of the Settings window */ qproperty-icon: url(./Paper/Automata/cross.svg); qproperty-iconSize: 14px; } -QToolButton#deactivateESP, -QToolButton#activateESP { +#deactivateESP, +#activateESP { /* activate and deactivate ESP buttons */ background: #DAD4BB; } -QToolButton:hover#deactivateESP, -QToolButton:hover#activateESP { +#deactivateESP:hover, +#activateESP:hover { /* activate and deactivate ESP buttons when moused-over */ background: #B4AF9A; } -QToolButton#deactivateESP { +#deactivateESP { /* icon for the deactivate ESP button */ qproperty-icon: url(./Paper/Automata/backup.svg); } -QToolButton#activateESP { +#activateESP { /* icon for the activate ESP button */ qproperty-icon: url(./Paper/Automata/restore-alt.svg); } /* Run button */ -QPushButton#startButton { +#startButton { /* Run button */ background: #4E4B42; color: #DAD4BB; @@ -427,7 +431,7 @@ QPushButton#startButton { padding: 6px; } -QPushButton:hover#startButton { +#startButton:hover { /* Run button when moused-over*/ background: #B4AF9A; color: #4E4B42; @@ -671,7 +675,7 @@ QToolTip { QProgressBar { /* progress bars when downloading */ - background: #DAD4BB; + background: transparent; text-align: center; border: 0px; margin: 0px 10px; @@ -747,7 +751,7 @@ QTabBar QToolButton:disabled { QLCDNumber { /* LCD number on the Conflicts tab */ background: #DAD4BB; - color: #CD664D; + color: #4E4B42; border: none; } @@ -791,7 +795,7 @@ QRadioButton::indicator:unchecked:hover { QTreeView::indicator:unchecked:selected, QRadioButton::indicator:unchecked:selected { /* a checkbox that is unchecked when clicked */ - image: url(./Paper/Automata/unchecked-alt.svg); + border: 2px solid #DAD4BB; } QTreeView::indicator:checked, @@ -887,52 +891,100 @@ QSlider::handle:hover { /* Downloads Tab */ -QWidget#downloadTab QAbstractScrollArea, +#downloadTab QAbstractScrollArea, DownloadListWidget { /* background of the entire downloads tab */ - background: transparent; + background: #DAD4BB; } -DownloadListWidget::item:!selected { +DownloadListWidget QFrame, +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab */ background: #DAD4BB; } -DownloadListWidget[downloadView=standard]::item { - padding: 15px; - margin-bottom: 2px; +DownloadListWidget#frame { + /* outer box of an entry on the Downloads tab */ + border: 2px solid #DAD4BB; } -QProgressBar[downloadView=standard] { - margin: 4px 0px 6px 0px; +#installLabel { + /* installed/done label */ + color: none; +} + +DownloadListWidgetCompact, +DownloadListWidgetCompact QLabel { + /* an entry on the Downloads tab */ + background: #DAD4BB; } -/* Compact Downloads View */ +/* New Downloads View */ + +DownloadListWidget[downloadView=standard]::item { + /* Entries on the Standard Downloads View */ + min-height: 44px; + margin: -16px 0; +} DownloadListWidget[downloadView=compact]::item { - padding: 4px 4px 6px 4px; - margin-bottom: 2px; + /* Entries on the Compact Downloads View */ + min-height: 22px; + margin: -4px 0; +} + +QProgressBar[downloadView=standard] { + /* Progress Bars on the Standard Downloads View */ + background: transparent; + margin: 11px 0; } QProgressBar[downloadView=compact] { - margin: 1px 0px 3px 0px; + /* Progress Bars on the Compact Downloads View */ + background: transparent; } /* Categories Filter */ -QPushButton#displayCategoriesBtn { +#displayCategoriesBtn { /* Filter button */ min-width: 12px; } -QTreeWidget#categoriesList { +#categoriesList { /* Categories panel */ min-width: 200px; margin-bottom: 4px; } -QGroupBox#categoriesGroup { +#categoriesGroup { /* Categories group box */ - padding-bottom: 0px; + padding-bottom: 0; + margin-top: 3px; +} + +/* Fixes */ + +#executablesListBox { + /* Increase right margin of the select executables box */ + margin-right: 8px; +} + +#stepsStack QWidget { + /* Groupboxes on the FOMOD Installer Dialog */ + background: #CDC8B0; + border: none; +} + +#stepsStack QGroupBox { + /* Fix to reimplement styling for Groupboxes on the FOMOD Installer dialog */ + border: 2px solid #4E4B42; +} + +#activeModslabel, #activePluginsLabel { + /* Increase the left margin of the counters */ + padding-left: 6px; } -/* For the Glory of Mankind */ \ No newline at end of file +/* For the Glory of Mankind */ -- cgit v1.3.1 From c1210714f801d69a31397a6254901a00407f6da4 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Sat, 9 Mar 2019 01:37:57 -0600 Subject: Update tutorials and stylesheets for problems->notifications change --- src/stylesheets/Paper Automata.qss | 36 +++++++++++++++---------------- src/stylesheets/Paper Dark by 6788.qss | 34 ++++++++++++++--------------- src/stylesheets/Paper Light by 6788.qss | 36 +++++++++++++++---------------- src/tutorials/tutorial_firststeps_main.js | 10 ++++----- src/tutorials/tutorial_primer_main.js | 2 +- 5 files changed, 59 insertions(+), 59 deletions(-) (limited to 'src/stylesheets/Paper Automata.qss') diff --git a/src/stylesheets/Paper Automata.qss b/src/stylesheets/Paper Automata.qss index 3c20e940..d72aa7e2 100644 --- a/src/stylesheets/Paper Automata.qss +++ b/src/stylesheets/Paper Automata.qss @@ -4,8 +4,8 @@ /* Color Palette */ /* Background - Main | #CDC8B0 */ /* Background - Content | #DAD4BB */ -/* Hover | #B4AF9A */ -/* Selected | #4E4B42 */ +/* Hover | #B4AF9A */ +/* Selected | #4E4B42 */ /* Accent | #CD664D */ /* All */ @@ -145,7 +145,7 @@ QToolButton QMenu { qproperty-icon: url(./Paper/Automata/Toolbar/settings.svg); } -#actionProblems { +#actionNotifications { qproperty-icon: url(./Paper/Automata/Toolbar/problems.svg); } @@ -508,7 +508,7 @@ QScrollBar::add-line:vertical { } QScrollBar::sub-line:vertical { - /* scroll up button */ + /* scroll up button */ background: #B4AF9A; image: url(./Paper/Automata/Arrows/up.svg); height: 23px; @@ -521,29 +521,29 @@ QScrollBar::sub-line:vertical { /* Combined */ -QScrollBar::handle:horizontal:hover, +QScrollBar::handle:horizontal:hover, QScrollBar::handle:vertical:hover, -QScrollBar::add-line:horizontal:hover, -QScrollBar::sub-line:horizontal:hover, -QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover { /* buttons and handles when moused-over */ background: #B4AF9A; } -QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:horizontal:pressed, QScrollBar::handle:vertical:pressed, -QScrollBar::add-line:horizontal:pressed, -QScrollBar::sub-line:horizontal:pressed, -QScrollBar::add-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed { /* buttons and handles when clicked */ background: #4E4B42; } -QScrollBar::add-page:horizontal, -QScrollBar::sub-page:horizontal, -QScrollBar::add-page:vertical, +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { /* area on scroll bars where clicking it scrolls to where you clicked */ background: transparent; @@ -897,8 +897,8 @@ DownloadListWidget { background: #DAD4BB; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #DAD4BB; @@ -914,7 +914,7 @@ DownloadListWidget#frame { color: none; } -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #DAD4BB; diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss index 9b07e3fb..9abd8086 100644 --- a/src/stylesheets/Paper Dark by 6788.qss +++ b/src/stylesheets/Paper Dark by 6788.qss @@ -24,7 +24,7 @@ QWidget { } QWidget:disabled { - /* disabled parts of the window like the update button when there are no updates */ + /* disabled parts of the window like the update button when there are no updates */ background: #242424; color: #808080; } @@ -133,7 +133,7 @@ QToolButton:menu-indicator { qproperty-icon: url(./Paper/Dark/Toolbar/settings.svg); } -#actionProblems { +#actionNotifications { qproperty-icon: url(./Paper/Dark/Toolbar/problems.svg); } @@ -494,7 +494,7 @@ QScrollBar::add-line:vertical { } QScrollBar::sub-line:vertical { - /* scroll up button */ + /* scroll up button */ background: #141414; image: url(./Paper/Dark/Arrows/up.svg); height: 23px; @@ -507,29 +507,29 @@ QScrollBar::sub-line:vertical { /* Combined */ -QScrollBar::handle:horizontal:hover, +QScrollBar::handle:horizontal:hover, QScrollBar::handle:vertical:hover, -QScrollBar::add-line:horizontal:hover, -QScrollBar::sub-line:horizontal:hover, -QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover { /* buttons and handles when moused-over */ background: #006868; } -QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:horizontal:pressed, QScrollBar::handle:vertical:pressed, -QScrollBar::add-line:horizontal:pressed, -QScrollBar::sub-line:horizontal:pressed, -QScrollBar::add-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed { /* buttons and handles when clicked */ background: #006868; } -QScrollBar::add-page:horizontal, -QScrollBar::sub-page:horizontal, -QScrollBar::add-page:vertical, +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { /* area on scroll bars where clicking it scrolls to where you clicked */ background: transparent; @@ -911,8 +911,8 @@ QSlider::handle:hover { background: #141414; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #141414; @@ -928,7 +928,7 @@ DownloadListWidget#frame { color: none; } -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab in Compact View */ background: #141414; diff --git a/src/stylesheets/Paper Light by 6788.qss b/src/stylesheets/Paper Light by 6788.qss index d78c26ea..4aad55a8 100644 --- a/src/stylesheets/Paper Light by 6788.qss +++ b/src/stylesheets/Paper Light by 6788.qss @@ -24,7 +24,7 @@ QWidget { } QWidget:disabled { - /* disabled parts of the window like the update button when there are no updates */ + /* disabled parts of the window like the update button when there are no updates */ background: #EBEBEB; color: #808080; } @@ -132,7 +132,7 @@ QToolButton:menu-indicator { qproperty-icon: url(./Paper/Light/Toolbar/settings.svg); } -#actionProblems { +#actionNotifications { qproperty-icon: url(./Paper/Light/Toolbar/problems.svg); } @@ -497,7 +497,7 @@ QScrollBar::add-line:vertical { } QScrollBar::sub-line:vertical { - /* scroll up button */ + /* scroll up button */ background: #FFFFFF; image: url(./Paper/Light/Arrows/up.svg); height: 23px; @@ -510,29 +510,29 @@ QScrollBar::sub-line:vertical { /* Combined */ -QScrollBar::handle:horizontal:hover, +QScrollBar::handle:horizontal:hover, QScrollBar::handle:vertical:hover, -QScrollBar::add-line:horizontal:hover, -QScrollBar::sub-line:horizontal:hover, -QScrollBar::add-line:vertical:hover, +QScrollBar::add-line:horizontal:hover, +QScrollBar::sub-line:horizontal:hover, +QScrollBar::add-line:vertical:hover, QScrollBar::sub-line:vertical:hover { /* buttons and handles when moused-over */ background: #008484; } -QScrollBar::handle:horizontal:pressed, +QScrollBar::handle:horizontal:pressed, QScrollBar::handle:vertical:pressed, -QScrollBar::add-line:horizontal:pressed, -QScrollBar::sub-line:horizontal:pressed, -QScrollBar::add-line:vertical:pressed, +QScrollBar::add-line:horizontal:pressed, +QScrollBar::sub-line:horizontal:pressed, +QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed { /* buttons and handles when clicked */ background: #008484; } -QScrollBar::add-page:horizontal, -QScrollBar::sub-page:horizontal, -QScrollBar::add-page:vertical, +QScrollBar::add-page:horizontal, +QScrollBar::sub-page:horizontal, +QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { /* area on scroll bars where clicking it scrolls to where you clicked */ background: transparent; @@ -918,8 +918,8 @@ QSlider::handle:hover { background: #FFFFFF; } -DownloadListWidget QFrame, -DownloadListWidgetCompact, +DownloadListWidget QFrame, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab */ background: #FFFFFF; @@ -935,7 +935,7 @@ DownloadListWidget #frame { color: none; } -DownloadListWidgetCompact, +DownloadListWidgetCompact, DownloadListWidgetCompact QLabel { /* an entry on the Downloads tab in Compacts View*/ background: #FFFFFF; @@ -992,4 +992,4 @@ QProgressBar[downloadView=standard] { #activeModslabel, #activePluginsLabel { /* Increase the left margin of the counters */ padding-left: 6px; -} \ No newline at end of file +} diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js index c47b5c0d..ee97766b 100644 --- a/src/tutorials/tutorial_firststeps_main.js +++ b/src/tutorials/tutorial_firststeps_main.js @@ -14,12 +14,12 @@ function getTutorialSteps() }, function() { - tutorial.text = qsTr("The highlighted button provides hints on solving problems MO recognized automatically.") - if (tutorialControl.waitForAction("actionProblems")) { - tutorial.text += qsTr("\nThere IS a problem now but you may want to hold off on fixing it until after completing the tutorial.") - highlightAction("actionProblems", true) + tutorial.text = qsTr("The highlighted button provides hints on solving potential problems MO recognized automatically.") + if (tutorialControl.waitForAction("actionNotifications")) { + tutorial.text += qsTr("\nThere IS a notification now but you may want to hold off on clearing it until after completing the tutorial.") + highlightAction("actionNotifications", true) } else { - highlightAction("actionProblems", false) + highlightAction("actionNotifications", false) waitForClick() } }, diff --git a/src/tutorials/tutorial_primer_main.js b/src/tutorials/tutorial_primer_main.js index 5d5597c1..5af99237 100644 --- a/src/tutorials/tutorial_primer_main.js +++ b/src/tutorials/tutorial_primer_main.js @@ -81,7 +81,7 @@ function setupTooptips() { tooltipWidget("logList", qsTr("Log messages produced by MO. Please note that messages with a light bulb usually don't require your attention.")) tooltipAction("actionSettings", qsTr("Configure Mod Organizer.")) - tooltipAction("actionProblems", qsTr("Reports potential Problems about the current setup.")) + tooltipAction("actionNotifications", qsTr("Notifications about the current setup.")) tooltipAction("actionUpdate", qsTr("Activates if there is an update for MO. Please note that if, for any reason, MO can't communicate with NMM, this will not work either.")) switch (manager.findControl("tabWidget").currentIndex) { -- cgit v1.3.1