mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 08:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Remove not needed controls/WideButton.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2020-08-20 11:47:43 +03:00
parent c3e880c724
commit bc73c42384
8 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/FortFirewall.pro
View File

@ -31,7 +31,6 @@ SOURCES += \
form/controls/tableview.cpp \
form/controls/textarea2splitter.cpp \
form/controls/textarea2splitterhandle.cpp \
form/controls/widebutton.cpp \
form/graph/axistickerspeed.cpp \
form/graph/graphplot.cpp \
form/graph/graphwindow.cpp \
@ -143,7 +142,6 @@ HEADERS += \
form/controls/tableview.h \
form/controls/textarea2splitter.h \
form/controls/textarea2splitterhandle.h \
form/controls/widebutton.h \
form/graph/axistickerspeed.h \
form/graph/graphplot.h \
form/graph/graphwindow.h \

18
src/ui/form/controls/widebutton.cpp
View File

@ -1,18 +0,0 @@
#include "widebutton.h"
WideButton::WideButton(QWidget *parent) :
QPushButton(parent)
{
}
WideButton::WideButton(const QIcon &icon, const QString &text, QWidget *parent) :
QPushButton(icon, text, parent)
{
}
QSize WideButton::minimumSizeHint() const
{
auto size = QPushButton::minimumSizeHint();
size.setWidth(size.width() + 3);
return size;
}

18
src/ui/form/controls/widebutton.h
View File

@ -1,18 +0,0 @@
#ifndef WIDEBUTTON_H
#define WIDEBUTTON_H
#include <QPushButton>
class WideButton : public QPushButton
{
Q_OBJECT
public:
explicit WideButton(QWidget *parent = nullptr);
explicit WideButton(const QIcon &icon, const QString &text = QString(),
QWidget *parent = nullptr);
QSize minimumSizeHint() const override;
};
#endif // WIDEBUTTON_H

3
src/ui/form/opt/pages/addresses/addressescolumn.cpp
View File

@ -7,7 +7,6 @@
#include <QVBoxLayout>
#include "../../../controls/controlutil.h"
#include "../../../controls/widebutton.h"
#include "../../../controls/plaintextedit.h"
AddressesColumn::AddressesColumn(QWidget *parent) :
@ -57,7 +56,7 @@ QLayout *AddressesColumn::setupZonesRow()
auto layout = new QHBoxLayout();
layout->setContentsMargins(0, 0, 0, 0);
m_btSelectZones = new WideButton(QIcon(":/images/map_magnify.png"));
m_btSelectZones = new QPushButton(QIcon(":/images/map_magnify.png"), QString());
layout->addWidget(m_btSelectZones);
m_labelZones = ControlUtil::createLabel();

3
src/ui/form/opt/pages/applicationspage.cpp
View File

@ -23,7 +23,6 @@
#include "../../controls/tabbar.h"
#include "../../controls/textarea2splitter.h"
#include "../../controls/textarea2splitterhandle.h"
#include "../../controls/widebutton.h"
#include "../optionscontroller.h"
#include "apps/appscolumn.h"
@ -381,7 +380,7 @@ void ApplicationsPage::setupGroupOptions()
auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btGroupOptions = new WideButton(QIcon(":/images/application_key.png"));
m_btGroupOptions = new QPushButton(QIcon(":/images/application_key.png"), QString());
m_btGroupOptions->setMenu(menu);
}

7
src/ui/form/opt/pages/statisticspage.cpp
View File

@ -32,7 +32,6 @@
#include "../../controls/labelspin.h"
#include "../../controls/labelspincombo.h"
#include "../../controls/listview.h"
#include "../../controls/widebutton.h"
#include "../optionscontroller.h"
namespace {
@ -340,7 +339,7 @@ void StatisticsPage::setupClearMenu()
appStatModel()->clear();
});
m_btClear = new WideButton(QIcon(":/images/bin_empty.png"));
m_btClear = new QPushButton(QIcon(":/images/bin_empty.png"), QString());
m_btClear->setMenu(menu);
}
@ -420,7 +419,7 @@ void StatisticsPage::setupGraphOptionsMenu()
auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btGraphOptions = new WideButton(QIcon(":/images/chart_bar.png"));
m_btGraphOptions = new QPushButton(QIcon(":/images/chart_bar.png"), QString());
m_btGraphOptions->setMenu(menu);
}
@ -447,7 +446,7 @@ void StatisticsPage::setupTrafOptionsMenu()
auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btTrafOptions = new WideButton(QIcon(":/images/database_save.png"));
m_btTrafOptions = new QPushButton(QIcon(":/images/database_save.png"), QString());
m_btTrafOptions->setMenu(menu);
}

5
src/ui/form/prog/programswindow.cpp
View File

@ -27,7 +27,6 @@
#include "../controls/checkspincombo.h"
#include "../controls/controlutil.h"
#include "../controls/tableview.h"
#include "../controls/widebutton.h"
#include "programscontroller.h"
namespace {
@ -378,7 +377,7 @@ QLayout *ProgramsWindow::setupHeader()
}
});
m_btEdit = new WideButton(QIcon(":/images/application_edit.png"));
m_btEdit = new QPushButton(QIcon(":/images/application_edit.png"), QString());
m_btEdit->setMenu(editMenu);
// Allow/Block
@ -413,7 +412,7 @@ void ProgramsWindow::setupLogOptions()
auto menu = ControlUtil::createMenuByLayout(layout, this);
m_btLogOptions = new WideButton(QIcon(":/images/application_key.png"));
m_btLogOptions = new QPushButton(QIcon(":/images/application_key.png"), QString());
m_btLogOptions->setMenu(menu);
}

3
src/ui/form/zone/zoneswindow.cpp
View File

@ -22,7 +22,6 @@
#include "../../util/conf/confutil.h"
#include "../controls/controlutil.h"
#include "../controls/tableview.h"
#include "../controls/widebutton.h"
#include "zonescontroller.h"
namespace {
@ -257,7 +256,7 @@ QLayout *ZonesWindow::setupHeader()
}
});
m_btEdit = new WideButton(QIcon(":/images/map_edit.png"));
m_btEdit = new QPushButton(QIcon(":/images/map_edit.png"), QString());
m_btEdit->setMenu(editMenu);
// Save As Text