0
0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-26 08:01:51 +08:00

#0 [GUI] Styling

This commit is contained in:
Victor Zarubkin 2017-11-20 23:34:45 +03:00
parent 5fdc4aa4e7
commit 43df2d8636
17 changed files with 521 additions and 191 deletions

View File

@ -590,11 +590,11 @@ void EasyTreeWidget::contextMenuEvent(QContextMenuEvent* _event)
{
action = menu.addAction("Expand all");
connect(action, &QAction::triggered, this, &This::onExpandAllClicked);
action->setIcon(QIcon(":/Expand"));
action->setIcon(QIcon(":/images/expand"));
action = menu.addAction("Collapse all");
connect(action, &QAction::triggered, this, &This::onCollapseAllClicked);
action->setIcon(QIcon(":/Collapse"));
action->setIcon(QIcon(":/images/collapse"));
if (item != nullptr && col >= 0)
{
@ -602,11 +602,11 @@ void EasyTreeWidget::contextMenuEvent(QContextMenuEvent* _event)
action = menu.addAction("Expand all children");
connect(action, &QAction::triggered, this, &This::onExpandAllChildrenClicked);
action->setIcon(QIcon(":/Expand"));
action->setIcon(QIcon(":/images/expand"));
action = menu.addAction("Collapse all children");
connect(action, &QAction::triggered, this, &This::onCollapseAllChildrenClicked);
action->setIcon(QIcon(":/Collapse"));
action->setIcon(QIcon(":/images/collapse"));
}
menu.addSeparator();
@ -638,11 +638,11 @@ void EasyTreeWidget::contextMenuEvent(QContextMenuEvent* _event)
auto f = action->font();
f.setBold(true);
action->setFont(f);
action->setIcon(QIcon(":/Color"));
action->setIcon(QIcon(":/images/color"));
}
else
{
action->setIcon(QIcon(":/NoColor"));
action->setIcon(QIcon(":/images/no-color"));
}
if (item != nullptr && item->parent() != nullptr)
@ -1156,7 +1156,7 @@ EasyHierarchyWidget::EasyHierarchyWidget(QWidget* _parent) : Parent(_parent)
QMenu* menu = new QMenu(this);
m_searchButton = menu->menuAction();
m_searchButton->setText("Find next");
m_searchButton->setIcon(QIcon(":/Search-next"));
m_searchButton->setIcon(QIcon(":/images/find-next"));
m_searchButton->setData(true);
connect(m_searchButton, &QAction::triggered, this, &This::findNext);
@ -1296,7 +1296,7 @@ void EasyHierarchyWidget::findNextFromMenu(bool _checked)
{
m_searchButton->setData(true);
m_searchButton->setText(tr("Find next"));
m_searchButton->setIcon(QIcon(":/Search-next"));
m_searchButton->setIcon(QIcon(":/images/find-next"));
disconnect(m_searchButton, &QAction::triggered, this, &This::findPrev);
connect(m_searchButton, &QAction::triggered, this, &This::findNext);
}
@ -1313,7 +1313,7 @@ void EasyHierarchyWidget::findPrevFromMenu(bool _checked)
{
m_searchButton->setData(false);
m_searchButton->setText(tr("Find prev"));
m_searchButton->setIcon(QIcon(":/Search-prev"));
m_searchButton->setIcon(QIcon(":/images/find-prev"));
disconnect(m_searchButton, &QAction::triggered, this, &This::findNext);
connect(m_searchButton, &QAction::triggered, this, &This::findPrev);
}

View File

