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 000000000..1a5fc3ef4 Binary files /dev/null and b/retroshare-gui/src/qss/blue/tab_hover.png differ diff --git a/retroshare-gui/src/qss/orangesurfer.qss b/retroshare-gui/src/qss/orangesurfer.qss index 84ae1c4fd..e7456a5e7 100644 --- a/retroshare-gui/src/qss/orangesurfer.qss +++ b/retroshare-gui/src/qss/orangesurfer.qss @@ -7,7 +7,7 @@ QFrame#titleBarFrame, QFrame#toolBarFrame { - border-image: url(qss/orangesurfer/main.png); + border-image: url(%THISPATH%/orangesurfer/main.png); } HeaderFrame { @@ -27,25 +27,25 @@ QWidget#chatcentralwidget{ } QToolBar#chattoolBar{ - border-image: url(qss/orangesurfer/main.png); + border-image: url(%THISPATH%/orangesurfer/main.png); } /* Customize the toolbar. */ QToolBar#toolBarPage { - border-image: url(qss/orangesurfer/main.png); + border-image: url(%THISPATH%/orangesurfer/main.png); } QToolBar#toolBarAction { - border-image: url(qss/orangesurfer/main.png); + border-image: url(%THISPATH%/orangesurfer/main.png); } QTabBar::tab { - border-image: url(qss/orangesurfer/tab_normal.png); + border-image: url(%THISPATH%/orangesurfer/tab_normal.png); border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; @@ -61,13 +61,13 @@ QTabBar::tab:!selected { QTabBar::tab:selected, QTabBar::tab:hover { - border-image: url(qss/orangesurfer/tab_hover.png); + border-image: url(%THISPATH%/orangesurfer/tab_hover.png); } QTabBar::tab:selected { - border-image: url(qss/orangesurfer/tab_pressed.png); + border-image: url(%THISPATH%/orangesurfer/tab_pressed.png); } @@ -105,7 +105,7 @@ QStatusBar{ } QSizeGrip { - image: url(qss/orangesurfer/sizegrip.png); + image: url(%THISPATH%/orangesurfer/sizegrip.png); width: 16px; height: 16px; } @@ -140,7 +140,7 @@ QTreeWidget::item:selected { /* when user selects item using mouse or keyboard * - border-image: url(qss/gofast/border.png); + border-image: url(%THISPATH%/orangesurfer/border.png); } @@ -157,13 +157,13 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ - border-image: url(qss/orangesurfer/border.png); + border-image: url(%THISPATH%/orangesurfer/border.png); } QFrame#messengerframetop{ - border-image: url(qss/orangesurfer/main.png); + border-image: url(%THISPATH%/orangesurfer/main.png); /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ @@ -171,7 +171,7 @@ QFrame#messengerframetop{ QFrame#Chatbuttonframe{ - border-image: url(qss/orangesurfer/main.png); + border-image: url(%THISPATH%/orangesurfer/main.png); } diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index fc48849ae..3e0927975 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -216,7 +216,7 @@ QScrollBar::handle:horizontal QScrollBar::sub-line:horizontal { - border-image: url(qss/qdarkstyle/right_arrow_disabled.png); + border-image: url(%THISPATH%/qdarkstyle/right_arrow_disabled.png); width: 10px; height: 10px; subcontrol-position: right; @@ -225,7 +225,7 @@ QScrollBar::sub-line:horizontal QScrollBar::add-line:horizontal { - border-image: url(qss/qdarkstyle/left_arrow_disabled.png); + border-image: url(%THISPATH%/qdarkstyle/left_arrow_disabled.png); height: 10px; width: 10px; subcontrol-position: left; @@ -234,7 +234,7 @@ QScrollBar::add-line:horizontal QScrollBar::sub-line:horizontal:hover,QScrollBar::sub-line:horizontal:on { - border-image: url(qss/qdarkstyle/right_arrow.png); + border-image: url(%THISPATH%/qdarkstyle/right_arrow.png); height: 10px; width: 10px; subcontrol-position: right; @@ -244,7 +244,7 @@ QScrollBar::sub-line:horizontal:hover,QScrollBar::sub-line:horizontal:on QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on { - border-image: url(qss/qdarkstyle/left_arrow.png); + border-image: url(%THISPATH%/qdarkstyle/left_arrow.png); height: 10px; width: 10px; subcontrol-position: left; @@ -282,7 +282,7 @@ QScrollBar::handle:vertical QScrollBar::sub-line:vertical { - border-image: url(qss/qdarkstyle/up_arrow_disabled.png); + border-image: url(%THISPATH%/qdarkstyle/up_arrow_disabled.png); height: 10px; width: 10px; subcontrol-position: top; @@ -292,7 +292,7 @@ QScrollBar::sub-line:vertical QScrollBar::add-line:vertical { - border-image: url(qss/qdarkstyle/down_arrow_disabled.png); + border-image: url(%THISPATH%/qdarkstyle/down_arrow_disabled.png); height: 10px; width: 10px; subcontrol-position: bottom; @@ -302,7 +302,7 @@ QScrollBar::add-line:vertical QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on { - border-image: url(qss/qdarkstyle/up_arrow.png); + border-image: url(%THISPATH%/qdarkstyle/up_arrow.png); height: 10px; width: 10px; subcontrol-position: top; @@ -312,7 +312,7 @@ QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on { - border-image: url(qss/qdarkstyle/down_arrow.png); + border-image: url(%THISPATH%/qdarkstyle/down_arrow.png); height: 10px; width: 10px; subcontrol-position: bottom; @@ -359,7 +359,7 @@ QCheckBox:disabled } QSizeGrip { - image: url(qss/qdarkstyle/sizegrip.png); + image: url(%THISPATH%/qdarkstyle/sizegrip.png); width: 12px; height: 12px; } @@ -483,16 +483,16 @@ QToolBar { } QToolBar::handle:horizontal { - image: url(qss/qdarkstyle/Hmovetoolbar.png); + image: url(%THISPATH%/qdarkstyle/Hmovetoolbar.png); } QToolBar::handle:vertical { - image: url(qss/qdarkstyle/Vmovetoolbar.png); + image: url(%THISPATH%/qdarkstyle/Vmovetoolbar.png); } QToolBar::separator:horizontal { - image: url(qss/qdarkstyle/Hsepartoolbar.png); + image: url(%THISPATH%/qdarkstyle/Hsepartoolbar.png); } QToolBar::separator:vertical { - image: url(qss/qdarkstyle/Vsepartoolbars.png); + image: url(%THISPATH%/qdarkstyle/Vsepartoolbars.png); } QPushButton @@ -574,13 +574,13 @@ QComboBox::drop-down QComboBox::down-arrow { - image: url(qss/qdarkstyle/down_arrow_disabled.png); + image: url(%THISPATH%/qdarkstyle/down_arrow_disabled.png); } QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus { - image: url(qss/qdarkstyle/down_arrow.png); + image: url(%THISPATH%/qdarkstyle/down_arrow.png); } QPushButton:pressed @@ -614,25 +614,25 @@ QAbstractSpinBox:down-button } QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off { - image: url(qss/qdarkstyle/up_arrow_disabled.png); + image: url(%THISPATH%/qdarkstyle/up_arrow_disabled.png); width: 10px; height: 10px; } QAbstractSpinBox::up-arrow:hover { - image: url(qss/qdarkstyle/up_arrow.png); + image: url(%THISPATH%/qdarkstyle/up_arrow.png); } QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off { - image: url(qss/qdarkstyle/down_arrow_disabled.png); + image: url(%THISPATH%/qdarkstyle/down_arrow_disabled.png); width: 10px; height: 10px; } QAbstractSpinBox::down-arrow:hover { - image: url(qss/qdarkstyle/down_arrow.png); + image: url(%THISPATH%/qdarkstyle/down_arrow.png); } @@ -658,7 +658,7 @@ QTabBar:focus } QTabBar::close-button { - image: url(qss/qdarkstyle/close.png); + image: url(%THISPATH%/qdarkstyle/close.png); background: transparent; icon-size: 10px; padding: 5px; @@ -795,26 +795,26 @@ QTabBar::tab:right:selected } QTabBar QToolButton::right-arrow:enabled { - image: url(qss/qdarkstyle/right_arrow.png); + image: url(%THISPATH%/qdarkstyle/right_arrow.png); } QTabBar QToolButton::left-arrow:enabled { - image: url(qss/qdarkstyle/left_arrow.png); + image: url(%THISPATH%/qdarkstyle/left_arrow.png); } QTabBar QToolButton::right-arrow:disabled { - image: url(qss/qdarkstyle/right_arrow_disabled.png); + image: url(%THISPATH%/qdarkstyle/right_arrow_disabled.png); } QTabBar QToolButton::left-arrow:disabled { - image: url(qss/qdarkstyle/left_arrow_disabled.png); + image: url(%THISPATH%/qdarkstyle/left_arrow_disabled.png); } QDockWidget { border: 1px solid #403F3F; - titlebar-close-icon: url(qss/qdarkstyle/close.png); - titlebar-normal-icon: url(qss/qdarkstyle/undock.png); + titlebar-close-icon: url(%THISPATH%/qdarkstyle/close.png); + titlebar-normal-icon: url(%THISPATH%/qdarkstyle/undock.png); } QDockWidget::close-button, QDockWidget::float-button { @@ -869,39 +869,39 @@ NetworkDialog { QTreeView:branch:selected, QTreeView:branch:hover { - background: url(qss/qdarkstyle/transparent.png); + background: url(%THISPATH%/qdarkstyle/transparent.png); } QTreeView::branch:has-siblings:!adjoins-item { - border-image: url(qss/qdarkstyle/transparent.png); + border-image: url(%THISPATH%/qdarkstyle/transparent.png); } QTreeView::branch:has-siblings:adjoins-item { - border-image: url(qss/qdarkstyle/transparent.png); + border-image: url(%THISPATH%/qdarkstyle/transparent.png); } QTreeView::branch:!has-children:!has-siblings:adjoins-item { - border-image: url(qss/qdarkstyle/transparent.png); + border-image: url(%THISPATH%/qdarkstyle/transparent.png); } QTreeView::branch:has-children:!has-siblings:closed, QTreeView::branch:closed:has-children:has-siblings { - image: url(qss/qdarkstyle/branch_closed.png); + image: url(%THISPATH%/qdarkstyle/branch_closed.png); } QTreeView::branch:open:has-children:!has-siblings, QTreeView::branch:open:has-children:has-siblings { - image: url(qss/qdarkstyle/branch_open.png); + image: url(%THISPATH%/qdarkstyle/branch_open.png); } QTreeView::branch:has-children:!has-siblings:closed:hover, QTreeView::branch:closed:has-children:has-siblings:hover { - image: url(qss/qdarkstyle/branch_closed-on.png); + image: url(%THISPATH%/qdarkstyle/branch_closed-on.png); } QTreeView::branch:open:has-children:!has-siblings:hover, QTreeView::branch:open:has-children:has-siblings:hover { - image: url(qss/qdarkstyle/branch_open-on.png); + image: url(%THISPATH%/qdarkstyle/branch_open-on.png); } QListView::item:!selected:hover, QTableView::item:!selected:hover, QTreeView::item:!selected:hover { @@ -986,7 +986,7 @@ QToolButton::menu-button { } QToolButton::menu-arrow { - image: url(qss/qdarkstyle/down_arrow.png); + image: url(%THISPATH%/qdarkstyle/down_arrow.png); } QToolButton::menu-arrow:open { @@ -1068,11 +1068,11 @@ QHeaderView::section:checked /* style the sort indicator */ QHeaderView::down-arrow { - image: url(qss/qdarkstyle/down_arrow.png); + image: url(%THISPATH%/qdarkstyle/down_arrow.png); } QHeaderView::up-arrow { - image: url(qss/qdarkstyle/up_arrow.png); + image: url(%THISPATH%/qdarkstyle/up_arrow.png); } @@ -1208,4 +1208,4 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-arrow { GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-button { image: none; -} \ No newline at end of file +} diff --git a/retroshare-gui/src/qss/qlive.qss b/retroshare-gui/src/qss/qlive.qss index b5e7a45a8..90ee24663 100644 --- a/retroshare-gui/src/qss/qlive.qss +++ b/retroshare-gui/src/qss/qlive.qss @@ -10,7 +10,7 @@ QDialog{ QFrame#titleBarFrame, QFrame#toolBarFrame { - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } HeaderFrame { @@ -20,17 +20,17 @@ HeaderFrame { /* Customize the toolbar. */ QToolBar#toolBarAction { - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } QToolBar#toolBarPage { - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } QToolBar#chattoolBar{ - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } @@ -72,13 +72,13 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ QFrame#messengerframetop{ - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } QFrame#Chatbuttonframe{ - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } @@ -113,6 +113,6 @@ QLabel#fromText{ } QStatusBar{ - border-image: url(qss/qlive/qb.png); + border-image: url(%THISPATH%/qlive/qb.png); } diff --git a/retroshare-gui/src/qss/redscorpion.qss b/retroshare-gui/src/qss/redscorpion.qss index 4946745ca..7b47f360b 100644 --- a/retroshare-gui/src/qss/redscorpion.qss +++ b/retroshare-gui/src/qss/redscorpion.qss @@ -191,27 +191,27 @@ QFrame#Chatbuttonframe{ } QFrame#frame_2{ - border-image: url(qss/redscorpion/red.png); + border-image: url(%THISPATH%/redscorpion/red.png); border: 1px solid #CCCCCC; } QFrame#buttonframe{ - border-image: url(qss/redscorpion/red.png); + border-image: url(%THISPATH%/redscorpion/red.png); border: 1px solid #CCCCCC; } QFrame#frame{ - border-image: url(qss/redscorpion/red.png); + border-image: url(%THISPATH%/redscorpion/red.png); border: 1px solid #CCCCCC; } QFrame#chheaderframe{ - border-image: url(qss/redscorpion/red.png); + border-image: url(%THISPATH%/redscorpion/red.png); border: 1px solid #CCCCCC; diff --git a/retroshare-gui/src/qss/silver.qss b/retroshare-gui/src/qss/silver.qss index 3d8d30909..2683ad533 100644 --- a/retroshare-gui/src/qss/silver.qss +++ b/retroshare-gui/src/qss/silver.qss @@ -22,18 +22,18 @@ HeaderFrame { /* Customize the toolbar. */ QToolBar#toolBarAction { - border-image: url(qss/silver/silver.png); + border-image: url(%THISPATH%/silver/silver.png); } /* Customize the toolbar. */ QToolBar#toolBarPage { - border-image: url(qss/silver/silver.png); + border-image: url(%THISPATH%/silver/silver.png); } QToolBar#chattoolBar{ - border-image: url(qss/silver/silver.png); + border-image: url(%THISPATH%/silver/silver.png); } @@ -92,7 +92,7 @@ QStatusBar{ QFrame#messengerframetop{ - border-image: url(qss/silver/silver.png); + border-image: url(%THISPATH%/silver/silver.png); /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, @@ -101,7 +101,7 @@ QFrame#messengerframetop{ QFrame#Chatbuttonframe{ - border-image: url(qss/silver/silver.png); + border-image: url(%THISPATH%/silver/silver.png); } diff --git a/retroshare-gui/src/qss/uus.qss b/retroshare-gui/src/qss/uus.qss index 3827ac94e..1c56e4c1f 100644 --- a/retroshare-gui/src/qss/uus.qss +++ b/retroshare-gui/src/qss/uus.qss @@ -8,7 +8,7 @@ QFrame#titleBarFrame, QFrame#toolBarFrame { - border-image: url(qss/uus/uus.png); + border-image: url(%THISPATH%/uus/uus.png); } FriendsDialog QFrame#headFrame { @@ -31,16 +31,16 @@ QDialog{ /* Customize the toolbar. */ QToolBar#toolBarAction { - border-image: url(qss/uus/uus.png); + border-image: url(%THISPATH%/uus/uus.png); } QToolBar#toolBarPage { - border-image: url(qss/uus/uus.png); + border-image: url(%THISPATH%/uus/uus.png); } QToolBar#chattoolBar{ - border-image: url(qss/uus/uus.png); + border-image: url(%THISPATH%/uus/uus.png); } @@ -161,7 +161,7 @@ color: white; } QStatusBar{ - border-image: url(qss/uus/uus.png); + border-image: url(%THISPATH%/uus/uus.png); } @@ -214,7 +214,7 @@ QToolTip{ QFrame#messengerframetop{ - border-image: url(qss/uus/uus.png); + border-image: url(%THISPATH%/uus/uus.png); /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ diff --git a/retroshare-gui/src/qss/wx.qss b/retroshare-gui/src/qss/wx.qss index b214c6766..39b5d8130 100644 --- a/retroshare-gui/src/qss/wx.qss +++ b/retroshare-gui/src/qss/wx.qss @@ -1,13 +1,13 @@ /* Customize the toolbar. */ QToolBar { - border-image: url(qss/wx/wx.png); + border-image: url(%THISPATH%/wx/wx.png); } QFrame#titleBarFrame, QFrame#toolBarFrame { - border-image: url(qss/wx/wx.png); + border-image: url(%THISPATH%/wx/wx.png); } @@ -43,7 +43,7 @@ QPushButton#applyButton { QFrame#messengerframetop{ - border-image: url(qss/wx/wx.png); + border-image: url(%THISPATH%/wx/wx.png); /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ @@ -51,7 +51,7 @@ QFrame#messengerframetop{ QFrame#Chatbuttonframe{ - border-image: url(qss/wx/wx.png); + border-image: url(%THISPATH%/wx/wx.png); } diff --git a/retroshare-gui/src/qss/yaba.qss b/retroshare-gui/src/qss/yaba.qss index a9b1e80db..98a09b8de 100644 --- a/retroshare-gui/src/qss/yaba.qss +++ b/retroshare-gui/src/qss/yaba.qss @@ -6,7 +6,7 @@ QFrame#titleBarFrame, QFrame#toolBarFrame { - border-image: url(qss/yaba/yaba.png); + border-image: url(%THISPATH%/yaba/yaba.png); } HeaderFrame { @@ -41,31 +41,31 @@ ChannelFeed QFrame#headerFrame { /* Customize the toolbar. */ QToolBar#toolBarAction { - border-image: url(qss/yaba/yaba.png); + border-image: url(%THISPATH%/yaba/yaba.png); } QToolBar#toolBarPage { - border-image: url(qss/yaba/yaba.png); + border-image: url(%THISPATH%/yaba/yaba.png); } QFrame#frame_2{ - border-image: url(qss/yaba/yaba3.png); + border-image: url(%THISPATH%/yaba/yaba3.png); } QFrame#buttonframe{ - border-image: url(qss/yaba/yaba3.png); + border-image: url(%THISPATH%/yaba/yaba3.png); } QFrame#chheaderframe{ - border-image: url(qss/yaba/yaba3.png); + border-image: url(%THISPATH%/yaba/yaba3.png); } QFrame#frame{ - border-image: url(qss/yaba/yaba3.png); + border-image: url(%THISPATH%/yaba/yaba3.png); } @@ -158,7 +158,7 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ QFrame#messengerframetop{ - border-image: url(qss/yaba/yaba.png); + border-image: url(%THISPATH%/yaba/yaba.png); /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ @@ -166,7 +166,7 @@ QFrame#messengerframetop{ QFrame#Chatbuttonframe{ - border-image: url(qss/yaba/yaba.png); + border-image: url(%THISPATH%/yaba/yaba.png); } @@ -202,7 +202,7 @@ QLabel#fromText{ } QToolBar#chattoolBar{ - border-image: url(qss/yaba/yaba.png); + border-image: url(%THISPATH%/yaba/yaba.png); } diff --git a/retroshare-gui/src/qss/yeah.qss b/retroshare-gui/src/qss/yeah.qss index e625c1867..558aa2b3a 100644 --- a/retroshare-gui/src/qss/yeah.qss +++ b/retroshare-gui/src/qss/yeah.qss @@ -29,7 +29,7 @@ QDialog{ /* Customize the toolbar. */ QToolBar { - border-image: url(qss/yeah/yeah.png); + border-image: url(%THISPATH%/yeah/yeah.png); } @@ -127,7 +127,7 @@ QTreeView::item:selected { /* when user selects item using mouse or keyboard */ QFrame#messengerframetop{ - border-image: url(qss/yeah/yeah.png); + border-image: url(%THISPATH%/yeah/yeah.png); /*background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F7B552, stop: 1 #FF5E07);*/ @@ -135,7 +135,7 @@ QFrame#messengerframetop{ QFrame#Chatbuttonframe{ - border-image: url(qss/yeah/yeah.png); + border-image: url(%THISPATH%/yeah/yeah.png); } diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp index 74fe3b6a7..872273613 100644 --- a/retroshare-gui/src/rshare.cpp +++ b/retroshare-gui/src/rshare.cpp @@ -755,6 +755,9 @@ void Rshare::loadStyleSheet(const QString &sheetName) styleSheet += QLatin1String(file.readAll()) + "\n"; file.close(); } + + /* replace %THISPATH% by file path so url can get relative files */ + styleSheet = styleSheet.replace("url(%THISPATH%",QString("url(%1").arg(fileInfo.absolutePath())); } } }