UI: Update icons

This commit is contained in:
Nodir Temirkhodjaev 2021-12-24 14:45:07 +03:00
parent f8a7b5c20f
commit ce1640de2f
86 changed files with 104 additions and 104 deletions

View File

@ -26,8 +26,8 @@ void AppInfoRow::setupUi()
auto layout = new QHBoxLayout(); auto layout = new QHBoxLayout();
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
m_btAppCopyPath = ControlUtil::createLinkButton(":/icons/copy.png"); m_btAppCopyPath = ControlUtil::createLinkButton(":/icons/page_copy.png");
m_btAppOpenFolder = ControlUtil::createLinkButton(":/icons/folder-open.png"); m_btAppOpenFolder = ControlUtil::createLinkButton(":/icons/folder.png");
m_lineAppPath = ControlUtil::createLineLabel(); m_lineAppPath = ControlUtil::createLineLabel();

View File

@ -50,15 +50,15 @@ void TextArea2SplitterHandle::setupUi()
auto layout = new QBoxLayout(direction); auto layout = new QBoxLayout(direction);
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
m_btMoveAllFrom1To2 = ControlUtil::createSplitterButton(":/icons/arrow-join.png", m_btMoveAllFrom1To2 = ControlUtil::createSplitterButton(":/icons/control_fastforward.png",
[&] { TextAreaUtil::moveAllLines(textArea1(), textArea2()); }); [&] { TextAreaUtil::moveAllLines(textArea1(), textArea2()); });
m_btMoveSelectedFrom1To2 = ControlUtil::createSplitterButton(":/icons/arrow-curve.png", m_btMoveSelectedFrom1To2 = ControlUtil::createSplitterButton(":/icons/control_end.png",
[&] { TextAreaUtil::moveSelectedLines(textArea1(), textArea2()); }); [&] { TextAreaUtil::moveSelectedLines(textArea1(), textArea2()); });
m_btInterchangeAll = ControlUtil::createSplitterButton(":/icons/arrow-retweet.png", m_btInterchangeAll = ControlUtil::createSplitterButton(":/icons/control_repeat.png",
[&] { TextAreaUtil::interchangeAllLines(textArea1(), textArea2()); }); [&] { TextAreaUtil::interchangeAllLines(textArea1(), textArea2()); });
m_btMoveSelectedFrom2To1 = ControlUtil::createSplitterButton(":/icons/arrow-curve-180.png", m_btMoveSelectedFrom2To1 = ControlUtil::createSplitterButton(":/icons/control_start.png",
[&] { TextAreaUtil::moveSelectedLines(textArea2(), textArea1()); }); [&] { TextAreaUtil::moveSelectedLines(textArea2(), textArea1()); });
m_btMoveAllFrom2To1 = ControlUtil::createSplitterButton(":/icons/arrow-join-180.png", m_btMoveAllFrom2To1 = ControlUtil::createSplitterButton(":/icons/control_rewind.png",
[&] { TextAreaUtil::moveAllLines(textArea2(), textArea1()); }); [&] { TextAreaUtil::moveAllLines(textArea2(), textArea1()); });
m_buttonsLayout = new QBoxLayout(direction); m_buttonsLayout = new QBoxLayout(direction);

View File

@ -55,7 +55,7 @@ QLayout *AddressesColumn::setupZonesRow()
auto layout = new QHBoxLayout(); auto layout = new QHBoxLayout();
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
m_btSelectZones = ControlUtil::createButton(":/icons/map-map-marker.png"); m_btSelectZones = ControlUtil::createButton(":/icons/ip_class.png");
layout->addWidget(m_btSelectZones); layout->addWidget(m_btSelectZones);
m_labelZones = ControlUtil::createLabel(); m_labelZones = ControlUtil::createLabel();

View File

