Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion common-plugin/networkdialog/item/netitem.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -267,6 +267,7 @@ void WiredItem::initUi()

m_connectionIconAction = new DViewItemAction(Qt::AlignLeft | Qt::AlignVCenter,
QSize(20, 20), QSize(8, 20), false);
m_connectionIconAction->setObjectName("ConnectionIconAction");

standardItem()->setActionList(Qt::LeftEdge, { emptyAction, m_connectionIconAction });
updateView();
Expand Down Expand Up @@ -371,6 +372,7 @@ QString WirelessItem::getStrengthStateString(int strength)
void WirelessItem::initUi(QWidget *parent)
{
m_expandItem = new DViewItemAction(Qt::AlignBottom, QSize(PANELWIDTH, 20), QSize(PANELWIDTH, 20), false);
m_expandItem->setObjectName("ExpandItem");
m_stackWidget = new DStackedWidget(parent);
// 初始化展开输入控件
initExpandUi();
Expand All @@ -379,15 +381,18 @@ void WirelessItem::initUi(QWidget *parent)
m_expandItem->setVisible(false);
// 左侧的加密图标
m_securityAction = new DViewItemAction(Qt::AlignLeft , QSize(20, 35), QSize(20, 35), false);
m_securityAction->setObjectName("SecurityAction");
updateSrcirityIcon();
// 绘制WiFi图标
m_wifiLabel = new DViewItemAction(Qt::AlignLeft , QSize(20, 35), QSize(8, 35), false);
m_wifiLabel->setObjectName("WifiLabel");
updateWifiIcon();

standardItem()->setSizeHint(QSize(-1, 36));
standardItem()->setActionList(Qt::LeftEdge, { m_securityAction, m_wifiLabel });

m_topItem = new DViewItemAction(Qt::AlignTop, QSize(-1, 1), QSize(-1, 1), false);
m_topItem->setObjectName("TopItem");
standardItem()->setActionList(Qt::TopEdge, { m_topItem });
m_topItem->setVisible(false);
// 绘制右侧的连接图标
Expand Down Expand Up @@ -524,6 +529,8 @@ void WirelessItem::createPasswordEdit()
// 密码输入窗
DWidget *passwdWidget = new DWidget(m_stackWidget);
m_passwdEdit = new DPasswordEdit(passwdWidget);
m_passwdEdit->setObjectName("PasswdEdit");
m_passwdEdit->setAccessibleName("PasswdEdit");
m_passwdEdit->lineEdit()->setPlaceholderText(tr("Password"));
m_passwdEdit->lineEdit()->setMaxLength(256);
m_passwdEdit->setContextMenuPolicy(Qt::NoContextMenu);
Expand All @@ -532,6 +539,8 @@ void WirelessItem::createPasswordEdit()

DPushButton *cancelButtion = new DPushButton(tr("Cancel", "button"), passwdWidget); // 取消
m_connectButton = new DSuggestButton(tr("Connect", "button"), passwdWidget); // 连接
m_connectButton->setObjectName("ConnectButton");
m_connectButton->setAccessibleName("ConnectButton");
cancelButtion->setFixedHeight(36);
cancelButtion->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_connectButton->setFixedHeight(36);
Expand Down Expand Up @@ -566,6 +575,8 @@ void WirelessItem::createSsidEdit()
// ssid输入窗
DWidget *ssidWidget = new DWidget(m_stackWidget);
m_ssidEdit = new DLineEdit(ssidWidget);
m_ssidEdit->setObjectName("SsidEdit");
m_ssidEdit->setAccessibleName("SsidEdit");
m_ssidEdit->setPlaceholderText(tr("Name (SSID)"));
m_ssidEdit->lineEdit()->setMaxLength(256);
m_ssidEdit->setContextMenuPolicy(Qt::NoContextMenu);
Expand All @@ -574,6 +585,10 @@ void WirelessItem::createSsidEdit()

DPushButton *cancelButtion = new DPushButton(tr("Cancel", "button"), ssidWidget); // 取消
DPushButton *connectButton = new DSuggestButton(tr("Connect", "button"), ssidWidget); // 连接
cancelButtion->setObjectName("SsidCancelBtn");
cancelButtion->setAccessibleName("SsidCancelBtn");
connectButton->setObjectName("SsidConnectBtn");
connectButton->setAccessibleName("SsidConnectBtn");
cancelButtion->setFixedHeight(36);
cancelButtion->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
connectButton->setFixedHeight(36);
Expand Down
4 changes: 3 additions & 1 deletion dcc-network-plugin/window/controllitemsmodel.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -34,6 +34,8 @@ struct ControllItemsAction
, conn(_conn)
, item(new DStandardItem())
{
iconAction->setObjectName("IconAction");
spinnerAction->setObjectName("SpinnerAction");
iconAction->setData(QVariant::fromValue(conn));
rightList.append(spinnerAction);
rightList.append(iconAction);
Expand Down
6 changes: 5 additions & 1 deletion dcc-network-plugin/window/editpage/connectioneditpage.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -97,6 +97,10 @@ void ConnectionEditPage::initUI()

m_disconnectBtn = m_buttonTuple_conn->leftButton();
m_removeBtn = m_buttonTuple_conn->rightButton();
m_disconnectBtn->setObjectName("DisconnectBtn");
m_disconnectBtn->setAccessibleName("DisconnectBtn");
m_removeBtn->setObjectName("RemoveBtn");
m_removeBtn->setAccessibleName("RemoveBtn");
// GSettingWatcher::instance()->bind("removeConnection", m_removeBtn);

m_disconnectBtn->setText(tr("Disconnect", "button"));
Expand Down
4 changes: 3 additions & 1 deletion dcc-network-plugin/window/editpage/connectionvpneditpage.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -168,6 +168,8 @@ void ConnectionVpnEditPage::initSettingsWidgetByType(ConnectionVpnEditPage::VpnT
if (SupportedExportVpnList.contains(vpnType) && !connectionUuid().isEmpty()) {
if (!m_exportButton) {
m_exportButton = new QPushButton(this);
m_exportButton->setObjectName("ExportButton");
m_exportButton->setAccessibleName("ExportButton");
m_exportButton->setText(tr("Export", "button"));
connect(m_exportButton, &QPushButton::clicked, this, &ConnectionVpnEditPage::exportConnConfig);
addHeaderButton(m_exportButton);
Expand Down
4 changes: 3 additions & 1 deletion dcc-network-plugin/window/sections/ethernetsection.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -130,6 +130,8 @@ void EthernetSection::initUI()
{
m_deviceMacLine->setTitle(tr("Device MAC Addr"));
m_deviceMacComboBox = m_deviceMacLine->comboBox();
m_deviceMacComboBox->setObjectName("DeviceMacComboBox");
m_deviceMacComboBox->setAccessibleName("DeviceMacComboBox");
for (const QString &key : m_macStrMap.keys())
m_deviceMacComboBox->addItem(key, m_macStrMap.value(key));

Expand Down
4 changes: 3 additions & 1 deletion dcc-network-plugin/window/sections/ipvxsection.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -223,6 +223,8 @@ void IpvxSection::initUI()
m_neverDefault->setVisible(false);

m_methodChooser = m_methodLine->comboBox();
m_methodChooser->setObjectName("MethodChooser");
m_methodChooser->setAccessibleName("MethodChooser");
m_methodLine->setTitle(tr("Method"));
appendItem(m_methodLine);
appendItem(m_ipAddress);
Expand Down
16 changes: 15 additions & 1 deletion dcc-network-plugin/window/sections/multiipvxsection.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -45,6 +45,8 @@ MultiIpvxSection::MultiIpvxSection(Setting::Ptr ipvSetting, QFrame *parent)
m_headerEditWidget->setFixedHeight(30);

m_methodChooser = m_methodLine->comboBox();
m_methodChooser->setObjectName("MethodChooser_2");
m_methodChooser->setAccessibleName("MethodChooser_2");
m_methodLine->setTitle(tr("Method"));
appendItem(m_methodLine);

Expand Down Expand Up @@ -359,6 +361,10 @@ IPInputSection::IPInputSection(IpAddress ipAddress, QFrame *parent)
, m_deleteButton(new DIconButton(DStyle::SP_DeleteButton, this))
{
initUi();
m_newIpButton->setObjectName("NewIpBtn");
m_newIpButton->setAccessibleName("NewIpBtn");
m_deleteButton->setObjectName("DeleteIpBtn");
m_deleteButton->setAccessibleName("DeleteIpBtn");
initConnection();
}

Expand Down Expand Up @@ -445,6 +451,10 @@ IPV4InputSection::IPV4InputSection(IpAddress ipAddress, QFrame *parent)
, m_netmaskIpv4(new LineEditWidget(this))
{
initUi();
m_newIpButton->setObjectName("NewIpBtn");
m_newIpButton->setAccessibleName("NewIpBtn");
m_deleteButton->setObjectName("DeleteIpBtn");
m_deleteButton->setAccessibleName("DeleteIpBtn");
initConnection();
}

Expand Down Expand Up @@ -591,6 +601,10 @@ IPV6InputSection::IPV6InputSection(IpAddress ipAddress, QFrame *parent)
, m_prefixIpv6(new SpinBoxWidget(this))
{
initUi();
m_newIpButton->setObjectName("NewIpBtn");
m_newIpButton->setAccessibleName("NewIpBtn");
m_deleteButton->setObjectName("DeleteIpBtn");
m_deleteButton->setAccessibleName("DeleteIpBtn");
}

IPV6InputSection::~IPV6InputSection()
Expand Down
4 changes: 3 additions & 1 deletion dcc-network-plugin/window/sections/wirelesssection.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -136,6 +136,8 @@ void WirelessSection::initUI()

m_deviceMacLine->setTitle(tr("Device MAC Addr"));
m_deviceMacComboBox = m_deviceMacLine->comboBox();
m_deviceMacComboBox->setObjectName("DeviceMacComboBox_2");
m_deviceMacComboBox->setAccessibleName("DeviceMacComboBox_2");
for (const QString &key : m_macStrMap.keys())
m_deviceMacComboBox->addItem(key, m_macStrMap.value(key).first);

Expand Down
8 changes: 7 additions & 1 deletion dcc-network-plugin/window/widgets/buttoneditwidget.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -60,6 +60,12 @@ ButtonEditWidget::ButtonEditWidget(QFrame *parent)
, m_reduceBtn(new DIconButton(DStyle::SP_DeleteButton, this))
{
m_title->setFixedWidth(110);
m_edit->setObjectName("IpEdit");
m_edit->setAccessibleName("IpEdit");
m_addBtn->setObjectName("AddBtn");
m_addBtn->setAccessibleName("AddBtn");
m_reduceBtn->setObjectName("ReduceBtn");
m_reduceBtn->setAccessibleName("ReduceBtn");
m_edit->setContextMenuPolicy(Qt::NoContextMenu);

m_addBtn->setFixedSize(QSize(19, 19));
Expand Down
4 changes: 3 additions & 1 deletion dcc-network-plugin/window/widgets/filechoosewidget.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand All @@ -24,6 +24,8 @@ FileChooseWidget::FileChooseWidget(QWidget *parent)
, m_fileChooserEdit(new DFileChooserEdit(this))
, m_title(new QLabel)
{
m_fileChooserEdit->setObjectName("FileChooserEdit");
m_fileChooserEdit->setAccessibleName("FileChooserEdit");
m_title->setFixedWidth(110);
QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->addWidget(m_title);
Expand Down
5 changes: 4 additions & 1 deletion dcc-network-plugin/window/wirelessdevicemodel.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -37,6 +37,9 @@ struct ItemAction
, ap(_ap)
, item(new DStandardItem())
{
secureAction->setObjectName("SecureAction");
iconAction->setObjectName("IconAction_2");
spinnerAction->setObjectName("SpinnerAction_2");
iconAction->setData(QVariant::fromValue(ap));
leftList.append(secureAction);
rightList.append(spinnerAction);
Expand Down
3 changes: 2 additions & 1 deletion dcc-network/qml/DeviceStatusItem.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15
import QtQuick.Controls 2.15
Expand Down Expand Up @@ -66,6 +66,7 @@ RowLayout {
}
}
D.Switch {
Accessible.name: "DeviceStatusItem_Switch"
checked: root.netItem.isEnabled
enabled: root.netItem.enabledable
onClicked: {
Expand Down
3 changes: 2 additions & 1 deletion dcc-network/qml/NetButton.qml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15
import QtQuick.Controls 2.15

Button {
Accessible.name: "NetButton_Button"
implicitHeight: implicitContentHeight + 6
implicitWidth: implicitContentWidth + 10
topPadding: 0
Expand Down
3 changes: 3 additions & 0 deletions dcc-network/qml/NetFileChooseEdit.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RowLayout {
}
D.LineEdit {
id: edit
Accessible.name: "FileChooseEdit"
Layout.preferredWidth: edit.implicitWidth - browseBtn.width - root.spacing
onTextChanged: {
if (!initialized) {
Expand All @@ -54,6 +55,8 @@ RowLayout {
}

NetButton {
Accessible.name: "BrowseBtn"
Accessible.role: Accessible.Button
id: browseBtn
text: "..."
onClicked: {
Expand Down
3 changes: 2 additions & 1 deletion dcc-network/qml/NetItemEditor.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15
import QtQuick.Controls 2.15
Expand All @@ -9,6 +9,7 @@ import org.deepin.dtk 1.0 as D
import org.deepin.dcc 1.0

D.ItemDelegate {
Accessible.name: "NetItemEditor_ItemDelegate"
Layout.fillWidth: true
backgroundVisible: false
checkable: false
Expand Down
3 changes: 2 additions & 1 deletion dcc-network/qml/NetPasswordEdit.qml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15

Expand All @@ -8,6 +8,7 @@ import org.deepin.dcc 1.0

D.PasswordEdit {
property var dataItem
Accessible.name: "PasswordEdit"
property bool newInput: false
property bool initialized: false
signal textUpdated
Expand Down
Loading
Loading