From 70e66802a2d46a1ffdac7528b134c9d7741a8797 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Wed, 27 Nov 2019 14:10:50 -0500 Subject: changed labels that have links to new LinkLabel, removed hardcoded colors changed the link colors on dark themes to something saner --- src/aboutdialog.ui | 11 +++++++++-- src/mainwindow.ui | 9 +++++++-- src/settingsdialog.ui | 7 ++++++- src/stylesheets/Night Eyes.qss | 4 ++++ src/stylesheets/Paper Dark by 6788.qss | 4 ++++ src/stylesheets/Transparent-Style-101-Green.qss | 5 +++++ src/stylesheets/Transparent-Style-BOS.qss | 4 ++++ src/stylesheets/Transparent-Style-Skyrim.qss | 4 ++++ src/stylesheets/dark.qss | 6 +++++- src/stylesheets/dracula.qss | 4 ++++ src/stylesheets/skyrim.qss | 3 +++ 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 +++ 17 files changed, 73 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui index 415ce0a7..424a80f9 100644 --- a/src/aboutdialog.ui +++ b/src/aboutdialog.ui @@ -158,9 +158,9 @@ - + - <html><head/><body><p>Source code can be found at <a href="https://github.com/ModOrganizer2/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html> + <html><head/><body><p>Source code can be found at <a href="https://github.com/ModOrganizer2/modorganizer">GitHub</a>.</p></body></html> @@ -536,6 +536,13 @@ + + + LinkLabel + QLabel +
linklabel.h
+ + diff --git a/src/mainwindow.ui b/src/mainwindow.ui index b8aeeeb5..723b42fe 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -941,12 +941,12 @@ p, li { white-space: pre-wrap; } - + <html><head/><body><p>BSAs / BA2s are bundles of game assets (textures, scripts, etc.). By default, the engine loads these bundles in a separate step from loose files. <p>Their load order is specified by the priority of the corresponding plugin (right pane, plugins tab).</p><p>If there is a matching plugin, the game will load them no matter what.</p></body></html> - <html><head/><body><p>Currently detected archives. (<a href="#"><span style=" text-decoration: underline; color:#0000ff;">What is an archive?</span></a>)</p></body></html> + <html><head/><body><p>Currently detected archives. (<a href="#">What is an archive?</a>)</p></body></html> true @@ -1773,6 +1773,11 @@ p, li { white-space: pre-wrap; } QStatusBar
statusbar.h
+ + LinkLabel + QLabel +
linklabel.h
+ diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui index e63ca692..c5a1d2ef 100644 --- a/src/settingsdialog.ui +++ b/src/settingsdialog.ui @@ -1410,7 +1410,7 @@ programs you are intentionally running. - + Hint: right click link and copy link location @@ -1535,6 +1535,11 @@ programs you are intentionally running. QTableWidget
colortable.h
+ + LinkLabel + QLabel +
linklabel.h
+ tabWidget diff --git a/src/stylesheets/Night Eyes.qss b/src/stylesheets/Night Eyes.qss index 0430a8c8..14f7434e 100644 --- a/src/stylesheets/Night Eyes.qss +++ b/src/stylesheets/Night Eyes.qss @@ -49,6 +49,10 @@ QAbstractScrollArea::corner margin: 0px -2px -2px 0px; } +LinkLabel +{ + qproperty-linkColor: #3399FF; +} /* Toolbar -------------------------------------------------------------------- */ diff --git a/src/stylesheets/Paper Dark by 6788.qss b/src/stylesheets/Paper Dark by 6788.qss index 77086c15..6043ae6b 100644 --- a/src/stylesheets/Paper Dark by 6788.qss +++ b/src/stylesheets/Paper Dark by 6788.qss @@ -66,6 +66,10 @@ QSplitter { width: 8px; } +LinkLabel { + qproperty-linkColor: #3399FF; +} + /* Toolbar */ QToolBar { diff --git a/src/stylesheets/Transparent-Style-101-Green.qss b/src/stylesheets/Transparent-Style-101-Green.qss index a4ed2623..3bbdb5db 100644 --- a/src/stylesheets/Transparent-Style-101-Green.qss +++ b/src/stylesheets/Transparent-Style-101-Green.qss @@ -485,6 +485,11 @@ QStatusBar::item {border: None;} font-family: Source Sans Pro; font-size: 14px; } + +LinkLabel { + qproperty-linkColor: #3399FF; +} + QAbstractItemView { color: #cccccc; font-family: Source Sans Pro; diff --git a/src/stylesheets/Transparent-Style-BOS.qss b/src/stylesheets/Transparent-Style-BOS.qss index efad0859..33eed327 100644 --- a/src/stylesheets/Transparent-Style-BOS.qss +++ b/src/stylesheets/Transparent-Style-BOS.qss @@ -743,3 +743,7 @@ QStatusBar::item {border: None;} border-bottom:1px solid #9A9A00; */ } + +LinkLabel { + qproperty-linkColor: #3399FF; +} diff --git a/src/stylesheets/Transparent-Style-Skyrim.qss b/src/stylesheets/Transparent-Style-Skyrim.qss index 89e36c74..308580a5 100644 --- a/src/stylesheets/Transparent-Style-Skyrim.qss +++ b/src/stylesheets/Transparent-Style-Skyrim.qss @@ -743,3 +743,7 @@ QStatusBar::item {border: None;} border-bottom:1px solid #9A9A00; */ } + +LinkLabel { + qproperty-linkColor: #3399FF; +} diff --git a/src/stylesheets/dark.qss b/src/stylesheets/dark.qss index 22cd598c..9d11109d 100644 --- a/src/stylesheets/dark.qss +++ b/src/stylesheets/dark.qss @@ -380,4 +380,8 @@ DownloadListWidget[downloadView=standard]::item { DownloadListWidget[downloadView=compact]::item { padding: 4px; -} \ No newline at end of file +} + +LinkLabel { + qproperty-linkColor: #3399FF; +} diff --git a/src/stylesheets/dracula.qss b/src/stylesheets/dracula.qss index 2a7fbf9e..537ff083 100644 --- a/src/stylesheets/dracula.qss +++ b/src/stylesheets/dracula.qss @@ -30,6 +30,10 @@ QCheckBox, QGroupBox { selection-color: #bbbbbb; } +LinkLabel { + qproperty-linkColor: #3399FF; +} + /* * GroupBox and CheckBox */ diff --git a/src/stylesheets/skyrim.qss b/src/stylesheets/skyrim.qss index 2da5154d..a516f5ff 100644 --- a/src/stylesheets/skyrim.qss +++ b/src/stylesheets/skyrim.qss @@ -113,6 +113,9 @@ QListView::item { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Font size */ QLabel, QTextEdit, diff --git a/src/stylesheets/vs15 Dark-Green.qss b/src/stylesheets/vs15 Dark-Green.qss index 88e7651f..6d95c6cc 100644 --- a/src/stylesheets/vs15 Dark-Green.qss +++ b/src/stylesheets/vs15 Dark-Green.qss @@ -94,6 +94,9 @@ QTreeView::branch:selected { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Left Pane & File Trees #QTreeView, #QListView*/ QTreeView::branch:closed:has-children { image: url(./vs15/branch-closed.png); } diff --git a/src/stylesheets/vs15 Dark-Orange.qss b/src/stylesheets/vs15 Dark-Orange.qss index 488da3c4..2dd27df4 100644 --- a/src/stylesheets/vs15 Dark-Orange.qss +++ b/src/stylesheets/vs15 Dark-Orange.qss @@ -95,6 +95,9 @@ QTreeView::branch:selected { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Left Pane & File Trees #QTreeView, #QListView*/ QTreeView::branch:closed:has-children { image: url(./vs15/branch-closed.png); } diff --git a/src/stylesheets/vs15 Dark-Purple.qss b/src/stylesheets/vs15 Dark-Purple.qss index 24c8705a..116aaa7d 100644 --- a/src/stylesheets/vs15 Dark-Purple.qss +++ b/src/stylesheets/vs15 Dark-Purple.qss @@ -95,6 +95,9 @@ QTreeView::branch:selected { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Left Pane & File Trees #QTreeView, #QListView*/ QTreeView::branch:closed:has-children { image: url(./vs15/branch-closed.png); } diff --git a/src/stylesheets/vs15 Dark-Red.qss b/src/stylesheets/vs15 Dark-Red.qss index 0c0e21a8..60f565a1 100644 --- a/src/stylesheets/vs15 Dark-Red.qss +++ b/src/stylesheets/vs15 Dark-Red.qss @@ -95,6 +95,9 @@ QTreeView::branch:selected { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Left Pane & File Trees #QTreeView, #QListView*/ QTreeView::branch:closed:has-children { image: url(./vs15/branch-closed.png); } diff --git a/src/stylesheets/vs15 Dark-Yellow.qss b/src/stylesheets/vs15 Dark-Yellow.qss index 2cf1cb2e..bfaa4c94 100644 --- a/src/stylesheets/vs15 Dark-Yellow.qss +++ b/src/stylesheets/vs15 Dark-Yellow.qss @@ -95,6 +95,9 @@ QTreeView::branch:selected { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Left Pane & File Trees #QTreeView, #QListView*/ QTreeView::branch:closed:has-children { image: url(./vs15/branch-closed.png); } diff --git a/src/stylesheets/vs15 Dark.qss b/src/stylesheets/vs15 Dark.qss index a5781d72..1d27be17 100644 --- a/src/stylesheets/vs15 Dark.qss +++ b/src/stylesheets/vs15 Dark.qss @@ -94,6 +94,9 @@ QTreeView::branch:selected { QLabel { background-color: transparent; } +LinkLabel { + qproperty-linkColor: #3399FF; } + /* Left Pane & File Trees #QTreeView, #QListView*/ QTreeView::branch:closed:has-children { image: url(./vs15/branch-closed.png); } -- cgit v1.3.1