mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 11:32:46 +01:00
qt: Generalized css files, simple design changes, added scripts to keep track of color usage (#3508)
* qt: Send tab - Generalized related CSS and some redesign - Removed grey boxes around labels of SendCoinEntry - Changed button styles for add/clear button - Removed padding for send button * qt: Overview tab - Generalized related CSS and some redesign - Removed grey boxes around balance labels * qt: Receive tab & QPushButton - Generalized related CSS and some redesign - Removed grey boxes around "Label", "Amount", "Message" and "Requested payment history" labels and increased their textsize - Changed the color of the "Requested payment history" label - Adjusted the style of the "Clear", "Remove" and "Show" buttons * qt: Transaction tab - Generalized related CSS and some redesign - Increased size of selected sum labels * qt: Masternode tab - Generalized related CSS and some redesign - Increased the size of the "Filter list" and "Node count" labels * qt: CoinControl dialog - Generalized related CSS and some redesign - Removed alternated coloring * qt: Sync overlay - Generalized related CSS and some redesign - Adjusted colors - Added rounded border * qt: About dialog - Generalized related CSS * qt: Edit address dialog - Generalized related CSS * qt: Help message dialog - Generalized related CSS * qt: RPC console - Generalized related CSS and some redesign - Changed colors for network activity legend (signal colors TBD in a code change commit) * qt: Options dialog - Generalized related CSS * qt: Ask passphrase dialog - Generalized related CSS * qt: Addressbook page - Generalized related CSS * qt: Sign/Verify dialog - Generalized related CSS * qt: Open URI dialog - Generalized related CSS * qt: Generalized remaining individual Qt classes * qt: Fixed indentation in css files * qt: Use newlines for multiple selector entries * qt: Formal cleanups in all css files * qt: Add copyright and file description to all css files * qt: Add update_colors.py, prepare css files for scripted color updates - update_colors.py is a python script which parses the css files and prints some details about their color usage into appropriate files in the css/colors directory. It also updates the <colors></colors> section for each css file. - Added <colors></colors> section to css files for automated color updates by update_colors.py * qt/contrib: Moved update_colors.py to update-css-files.py This also moves the file from src/qt/res/css to contrib/devtools * build: Remove files in src/qt/res/css/colors when running "make clean" * git: Add src/qt/res/css/colors/* to gitignore and remove the files from the repo * path -> css_folder_path * Resolve path and fail early * Create 'colors/' if it doesn't exist and fail if smth went wrong * Run git after all filesystem preparations are done * qt: Fix background-color of bgWidget in trad.css Its #AARRGGBB not #RRGGBBAA! Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com> * qt: Run update_colors.py * contrib: Use case insensitive regex for color matching * qt: Update colors in css files * contrib: Remove obsolete import in update-css-files.py Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
parent
3f7553a711
commit
f6e14ab57a
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,6 +13,7 @@ src/dash-tx
|
||||
src/test/test_dash
|
||||
src/test/test_dash_fuzzy
|
||||
src/qt/test/test_dash-qt
|
||||
src/qt/res/css/colors/*
|
||||
src/bench/bench_dash
|
||||
|
||||
# autoreconf
|
||||
|
198
contrib/devtools/update-css-files.py
Executable file
198
contrib/devtools/update-css-files.py
Executable file
@ -0,0 +1,198 @@
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# update-css-files.py creates color analyse files in css/colors and updates the
|
||||
# `<colors></colors>` section in all css files.
|
||||
#
|
||||
# Copyright (c) 2020 The Dash Core developers
|
||||
# Distributed under the MIT/X11 software license, see the accompanying
|
||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
from pathlib import Path
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
MATCH_REPLACE = '<colors>.+?</colors>'
|
||||
MATCH_COLORS = '#(?:[0-9a-fA-F]{2}){2,4}|#(?:[0-9a-f]{1}){3}'
|
||||
|
||||
def error(msg):
|
||||
exit('\nERROR: {}\n'.format(msg))
|
||||
|
||||
def parse_css(file_css):
|
||||
# Temporarily
|
||||
state = 0
|
||||
selectors = []
|
||||
|
||||
# Results
|
||||
by_attribute = {}
|
||||
by_color = {}
|
||||
|
||||
for line in file_css.read_text().splitlines():
|
||||
|
||||
if line == '':
|
||||
continue
|
||||
|
||||
# start of a comment
|
||||
if state == 0 and line.startswith('/*'):
|
||||
if '*/' in line:
|
||||
state = 0
|
||||
else:
|
||||
state = 1
|
||||
# we are in a comment section
|
||||
elif state == 1:
|
||||
# end of the comment
|
||||
if '*/' in line:
|
||||
state = 0
|
||||
else:
|
||||
continue
|
||||
# first line of multiple selector
|
||||
elif (state == 0 or state == 2) and ',' in line:
|
||||
state = 2
|
||||
# first line of single selector or end of multiple
|
||||
elif (state == 0 or state == 2) and '{' in line:
|
||||
state = 3
|
||||
# end of element
|
||||
elif state == 4 and line == '}':
|
||||
state = 0
|
||||
|
||||
if state == 0 and len(selectors):
|
||||
selectors = []
|
||||
|
||||
if state == 2:
|
||||
selector = line.split(",")[0].strip(' ')
|
||||
selectors.append(selector)
|
||||
|
||||
if state == 3:
|
||||
selector = line.split("{")[0].strip(' ')
|
||||
selectors.append(selector)
|
||||
state = 4
|
||||
continue
|
||||
|
||||
if state == 4:
|
||||
matched_colors = re.findall(MATCH_COLORS, line)
|
||||
|
||||
if len(matched_colors) > 1:
|
||||
error("Multiple colors in a line.\n\n {}\n\nSeems to be an invalid file!".format(line))
|
||||
elif len(matched_colors) == 1:
|
||||
matched_color = matched_colors[0]
|
||||
element = line.split(":")[0].strip(' ')
|
||||
|
||||
if not matched_color in by_color:
|
||||
by_color[matched_color] = []
|
||||
|
||||
by_color[matched_color].append(element)
|
||||
|
||||
entry = element + " " + matched_color
|
||||
|
||||
if not entry in by_attribute:
|
||||
by_attribute[entry] = []
|
||||
|
||||
by_attribute[entry].extend(selectors)
|
||||
|
||||
def sort_color(color):
|
||||
tmp = color[0].replace('#', '0x')
|
||||
return int(tmp, 0)
|
||||
|
||||
def remove_duplicates(l):
|
||||
no_duplicates = []
|
||||
[no_duplicates.append(i) for i in l if not no_duplicates.count(i)]
|
||||
return no_duplicates
|
||||
|
||||
colors = []
|
||||
|
||||
# sort colors just by hex value
|
||||
if len(by_color):
|
||||
colors = sorted(by_color.items(), key=lambda x: sort_color(x))
|
||||
|
||||
for k, l in by_attribute.items():
|
||||
by_attribute[k] = remove_duplicates(l)
|
||||
|
||||
for k, l in by_color.items():
|
||||
by_color[k] = remove_duplicates(l)
|
||||
|
||||
return {'fileName': file_css.stem, 'byAttribute': by_attribute, 'byColor': by_color, 'colors': colors}
|
||||
|
||||
|
||||
def create_color_file(content, commit):
|
||||
|
||||
str_result = "Color analyse of " +\
|
||||
content['fileName'] + ".css " + \
|
||||
"by " + \
|
||||
Path(__file__).name + \
|
||||
" for commit " + \
|
||||
commit + \
|
||||
"\n\n"
|
||||
|
||||
if not len(content['colors']):
|
||||
return None
|
||||
|
||||
str_result += "# Used colors\n\n"
|
||||
for c in content['colors']:
|
||||
str_result += c[0] + '\n'
|
||||
|
||||
str_result += "\n# Grouped by attribute\n"
|
||||
|
||||
for k, v in content['byAttribute'].items():
|
||||
str_result += '\n' + k + '\n'
|
||||
for val in v:
|
||||
str_result += ' ' + val + '\n'
|
||||
|
||||
str_result += "\n# Grouped by color\n"
|
||||
|
||||
for k, v in content['byColor'].items():
|
||||
str_result += '\n' + k + '\n'
|
||||
for val in v:
|
||||
str_result += ' ' + val + '\n'
|
||||
|
||||
return str_result
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
error('No argument required!')
|
||||
|
||||
try:
|
||||
css_folder_path = Path(__file__).parent.absolute() / Path('../../src/qt/res/css/')
|
||||
css_folder_path = css_folder_path.resolve(strict=True)
|
||||
except Exception:
|
||||
error("Path doesn't exist: {}".format(css_folder_path))
|
||||
|
||||
if not len(list(css_folder_path.glob('*.css'))):
|
||||
error("No .css files found in {}".format(css_folder_path))
|
||||
|
||||
results = [parse_css(x) for x in css_folder_path.glob('*.css') if x.is_file()]
|
||||
|
||||
colors_folder_path = css_folder_path / Path('colors/')
|
||||
if not colors_folder_path.is_dir():
|
||||
try:
|
||||
colors_folder_path.mkdir()
|
||||
except Exception:
|
||||
error("Can't create new folder: {}".format(colors_folder_path))
|
||||
|
||||
commit = subprocess.check_output(['git', '-C', css_folder_path, 'rev-parse', '--short', 'HEAD']).decode("utf-8")
|
||||
|
||||
for r in results:
|
||||
|
||||
# Update the css file
|
||||
css_file = css_folder_path / Path(r['fileName'] + '.css')
|
||||
css_content = css_file.read_text()
|
||||
to_replace = re.findall(MATCH_REPLACE, css_content, re.DOTALL)
|
||||
|
||||
str_result = "\n# Used colors in {}.css for commit {}\n".format(r['fileName'], commit)
|
||||
for c in r['colors']:
|
||||
str_result += c[0] + '\n'
|
||||
|
||||
str_replace = "<colors>\n{}\n</colors>".format(str_result)
|
||||
css_content = css_content.replace(to_replace[0], str_replace)
|
||||
css_file.write_text(css_content)
|
||||
|
||||
# Write the <css>_color.txt files
|
||||
str_result = create_color_file(r, commit)
|
||||
|
||||
if str_result is not None:
|
||||
color_file = colors_folder_path / Path(r['fileName'] + '_css_colors.txt')
|
||||
color_file.write_text(str_result)
|
||||
|
||||
print('\n{}.css -> {} created!'.format(r['fileName'], color_file))
|
||||
else:
|
||||
print('\n{}.css -> No colors found..'.format(r['fileName'] + ".css"))
|
@ -435,7 +435,7 @@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(R
|
||||
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(RCCFLAGS) -name dash $< | \
|
||||
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
|
||||
|
||||
CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc
|
||||
CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc qt/res/css/colors/*
|
||||
|
||||
CLEANFILES += $(CLEAN_QT)
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,65 +1,110 @@
|
||||
/**
|
||||
Copyright (c) 2020 The Dash Core developers
|
||||
Distributed under the MIT/X11 software license, see the accompanying
|
||||
file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
---------------------------------------------------------------------
|
||||
|
||||
This file contains style to customize the scrollbars. It's only loaded
|
||||
for dash themes (dark/light) and also only by windwos and linux,
|
||||
not by macOS clients.
|
||||
|
||||
NOTE: This file is getting appended to the general.css while its
|
||||
getting loaded in GUIUtil::loadStyleSheet(). Thus changes made in
|
||||
general.css may become overwritten by changes in this file.
|
||||
|
||||
Loaded in GUIUtil::loadStyleSheet() in guitil.cpp.
|
||||
**/
|
||||
|
||||
/* do not modify! section updated by update-css-files.py
|
||||
<colors>
|
||||
|
||||
# Used colors in scrollbars.css for commit 3bebd1a5c
|
||||
|
||||
#e0e0e0
|
||||
#f2f0f0
|
||||
#f6f6f6
|
||||
#ffffff
|
||||
|
||||
</colors>
|
||||
*/
|
||||
|
||||
/******************************************************
|
||||
QScrollBar
|
||||
******************************************************/
|
||||
|
||||
QScrollBar:vertical { /* Vertical Scroll Bar Attributes */
|
||||
border:0;
|
||||
background:#ffffff;
|
||||
width:18px;
|
||||
border: 0;
|
||||
background-color: #ffffff;
|
||||
width: 18px;
|
||||
margin: 18px 0px 18px 0px;
|
||||
}
|
||||
|
||||
QScrollBar:horizontal { /* Horizontal Scroll Bar Attributes */
|
||||
border:0;
|
||||
background:#ffffff;
|
||||
height:18px;
|
||||
border: 0;
|
||||
background-color: #ffffff;
|
||||
height: 18px;
|
||||
margin: 0px 18px 0px 18px;
|
||||
}
|
||||
|
||||
QScrollBar::handle:vertical { /* Scroll Bar Slider - vertical */
|
||||
background:#e0e0e0;
|
||||
min-height:10px;
|
||||
background-color: #e0e0e0;
|
||||
min-height: 10px;
|
||||
}
|
||||
|
||||
QScrollBar::handle:horizontal { /* Scroll Bar Slider - horizontal */
|
||||
background:#e0e0e0;
|
||||
min-width:10px;
|
||||
background-color: #e0e0e0;
|
||||
min-width: 10px;
|
||||
}
|
||||
|
||||
QScrollBar::add-page, QScrollBar::sub-page { /* Scroll Bar Background */
|
||||
background:#F8F6F6;
|
||||
QScrollBar::add-page,
|
||||
QScrollBar::sub-page { /* Scroll Bar Background */
|
||||
background-color: #f6f6f6;
|
||||
}
|
||||
|
||||
QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical, QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */
|
||||
background-color:#F8F6F6;
|
||||
QScrollBar::add-line:vertical,
|
||||
QScrollBar::sub-line:vertical,
|
||||
QScrollBar::add-line:horizontal,
|
||||
QScrollBar::sub-line:horizontal { /* Define Arrow Button Dimensions */
|
||||
background-color: #f6f6f6;
|
||||
border: 1px solid #f2f0f0;
|
||||
width:16px;
|
||||
height:16px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
QScrollBar::add-line:vertical:pressed, QScrollBar::sub-line:vertical:pressed, QScrollBar::add-line:horizontal:pressed, QScrollBar::sub-line:horizontal:pressed {
|
||||
background-color:#e0e0e0;
|
||||
QScrollBar::add-line:vertical:pressed,
|
||||
QScrollBar::sub-line:vertical:pressed,
|
||||
QScrollBar::add-line:horizontal:pressed,
|
||||
QScrollBar::sub-line:horizontal:pressed {
|
||||
background-color: #e0e0e0;
|
||||
}
|
||||
|
||||
QScrollBar::sub-line:vertical { /* Vertical - top button position */
|
||||
subcontrol-position:top;
|
||||
subcontrol-position: top;
|
||||
subcontrol-origin: margin;
|
||||
}
|
||||
|
||||
QScrollBar::add-line:vertical { /* Vertical - bottom button position */
|
||||
subcontrol-position:bottom;
|
||||
subcontrol-position: bottom;
|
||||
subcontrol-origin: margin;
|
||||
}
|
||||
|
||||
QScrollBar::sub-line:horizontal { /* Vertical - left button position */
|
||||
subcontrol-position:left;
|
||||
subcontrol-position: left;
|
||||
subcontrol-origin: margin;
|
||||
}
|
||||
|
||||
QScrollBar::add-line:horizontal { /* Vertical - right button position */
|
||||
subcontrol-position:right;
|
||||
subcontrol-position: right;
|
||||
subcontrol-origin: margin;
|
||||
}
|
||||
|
||||
QScrollBar:up-arrow, QScrollBar:down-arrow, QScrollBar:left-arrow, QScrollBar:right-arrow { /* Arrows Icon */
|
||||
width:18px;
|
||||
height:18px;
|
||||
QScrollBar:up-arrow,
|
||||
QScrollBar:down-arrow,
|
||||
QScrollBar:left-arrow,
|
||||
QScrollBar:right-arrow { /* Arrows Icon */
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
}
|
||||
|
||||
QScrollBar:up-arrow {
|
||||
@ -114,10 +159,7 @@ QScrollBar:right-arrow:disabled {
|
||||
border-image: url(':/images/arrow_light_right_hover');
|
||||
}
|
||||
|
||||
QDialog#HelpMessageDialog QScrollBar:vertical, QDialog#HelpMessageDialog QScrollBar:horizontal {
|
||||
border:0;
|
||||
}
|
||||
|
||||
.QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */
|
||||
background:transparent;
|
||||
QDialog#HelpMessageDialog QScrollBar:vertical,
|
||||
QDialog#HelpMessageDialog QScrollBar:horizontal {
|
||||
border: 0;
|
||||
}
|
||||
|
@ -1,29 +1,68 @@
|
||||
/* MODAL OVERLAY */
|
||||
/**
|
||||
Copyright (c) 2020 The Dash Core developers
|
||||
Distributed under the MIT/X11 software license, see the accompanying
|
||||
file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
QWidget#bgWidget { /* The 'frame' overlaying the overview-page */
|
||||
background: rgba(0,0,0,220);
|
||||
---------------------------------------------------------------------
|
||||
|
||||
This file contains all changes for the dash theme "Traditional".
|
||||
|
||||
NOTE: This file gets not appended to the general.css. The Traditional
|
||||
theme is a standalone theme which just fixes some bugs in the OS default
|
||||
depiction of the Qt elements.
|
||||
|
||||
Loaded in GUIUtil::loadStyleSheet() in guitil.cpp.
|
||||
**/
|
||||
|
||||
/* do not modify! section updated by update-css-files.py
|
||||
<colors>
|
||||
|
||||
# Used colors in trad.css for commit 3bebd1a5c
|
||||
|
||||
#fff
|
||||
#ccfafafa
|
||||
|
||||
</colors>
|
||||
*/
|
||||
|
||||
/******************************************************
|
||||
ModalOverlay
|
||||
******************************************************/
|
||||
|
||||
QWidget#bgWidget { /* The frame overlaying the overview-page */
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
background-color: #ccfafafa;
|
||||
}
|
||||
|
||||
QWidget#contentWidget { /* The actual content with the text/buttons/etc... */
|
||||
background: rgba(255,255,255,240);
|
||||
border-radius: 6px;
|
||||
background-color: #fff;
|
||||
margin: 0;
|
||||
padding-top: 20px;
|
||||
padding-bottom: 20px;
|
||||
border: 1px solid;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
/* OVERVIEW SCREEN */
|
||||
/******************************************************
|
||||
OverviewPage
|
||||
******************************************************/
|
||||
|
||||
QWidget .QFrame#frame .QLabel#labelWalletStatus, /* Wallet Sync Status */
|
||||
QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus, /* PrivateSend Sync Status */
|
||||
QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */
|
||||
color: red;
|
||||
color: red;
|
||||
}
|
||||
|
||||
/* SEND DIALOG */
|
||||
/******************************************************
|
||||
SendCoinsDialog
|
||||
******************************************************/
|
||||
|
||||
QDialog#SendCoinsDialog QLabel#labelBalance {
|
||||
margin-left:0px;
|
||||
padding-left:0px;
|
||||
margin-left: 0px;
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */
|
||||
color: red;
|
||||
color: red;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user