@ -99,8 +99,8 @@ void AddressesPage::setupUi()
m_tabBar->setShape(QTabBar::TriangularNorth); m_tabBar->setShape(QTabBar::TriangularNorth);
layout->addWidget(m_tabBar); layout->addWidget(m_tabBar);
m_tabBar->addTab(IconCache::icon(":/icons/globe.png"), QString()); m_tabBar->addTab(IconCache::icon(":/icons/global_telecom.png"), QString());
m_tabBar->addTab(IconCache::icon(":/icons/funnel.png"), QString()); m_tabBar->addTab(IconCache::icon(":/icons/filter.png"), QString());
// Address Columns // Address Columns
setupIncludeAddresses(); setupIncludeAddresses();
@ -203,7 +203,7 @@ void AddressesPage::setupSplitter()
void AddressesPage::setupSplitterButtons() void AddressesPage::setupSplitterButtons()
{ {
m_btAddLocals = ControlUtil::createSplitterButton(":/icons/home.png", [&] { m_btAddLocals = ControlUtil::createSplitterButton(":/icons/drive_network.png", [&] {
auto area = m_splitter->handle()->currentTextArea(); auto area = m_splitter->handle()->currentTextArea();
TextAreaUtil::appendText(area, localNetworks()); TextAreaUtil::appendText(area, localNetworks());
}); });

View File

@ -186,7 +186,7 @@ QLayout *ApplicationsPage::setupHeader()
void ApplicationsPage::setupAddGroup() void ApplicationsPage::setupAddGroup()
{ {
m_btAddGroup = ControlUtil::createButton(":/icons/sign-add.png", [&] { m_btAddGroup = ControlUtil::createButton(":/icons/add.png", [&] {
const auto text = m_editGroupName->text(); const auto text = m_editGroupName->text();
if (text.isEmpty()) { if (text.isEmpty()) {
m_editGroupName->setFocus(); m_editGroupName->setFocus();
@ -236,13 +236,13 @@ void ApplicationsPage::setupBlockAllowAll()
conf()->setAppBlockAll(checked); conf()->setAppBlockAll(checked);
ctrl()->setFlagsEdited(); ctrl()->setFlagsEdited();
}); });
m_cbBlockAll->setIcon(IconCache::icon(":/icons/sign-ban.png")); m_cbBlockAll->setIcon(IconCache::icon(":/icons/deny.png"));
m_cbAllowAll = ControlUtil::createCheckBox(conf()->appAllowAll(), [&](bool checked) { m_cbAllowAll = ControlUtil::createCheckBox(conf()->appAllowAll(), [&](bool checked) {
conf()->setAppAllowAll(checked); conf()->setAppAllowAll(checked);
ctrl()->setFlagsEdited(); ctrl()->setFlagsEdited();
}); });
m_cbAllowAll->setIcon(IconCache::icon(":/icons/sign-check.png")); m_cbAllowAll->setIcon(IconCache::icon(":/icons/accept.png"));
const auto refreshBlockAllowAllEnabled = [&] { const auto refreshBlockAllowAllEnabled = [&] {
const bool blockAll = m_cbBlockAll->isChecked(); const bool blockAll = m_cbBlockAll->isChecked();
@ -384,7 +384,7 @@ void ApplicationsPage::setupGroupOptions()
auto menu = ControlUtil::createMenuByLayout(layout, this); auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btGroupOptions = ControlUtil::createButton(":/icons/wrench.png"); m_btGroupOptions = ControlUtil::createButton(":/icons/gear_in.png");
m_btGroupOptions->setMenu(menu); m_btGroupOptions->setMenu(menu);
} }
@ -483,7 +483,7 @@ void ApplicationsPage::setupGroupOptionsEnabled()
void ApplicationsPage::setupBlockApps() void ApplicationsPage::setupBlockApps()
{ {
m_blockApps = new AppsColumn(); m_blockApps = new AppsColumn();
m_blockApps->icon()->setPixmap(IconCache::file(":/icons/sign-ban.png")); m_blockApps->icon()->setPixmap(IconCache::file(":/icons/deny.png"));
connect(m_blockApps->editText(), &QPlainTextEdit::textChanged, this, [&] { connect(m_blockApps->editText(), &QPlainTextEdit::textChanged, this, [&] {
const auto text = m_blockApps->editText()->toPlainText(); const auto text = m_blockApps->editText()->toPlainText();
@ -500,7 +500,7 @@ void ApplicationsPage::setupBlockApps()
void ApplicationsPage::setupAllowApps() void ApplicationsPage::setupAllowApps()
{ {
m_allowApps = new AppsColumn(); m_allowApps = new AppsColumn();
m_allowApps->icon()->setPixmap(IconCache::file(":/icons/sign-check.png")); m_allowApps->icon()->setPixmap(IconCache::file(":/icons/accept.png"));
connect(m_allowApps->editText(), &QPlainTextEdit::textChanged, this, [&] { connect(m_allowApps->editText(), &QPlainTextEdit::textChanged, this, [&] {
const auto text = m_allowApps->editText()->toPlainText(); const auto text = m_allowApps->editText()->toPlainText();
@ -532,7 +532,7 @@ void ApplicationsPage::setupSplitter()
void ApplicationsPage::setupSplitterButtons() void ApplicationsPage::setupSplitterButtons()
{ {
m_btSelectFile = ControlUtil::createSplitterButton(":/icons/folder-open.png", [&] { m_btSelectFile = ControlUtil::createSplitterButton(":/icons/folder.png", [&] {
const auto filePaths = DialogUtil::getOpenFileNames( const auto filePaths = DialogUtil::getOpenFileNames(
m_btSelectFile->text(), tr("Programs (*.exe);;All files (*.*)")); m_btSelectFile->text(), tr("Programs (*.exe);;All files (*.*)"));

View File

@ -431,7 +431,7 @@ void OptionsPage::setupEditPassword()
void OptionsPage::setupPasswordLock() void OptionsPage::setupPasswordLock()
{ {
m_btPasswordLock = ControlUtil::createFlatButton(":/icons/lock-open.png", [&] { m_btPasswordLock = ControlUtil::createFlatButton(":/icons/lock_open.png", [&] {
settings()->resetCheckedPassword(); settings()->resetCheckedPassword();
m_btPasswordLock->hide(); m_btPasswordLock->hide();
}); });
@ -570,7 +570,7 @@ void OptionsPage::setupDriverIcon()
m_iconDriver = ControlUtil::createLabel(); m_iconDriver = ControlUtil::createLabel();
m_iconDriver->setScaledContents(true); m_iconDriver->setScaledContents(true);
m_iconDriver->setMaximumSize(16, 16); m_iconDriver->setMaximumSize(16, 16);
m_iconDriver->setPixmap(IconCache::file(":/icons/puzzle.png")); m_iconDriver->setPixmap(IconCache::file(":/icons/server_components.png"));
const auto refreshDriverInfo = [&] { const auto refreshDriverInfo = [&] {
m_iconDriver->setEnabled(driverManager()->isDeviceOpened()); m_iconDriver->setEnabled(driverManager()->isDeviceOpened());
@ -599,7 +599,7 @@ void OptionsPage::setupNewVersionBox()
colLayout->addWidget(m_labelNewVersion); colLayout->addWidget(m_labelNewVersion);
// Button // Button
m_btNewVersion = ControlUtil::createLinkButton(":/icons/download.png"); m_btNewVersion = ControlUtil::createLinkButton(":/icons/download_for_windows.png");
connect(m_btNewVersion, &QAbstractButton::clicked, this, &OptionsPage::onLinkClicked); connect(m_btNewVersion, &QAbstractButton::clicked, this, &OptionsPage::onLinkClicked);

View File

@ -74,16 +74,16 @@ void OptMainPage::setupTabBar()
m_tabBar = new QTabWidget(); m_tabBar = new QTabWidget();
m_tabBar->addTab(optionsPage, IconCache::icon(":/icons/cog.png"), QString()); m_tabBar->addTab(optionsPage, IconCache::icon(":/icons/cog.png"), QString());
m_tabBar->addTab(addressesPage, IconCache::icon(":/icons/map-marker.png"), QString()); m_tabBar->addTab(addressesPage, IconCache::icon(":/icons/ip.png"), QString());
m_tabBar->addTab(rulesPage, IconCache::icon(":/icons/task-list.png"), QString()); m_tabBar->addTab(rulesPage, IconCache::icon(":/icons/source_code.png"), QString());
m_tabBar->addTab(applicationsPage, IconCache::icon(":/icons/window-list.png"), QString()); m_tabBar->addTab(
applicationsPage, IconCache::icon(":/icons/application_double.png"), QString());
m_tabBar->addTab(servicesPage, IconCache::icon(":/icons/windows-48.png"), QString()); m_tabBar->addTab(servicesPage, IconCache::icon(":/icons/windows-48.png"), QString());
m_tabBar->addTab(statisticsPage, IconCache::icon(":/icons/chart-bar.png"), QString()); m_tabBar->addTab(statisticsPage, IconCache::icon(":/icons/chart_bar.png"), QString());
m_tabBar->addTab(schedulePage, IconCache::icon(":/icons/clock.png"), QString()); m_tabBar->addTab(schedulePage, IconCache::icon(":/icons/clock.png"), QString());
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
m_tabBar->setTabVisible(2, false); // TODO: Impl. Network Rules m_tabBar->setTabVisible(2, false); // TODO: Impl. Network Rules
m_tabBar->setTabVisible(4, false); // TODO: Impl. Services
#endif #endif
} }
@ -91,10 +91,10 @@ QLayout *OptMainPage::setupDialogButtons()
{ {
auto buttonsLayout = new QHBoxLayout(); auto buttonsLayout = new QHBoxLayout();
m_btLogs = ControlUtil::createLinkButton(":/icons/folder-open.png", settings()->logsPath()); m_btLogs = ControlUtil::createLinkButton(":/icons/folder.png", settings()->logsPath());
m_btProfile = m_btProfile =
ControlUtil::createLinkButton(":/icons/folder-open.png", settings()->profilePath()); ControlUtil::createLinkButton(":/icons/folder.png", settings()->profilePath());
m_btStat = ControlUtil::createLinkButton(":/icons/folder-open.png", settings()->statPath()); m_btStat = ControlUtil::createLinkButton(":/icons/folder.png", settings()->statPath());
m_btReleases = ControlUtil::createLinkButton(":/icons/github.png", APP_UPDATES_URL); m_btReleases = ControlUtil::createLinkButton(":/icons/github.png", APP_UPDATES_URL);
connect(m_btLogs, &QAbstractButton::clicked, this, &OptMainPage::onLinkClicked); connect(m_btLogs, &QAbstractButton::clicked, this, &OptMainPage::onLinkClicked);

View File

@ -127,10 +127,10 @@ void SchedulePage::setupTaskDetails()
setupTaskInterval(); setupTaskInterval();
m_btTaskRun = ControlUtil::createButton( m_btTaskRun = ControlUtil::createButton(":/icons/arrow_refresh_small.png",
":/icons/sign-sync.png", [&] { taskManager()->runTask(currentTaskInfo()->type()); }); [&] { taskManager()->runTask(currentTaskInfo()->type()); });
m_btTaskAbort = ControlUtil::createButton( m_btTaskAbort = ControlUtil::createButton(
":/icons/sign-error.png", [&] { taskManager()->abortTask(currentTaskInfo()->type()); }); ":/icons/cancel.png", [&] { taskManager()->abortTask(currentTaskInfo()->type()); });
layout->addWidget(m_cscTaskInterval, 1); layout->addWidget(m_cscTaskInterval, 1);
layout->addWidget(m_btTaskRun); layout->addWidget(m_btTaskRun);

View File

@ -97,7 +97,7 @@ void ServicesPage::setupOptions()
auto menu = ControlUtil::createMenuByLayout(layout, this); auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btOptions = ControlUtil::createButton(":/icons/wrench.png"); m_btOptions = ControlUtil::createButton(":/icons/gear_in.png");
m_btOptions->setMenu(menu); m_btOptions->setMenu(menu);
} }

View File

@ -236,7 +236,7 @@ QLayout *ProgramEditDialog::setupAppPathLayout()
m_editPath = new QLineEdit(); m_editPath = new QLineEdit();
m_editPath->setMaxLength(1024); m_editPath->setMaxLength(1024);
m_btSelectFile = ControlUtil::createFlatButton(":/icons/folder-open.png", [&] { m_btSelectFile = ControlUtil::createFlatButton(":/icons/folder.png", [&] {
const auto filePath = DialogUtil::getOpenFileName( const auto filePath = DialogUtil::getOpenFileName(
m_labelEditPath->text(), tr("Programs (*.exe);;All files (*.*)")); m_labelEditPath->text(), tr("Programs (*.exe);;All files (*.*)"));
@ -267,7 +267,7 @@ QLayout *ProgramEditDialog::setupAppNameLayout()
m_editName->setText(appName); m_editName->setText(appName);
}; };
m_btGetName = ControlUtil::createFlatButton(":/icons/sign-sync.png", updateAppName); m_btGetName = ControlUtil::createFlatButton(":/icons/arrow_refresh_small.png", updateAppName);
layout->addWidget(m_editName); layout->addWidget(m_editName);
layout->addWidget(m_btGetName); layout->addWidget(m_btGetName);
@ -299,11 +299,11 @@ QLayout *ProgramEditDialog::setupAllowLayout()
allowLayout->setSpacing(20); allowLayout->setSpacing(20);
m_rbAllowApp = new QRadioButton(); m_rbAllowApp = new QRadioButton();
m_rbAllowApp->setIcon(IconCache::icon(":/icons/sign-check.png")); m_rbAllowApp->setIcon(IconCache::icon(":/icons/accept.png"));
m_rbAllowApp->setChecked(true); m_rbAllowApp->setChecked(true);
m_rbBlockApp = new QRadioButton(); m_rbBlockApp = new QRadioButton();
m_rbBlockApp->setIcon(IconCache::icon(":/icons/sign-ban.png")); m_rbBlockApp->setIcon(IconCache::icon(":/icons/deny.png"));
allowLayout->addWidget(m_rbAllowApp, 1, Qt::AlignRight); allowLayout->addWidget(m_rbAllowApp, 1, Qt::AlignRight);
allowLayout->addWidget(m_rbBlockApp, 1, Qt::AlignLeft); allowLayout->addWidget(m_rbBlockApp, 1, Qt::AlignLeft);

View File

@ -164,7 +164,7 @@ void ProgramsWindow::setupUi()
this->setFont(WindowManager::defaultFont()); this->setFont(WindowManager::defaultFont());
// Icon // Icon
this->setWindowIcon(GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/window.png")); this->setWindowIcon(GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/application.png"));
// Size // Size
this->setMinimumSize(500, 400); this->setMinimumSize(500, 400);
@ -177,26 +177,26 @@ QLayout *ProgramsWindow::setupHeader()
// Edit Menu // Edit Menu
auto editMenu = new QMenu(this); auto editMenu = new QMenu(this);
m_actAllowApp = editMenu->addAction(IconCache::icon(":/icons/sign-check.png"), QString()); m_actAllowApp = editMenu->addAction(IconCache::icon(":/icons/accept.png"), QString());
m_actAllowApp->setShortcut(Qt::Key_A); m_actAllowApp->setShortcut(Qt::Key_A);
m_actBlockApp = editMenu->addAction(IconCache::icon(":/icons/sign-ban.png"), QString()); m_actBlockApp = editMenu->addAction(IconCache::icon(":/icons/deny.png"), QString());
m_actBlockApp->setShortcut(Qt::Key_B); m_actBlockApp->setShortcut(Qt::Key_B);
editMenu->addSeparator(); editMenu->addSeparator();
m_actAddApp = editMenu->addAction(IconCache::icon(":/icons/sign-add.png"), QString()); m_actAddApp = editMenu->addAction(IconCache::icon(":/icons/add.png"), QString());
m_actAddApp->setShortcut(Qt::Key_Plus); m_actAddApp->setShortcut(Qt::Key_Plus);
m_actEditApp = editMenu->addAction(IconCache::icon(":/icons/pencil.png"), QString()); m_actEditApp = editMenu->addAction(IconCache::icon(":/icons/pencil.png"), QString());
m_actEditApp->setShortcut(Qt::Key_Enter); m_actEditApp->setShortcut(Qt::Key_Enter);
m_actRemoveApp = editMenu->addAction(IconCache::icon(":/icons/sign-delete.png"), QString()); m_actRemoveApp = editMenu->addAction(IconCache::icon(":/icons/delete.png"), QString());
m_actRemoveApp->setShortcut(Qt::Key_Delete); m_actRemoveApp->setShortcut(Qt::Key_Delete);
editMenu->addSeparator(); editMenu->addSeparator();
m_actPurgeApps = editMenu->addAction(IconCache::icon(":/icons/trashcan-full.png"), QString()); m_actPurgeApps = editMenu->addAction(IconCache::icon(":/icons/bin_closed.png"), QString());
connect(m_actAllowApp, &QAction::triggered, this, [&] { updateSelectedApps(false); }); connect(m_actAllowApp, &QAction::triggered, this, [&] { updateSelectedApps(false); });
connect(m_actBlockApp, &QAction::triggered, this, [&] { updateSelectedApps(true); }); connect(m_actBlockApp, &QAction::triggered, this, [&] { updateSelectedApps(true); });
@ -218,9 +218,9 @@ QLayout *ProgramsWindow::setupHeader()
m_btEdit->setMenu(editMenu); m_btEdit->setMenu(editMenu);
// Toolbar buttons // Toolbar buttons
m_btAllowApp = ControlUtil::createLinkButton(":/icons/sign-check.png"); m_btAllowApp = ControlUtil::createLinkButton(":/icons/accept.png");
m_btBlockApp = ControlUtil::createLinkButton(":/icons/sign-ban.png"); m_btBlockApp = ControlUtil::createLinkButton(":/icons/deny.png");
m_btRemoveApp = ControlUtil::createLinkButton(":/icons/sign-delete.png"); m_btRemoveApp = ControlUtil::createLinkButton(":/icons/delete.png");
connect(m_btAllowApp, &QAbstractButton::clicked, m_actAllowApp, &QAction::trigger); connect(m_btAllowApp, &QAbstractButton::clicked, m_actAllowApp, &QAction::trigger);
connect(m_btBlockApp, &QAbstractButton::clicked, m_actBlockApp, &QAction::trigger); connect(m_btBlockApp, &QAbstractButton::clicked, m_actBlockApp, &QAction::trigger);
@ -251,7 +251,7 @@ void ProgramsWindow::setupLogOptions()
auto menu = ControlUtil::createMenuByLayout(layout, this); auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btLogOptions = ControlUtil::createButton(":/icons/wrench.png"); m_btLogOptions = ControlUtil::createButton(":/icons/gear_in.png");
m_btLogOptions->setMenu(menu); m_btLogOptions->setMenu(menu);
} }

View File

@ -105,16 +105,16 @@ QLayout *ConnectionsPage::setupHeader()
// Edit Menu // Edit Menu
auto editMenu = new QMenu(this); auto editMenu = new QMenu(this);
m_actCopy = editMenu->addAction(IconCache::icon(":/icons/copy.png"), QString()); m_actCopy = editMenu->addAction(IconCache::icon(":/icons/page_copy.png"), QString());
m_actCopy->setShortcut(Qt::Key_Copy); m_actCopy->setShortcut(Qt::Key_Copy);
m_actAddProgram = editMenu->addAction(IconCache::icon(":/icons/window.png"), QString()); m_actAddProgram = editMenu->addAction(IconCache::icon(":/icons/application.png"), QString());
m_actAddProgram->setShortcut(Qt::Key_Insert); m_actAddProgram->setShortcut(Qt::Key_Insert);
m_actRemoveConn = editMenu->addAction(IconCache::icon(":/icons/sign-delete.png"), QString()); m_actRemoveConn = editMenu->addAction(IconCache::icon(":/icons/delete.png"), QString());
m_actRemoveConn->setShortcut(Qt::Key_Delete); m_actRemoveConn->setShortcut(Qt::Key_Delete);
m_actClearAll = editMenu->addAction(IconCache::icon(":/icons/trashcan-full.png"), QString()); m_actClearAll = editMenu->addAction(IconCache::icon(":/icons/bin_closed.png"), QString());
connect(m_actCopy, &QAction::triggered, this, connect(m_actCopy, &QAction::triggered, this,
[&] { GuiUtil::setClipboardData(m_connListView->selectedText()); }); [&] { GuiUtil::setClipboardData(m_connListView->selectedText()); });
@ -160,7 +160,7 @@ void ConnectionsPage::setupOptions()
auto menu = ControlUtil::createMenuByLayout(layout, this); auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btOptions = ControlUtil::createButton(":/icons/wrench.png"); m_btOptions = ControlUtil::createButton(":/icons/gear_in.png");
m_btOptions->setMenu(menu); m_btOptions->setMenu(menu);
} }

View File

@ -41,6 +41,6 @@ void StatMainPage::setupTabBar()
auto connectionsPage = new ConnectionsPage(ctrl()); auto connectionsPage = new ConnectionsPage(ctrl());
m_tabBar = new QTabWidget(); m_tabBar = new QTabWidget();
m_tabBar->addTab(statisticsPage, IconCache::icon(":/icons/chart-bar.png"), QString()); m_tabBar->addTab(statisticsPage, IconCache::icon(":/icons/chart_bar.png"), QString());
m_tabBar->addTab(connectionsPage, IconCache::icon(":/icons/connect.png"), QString()); m_tabBar->addTab(connectionsPage, IconCache::icon(":/icons/connect.png"), QString());
} }

View File

@ -135,8 +135,8 @@ QLayout *TrafficPage::setupHeader()
{ {
auto layout = new QHBoxLayout(); auto layout = new QHBoxLayout();
m_btRefresh = m_btRefresh = ControlUtil::createButton(
ControlUtil::createButton(":/icons/sign-sync.png", [&] { trafListModel()->reset(); }); ":/icons/arrow_refresh_small.png", [&] { trafListModel()->reset(); });
setupClearMenu(); setupClearMenu();
setupTrafUnits(); setupTrafUnits();
@ -155,7 +155,7 @@ void TrafficPage::setupClearMenu()
{ {
auto menu = new QMenu(this); auto menu = new QMenu(this);
m_actRemoveApp = menu->addAction(IconCache::icon(":/icons/sign-delete.png"), QString()); m_actRemoveApp = menu->addAction(IconCache::icon(":/icons/delete.png"), QString());
m_actRemoveApp->setShortcut(Qt::Key_Delete); m_actRemoveApp->setShortcut(Qt::Key_Delete);
m_actResetTotal = menu->addAction(QString()); m_actResetTotal = menu->addAction(QString());
@ -183,7 +183,7 @@ void TrafficPage::setupClearMenu()
trafListModel()->clear(); trafListModel()->clear();
}); });
m_btClear = ControlUtil::createButton(":/icons/trashcan-full.png"); m_btClear = ControlUtil::createButton(":/icons/bin_closed.png");
m_btClear->setMenu(menu); m_btClear->setMenu(menu);
} }

View File

@ -81,7 +81,7 @@ void StatisticsWindow::setupUi()
this->setFont(WindowManager::defaultFont()); this->setFont(WindowManager::defaultFont());
// Icon // Icon
this->setWindowIcon(GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/chart-bar.png")); this->setWindowIcon(GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/chart_bar.png"));
// Size // Size
this->setMinimumSize(500, 400); this->setMinimumSize(500, 400);

View File

@ -133,7 +133,7 @@ void TrayIcon::onTrayActivated(QSystemTrayIcon::ActivationReason reason)
void TrayIcon::updateTrayIcon(bool alerted) void TrayIcon::updateTrayIcon(bool alerted)
{ {
const auto icon = alerted const auto icon = alerted
? GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/sign-warning.png") ? GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/error.png")
: IconCache::icon(":/icons/sheild-96.png"); : IconCache::icon(":/icons/sheild-96.png");
this->setIcon(icon); this->setIcon(icon);
@ -199,7 +199,7 @@ void TrayIcon::setupTrayMenu()
{ {
m_menu = new QMenu(); m_menu = new QMenu();
m_programsAction = addAction(m_menu, IconCache::icon(":/icons/window.png"), QString(), m_programsAction = addAction(m_menu, IconCache::icon(":/icons/application.png"), QString(),
windowManager(), SLOT(showProgramsWindow())); windowManager(), SLOT(showProgramsWindow()));
addHotKey(m_programsAction, iniUser()->hotKeyPrograms()); addHotKey(m_programsAction, iniUser()->hotKeyPrograms());
@ -207,15 +207,15 @@ void TrayIcon::setupTrayMenu()
windowManager(), SLOT(showOptionsWindow())); windowManager(), SLOT(showOptionsWindow()));
addHotKey(m_optionsAction, iniUser()->hotKeyOptions()); addHotKey(m_optionsAction, iniUser()->hotKeyOptions());
m_statisticsAction = addAction(m_menu, IconCache::icon(":/icons/chart-bar.png"), QString(), m_statisticsAction = addAction(m_menu, IconCache::icon(":/icons/chart_bar.png"), QString(),
windowManager(), SLOT(showStatisticsWindow())); windowManager(), SLOT(showStatisticsWindow()));
addHotKey(m_statisticsAction, iniUser()->hotKeyStatistics()); addHotKey(m_statisticsAction, iniUser()->hotKeyStatistics());
m_graphAction = addAction(m_menu, IconCache::icon(":/icons/line-graph.png"), QString(), m_graphAction = addAction(m_menu, IconCache::icon(":/icons/action_log.png"), QString(),
windowManager(), SLOT(switchGraphWindow()), true, !!windowManager()->graphWindow()); windowManager(), SLOT(switchGraphWindow()), true, !!windowManager()->graphWindow());
addHotKey(m_graphAction, iniUser()->hotKeyGraph()); addHotKey(m_graphAction, iniUser()->hotKeyGraph());
m_zonesAction = addAction(m_menu, IconCache::icon(":/icons/map-map-marker.png"), QString(), m_zonesAction = addAction(m_menu, IconCache::icon(":/icons/ip_class.png"), QString(),
windowManager(), SLOT(showZonesWindow())); windowManager(), SLOT(showZonesWindow()));
addHotKey(m_zonesAction, iniUser()->hotKeyZones()); addHotKey(m_zonesAction, iniUser()->hotKeyZones());

View File

@ -167,7 +167,7 @@ void ZonesWindow::setupUi()
// Icon // Icon
this->setWindowIcon( this->setWindowIcon(
GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/map-map-marker.png")); GuiUtil::overlayIcon(":/icons/sheild-96.png", ":/icons/ip_class.png"));
// Size // Size
this->setMinimumSize(500, 400); this->setMinimumSize(500, 400);
@ -276,13 +276,13 @@ QLayout *ZonesWindow::setupHeader()
// Edit Menu // Edit Menu
auto editMenu = new QMenu(this); auto editMenu = new QMenu(this);
m_actAddZone = editMenu->addAction(IconCache::icon(":/icons/sign-add.png"), QString()); m_actAddZone = editMenu->addAction(IconCache::icon(":/icons/add.png"), QString());
m_actAddZone->setShortcut(Qt::Key_Plus); m_actAddZone->setShortcut(Qt::Key_Plus);
m_actEditZone = editMenu->addAction(IconCache::icon(":/icons/pencil.png"), QString()); m_actEditZone = editMenu->addAction(IconCache::icon(":/icons/pencil.png"), QString());
m_actEditZone->setShortcut(Qt::Key_Enter); m_actEditZone->setShortcut(Qt::Key_Enter);
m_actRemoveZone = editMenu->addAction(IconCache::icon(":/icons/sign-delete.png"), QString()); m_actRemoveZone = editMenu->addAction(IconCache::icon(":/icons/delete.png"), QString());
m_actRemoveZone->setShortcut(Qt::Key_Delete); m_actRemoveZone->setShortcut(Qt::Key_Delete);
connect(m_actAddZone, &QAction::triggered, this, [&] { updateZoneEditForm(false); }); connect(m_actAddZone, &QAction::triggered, this, [&] { updateZoneEditForm(false); });
@ -297,7 +297,7 @@ QLayout *ZonesWindow::setupHeader()
m_btEdit->setMenu(editMenu); m_btEdit->setMenu(editMenu);
// Save As Text // Save As Text
m_btSaveAsText = ControlUtil::createButton(":/icons/floppy.png", [&] { m_btSaveAsText = ControlUtil::createButton(":/icons/save_as.png", [&] {
const auto filePath = DialogUtil::getSaveFileName( const auto filePath = DialogUtil::getSaveFileName(
m_btSaveAsText->text(), tr("Text files (*.txt);;All files (*.*)")); m_btSaveAsText->text(), tr("Text files (*.txt);;All files (*.*)"));

View File

@ -1,44 +1,44 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource> <qresource>
<file>icons/accept.png</file>
<file>icons/action_log.png</file>
<file>icons/add.png</file>
<file>icons/application.png</file>
<file>icons/application-window-96.png</file> <file>icons/application-window-96.png</file>
<file>icons/arrow-curve.png</file> <file>icons/application_double.png</file>
<file>icons/arrow-curve-180.png</file> <file>icons/arrow_refresh_small.png</file>
<file>icons/arrow-join.png</file> <file>icons/bin_closed.png</file>
<file>icons/arrow-join-180.png</file> <file>icons/cancel.png</file>
<file>icons/arrow-retweet.png</file> <file>icons/chart_bar.png</file>
<file>icons/chart-bar.png</file>
<file>icons/clock.png</file> <file>icons/clock.png</file>
<file>icons/cog.png</file> <file>icons/cog.png</file>
<file>icons/computer-96.png</file> <file>icons/computer-96.png</file>
<file>icons/connect.png</file> <file>icons/connect.png</file>
<file>icons/copy.png</file> <file>icons/control_end.png</file>
<file>icons/download.png</file> <file>icons/control_fastforward.png</file>
<file>icons/floppy.png</file> <file>icons/control_repeat.png</file>
<file>icons/folder-open.png</file> <file>icons/control_rewind.png</file>
<file>icons/funnel.png</file> <file>icons/control_start.png</file>
<file>icons/delete.png</file>
<file>icons/deny.png</file>
<file>icons/drive_network.png</file>
<file>icons/download_for_windows.png</file>
<file>icons/error.png</file>
<file>icons/filter.png</file>
<file>icons/folder.png</file>
<file>icons/gear_in.png</file>
<file>icons/github.png</file> <file>icons/github.png</file>
<file>icons/globe.png</file> <file>icons/global_telecom.png</file>
<file>icons/home.png</file> <file>icons/ip.png</file>
<file>icons/ip_class.png</file>
<file>icons/key.png</file> <file>icons/key.png</file>
<file>icons/line-graph.png</file> <file>icons/lock_open.png</file>
<file>icons/lock-open.png</file> <file>icons/page_copy.png</file>
<file>icons/map-map-marker.png</file>
<file>icons/map-marker.png</file>
<file>icons/pencil.png</file> <file>icons/pencil.png</file>
<file>icons/puzzle.png</file>
<file>icons/sheild-96.png</file> <file>icons/sheild-96.png</file>
<file>icons/sign-add.png</file> <file>icons/save_as.png</file>
<file>icons/sign-ban.png</file> <file>icons/server_components.png</file>
<file>icons/sign-check.png</file> <file>icons/source_code.png</file>
<file>icons/sign-delete.png</file>
<file>icons/sign-error.png</file>
<file>icons/sign-sync.png</file>
<file>icons/sign-warning.png</file>
<file>icons/task-list.png</file>
<file>icons/trashcan-full.png</file>
<file>icons/window.png</file>
<file>icons/window-list.png</file>
<file>icons/windows-48.png</file> <file>icons/windows-48.png</file>
<file>icons/wrench.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
src/ui/icons/accept.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/ui/icons/action_log.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/ui/icons/add.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 782 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 874 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 929 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1019 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/ui/icons/bin_closed.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/ui/icons/cancel.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 801 B

BIN
src/ui/icons/chart_bar.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 638 B

BIN
src/ui/icons/delete.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/ui/icons/deny.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 855 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/ui/icons/error.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/ui/icons/filter.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

BIN
src/ui/icons/folder.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 440 B

BIN
src/ui/icons/gear_in.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/ui/icons/ip.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 937 B

BIN
src/ui/icons/ip_class.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 657 B

BIN
src/ui/icons/lock_open.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 999 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 762 B

BIN
src/ui/icons/page_copy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 621 B

After

Width:  |  Height:  |  Size: 857 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 802 B

BIN
src/ui/icons/save_as.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 908 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 667 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 868 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 983 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 555 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 666 B

View File

@ -256,7 +256,7 @@ QColor AppListModel::appStateColor(const AppRow &appRow)
QIcon AppListModel::appStateIcon(const AppRow &appRow) QIcon AppListModel::appStateIcon(const AppRow &appRow)
{ {
return IconCache::icon(appRow.blocked ? ":/icons/sign-ban.png" : ":/icons/sign-check.png"); return IconCache::icon(appRow.blocked ? ":/icons/deny.png" : ":/icons/accept.png");
} }
QIcon AppListModel::appEndTimeIcon(const AppRow &appRow) QIcon AppListModel::appEndTimeIcon(const AppRow &appRow)

View File

@ -195,20 +195,20 @@ QString ConnListModel::connIconPath(const ConnRow &connRow)
if (connRow.blocked) { if (connRow.blocked) {
switch (connRow.blockReason) { switch (connRow.blockReason) {
case LogEntryBlockedIp::ReasonIpInet: case LogEntryBlockedIp::ReasonIpInet:
return ":/icons/map-marker.png"; return ":/icons/ip.png";
case LogEntryBlockedIp::ReasonReauth: case LogEntryBlockedIp::ReasonReauth:
return ":/icons/sign-sync.png"; return ":/icons/arrow_refresh_small.png";
case LogEntryBlockedIp::ReasonProgram: case LogEntryBlockedIp::ReasonProgram:
return ":/icons/window.png"; return ":/icons/application.png";
case LogEntryBlockedIp::ReasonAppGroupFound: case LogEntryBlockedIp::ReasonAppGroupFound:
return ":/icons/window-list.png"; return ":/icons/application_double.png";
case LogEntryBlockedIp::ReasonAppGroupDefault: case LogEntryBlockedIp::ReasonAppGroupDefault:
default: default:
return ":/icons/sign-ban.png"; return ":/icons/deny.png";
} }
} }
return ":/icons/sign-check.png"; return ":/icons/accept.png";
} }
void ConnListModel::deleteConn(qint64 rowIdTo, bool blocked) void ConnListModel::deleteConn(qint64 rowIdTo, bool blocked)