@ -2,100 +2,139 @@
* *
* Light theme for EasyProfiler. *
* *
* Automatically generated from *
* default.scss by pysassc tool *
* *
***********************************/
/* ****************************************************************************************************************** */
/* Functions */
/* ****************************************************************************************************************** */
/* Constants */
/* ****************************************************************************************************************** */
/* StyleSheet */
* {
font-family: "DejaVu Sans";
font-size: 13px;
color: #606070;
}
font-family: "DejaVu Sans";
font-size: 13px;
color: #686060; }
*:disabled {
color: #b0b0c0;
}
color: #b8b0b0; }
EasyMainWindow, QToolBar, QDialog {
background-color: #fffbfb; }
/* ****************************************************************************************************************** */
QLineEdit, QPushButton {
height: 24px;
border: 1px solid #cccccc;
background-color: white;
}
QLineEdit, QComboBox {
height: 24px;
border: 1px solid #cccccc;
background-color: white;
selection-background-color: rgba(152, 206, 152, 0.4);
selection-color: #686060; }
QLineEdit:focus { border: 1px ridge #f44336; }
QLineEdit:disabled, QComboBox:disabled {
background-color: #dddddd;
color: #b8b0b0;
selection-background-color: rgba(152, 206, 152, 0.4);
selection-color: #b8b0b0; }
QPushButton { padding: 2px 5px 2px 5px; }
QPushButton:hover { border: 1px solid #f4a386; color: #806070; }
QPushButton:pressed { border: 1px solid #d47366; color: #705060; }
QLineEdit:focus {
border: 1px solid #ffbcbc; }
QComboBox::drop-down {
subcontrol-origin: padding;
subcontrol-position: top right;
width: 20px;
border-left: none;
margin-left: 0; }
QComboBox::down-arrow {
image: url(":/images/combo-arrow");
height: 8px;
width: 8px; }
QComboBox::down-arrow:disabled {
image: url(":/images/combo-arrow-disabled");
height: 8px;
width: 8px; }
QPushButton {
height: 24px;
border: 1px solid #cccccc;
background-color: white;
padding: 0 5px 0 5px; }
QPushButton:hover {
border: 1px solid #ffbcbc;
color: #d77d7d; }
QPushButton:pressed {
border: 1px solid #d77d7d;
color: #922c2c; }
QComboBox QListView {
background-color: white;
border: 1px solid #cccccc;
selection-background-color: rgba(96, 112, 208, 64);
}
background-color: white;
border: 1px solid #cccccc;
selection-background-color: rgba(152, 206, 152, 0.4);
selection-color: #686060; }
/* ****************************************************************************************************************** */
QMenu {
background-color: white;
padding-top: 4px;
padding-bottom: 4px;
}
background-color: white;
border: 1px solid #cccccc;
padding-top: 4px;
padding-bottom: 4px; }
QMenu::item {
height: 22px;
padding: 0 16px 0 25px;
border: 1px solid transparent; /* reserve space for selection border */
}
height: 22px;
padding: 0 16px 0 25px;
border: 1px solid transparent;
/* reserve space for selection border */ }
QMenu::item:selected {
border-color: rgba(96, 112, 208, 128);
background: rgba(96, 112, 208, 64);
}
border: 1px solid rgba(152, 206, 152, 0.4);
background-color: rgba(152, 206, 152, 0.4); }
QMenu::icon {
width: 12px;
height: 12px;
background: none;
border: 1px inset transparent;
padding: 1px;
margin-left: 2px;
}
width: 12px;
height: 12px;
background: none;
border: 1px inset transparent;
padding: 1px;
margin-left: 2px; }
QMenu::icon:checked { /* appearance of a 'checked' icon */
background-color: #dddddd;
border: 1px inset #aaaaaa;
}
QMenu::icon:checked {
/* appearance of a 'checked' icon */
background-color: #dddddd;
border: 1px inset #aaaaaa; }
QMenu::separator {
height: 1px;
background: #cccccc;
margin-left: 5px;
margin-right: 5px;
}
height: 1px;
background: #cccccc;
margin-left: 5px;
margin-right: 5px; }
QMenu::indicator {
width: 14px;
height: 14px;
background-color: white;
border: 1px solid #cccccc;
margin-left: 2px;
padding: 1px;
}
width: 14px;
height: 14px;
background-color: white;
border: 1px solid #cccccc;
margin-left: 2px;
padding: 1px; }
QMenu::indicator:non-exclusive:checked { image: url(":/CheckIndicator"); }
QMenu::indicator:non-exclusive:checked:disabled { image: url(":/CheckIndicatorDisabled"); }
QMenu::indicator:non-exclusive:checked {
image: url(":/images/check"); }
QMenu::indicator:exclusive { border-radius: 8px; }
QMenu::indicator:exclusive:checked { image: url(":/RadioIndicator"); }
QMenu::indicator:exclusive:checked:disabled { image: url(":/RadioIndicatorDisabled"); }
QMenu::indicator:non-exclusive:checked:disabled {
image: url(":/images/check-disabled"); }
QMenu::indicator:exclusive {
border-radius: 8px; }
QMenu::indicator:exclusive:checked {
image: url(":/images/radio-check"); }
QMenu::indicator:exclusive:checked:disabled {
image: url(":/images/radio-check-disabled"); }
/* ****************************************************************************************************************** */
/*QToolButton {
@ -105,7 +144,7 @@ QMenu::indicator:exclusive:checked:disabled { image: url(":/RadioIndicatorDisabl
}
QToolButton:hover {
border: 1px solid #cccccc;
border: 1px solid $BorderColor;
}
QToolButton[popupMode="1"] {
@ -123,70 +162,67 @@ QToolButton::menu-button {
}
QToolButton::menu-button:hover {
border-left: 1px solid #cccccc;
border-left: 1px solid $BorderColor;
background-color: #bbbbbb;
}
QToolButton::menu-button:pressed {
border-left: 1px solid #cccccc;
border-left: 1px solid $BorderColor;
background-color: #808080;
}*/
/* ****************************************************************************************************************** */
QHeaderView::section {
height: 28px;
width: 96px;
min-width: 64px;
background: #eeeeee;
}
height: 28px;
width: 96px;
min-width: 64px;
background: #eeeeee; }
/* ****************************************************************************************************************** */
EasyDockWidget QWidget#EasyDockWidgetTitle {
background-color: #666666;
}
EasyDockWidget QWidget#EasyDockWidgetTitle QLabel {
background-color: #686464; }
EasyDockWidget QWidget#EasyDockWidgetTitle QLabel {
color: white;
margin-left: 4px;
}
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton {
margin-left: 4px; }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton {
background: none;
border: none;
max-height: 12px;
max-width: 12px;
margin-right: 4px;
padding: 0;
}
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton { image: url(":/DockMaximizeWhite"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:hover { image: url(":/DockMaximizeWhiteHover"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:pressed { image: url(":/DockMaximizeWhitePressed"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true] { image: url(":/DockMinimizeWhite"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:hover { image: url(":/DockMinimizeWhiteHover"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:pressed { image: url(":/DockMinimizeWhitePressed"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton { image: url(":/DockCloseWhite"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:hover { image: url(":/DockCloseWhiteHover"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:pressed { image: url(":/DockCloseWhitePressed"); }
padding: 0; }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton {
image: url(":/images/dock-maximize-white"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:hover {
image: url(":/images/dock-maximize-white-hover"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton:pressed {
image: url(":/images/dock-maximize-white-pressed"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true] {
image: url(":/images/dock-minimize-white"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:hover {
image: url(":/images/dock-minimize-white-hover"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetFloatButton[floating=true]:pressed {
image: url(":/images/dock-minimize-white-pressed"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton {
image: url(":/images/dock-close-white"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:hover {
image: url(":/images/dock-close-white-hover"); }
EasyDockWidget QWidget#EasyDockWidgetTitle QPushButton#EasyDockWidgetCloseButton:pressed {
image: url(":/images/dock-close-white-pressed"); }
/* ****************************************************************************************************************** */
QWidget#DiagramPopup, QWidget#ThreadsPopup {
background-color: white;
border: 1px solid #cccccc;
}
background-color: white;
border: 1px solid #cccccc; }
/* ****************************************************************************************************************** */
QProgressBar {
height: 24px;
background-color: white;
border: 1px solid #64BC64;
color: #0B530B;
text-align: center; }
QProgressBar::chunk {
background-color: #98DE98;
width: 2px;
margin: 0; }

265
profiler_gui/default.scss Normal file
View File

@ -0,0 +1,265 @@
/**********************************
* *
* Light theme for EasyProfiler. *
* *
* Automatically generated from *
* default.scss by pysassc tool *
* *
***********************************/
/* ****************************************************************************************************************** */
/* Functions */
@function rgb_a($color, $opacity) {
@return fade_out($color, 1.0 - $opacity);
}
/* ****************************************************************************************************************** */
/* Constants */
$TextColor: #686060;
$DisabledTextColor: #b8b0b0;
$BorderColor: #cccccc;
$MainColor: #f44336;
$HoveredMenuRowColor: rgb_a(#98CE98, 0.4);
$BackgroundColor: white;
$DisabledBackgroundColor: #dddddd;
$ButtonHoverColor: #d77d7d;
$ButtonPressedColor: #922c2c;
/* ****************************************************************************************************************** */
/* StyleSheet */
* {
font-family: "DejaVu Sans";
font-size: 13px;
color: $TextColor;
}
*:disabled {
color: $DisabledTextColor;
}
EasyMainWindow, QToolBar, QDialog {
background-color: #fffbfb;
}
/* ****************************************************************************************************************** */
QLineEdit, QComboBox {
height: 24px;
border: 1px solid $BorderColor;
background-color: $BackgroundColor;
selection-background-color: $HoveredMenuRowColor;
selection-color: $TextColor;
}
QLineEdit:disabled, QComboBox:disabled {
background-color: $DisabledBackgroundColor;
color: $DisabledTextColor;
selection-background-color: $HoveredMenuRowColor;
selection-color: $DisabledTextColor;
}
QLineEdit:focus { border: 1px solid #ffbcbc; }
QComboBox::drop-down {
subcontrol-origin: padding;
subcontrol-position: top right;
width: 20px;
border-left: none;
margin-left: 0;
}
QComboBox::down-arrow { image: url(":/images/combo-arrow"); height: 8px; width: 8px; }
QComboBox::down-arrow:disabled { image: url(":/images/combo-arrow-disabled"); height: 8px; width: 8px; }
QPushButton {
height: 24px;
border: 1px solid $BorderColor;
background-color: $BackgroundColor;
padding: 0 5px 0 5px;
}
QPushButton:hover {
border: 1px solid #ffbcbc;
color: $ButtonHoverColor;
}
QPushButton:pressed {
border: 1px solid $ButtonHoverColor;
color: $ButtonPressedColor;
}
QComboBox QListView {
background-color: $BackgroundColor;
border: 1px solid $BorderColor;
selection-background-color: $HoveredMenuRowColor;
selection-color: $TextColor;
}
/* ****************************************************************************************************************** */
QMenu {
background-color: $BackgroundColor;
border: 1px solid $BorderColor;
padding-top: 4px;
padding-bottom: 4px;
}
QMenu::item {
height: 22px;
padding: 0 16px 0 25px;
border: 1px solid transparent; /* reserve space for selection border */
}
QMenu::item:selected {
border: 1px solid $HoveredMenuRowColor;
background-color: $HoveredMenuRowColor;
}
QMenu::icon {
width: 12px;
height: 12px;
background: none;
border: 1px inset transparent;
padding: 1px;
margin-left: 2px;
}
QMenu::icon:checked { /* appearance of a 'checked' icon */
background-color: #dddddd;
border: 1px inset #aaaaaa;
}
QMenu::separator {
height: 1px;
background: $BorderColor;
margin-left: 5px;
margin-right: 5px;
}
QMenu::indicator {
width: 14px;
height: 14px;
background-color: $BackgroundColor;
border: 1px solid $BorderColor;
margin-left: 2px;
padding: 1px;
}
QMenu::indicator:non-exclusive:checked { image: url(":/images/check"); }
QMenu::indicator:non-exclusive:checked:disabled { image: url(":/images/check-disabled"); }
QMenu::indicator:exclusive { border-radius: 8px; }
QMenu::indicator:exclusive:checked { image: url(":/images/radio-check"); }
QMenu::indicator:exclusive:checked:disabled { image: url(":/images/radio-check-disabled"); }
/* ****************************************************************************************************************** */
/*QToolButton {
border: 1px solid transparent;
background: none;
padding: 2px;
}
QToolButton:hover {
border: 1px solid $BorderColor;
}
QToolButton[popupMode="1"] {
padding-right: 13px;
}
QToolButton:pressed {
background-color: #808080;
}
QToolButton::menu-button {
border: none;
border-left: 1px solid transparent;
width: 12px;
}
QToolButton::menu-button:hover {
border-left: 1px solid $BorderColor;
background-color: #bbbbbb;
}
QToolButton::menu-button:pressed {
border-left: 1px solid $BorderColor;
background-color: #808080;
}*/
/* ****************************************************************************************************************** */
QHeaderView::section {
height: 28px;
width: 96px;
min-width: 64px;
background: #eeeeee;
}
/* ****************************************************************************************************************** */
EasyDockWidget
{
QWidget#EasyDockWidgetTitle
{
background-color: #686464;
QLabel {
color: white;
margin-left: 4px;
}
QPushButton {
background: none;
border: none;
max-height: 12px;
max-width: 12px;
margin-right: 4px;
padding: 0;
}
QPushButton#EasyDockWidgetFloatButton { image: url(":/images/dock-maximize-white"); }
QPushButton#EasyDockWidgetFloatButton:hover { image: url(":/images/dock-maximize-white-hover"); }
QPushButton#EasyDockWidgetFloatButton:pressed { image: url(":/images/dock-maximize-white-pressed"); }
QPushButton#EasyDockWidgetFloatButton[floating=true] { image: url(":/images/dock-minimize-white"); }
QPushButton#EasyDockWidgetFloatButton[floating=true]:hover { image: url(":/images/dock-minimize-white-hover"); }
QPushButton#EasyDockWidgetFloatButton[floating=true]:pressed { image: url(":/images/dock-minimize-white-pressed"); }
QPushButton#EasyDockWidgetCloseButton { image: url(":/images/dock-close-white"); }
QPushButton#EasyDockWidgetCloseButton:hover { image: url(":/images/dock-close-white-hover"); }
QPushButton#EasyDockWidgetCloseButton:pressed { image: url(":/images/dock-close-white-pressed"); }
}
}
/* ****************************************************************************************************************** */
QWidget#DiagramPopup, QWidget#ThreadsPopup {
background-color: $BackgroundColor;
border: 1px solid $BorderColor;
}
/* ****************************************************************************************************************** */
QProgressBar {
height: 24px;
background-color: $BackgroundColor;
border: 1px solid #64BC64;
color: #0B530B;
text-align: center;
}
QProgressBar::chunk {
background-color: #98DE98;
width: 2px;
margin: 0;
}

View File

@ -261,11 +261,11 @@ void EasyDescTreeWidget::contextMenuEvent(QContextMenuEvent* _event)
QMenu menu;
menu.setToolTipsVisible(true);
auto action = menu.addAction("Expand all");
action->setIcon(QIcon(":/Expand"));
action->setIcon(QIcon(":/images/expand"));
connect(action, &QAction::triggered, this, &This::expandAll);
action = menu.addAction("Collapse all");
action->setIcon(QIcon(":/Collapse"));
action->setIcon(QIcon(":/images/collapse"));
connect(action, &QAction::triggered, this, &This::collapseAll);
menu.addSeparator();
@ -744,7 +744,7 @@ EasyDescWidget::EasyDescWidget(QWidget* _parent) : Parent(_parent)
auto tb = new QToolBar(this);
tb->setIconSize(::profiler_gui::ICONS_SIZE);
auto refreshButton = tb->addAction(QIcon(":/Reload"), tr("Refresh blocks list"));
auto refreshButton = tb->addAction(QIcon(":/images/reload"), tr("Refresh blocks list"));
refreshButton->setEnabled(EASY_GLOBALS.connected);
refreshButton->setToolTip(tr("Refresh blocks list.\nConnection needed."));
connect(refreshButton, &QAction::triggered, &EASY_GLOBALS.events, &::profiler_gui::EasyGlobalSignals::blocksRefreshRequired);
@ -754,7 +754,7 @@ EasyDescWidget::EasyDescWidget(QWidget* _parent) : Parent(_parent)
QMenu* menu = new QMenu(this);
m_searchButton = menu->menuAction();
m_searchButton->setText("Find next");
m_searchButton->setIcon(QIcon(":/Search-next"));
m_searchButton->setIcon(QIcon(":/images/find-next"));
m_searchButton->setData(true);
connect(m_searchButton, &QAction::triggered, this, &This::findNext);
@ -891,7 +891,7 @@ void EasyDescWidget::findNextFromMenu(bool _checked)
{
m_searchButton->setData(true);
m_searchButton->setText(tr("Find next"));
m_searchButton->setIcon(QIcon(":/Search-next"));
m_searchButton->setIcon(QIcon(":/images/find-next"));
disconnect(m_searchButton, &QAction::triggered, this, &This::findPrev);
connect(m_searchButton, &QAction::triggered, this, &This::findNext);
}
@ -908,7 +908,7 @@ void EasyDescWidget::findPrevFromMenu(bool _checked)
{
m_searchButton->setData(false);
m_searchButton->setText(tr("Find prev"));
m_searchButton->setIcon(QIcon(":/Search-prev"));
m_searchButton->setIcon(QIcon(":/images/find-prev"));
disconnect(m_searchButton, &QAction::triggered, this, &This::findNext);
connect(m_searchButton, &QAction::triggered, this, &This::findPrev);
}

View File

@ -324,7 +324,7 @@ void EasyFrameRateViewer::contextMenuEvent(QContextMenuEvent* _event)
QMenu menu;
QAction* action = nullptr;
action = menu.addAction(QIcon(":/Delete"), "Clear");
action = menu.addAction(QIcon(":/images/delete"), "Clear");
connect(action, &QAction::triggered, [this](bool){ clear(); });
action = menu.addAction("Close");

View File

@ -32,4 +32,5 @@ maximize-white-hover.svg - Icon made by Freepik from www.flaticon.com
maximize-white-pressed.svg - Icon made by Freepik from www.flaticon.com
minimize-white.svg - Icon made by Freepik from www.flaticon.com
minimize-white-pressed.svg - Icon made by Freepik from www.flaticon.com
combo-arrow.svg - Icon made by Freepik from www.flaticon.com
combo-arrow-disabled.svg - Icon made by Freepik from www.flaticon.com

View File

@ -3,6 +3,6 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 426.667 426.667" style="enable-background:new 0 0 426.667 426.667;" xml:space="preserve">
<g>
<polygon fill="#cccccc" points="293.333,135.04 190.08,240.213 137.173,187.093 108.8,215.467 192.213,298.667 326.187,168.747"/>
<polygon fill="#98CE98" points="293.333,135.04 190.08,240.213 137.173,187.093 108.8,215.467 192.213,298.667 326.187,168.747"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 514 B

After

Width:  |  Height:  |  Size: 514 B

View File

@ -3,6 +3,6 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 426.667 426.667" style="enable-background:new 0 0 426.667 426.667;" xml:space="preserve">
<g>
<polygon fill="#484848" points="293.333,135.04 190.08,240.213 137.173,187.093 108.8,215.467 192.213,298.667 326.187,168.747"/>
<polygon fill="#237423" points="293.333,135.04 190.08,240.213 137.173,187.093 108.8,215.467 192.213,298.667 326.187,168.747"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 514 B

After

Width:  |  Height:  |  Size: 514 B

View File

@ -3,10 +3,10 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<g>
<path fill="#f4a386" d="M505.943,6.058c-8.077-8.077-21.172-8.077-29.249,0L6.058,476.693c-8.077,8.077-8.077,21.172,0,29.249
<path fill="#f4b3a6" d="M505.943,6.058c-8.077-8.077-21.172-8.077-29.249,0L6.058,476.693c-8.077,8.077-8.077,21.172,0,29.249
C10.096,509.982,15.39,512,20.683,512c5.293,0,10.586-2.019,14.625-6.059L505.943,35.306
C514.019,27.23,514.019,14.135,505.943,6.058z"/>
<path fill="#f4a386" d="M505.942,476.694L35.306,6.059c-8.076-8.077-21.172-8.077-29.248,0c-8.077,8.076-8.077,21.171,0,29.248l470.636,470.636
<path fill="#f4b3a6" d="M505.942,476.694L35.306,6.059c-8.076-8.077-21.172-8.077-29.248,0c-8.077,8.076-8.077,21.171,0,29.248l470.636,470.636
c4.038,4.039,9.332,6.058,14.625,6.058c5.293,0,10.587-2.019,14.624-6.057C514.018,497.866,514.018,484.771,505.942,476.694z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 899 B

View File

@ -3,10 +3,10 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<g>
<path fill="#f44336" d="M505.943,6.058c-8.077-8.077-21.172-8.077-29.249,0L6.058,476.693c-8.077,8.077-8.077,21.172,0,29.249
<path fill="#f48376" d="M505.943,6.058c-8.077-8.077-21.172-8.077-29.249,0L6.058,476.693c-8.077,8.077-8.077,21.172,0,29.249
C10.096,509.982,15.39,512,20.683,512c5.293,0,10.586-2.019,14.625-6.059L505.943,35.306
C514.019,27.23,514.019,14.135,505.943,6.058z"/>
<path fill="#f44336" d="M505.942,476.694L35.306,6.059c-8.076-8.077-21.172-8.077-29.248,0c-8.077,8.076-8.077,21.171,0,29.248l470.636,470.636
<path fill="#f48376" d="M505.942,476.694L35.306,6.059c-8.076-8.077-21.172-8.077-29.248,0c-8.077,8.076-8.077,21.171,0,29.248l470.636,470.636
c4.038,4.039,9.332,6.058,14.625,6.058c5.293,0,10.587-2.019,14.624-6.057C514.018,497.866,514.018,484.771,505.942,476.694z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 899 B

After

Width:  |  Height:  |  Size: 899 B

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="451.847px" height="451.847px" viewBox="0 0 451.847 451.847" style="enable-background:new 0 0 451.847 451.847;"
xml:space="preserve">
<g>
<path fill="#cccccc" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0
c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 868 B

View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="451.847px" height="451.847px" viewBox="0 0 451.847 451.847" style="enable-background:new 0 0 451.847 451.847;"
xml:space="preserve">
<g>
<path fill="#686060" d="M225.923,354.706c-8.098,0-16.195-3.092-22.369-9.263L9.27,151.157c-12.359-12.359-12.359-32.397,0-44.751
c12.354-12.354,32.388-12.354,44.748,0l171.905,171.915l171.906-171.909c12.359-12.354,32.391-12.354,44.744,0
c12.365,12.354,12.365,32.392,0,44.751L248.292,345.449C242.115,351.621,234.018,354.706,225.923,354.706z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 868 B

View File

@ -2,6 +2,6 @@
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g>
<circle fill="#cccccc" cx="32" cy="32" r="16"/>
<circle fill="#98CE98" cx="32" cy="32" r="16"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

View File

@ -2,6 +2,6 @@
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="64px" height="64px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
<g>
<circle fill="#484848" cx="32" cy="32" r="16"/>
<circle fill="#237423" cx="32" cy="32" r="16"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

View File

@ -63,7 +63,7 @@ int main(int argc, char **argv)
{
QApplication app(argc, argv);
QFile file(":/DefaultTheme");
QFile file(":/themes/default");
if (file.open(QFile::ReadOnly | QFile::Text))
{
QTextStream in(&file);

View File

@ -173,7 +173,7 @@ EasyDockWidget::~EasyDockWidget()
EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastPort(::profiler::DEFAULT_PORT)
{
{ QIcon icon(":/logo"); if (!icon.isNull()) QApplication::setWindowIcon(icon); }
{ QIcon icon(":/images/logo"); if (!icon.isNull()) QApplication::setWindowIcon(icon); }
setObjectName("ProfilerGUI_MainWindow");
setWindowTitle(EASY_DEFAULT_WINDOW_TITLE);
@ -230,7 +230,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
m_loadActionMenu = new QMenu(this);
auto action = m_loadActionMenu->menuAction();
action->setText("Open file");
action->setIcon(QIcon(":/Open"));
action->setIcon(QIcon(":/images/open"));
connect(action, &QAction::triggered, this, &This::onOpenFileClicked);
toolbar->addAction(action);
@ -241,8 +241,8 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
m_loadActionMenu->addAction(action);
}
m_saveAction = toolbar->addAction(QIcon(":/Save"), tr("Save"), this, SLOT(onSaveFileClicked(bool)));
m_deleteAction = toolbar->addAction(QIcon(":/Delete"), tr("Clear all"), this, SLOT(onDeleteClicked(bool)));
m_saveAction = toolbar->addAction(QIcon(":/images/save"), tr("Save"), this, SLOT(onSaveFileClicked(bool)));
m_deleteAction = toolbar->addAction(QIcon(":/images/delete"), tr("Clear all"), this, SLOT(onDeleteClicked(bool)));
m_saveAction->setEnabled(false);
m_deleteAction->setEnabled(false);
@ -254,12 +254,12 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
toolbar->setObjectName("ProfilerGUI_ProfileToolbar");
toolbar->setContentsMargins(1, 0, 1, 0);
toolbar->addAction(QIcon(":/List"), tr("Blocks"), this, SLOT(onEditBlocksClicked(bool)));
m_captureAction = toolbar->addAction(QIcon(":/Start"), tr("Capture"), this, SLOT(onCaptureClicked(bool)));
toolbar->addAction(QIcon(":/images/list"), tr("Blocks"), this, SLOT(onEditBlocksClicked(bool)));
m_captureAction = toolbar->addAction(QIcon(":/images/start"), tr("Capture"), this, SLOT(onCaptureClicked(bool)));
m_captureAction->setEnabled(false);
toolbar->addSeparator();
m_connectAction = toolbar->addAction(QIcon(":/Connection"), tr("Connect"), this, SLOT(onConnectClicked(bool)));
m_connectAction = toolbar->addAction(QIcon(":/images/connect"), tr("Connect"), this, SLOT(onConnectClicked(bool)));
auto lbl = new QLabel("Address:", toolbar);
lbl->setContentsMargins(5, 0, 2, 0);
@ -291,15 +291,15 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
toolbar->setObjectName("ProfilerGUI_SetupToolbar");
toolbar->setContentsMargins(1, 0, 1, 0);
toolbar->addAction(QIcon(":/Expand"), "Expand all", this, SLOT(onExpandAllClicked(bool)));
toolbar->addAction(QIcon(":/Collapse"), "Collapse all", this, SLOT(onCollapseAllClicked(bool)));
toolbar->addAction(QIcon(":/images/expand"), "Expand all", this, SLOT(onExpandAllClicked(bool)));
toolbar->addAction(QIcon(":/images/collapse"), "Collapse all", this, SLOT(onCollapseAllClicked(bool)));
toolbar->addSeparator();
auto menu = new QMenu("Settings", this);
menu->setToolTipsVisible(true);
QToolButton* toolButton = new QToolButton(toolbar);
toolButton->setIcon(QIcon(":/Settings"));
toolButton->setIcon(QIcon(":/images/settings"));
toolButton->setMenu(menu);
toolButton->setPopupMode(QToolButton::InstantPopup);
toolbar->addWidget(toolButton);
@ -313,12 +313,12 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
auto f = action->font();
f.setBold(true);
action->setFont(f);
action->setIcon(QIcon(":/Stats"));
action->setIcon(QIcon(":/images/stats"));
}
else
{
action->setText("Statistics disabled");
action->setIcon(QIcon(":/Stats-off"));
action->setIcon(QIcon(":/images/stats-off"));
}
@ -1065,12 +1065,12 @@ void EasyMainWindow::onEnableDisableStatistics(bool _checked)
if (_checked)
{
action->setText("Statistics enabled");
action->setIcon(QIcon(":/Stats"));
action->setIcon(QIcon(":/images/stats"));
}
else
{
action->setText("Statistics disabled");
action->setIcon(QIcon(":/Stats-off"));
action->setIcon(QIcon(":/images/stats-off"));
}
}
}
@ -1424,7 +1424,7 @@ void EasyMainWindow::setDisconnected(bool _showMessage)
EASY_GLOBALS.connected = false;
m_captureAction->setEnabled(false);
m_connectAction->setIcon(QIcon(":/Connection"));
m_connectAction->setIcon(QIcon(":/images/connect"));
m_connectAction->setText(tr("Connect"));
m_eventTracingEnableAction->setEnabled(false);
@ -1964,7 +1964,7 @@ void EasyMainWindow::onConnectClicked(bool)
qInfo() << "Connected successfully";
EASY_GLOBALS.connected = true;
m_captureAction->setEnabled(true);
m_connectAction->setIcon(QIcon(":/Connection-on"));
m_connectAction->setIcon(QIcon(":/images/connected"));
m_connectAction->setText(tr("Disconnect"));
if (m_fpsViewer->isVisible())
@ -2043,7 +2043,7 @@ void EasyMainWindow::onCaptureClicked(bool)
button->setAutoRaise(true);
button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
button->setIconSize(::profiler_gui::ICONS_SIZE);
button->setIcon(QIcon(":/Stop"));
button->setIcon(QIcon(":/images/stop"));
button->setText("Stop");
m_listenerDialog->addButton(button, QMessageBox::AcceptRole);

View File

@ -1,43 +1,47 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file alias="DefaultTheme">default.css</file>
<qresource prefix="/themes">
<file alias="default">default.css</file>
</qresource>
<qresource prefix="/images">
<file alias="logo">icons/logo.svg</file>
<file alias="Exit">icons/off.svg</file>
<file alias="Open">icons/open-folder2.svg</file>
<file alias="Reopen">icons/reload-folder2.svg</file>
<file alias="Reload">icons/reload.svg</file>
<file alias="Expand">icons/expand.svg</file>
<file alias="Collapse">icons/collapse.svg</file>
<file alias="Color">icons/colors.svg</file>
<file alias="NoColor">icons/colors-black.svg</file>
<file alias="Save">icons/save.svg</file>
<file alias="Stats">icons/statistics.svg</file>
<file alias="Stats-off">icons/statistics2.svg</file>
<file alias="LAN">icons/lan.svg</file>
<file alias="LAN-on">icons/lan_on.svg</file>
<file alias="WiFi">icons/wifi.svg</file>
<file alias="WiFi-on">icons/wifi_on.svg</file>
<file alias="Connection">icons/lan.svg</file>
<file alias="Connection-on">icons/lan_on.svg</file>
<file alias="Start">icons/play.svg</file>
<file alias="Stop">icons/stop.svg</file>
<file alias="Delete">icons/delete.svg</file>
<file alias="List">icons/list.svg</file>
<file alias="Search-next">icons/search-next.svg</file>
<file alias="Search-prev">icons/search-prev.svg</file>
<file alias="Settings">icons/settings.svg</file>
<file alias="CheckIndicator">icons/check.svg</file>
<file alias="CheckIndicatorDisabled">icons/check-disabled.svg</file>
<file alias="RadioIndicator">icons/radio-indicator.svg</file>
<file alias="RadioIndicatorDisabled">icons/radio-indicator-disabled.svg</file>
<file alias="DockMaximizeWhite">icons/maximize-white.svg</file>
<file alias="DockMaximizeWhiteHover">icons/maximize-white-hover.svg</file>
<file alias="DockMaximizeWhitePressed">icons/maximize-white-pressed.svg</file>
<file alias="DockMinimizeWhite">icons/minimize-white.svg</file>
<file alias="DockMinimizeWhiteHover">icons/minimize-white-hover.svg</file>
<file alias="DockMinimizeWhitePressed">icons/minimize-white-pressed.svg</file>
<file alias="DockCloseWhite">icons/close-white.svg</file>
<file alias="DockCloseWhiteHover">icons/close-white-hover.svg</file>
<file alias="DockCloseWhitePressed">icons/close-white-pressed.svg</file>
<file alias="exit">icons/off.svg</file>
<file alias="open">icons/open-folder2.svg</file>
<file alias="reopen">icons/reload-folder2.svg</file>
<file alias="reload">icons/reload.svg</file>
<file alias="expand">icons/expand.svg</file>
<file alias="collapse">icons/collapse.svg</file>
<file alias="color">icons/colors.svg</file>
<file alias="no-color">icons/colors-black.svg</file>
<file alias="save">icons/save.svg</file>
<file alias="stats">icons/statistics.svg</file>
<file alias="stats-off">icons/statistics2.svg</file>
<file alias="lan">icons/lan.svg</file>
<file alias="lan-on">icons/lan_on.svg</file>
<file alias="wifi">icons/wifi.svg</file>
<file alias="wifi-on">icons/wifi_on.svg</file>
<file alias="connect">icons/lan.svg</file>
<file alias="connected">icons/lan_on.svg</file>
<file alias="start">icons/play.svg</file>
<file alias="stop">icons/stop.svg</file>
<file alias="delete">icons/delete.svg</file>
<file alias="list">icons/list.svg</file>
<file alias="find-next">icons/search-next.svg</file>
<file alias="find-prev">icons/search-prev.svg</file>
<file alias="settings">icons/settings.svg</file>
<file alias="check">icons/check.svg</file>
<file alias="check-disabled">icons/check-disabled.svg</file>
<file alias="radio-check">icons/radio-indicator.svg</file>
<file alias="radio-check-disabled">icons/radio-indicator-disabled.svg</file>
<file alias="dock-maximize-white">icons/maximize-white.svg</file>
<file alias="dock-maximize-white-hover">icons/maximize-white-hover.svg</file>
<file alias="dock-maximize-white-pressed">icons/maximize-white-pressed.svg</file>
<file alias="dock-minimize-white">icons/minimize-white.svg</file>
<file alias="dock-minimize-white-hover">icons/minimize-white-hover.svg</file>
<file alias="dock-minimize-white-pressed">icons/minimize-white-pressed.svg</file>
<file alias="dock-close-white">icons/close-white.svg</file>
<file alias="dock-close-white-hover">icons/close-white-hover.svg</file>
<file alias="dock-close-white-pressed">icons/close-white-pressed.svg</file>
<file alias="combo-arrow">icons/combo-arrow.svg</file>
<file alias="combo-arrow-disabled">icons/combo-arrow-disabled.svg</file>
</qresource>
</RCC>