0
0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-27 08:41:02 +08:00

(GUI) Added new icon (:/Stop), increased default icon size

This commit is contained in:
Victor Zarubkin 2016-12-18 19:16:21 +03:00
parent 6c403ae4ba
commit 829ca05e75
7 changed files with 61 additions and 1 deletions

View File

@ -1149,6 +1149,7 @@ EasyHierarchyWidget::EasyHierarchyWidget(QWidget* _parent) : Parent(_parent)
menu->addAction(a); menu->addAction(a);
auto tb = new QToolBar(this); auto tb = new QToolBar(this);
tb->setIconSize(::profiler_gui::ICONS_SIZE);
tb->setContentsMargins(0, 0, 0, 0); tb->setContentsMargins(0, 0, 0, 0);
tb->addAction(m_searchButton); tb->addAction(m_searchButton);
tb->addWidget(m_searchBox); tb->addWidget(m_searchBox);

View File

@ -732,6 +732,7 @@ EasyDescWidget::EasyDescWidget(QWidget* _parent) : Parent(_parent)
m_searchBox->setContentsMargins(5, 0, 0, 0); m_searchBox->setContentsMargins(5, 0, 0, 0);
auto tb = new QToolBar(this); 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(":/Reload"), tr("Refresh blocks list"));
refreshButton->setEnabled(EASY_GLOBALS.connected); refreshButton->setEnabled(EASY_GLOBALS.connected);
refreshButton->setToolTip(tr("Refresh blocks list.\nConnection needed.")); refreshButton->setToolTip(tr("Refresh blocks list.\nConnection needed."));

View File

