From 0e97595b8c70db4eca3252fed14afa7a6b38c59f Mon Sep 17 00:00:00 2001 From: Nodir Temirkhodjaev Date: Thu, 28 Jan 2021 20:18:30 +0300 Subject: [PATCH] UI: Improve Graph/Statistics icons. --- src/ui/form/opt/pages/mainpage.cpp | 2 +- src/ui/form/opt/pages/statisticspage.cpp | 2 +- src/ui/fort-icons.qrc | 2 ++ src/ui/fort-images.qrc | 2 -- src/ui/fortmanager.cpp | 2 +- src/ui/icons/database.png | Bin 0 -> 715 bytes src/ui/icons/monitor.png | Bin 0 -> 563 bytes src/ui/images/chart_bar.png | Bin 541 -> 0 bytes src/ui/images/chart_line.png | Bin 526 -> 0 bytes 9 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 src/ui/icons/database.png create mode 100644 src/ui/icons/monitor.png delete mode 100644 src/ui/images/chart_bar.png delete mode 100644 src/ui/images/chart_line.png diff --git a/src/ui/form/opt/pages/mainpage.cpp b/src/ui/form/opt/pages/mainpage.cpp index 9a4f95fc..210b8f1e 100644 --- a/src/ui/form/opt/pages/mainpage.cpp +++ b/src/ui/form/opt/pages/mainpage.cpp @@ -56,7 +56,7 @@ void MainPage::setupUi() m_tabBar->addTab(m_optionsPage, QIcon(":/icons/cog.png"), QString()); m_tabBar->addTab(m_addressesPage, QIcon(":/icons/map-marker.png"), QString()); m_tabBar->addTab(m_applicationsPage, QIcon(":/icons/window-system.png"), QString()); - m_tabBar->addTab(m_statisticsPage, QIcon(":/images/chart_line.png"), QString()); + m_tabBar->addTab(m_statisticsPage, QIcon(":/icons/database.png"), QString()); m_tabBar->addTab(m_schedulePage, QIcon(":/icons/clock.png"), QString()); // Dialog butons diff --git a/src/ui/form/opt/pages/statisticspage.cpp b/src/ui/form/opt/pages/statisticspage.cpp index ebbc0ff4..35a5fc91 100644 --- a/src/ui/form/opt/pages/statisticspage.cpp +++ b/src/ui/form/opt/pages/statisticspage.cpp @@ -414,7 +414,7 @@ void StatisticsPage::setupGraphOptionsMenu() auto menu = ControlUtil::createMenuByLayout(layout, this); - m_btGraphOptions = new QPushButton(QIcon(":/images/chart_bar.png"), QString()); + m_btGraphOptions = new QPushButton(QIcon(":/icons/monitor.png"), QString()); m_btGraphOptions->setMenu(menu); } diff --git a/src/ui/fort-icons.qrc b/src/ui/fort-icons.qrc index ea5ed12e..769525c6 100644 --- a/src/ui/fort-icons.qrc +++ b/src/ui/fort-icons.qrc @@ -2,6 +2,7 @@ icons/clock.png icons/cog.png + icons/database.png icons/file-link.png icons/floppy.png icons/folder.png @@ -9,6 +10,7 @@ icons/globe.png icons/map-map-marker.png icons/map-marker.png + icons/monitor.png icons/pencil.png icons/puzzle.png icons/sign-add.png diff --git a/src/ui/fort-images.qrc b/src/ui/fort-images.qrc index 3d2f18c6..28b1bc54 100644 --- a/src/ui/fort-images.qrc +++ b/src/ui/fort-images.qrc @@ -1,8 +1,6 @@ images/application-window-96.png - images/chart_bar.png - images/chart_line.png images/computer-96.png images/control_fastforward.png images/control_play.png diff --git a/src/ui/fortmanager.cpp b/src/ui/fortmanager.cpp index 1c68df2a..dfecf780 100644 --- a/src/ui/fortmanager.cpp +++ b/src/ui/fortmanager.cpp @@ -764,7 +764,7 @@ void FortManager::createTrayMenu() menu, QIcon(":/icons/map-map-marker.png"), QString(), this, SLOT(showZonesWindow())); addHotKey(m_zonesAction, settings()->hotKeyZones(), hotKeyEnabled); - m_graphWindowAction = addAction(menu, QIcon(":/images/chart_bar.png"), QString(), this, + m_graphWindowAction = addAction(menu, QIcon(":/icons/monitor.png"), QString(), this, SLOT(switchGraphWindow()), true, (m_graphWindow != nullptr)); addHotKey(m_graphWindowAction, settings()->hotKeyGraph(), conf()->logStat()); diff --git a/src/ui/icons/database.png b/src/ui/icons/database.png new file mode 100644 index 0000000000000000000000000000000000000000..395cda5538d8164480d04f3033ecbf40e8232964 GIT binary patch literal 715 zcmV;+0yO=JP)c`L5IP?+$kIr&Z2E4P7PiOAm*@y(Ju6=sQh~5B5pQZdrTEy7nndzzbhYS1|ZLy1T z07xHn{7nep`RZO5<%bD%gaDOB9k$1>Dgx}LN4cT3&=pL;~re5iA5JaTY`!oo$snZ+G#yX@GT%S1h#`GVXsVG!s0{9XdDr-OzO?#90Z1|&KxnEVhV(UP zwJ6E($B+)7m-2>5-Z1+DJqfU!o}iG<4F)ix=`5I87R}d;XnOJhD>cT!?G*>NS6HdB zWC5yBuu|iEa}KecDpqP7RmA&rBHi=DSp-n>YLvV)l-6DxsqIC1+Ujc9_*LOvh5!`Z zW0psAYe_LGFj zW002ovPDHLkV1mBr B{R031 literal 0 HcmV?d00001 diff --git a/src/ui/images/chart_bar.png b/src/ui/images/chart_bar.png deleted file mode 100644 index 9051fbc609b92b15af9be410e368b7adc20283b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 541 zcmV+&0^V&qIn(Wzh!))n z^W^$!aM&X3bCX~Vo|JLOLCb!-`g!yN7b-yh!|sbVZ|M~fElQAyiB?lO%sjz z7TJ==TTk%_A{ znxkIa+E~RC#EKF{U0G~y<6)R9(uCp7&f7|JN}RHwEO@{EgbF~D3a1<@ip|9yZb^6$ fo@6A$W#9P^w2GuX0-m@}00000NkvXXu0mjfB69Bi diff --git a/src/ui/images/chart_line.png b/src/ui/images/chart_line.png deleted file mode 100644 index 85020f3205adc903896aae3ac8b2431d81d25a92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dKcP)vZ>%h3)%~ z#+IbJ;FFDG??-c+T_21rm1LV#4~LF)_b?ghyQZ9u#u#o3H=L6>&|AoXU?qv@1Je4>AlGSTjH9nQnv` zZj`d7z#wVmBfa>gsDTLdFI#`g-3Fu!5 z$Es7u?8}cWwJkZs2@EU)U|{|IH*L!Qck23oaHd4px(fwB|2_x$_YKg$rO1-+wT;%l zQ`7tXR!Mt3P6M2(&pepC=Hh>#e_xW77aS^%7ub~^eqd9yzkqI;iK+$w0LJvVLF}yV Q@Bjb+07*qoM6N<$f}^baNdN!<