From bdce8e6d314efb25497ceabd73bf2d66dc314a13 Mon Sep 17 00:00:00 2001 From: Phenom Date: Sun, 14 Apr 2019 13:55:27 +0200 Subject: [PATCH] Fix Relative URL in QSS files. As qss files are read and added as plaintext, url() cannot find relative path. Using "url(%THISPATH%/" will be replaced by current file path. --- retroshare-gui/src/qss/blacknight.qss | 58 ++++++----------- retroshare-gui/src/qss/blue.qss | 18 ++--- retroshare-gui/src/qss/blue/tab_hover.png | Bin 0 -> 1228 bytes retroshare-gui/src/qss/orangesurfer.qss | 24 +++---- retroshare-gui/src/qss/qdarkstyle.qss | 76 +++++++++++----------- retroshare-gui/src/qss/qlive.qss | 14 ++-- retroshare-gui/src/qss/redscorpion.qss | 8 +-- retroshare-gui/src/qss/silver.qss | 10 +-- retroshare-gui/src/qss/uus.qss | 12 ++-- retroshare-gui/src/qss/wx.qss | 8 +-- retroshare-gui/src/qss/yaba.qss | 20 +++--- retroshare-gui/src/qss/yeah.qss | 6 +- retroshare-gui/src/rshare.cpp | 3 + 13 files changed, 121 insertions(+), 136 deletions(-) create mode 100644 retroshare-gui/src/qss/blue/tab_hover.png diff --git a/retroshare-gui/src/qss/blacknight.qss b/retroshare-gui/src/qss/blacknight.qss index 3d56385ab..b20649895 100644 --- a/retroshare-gui/src/qss/blacknight.qss +++ b/retroshare-gui/src/qss/blacknight.qss @@ -132,9 +132,9 @@ selection-background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2 background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:1, y2:0, stop:0 rgb(15, 15, 15), stop:0.10 rgb(0, 0, 0), stop:0.90 rgb(0, 0, 0), stop:1 rgb(15, 15, 15)); } QComboBox::down-arrow{ -image: url(:/qss/simple/combobox/arrow.png); -width: 8px; -height: 8px; + image: url(%THISPATH%/blacknight/down.png); + width: 8px; + height: 8px; } QComboBox::drop-down{ width: 20px; @@ -202,10 +202,10 @@ subcontrol-position: top; subcontrol-origin: margin; } QScrollBar::up-arrow:vertical{ -image: url(qss/blacknight/up.png); + image: url(%THISPATH%/blacknight/up.png); } QScrollBar::down-arrow:vertical{ -image: url(qss/blacknight/down.png); + image: url(%THISPATH%/blacknight/down.png); } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical{ background: none; @@ -216,47 +216,29 @@ spacing: 2px; QCheckBox::!enabled, QRadioButton::!enabled{ color : rgb(50, 50, 50); } -QCheckBox::indicator:unchecked{ -image: url(qss/blacknight/check_unsel.png); -} -QCheckBox::indicator:unchecked:hover{ -image: url(qss/blacknight/check_unsel.png); -} -QCheckBox::indicator:unchecked:pressed{ -image: url(qss/blacknight/check_unsel.png); -} -QCheckBox::indicator:checked{ -image: url(qss/blacknight/check_sel.png); -} -QCheckBox::indicator:checked:hover{ -image: url(qss/blacknight/check_sel.png); -} -QCheckBox::indicator:checked:!enabled{ -image: url(qss/blacknight/check_sel.png); -} +QCheckBox::indicator:unchecked, +QCheckBox::indicator:unchecked:hover, +QCheckBox::indicator:unchecked:pressed, QCheckBox::indicator:unchecked:!enabled{ -image: url(qss/blacknight/check_unsel.png); + image: url(%THISPATH%/blacknight/check_unsel.png); } -QRadioButton::indicator::unchecked{ -image: url(qss/blacknight/radio_unsel.png); -} -QRadioButton::indicator:unchecked:hover{ -image: url(qss/blacknight/radio_unsel.png); +QCheckBox::indicator:checked, +QCheckBox::indicator:checked:hover, +QCheckBox::indicator:checked:!enabled{ + image: url(%THISPATH%/blacknight/check_sel.png); } +QRadioButton::indicator::unchecked, +QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:pressed{ -image: url(qss/blacknight/radio_unsel.png); -} -QRadioButton::indicator::checked{ -image: url(qss/blacknight/radio_sel.png); -} -QRadioButton::indicator:checked:hover{ -image: url(qss/blacknight/radio_sel.png); + image: url(%THISPATH%/blacknight/radio_unsel.png); } +QRadioButton::indicator::checked, +QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:pressed{ -image: url(qss/blacknight/radio_sel.png); + image: url(%THISPATH%/blacknight/radio_sel.png); } QTreeWidget#contactListTree{ -background: black url(qss/blacknight/clbg.png) repeat-y; +background: black url(%THISPATH%/blacknight/clbg.png) repeat-y; } icqTextBrowser, icqTextEdit{ /* diff --git a/retroshare-gui/src/qss/blue.qss b/retroshare-gui/src/qss/blue.qss index 35e5bc7e7..781e885f7 100644 --- a/retroshare-gui/src/qss/blue.qss +++ b/retroshare-gui/src/qss/blue.qss @@ -34,7 +34,7 @@ QWidget#chatcentralwidget{ } QToolBar#chattoolBar{ - border-image: url(qss/blue/blue.png); + border-image: url(%THISPATH%/blue/blue.png); } @@ -42,17 +42,17 @@ QToolBar#chattoolBar{ /* Customize the toolbar. */ QToolBar#toolBarPage { - border-image: url(qss/blue/blue.png); + border-image: url(%THISPATH%/blue/blue.png); } QToolBar#toolBarAction { - border-image: url(qss/blue/blue.png); + border-image: url(%THISPATH%/blue/blue.png); } QTabBar::tab { - border-image: url(qss/blue/tab1.png); + border-image: url(%THISPATH%/blue/tab1.png); min-width: 8ex; padding: 4px; @@ -66,13 +66,13 @@ QTabBar::tab:!selected { QTabBar::tab:selected, QTabBar::tab:hover { - border-image: url(qss/orangesurfer/tab_hover.png); + border-image: url(%THISPATH%/blue/tab_hover.png); } QTabBar::tab:selected { - border-image: url(qss/blue/tabselected.png); + border-image: url(%THISPATH%/blue/tabselected.png); } QPushButton#okButton { @@ -128,13 +128,13 @@ QStatusBar{ QFrame#messengerframetop{ - border-image: url(qss/blue/blue.png); + border-image: url(%THISPATH%/blue/blue.png); } QFrame#Chatbuttonframe{ - border-image: url(qss/blue/blue.png); + border-image: url(%THISPATH%/blue/blue.png); } @@ -169,7 +169,7 @@ QLabel#fromText{ } QSplitter#splitter{ - border-image: url(qss/blue/blue.png); + border-image: url(%THISPATH%/blue/blue.png); } diff --git a/retroshare-gui/src/qss/blue/tab_hover.png b/retroshare-gui/src/qss/blue/tab_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..1a5fc3ef41b96be9690580e19b288fde7f0842d7 GIT binary patch literal 1228 zcmV;-1T*`IP)N2bPDNB8 zb~7$BHmT?0B>(^fN=ZaPRA@u(TFpyTQ4}v77aDDXLPs4-0>Pcjgc!oyC?VA*f;Ngp zF2b=X(;xza=tFQ55w)pyL6oba5B#8l%nt%BGe45PTs#;MJP!fg{uxf!Q};PEkji5jpAmysnwJ`jxY%Wl z(^$l1QiqO9W4k#3=K#k^KA5M2abx7F`#*jpkoB-0hhw28r)FHsl#AawLFO6%X?rj6 z&SSe6rygBPbMl6Yb1t}sP9?878y)uF$+PL}sOKCUcvR!Fp%__0*TY4enGQghXps+^EzmEf?csWo7U^nS@{6-LUxR5iC7@3QN7c z>88inwPFes*(G1KVF{+FV)0(l{l1mlGZfk zVX8^u#cvP2_LB0AxF=6w@xcR_KYA4ISM7r{ojtN3A6FlM*`_A=dg27kcXYs9Yb(qp z5-V42_^iz|M&~6gjmKm2Il4ZNE5*@x?q|Ygil;cviK!mH@t|=eytF@b-#Gu$p3;5f z_Y#k$yiHg(KHuIBb8T%fU0De|hmJX)8#}MwOaHe%yr&$-_wR?#_4P1w`t%x`ZD|2C zJ*S`P7|!WuX`W;0I@C|cp=BdHDmV;0=uyFV=Jlk0)pQurc zqkH$lL~Sih9Y1c(auAvZrWLmfb#?H3mya07<8hcga%9DndQ(?=PvBo>v^4 zGntOhWAfNuG5%*RlNxw!G-p%ZoNE)GLF=Y*B#umbOxMwTNwFk-Nc%0-qj0}#YLpm@ zygTE19N}#Y`zpvw1Ne$(Mwu0(eQ&zq?~PH6-;}*5jM~mZw{EVC+V1>_%+{{&i=36)mxyaWiaqHrJ>-Tun=6(3<5SYz_QSIvb3Y!9f4pwZHa$pPLKw<>e_MqH@u^lG5|iRr{N+Qd}BG@-yYa zv4}I}Z^HW3N&RSix{hDXQhj>eOno_?=ACH_FTU1m&cqkxZZKwewS!{(seTHcNkJB~ qDt607a4xVbq79U;ig9B6OXM%54QQer2nnD70000