@ -69,6 +69,7 @@ namespace profiler_gui {
const qreal SCALING_COEFFICIENT = 1.25; const qreal SCALING_COEFFICIENT = 1.25;
const qreal SCALING_COEFFICIENT_INV = 1.0 / SCALING_COEFFICIENT; const qreal SCALING_COEFFICIENT_INV = 1.0 / SCALING_COEFFICIENT;
const QSize ICONS_SIZE(28, 28);
const uint16_t GRAPHICS_ROW_SIZE = 18; const uint16_t GRAPHICS_ROW_SIZE = 18;
const uint16_t GRAPHICS_ROW_SPACING = 2; const uint16_t GRAPHICS_ROW_SPACING = 2;
const uint16_t GRAPHICS_ROW_SIZE_FULL = GRAPHICS_ROW_SIZE + GRAPHICS_ROW_SPACING; const uint16_t GRAPHICS_ROW_SIZE_FULL = GRAPHICS_ROW_SIZE + GRAPHICS_ROW_SPACING;

View File

@ -16,6 +16,7 @@ lan_on.svg - Icon made by Freepik from www.flaticon.com
wifi.svg - Icon made by Freepik from www.flaticon.com wifi.svg - Icon made by Freepik from www.flaticon.com
wifi_on.svg - Icon made by Freepik from www.flaticon.com wifi_on.svg - Icon made by Freepik from www.flaticon.com
play.svg - Icon made by Google from www.flaticon.com play.svg - Icon made by Google from www.flaticon.com
stop.svg - Icon made by Google from www.flaticon.com
delete.svg - Icon made by Freepik from www.flaticon.com delete.svg - Icon made by Freepik from www.flaticon.com
list.svg - Icon made by Freepik from www.flaticon.com list.svg - Icon made by Freepik from www.flaticon.com
search-prev.svg - Icon made by Freepik from www.flaticon.com search-prev.svg - Icon made by Freepik from www.flaticon.com

View File

@ -0,0 +1,43 @@
<?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="510px" height="510px" viewBox="0 0 510 510" style="enable-background:new 0 0 510 510;" xml:space="preserve">
<g>
<g id="pause-circle-outline">
<path style="fill:#f44336;" d="M178.5,357h-25.5V153h204V357z"/>
<path style="fill:#212121;" d="M255,0C114.75,0,0,114.75,0,255s114.75,255,255,255s255-114.75,255-255S395.25,0,255,0z
M255,459c-112.2,0-204-91.8-204-204S142.8,51,255,51s204,91.8,204,204S367.2,459,255,459z"/>
</g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 996 B

View File

@ -163,6 +163,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
auto toolbar = addToolBar("FileToolbar"); auto toolbar = addToolBar("FileToolbar");
toolbar->setIconSize(::profiler_gui::ICONS_SIZE);
toolbar->setObjectName("ProfilerGUI_FileToolbar"); toolbar->setObjectName("ProfilerGUI_FileToolbar");
toolbar->setContentsMargins(1, 0, 1, 0); toolbar->setContentsMargins(1, 0, 1, 0);
@ -189,6 +190,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
toolbar = addToolBar("ProfileToolbar"); toolbar = addToolBar("ProfileToolbar");
toolbar->setIconSize(::profiler_gui::ICONS_SIZE);
toolbar->setObjectName("ProfilerGUI_ProfileToolbar"); toolbar->setObjectName("ProfilerGUI_ProfileToolbar");
toolbar->setContentsMargins(1, 0, 1, 0); toolbar->setContentsMargins(1, 0, 1, 0);
@ -225,6 +227,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
toolbar = addToolBar("SetupToolbar"); toolbar = addToolBar("SetupToolbar");
toolbar->setIconSize(::profiler_gui::ICONS_SIZE);
toolbar->setObjectName("ProfilerGUI_SetupToolbar"); toolbar->setObjectName("ProfilerGUI_SetupToolbar");
toolbar->setContentsMargins(1, 0, 1, 0); toolbar->setContentsMargins(1, 0, 1, 0);
@ -493,6 +496,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_lastAddress("localhost"), m_lastP
auto tb_height = toolbar->height() + 4; auto tb_height = toolbar->height() + 4;
toolbar = addToolBar("FrameToolbar"); toolbar = addToolBar("FrameToolbar");
toolbar->setIconSize(::profiler_gui::ICONS_SIZE);
toolbar->setObjectName("ProfilerGUI_FrameToolbar"); toolbar->setObjectName("ProfilerGUI_FrameToolbar");
toolbar->setContentsMargins(1, 0, 1, 0); toolbar->setContentsMargins(1, 0, 1, 0);
toolbar->setMinimumHeight(tb_height); toolbar->setMinimumHeight(tb_height);
@ -1595,7 +1599,15 @@ void EasyMainWindow::onCaptureClicked(bool)
m_listenerTimer.start(250); m_listenerTimer.start(250);
m_listenerDialog = new QMessageBox(QMessageBox::Information, "Capturing frames...", "Close this dialog to stop capturing.", QMessageBox::NoButton, this); m_listenerDialog = new QMessageBox(QMessageBox::Information, "Capturing frames...", "Close this dialog to stop capturing.", QMessageBox::NoButton, this);
m_listenerDialog->addButton("Stop", QMessageBox::AcceptRole);
auto button = new QToolButton(m_listenerDialog);
button->setAutoRaise(true);
button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
button->setIconSize(::profiler_gui::ICONS_SIZE);
button->setIcon(QIcon(":/Stop"));
button->setText("Stop");
m_listenerDialog->addButton(button, QMessageBox::AcceptRole);
m_listenerDialog->setAttribute(Qt::WA_DeleteOnClose, true); m_listenerDialog->setAttribute(Qt::WA_DeleteOnClose, true);
connect(m_listenerDialog, &QDialog::finished, this, &This::onListenerDialogClose); connect(m_listenerDialog, &QDialog::finished, this, &This::onListenerDialogClose);
m_listenerDialog->show(); m_listenerDialog->show();

View File

@ -19,6 +19,7 @@
<file alias="Connection">icons/lan.svg</file> <file alias="Connection">icons/lan.svg</file>
<file alias="Connection-on">icons/lan_on.svg</file> <file alias="Connection-on">icons/lan_on.svg</file>
<file alias="Start">icons/play.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="Delete">icons/delete.svg</file>
<file alias="List">icons/list.svg</file> <file alias="List">icons/list.svg</file>
<file alias="Search-next">icons/search-next.svg</file> <file alias="Search-next">icons/search-next.svg</file>