fix:暂时屏蔽dns高级设置(开源后端无相关接口)

This commit is contained in:
jzxc95 2023-09-22 17:54:21 +08:00
parent c051d72b6b
commit a7566033f9
212 changed files with 4623 additions and 2269 deletions

140
debian/changelog vendored Normal file
View File

@ -0,0 +1,140 @@
kylin-nm (4.0.0.0-ok8.1) yangtze; urgency=medium
* rebuild with no changes.
-- handsome_feng <jianfengli@ubuntukylin.com> Fri, 09 Jun 2023 16:55:52 +0800
kylin-nm (4.0.0.0-ok8) yangtze; urgency=medium
* issue #I71UQZ #I71VZ1 #I7200J #I72OMH #I73HNK
-- zhaoshixu <zhaoshixu@kylinos.cn> Tue, 30 May 2023 13:52:06 +0800
kylin-nm (4.0.0.0-ok7) yangtze; urgency=medium
* issue #I73I44 #I71WH5
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 24 May 2023 15:36:21 +0800
kylin-nm (4.0.0.0-ok6) yangtze; urgency=medium
* issue #I7357J
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 17 May 2023 09:56:46 +0800
kylin-nm (4.0.0.0-ok5) yangtze; urgency=medium
* Modify plugin name from Vpn to VPN.
-- handsome_feng <jianfengli@ubuntukylin.com> Sat, 13 May 2023 16:52:05 +0800
kylin-nm (4.0.0.0-ok4) yangtz; urgency=medium
* remove kysec
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 19:28:57 +0800
kylin-nm (4.0.0.0-ok3) yangtze; urgency=medium
* #include <QPainterPath>
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 19:05:00 +0800
kylin-nm (4.0.0.0-ok2) yangtze; urgency=medium
* remove wired switch
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 18:44:10 +0800
kylin-nm (4.0.0.0-ok1) yangtze; urgency=medium
* merge upstream
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 17:09:37 +0800
kylin-nm (3.14.0.0+0512-3k15) yangtze; urgency=medium
* QSystemTrayIcon register
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 06 Jan 2023 16:22:59 +0800
kylin-nm (3.14.0.0+0512-3k14) yangtze; urgency=medium
* add include QPainterPath
-- zhaoshixu <zhaoshixu@kylinos.cn> Thu, 05 Jan 2023 16:27:10 +0800
kylin-nm (3.14.0.0+0512-3k13) yangtze; urgency=medium
* 增加三种企业网加密方式LEAP PWD FAST
-- zhaoshixu <zhaoshixu@kylinos.cn> Mon, 26 Dec 2022 16:11:31 +0800
kylin-nm (3.14.0.0+0512-3k12) yangtze; urgency=medium
* vpn页面增加
* dns优化
* tabBar圆角
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 16 Dec 2022 12:04:41 +0800
kylin-nm (3.14.0.0+0512-3k11) yangtz; urgency=medium
* 合并3.22需求
-- zhaoshixu <zhaoshixu@kylinos.cn> Mon, 21 Nov 2022 15:31:28 +0800
kylin-nm (3.14.0.0+0512-2k11) yangtz; urgency=medium
* 修改因有线连接未指定网卡造成VPN托盘崩溃的问题
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 21 Oct 2022 16:35:19 +0800
kylin-nm (3.14.0.0+0512-2k10) yangtz; urgency=medium
* 托盘vpn需求
-- zhaoshixu <zhaoshixu@kylinos.cn> Thu, 20 Oct 2022 20:21:39 +0800
kylin-nm (3.14.0.0+0512-1k10) yangtz; urgency=medium
* 同步3.22需求
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 19 Oct 2022 10:01:07 +0800
kylin-nm (3.14.0.0+0512-0k10) yangtz; urgency=medium
* close-cd #131075 【网络】普通用户在详情界面修改网络IP信息时会弹出授权框如果不进行授权详情界面也会显示修改成功但是实际未修改
-- zhaoshixu <zhaoshixu@kylinos.cn> Thu, 18 Aug 2022 17:09:12 +0800
kylin-nm (3.14.0.0+0512-0k9) yangtz; urgency=medium
* close-cd #131247 登录界面连接wifi后登录桌面任务栏网络工具显示未连接wifi依旧关闭状态
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 03 Aug 2022 16:12:40 +0800
kylin-nm (3.14.0.0+0512-0k8) yangtz; urgency=medium
* close-cd #127890 开启无线局域网后关闭,重新打开控制面板,无线局域网处显示网卡名称
* close-cd #128339 连接WIFI过程中点击忘记此WIFI之后密码仍保留在输入框内
-- zhaoshixu <zhaoshixu@kylinos.cn> Mon, 18 Jul 2022 10:54:25 +0800
kylin-nm (3.14.0.0+0512-0k7~0707) yangtz; urgency=medium
* Fix mobilehotspot segmentation fault and init wlanSwitchEnable status.
* close-cd #91326 【控制面板】-首页图标、左侧导航线性图标可以跟随主题切换
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 22 Jun 2022 09:44:33 +0800
kylin-nm (3.14.0.0+0512-0k5) yangtz; urgency=medium
* set window frameless.
-- zhaoshixu <zhaoshixu@kylinos.cn> Mon, 20 Jun 2022 16:01:48 +0800
kylin-nm (3.14.0.0+0512-0k4) yangtze; urgency=medium
* Initial for openKylin.
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 17 Jun 2022 11:46:09 +0800

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
9

49
debian/control vendored Normal file
View File

@ -0,0 +1,49 @@
Source: kylin-nm
Section: utils
Priority: optional
Maintainer: Kylin Team <team+kylin@tracker.debian.org>
Uploaders: handsome_feng <jianfengli@ubuntukylin.com>
Build-Depends: debhelper (>=9),
libcap-dev,
libgsettings-qt-dev,
libgtk-3-dev,
libkf5networkmanagerqt-dev (>= 5.36.0),
libkf5windowsystem-dev,
libkysdk-qtwidgets-dev(>= 1.2.0),
libkysdk-sysinfo-dev,
libkysdk-waylandhelper-dev(>= 1.2.0kylin2),
libnm-dev,
libnma-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libsecret-1-dev,
libukcc-dev (>= 3.1.1+1217),
libukui-common-dev,
libukui-log4qt-dev,
libx11-dev,
qt5-qmake,
qtbase5-dev,
qtbase5-dev-tools,
qtchooser,
qtscript5-dev,
qttools5-dev-tools
Standards-Version: 4.5.0
Rules-Requires-Root: no
Homepage: https://github.com/ukui/kylin-nm
Vcs-Git: https://github.com/ukui/kylin-nm.git
Vcs-Browser: https://github.com/ukui/kylin-nm
Package: kylin-nm
Architecture: any
Depends: libkysdk-qtwidgets(>= 1.2.0),
libkysdk-waylandhelper(>= 1.2.0kylin2),
network-manager (>=1.2.6),
ukui-control-center (>= 3.1.1+1217),
dpkg-dev,
libkysdk-sysinfo,
${shlibs:Depends},
${misc:Depends}
Description: Gui Applet tool for display and edit network simply
Kylin NM is a Applet tool for managing network settings simply.
It has beautiful UI and very comfortable to use.
It's better work together with UKUI.

25
debian/copyright vendored Normal file
View File

@ -0,0 +1,25 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: kylin-nm
Upstream-Contact: Kylin Team <ukui@kylinos.cn>
Source: https://github.com/ukui/kylin-nm
Files: *
Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd.
License: GPL-3+
License: GPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Genaral Public License for more details.
.
You should have received a copy og the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

1
debian/kylin-nm.manpages vendored Normal file
View File

@ -0,0 +1 @@
man/kylin-nm.1

14
debian/kylin-nm.postinst vendored Executable file
View File

@ -0,0 +1,14 @@
#!/bin/sh
set -e
PROGRAM=$(dpkg-divert --truename /usr/bin/kylin-nm)
if setcap cap_net_raw+ep $PROGRAM; then
chmod u-s $PROGRAM
fi
echo "kylin nm set cap success"
exit 0

12
debian/kylin-nm.preinst vendored Normal file
View File

@ -0,0 +1,12 @@
#!/bin/bash
set -e
path="/usr/lib/`/usr/bin/dpkg-architecture -qDEB_TARGET_MULTIARCH`/ukui-control-center/libnetconnect.so"
dpkg-divert --package kylin-nm --rename --divert "$path"".old" --add $path
path2="/usr/lib/`/usr/bin/dpkg-architecture -qDEB_TARGET_MULTIARCH`/ukui-control-center/libproxy.so"
dpkg-divert --package kylin-nm --rename --divert "$path2"".old" --add $path2
path3="/usr/lib/`/usr/bin/dpkg-architecture -qDEB_TARGET_MULTIARCH`/ukui-control-center/libvpn.so"
dpkg-divert --package kylin-nm --rename --divert "$path3"".old" --add $path3

34
debian/rules vendored Executable file
View File

@ -0,0 +1,34 @@
#!/usr/bin/make -f
export QT_SELECT=5
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE
MAKE_OPTS = PREFIX=/usr QMAKE=qmake LRELEASE=lrelease QMAKE_OPTS="$(QMAKE_OPTS)"
override_dh_auto_configure:
QT_SELECT=qt5 dh_auto_configure \
-- "QMAKE_CXXFLAGS=$(CFLAGS)" \
kylin-nm.pro
%:
dh $@
override_dh_install:
dh_install
override_dh_missing:
dh_missing --fail-missing
override_dh_auto_clean:
[ ! -d .moc ] || $(RM) -r .moc
[ ! -d .obj ] || $(RM) -r .obj
[ ! -d .ui ] || $(RM) -r .ui
[ ! -f Makefile ] || dh_auto_clean
override_dh_auto_build:
dh_auto_build -- $(MAKE_OPTS)
override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (native)

2
debian/watch vendored Normal file
View File

@ -0,0 +1,2 @@
version=4
https://github.com/ukui/kylin-nm/releases .*/kylin-nm_(\d\S+)\.orig\.tar\.gz

View File

@ -1,5 +1,6 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += \ CONFIG += \
ordered \ ordered \
qt \ qt \

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -82,6 +82,7 @@ void AddNetBtn::paintEvent(QPaintEvent *event)
QPainter painter(this); QPainter painter(this);
painter.setRenderHint(QPainter:: Antialiasing, true); //设置渲染,启动反锯齿 painter.setRenderHint(QPainter:: Antialiasing, true); //设置渲染,启动反锯齿
painter.setPen(Qt::NoPen); painter.setPen(Qt::NoPen);
painter.setBrush(this->palette().base().color()); painter.setBrush(this->palette().base().color());
QPalette pal = qApp->palette(); QPalette pal = qApp->palette();

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -1,10 +1,11 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* *
* Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd. * Copyright (C) 2022 Tianjin KYLIN Information Technology Co., Ltd.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -27,13 +27,16 @@
#define FRAME_MIN_SIZE 550, 60 #define FRAME_MIN_SIZE 550, 60
#define FRAME_MAX_SIZE 16777215, 16777215 #define FRAME_MAX_SIZE 16777215, 16777215
#define CONTECT_FRAME_MAX_SIZE 16777215, 60 #define CONTECT_FRAME_MAX_SIZE 16777215, 60
#define HINT_TEXT_MARGINS 8, 0, 0, 0 #define HINT_TEXT_MARGINS 8, 0, 0, 0
#define FRAME_MIN_SIZE 550, 60 #define FRAME_MIN_SIZE 550, 60
#define LABLE_MIN_WIDTH 188 #define LABLE_MIN_WIDTH 188
#define COMBOBOX_MIN_WIDTH 200 #define COMBOBOX_MIN_WIDTH 200
#define LINE_MAX_SIZE 16777215, 1 #define LINE_MAX_SIZE 16777215, 1
#define LINE_MIN_SIZE 0, 1 #define LINE_MIN_SIZE 0, 1
#define ICON_SIZE 24,24 #define ICON_SIZE 24,24
#define PASSWORD_FRAME_MIN_HIGHT 60 #define PASSWORD_FRAME_MIN_HIGHT 60
#define PASSWORD_FRAME_FIX_HIGHT 90 #define PASSWORD_FRAME_FIX_HIGHT 90
#define PASSWORD_FRAME_MIN_SIZE 550, 60 #define PASSWORD_FRAME_MIN_SIZE 550, 60
@ -191,7 +194,6 @@ bool MobileHotspotWidget::eventFilter(QObject *watched, QEvent *event)
qDebug() << LOG_HEAD << "call activeWirelessAp failed "; qDebug() << LOG_HEAD << "call activeWirelessAp failed ";
return true; return true;
} }
} }
return true; return true;
} }
@ -260,7 +262,6 @@ void MobileHotspotWidget::initUI()
} }
void MobileHotspotWidget::initDbusConnect() void MobileHotspotWidget::initDbusConnect()
{ {
if(m_interface->isValid()) { if(m_interface->isValid()) {
@ -269,6 +270,7 @@ void MobileHotspotWidget::initDbusConnect()
connect(m_interface,SIGNAL(wirelessDeviceStatusChanged()), this, SLOT(onDeviceStatusChanged()), Qt::QueuedConnection); connect(m_interface,SIGNAL(wirelessDeviceStatusChanged()), this, SLOT(onDeviceStatusChanged()), Qt::QueuedConnection);
connect(m_interface,SIGNAL(deviceNameChanged(QString, QString, int)), this, SLOT(onDeviceNameChanged(QString, QString, int)), Qt::QueuedConnection); connect(m_interface,SIGNAL(deviceNameChanged(QString, QString, int)), this, SLOT(onDeviceNameChanged(QString, QString, int)), Qt::QueuedConnection);
connect(m_interface,SIGNAL(hotspotDeactivated(QString, QString)), this, SLOT(onHotspotDeactivated(QString, QString)), Qt::QueuedConnection); connect(m_interface,SIGNAL(hotspotDeactivated(QString, QString)), this, SLOT(onHotspotDeactivated(QString, QString)), Qt::QueuedConnection);
connect(m_interface,SIGNAL(hotspotActivated(QString, QString, QString, QString, QString)), this, SLOT(onHotspotActivated(QString, QString, QString, QString, QString)), Qt::QueuedConnection); connect(m_interface,SIGNAL(hotspotActivated(QString, QString, QString, QString, QString)), this, SLOT(onHotspotActivated(QString, QString, QString, QString, QString)), Qt::QueuedConnection);
connect(m_interface, SIGNAL(wlanactiveConnectionStateChanged(QString, QString, QString, int)), this, SLOT(onActiveConnectionChanged(QString, QString, QString, int)), Qt::QueuedConnection); connect(m_interface, SIGNAL(wlanactiveConnectionStateChanged(QString, QString, QString, int)), this, SLOT(onActiveConnectionChanged(QString, QString, QString, int)), Qt::QueuedConnection);
@ -440,11 +442,11 @@ void MobileHotspotWidget::getApInfo()
} }
if (m_interfaceComboBox->count() <= 0) { if (m_interfaceComboBox->count() <= 0) {
m_switchBtn->setChecked(false); m_switchBtn->setChecked(false);
setWidgetHidden(true); setWidgetHidden(true);
qWarning() << LOG_HEAD << "getApInfo but interface is empty"; qWarning() << LOG_HEAD << "getApInfo but interface is empty";
return; return;
} }
QDBusReply<QStringList> reply = m_interface->call("getStoredApInfo"); QDBusReply<QStringList> reply = m_interface->call("getStoredApInfo");
@ -819,7 +821,6 @@ void MobileHotspotWidget::setWidgetHidden(bool isHidden)
onWirelessBtnChanged(state); onWirelessBtnChanged(state);
} }
resetFrameSize(); resetFrameSize();
} }
void MobileHotspotWidget::updateBandCombox() void MobileHotspotWidget::updateBandCombox()
@ -846,6 +847,7 @@ void MobileHotspotWidget::updateBandCombox()
if (index >= 0) { if (index >= 0) {
m_freqBandComboBox->setCurrentIndex(index); m_freqBandComboBox->setCurrentIndex(index);
} }
m_isUserSelect = true; m_isUserSelect = true;
} }
@ -994,4 +996,3 @@ void MobileHotspotWidget::initBlackListPage()
m_Vlayout->addSpacing(32); m_Vlayout->addSpacing(32);
m_Vlayout->addWidget(m_blacklistPage); m_Vlayout->addWidget(m_blacklistPage);
} }

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -56,79 +56,79 @@
<context> <context>
<name>MobileHotspotWidget</name> <name>MobileHotspotWidget</name>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="156"/> <location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>wirless switch is close or no wireless device</source> <source>wirless switch is close or no wireless device</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="177"/> <location filename="../mobilehotspotwidget.cpp" line="180"/>
<source>hotpots name or device is invalid</source> <source>hotpots name or device is invalid</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="556"/> <location filename="../mobilehotspotwidget.cpp" line="558"/>
<source>Contains at least 8 characters</source> <source>Contains at least 8 characters</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="231"/> <location filename="../mobilehotspotwidget.cpp" line="233"/>
<source>Hotspot</source> <source>Hotspot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="61"/> <location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="64"/> <location filename="../mobilehotspotwidget.cpp" line="67"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="340"/> <location filename="../mobilehotspotwidget.cpp" line="342"/>
<source>use </source> <source>use </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="341"/> <location filename="../mobilehotspotwidget.cpp" line="343"/>
<source> share network, will interrupt local wireless connection</source> <source> share network, will interrupt local wireless connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="357"/> <location filename="../mobilehotspotwidget.cpp" line="359"/>
<location filename="../mobilehotspotwidget.cpp" line="705"/> <location filename="../mobilehotspotwidget.cpp" line="707"/>
<source>hotspot already close</source> <source>hotspot already close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="502"/> <location filename="../mobilehotspotwidget.cpp" line="504"/>
<source>Open</source> <source>Open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="523"/> <location filename="../mobilehotspotwidget.cpp" line="525"/>
<source>Wi-Fi Name</source> <source>Wi-Fi Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="544"/> <location filename="../mobilehotspotwidget.cpp" line="546"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="588"/> <location filename="../mobilehotspotwidget.cpp" line="590"/>
<source>Frequency band</source> <source>Frequency band</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="612"/> <location filename="../mobilehotspotwidget.cpp" line="614"/>
<source>Net card</source> <source>Net card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="735"/> <location filename="../mobilehotspotwidget.cpp" line="737"/>
<location filename="../mobilehotspotwidget.cpp" line="743"/> <location filename="../mobilehotspotwidget.cpp" line="745"/>
<source>hotspot already open</source> <source>hotspot already open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -64,7 +64,7 @@
<translation type="vanished">ukui </translation> <translation type="vanished">ukui </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="156"/> <location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>wirless switch is close or no wireless device</source> <source>wirless switch is close or no wireless device</source>
<translation></translation> <translation></translation>
</message> </message>
@ -73,7 +73,7 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="177"/> <location filename="../mobilehotspotwidget.cpp" line="180"/>
<source>hotpots name or device is invalid</source> <source>hotpots name or device is invalid</source>
<translation></translation> <translation></translation>
</message> </message>
@ -86,69 +86,69 @@
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="556"/> <location filename="../mobilehotspotwidget.cpp" line="558"/>
<source>Contains at least 8 characters</source> <source>Contains at least 8 characters</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="231"/> <location filename="../mobilehotspotwidget.cpp" line="233"/>
<source>Hotspot</source> <source>Hotspot</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="61"/> <location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="64"/> <location filename="../mobilehotspotwidget.cpp" line="67"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="340"/> <location filename="../mobilehotspotwidget.cpp" line="342"/>
<source>use </source> <source>use </source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="341"/> <location filename="../mobilehotspotwidget.cpp" line="343"/>
<source> share network, will interrupt local wireless connection</source> <source> share network, will interrupt local wireless connection</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="357"/> <location filename="../mobilehotspotwidget.cpp" line="359"/>
<location filename="../mobilehotspotwidget.cpp" line="705"/> <location filename="../mobilehotspotwidget.cpp" line="707"/>
<source>hotspot already close</source> <source>hotspot already close</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="502"/> <location filename="../mobilehotspotwidget.cpp" line="504"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="523"/> <location filename="../mobilehotspotwidget.cpp" line="525"/>
<source>Wi-Fi Name</source> <source>Wi-Fi Name</source>
<translation>Wi-Fiཡི</translation> <translation>Wi-Fiཡི</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="544"/> <location filename="../mobilehotspotwidget.cpp" line="546"/>
<source>Password</source> <source>Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="588"/> <location filename="../mobilehotspotwidget.cpp" line="590"/>
<source>Frequency band</source> <source>Frequency band</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="612"/> <location filename="../mobilehotspotwidget.cpp" line="614"/>
<source>Net card</source> <source>Net card</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="735"/> <location filename="../mobilehotspotwidget.cpp" line="737"/>
<location filename="../mobilehotspotwidget.cpp" line="743"/> <location filename="../mobilehotspotwidget.cpp" line="745"/>
<source>hotspot already open</source> <source>hotspot already open</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -64,79 +64,79 @@
<translation type="vanished">ukui control center desktop message</translation> <translation type="vanished">ukui control center desktop message</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="61"/> <location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="64"/> <location filename="../mobilehotspotwidget.cpp" line="67"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="156"/> <location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>wirless switch is close or no wireless device</source> <source>wirless switch is close or no wireless device</source>
<translation>wirless switch is close or no wireless device</translation> <translation>wirless switch is close or no wireless device</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="177"/> <location filename="../mobilehotspotwidget.cpp" line="180"/>
<source>hotpots name or device is invalid</source> <source>hotpots name or device is invalid</source>
<translation>hotpots name or device is invalid</translation> <translation>hotpots name or device is invalid</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="231"/> <location filename="../mobilehotspotwidget.cpp" line="233"/>
<source>Hotspot</source> <source>Hotspot</source>
<translation>Hotspot</translation> <translation>Hotspot</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="340"/> <location filename="../mobilehotspotwidget.cpp" line="342"/>
<source>use </source> <source>use </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="341"/> <location filename="../mobilehotspotwidget.cpp" line="343"/>
<source> share network, will interrupt local wireless connection</source> <source> share network, will interrupt local wireless connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="357"/> <location filename="../mobilehotspotwidget.cpp" line="359"/>
<location filename="../mobilehotspotwidget.cpp" line="705"/> <location filename="../mobilehotspotwidget.cpp" line="707"/>
<source>hotspot already close</source> <source>hotspot already close</source>
<translation>hotspot already close</translation> <translation>hotspot already close</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="502"/> <location filename="../mobilehotspotwidget.cpp" line="504"/>
<source>Open</source> <source>Open</source>
<translation>Open</translation> <translation>Open</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="523"/> <location filename="../mobilehotspotwidget.cpp" line="525"/>
<source>Wi-Fi Name</source> <source>Wi-Fi Name</source>
<translation>Wi-Fi Name</translation> <translation>Wi-Fi Name</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="544"/> <location filename="../mobilehotspotwidget.cpp" line="546"/>
<source>Password</source> <source>Password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="556"/> <location filename="../mobilehotspotwidget.cpp" line="558"/>
<source>Contains at least 8 characters</source> <source>Contains at least 8 characters</source>
<translation>Contains at least 8 characters</translation> <translation>Contains at least 8 characters</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="588"/> <location filename="../mobilehotspotwidget.cpp" line="590"/>
<source>Frequency band</source> <source>Frequency band</source>
<translation>Frequency band</translation> <translation>Frequency band</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="612"/> <location filename="../mobilehotspotwidget.cpp" line="614"/>
<source>Net card</source> <source>Net card</source>
<translation>Net card</translation> <translation>Net card</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="735"/> <location filename="../mobilehotspotwidget.cpp" line="737"/>
<location filename="../mobilehotspotwidget.cpp" line="743"/> <location filename="../mobilehotspotwidget.cpp" line="745"/>
<source>hotspot already open</source> <source>hotspot already open</source>
<translation>hotspot already open</translation> <translation>hotspot already open</translation>
</message> </message>

View File

@ -64,7 +64,7 @@
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="156"/> <location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>wirless switch is close or no wireless device</source> <source>wirless switch is close or no wireless device</source>
<translation> </translation> <translation> </translation>
</message> </message>
@ -73,7 +73,7 @@
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="177"/> <location filename="../mobilehotspotwidget.cpp" line="180"/>
<source>hotpots name or device is invalid</source> <source>hotpots name or device is invalid</source>
<translation> </translation> <translation> </translation>
</message> </message>
@ -86,69 +86,69 @@
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="556"/> <location filename="../mobilehotspotwidget.cpp" line="558"/>
<source>Contains at least 8 characters</source> <source>Contains at least 8 characters</source>
<translation> 8 </translation> <translation> 8 </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="231"/> <location filename="../mobilehotspotwidget.cpp" line="233"/>
<source>Hotspot</source> <source>Hotspot</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="61"/> <location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="64"/> <location filename="../mobilehotspotwidget.cpp" line="67"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="340"/> <location filename="../mobilehotspotwidget.cpp" line="342"/>
<source>use </source> <source>use </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="341"/> <location filename="../mobilehotspotwidget.cpp" line="343"/>
<source> share network, will interrupt local wireless connection</source> <source> share network, will interrupt local wireless connection</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="357"/> <location filename="../mobilehotspotwidget.cpp" line="359"/>
<location filename="../mobilehotspotwidget.cpp" line="705"/> <location filename="../mobilehotspotwidget.cpp" line="707"/>
<source>hotspot already close</source> <source>hotspot already close</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="502"/> <location filename="../mobilehotspotwidget.cpp" line="504"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="523"/> <location filename="../mobilehotspotwidget.cpp" line="525"/>
<source>Wi-Fi Name</source> <source>Wi-Fi Name</source>
<translation>Wi-Fi </translation> <translation>Wi-Fi </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="544"/> <location filename="../mobilehotspotwidget.cpp" line="546"/>
<source>Password</source> <source>Password</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="588"/> <location filename="../mobilehotspotwidget.cpp" line="590"/>
<source>Frequency band</source> <source>Frequency band</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="612"/> <location filename="../mobilehotspotwidget.cpp" line="614"/>
<source>Net card</source> <source>Net card</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="735"/> <location filename="../mobilehotspotwidget.cpp" line="737"/>
<location filename="../mobilehotspotwidget.cpp" line="743"/> <location filename="../mobilehotspotwidget.cpp" line="745"/>
<source>hotspot already open</source> <source>hotspot already open</source>
<translation> </translation> <translation> </translation>
</message> </message>

View File

@ -56,79 +56,79 @@
<context> <context>
<name>MobileHotspotWidget</name> <name>MobileHotspotWidget</name>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="156"/> <location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>wirless switch is close or no wireless device</source> <source>wirless switch is close or no wireless device</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="177"/> <location filename="../mobilehotspotwidget.cpp" line="180"/>
<source>hotpots name or device is invalid</source> <source>hotpots name or device is invalid</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="556"/> <location filename="../mobilehotspotwidget.cpp" line="558"/>
<source>Contains at least 8 characters</source> <source>Contains at least 8 characters</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="231"/> <location filename="../mobilehotspotwidget.cpp" line="233"/>
<source>Hotspot</source> <source>Hotspot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="61"/> <location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="64"/> <location filename="../mobilehotspotwidget.cpp" line="67"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="340"/> <location filename="../mobilehotspotwidget.cpp" line="342"/>
<source>use </source> <source>use </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="341"/> <location filename="../mobilehotspotwidget.cpp" line="343"/>
<source> share network, will interrupt local wireless connection</source> <source> share network, will interrupt local wireless connection</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="357"/> <location filename="../mobilehotspotwidget.cpp" line="359"/>
<location filename="../mobilehotspotwidget.cpp" line="705"/> <location filename="../mobilehotspotwidget.cpp" line="707"/>
<source>hotspot already close</source> <source>hotspot already close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="502"/> <location filename="../mobilehotspotwidget.cpp" line="504"/>
<source>Open</source> <source>Open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="523"/> <location filename="../mobilehotspotwidget.cpp" line="525"/>
<source>Wi-Fi Name</source> <source>Wi-Fi Name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="544"/> <location filename="../mobilehotspotwidget.cpp" line="546"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="588"/> <location filename="../mobilehotspotwidget.cpp" line="590"/>
<source>Frequency band</source> <source>Frequency band</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="612"/> <location filename="../mobilehotspotwidget.cpp" line="614"/>
<source>Net card</source> <source>Net card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="735"/> <location filename="../mobilehotspotwidget.cpp" line="737"/>
<location filename="../mobilehotspotwidget.cpp" line="743"/> <location filename="../mobilehotspotwidget.cpp" line="745"/>
<source>hotspot already open</source> <source>hotspot already open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -64,7 +64,7 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="156"/> <location filename="../mobilehotspotwidget.cpp" line="159"/>
<source>wirless switch is close or no wireless device</source> <source>wirless switch is close or no wireless device</source>
<translation>线线</translation> <translation>线线</translation>
</message> </message>
@ -73,7 +73,7 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="177"/> <location filename="../mobilehotspotwidget.cpp" line="180"/>
<source>hotpots name or device is invalid</source> <source>hotpots name or device is invalid</source>
<translation></translation> <translation></translation>
</message> </message>
@ -86,69 +86,69 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="556"/> <location filename="../mobilehotspotwidget.cpp" line="558"/>
<source>Contains at least 8 characters</source> <source>Contains at least 8 characters</source>
<translation>8</translation> <translation>8</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="231"/> <location filename="../mobilehotspotwidget.cpp" line="233"/>
<source>Hotspot</source> <source>Hotspot</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="61"/> <location filename="../mobilehotspotwidget.cpp" line="64"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="64"/> <location filename="../mobilehotspotwidget.cpp" line="67"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="340"/> <location filename="../mobilehotspotwidget.cpp" line="342"/>
<source>use </source> <source>use </source>
<translation>使 </translation> <translation>使 </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="341"/> <location filename="../mobilehotspotwidget.cpp" line="343"/>
<source> share network, will interrupt local wireless connection</source> <source> share network, will interrupt local wireless connection</source>
<translation> 线</translation> <translation> 线</translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="357"/> <location filename="../mobilehotspotwidget.cpp" line="359"/>
<location filename="../mobilehotspotwidget.cpp" line="705"/> <location filename="../mobilehotspotwidget.cpp" line="707"/>
<source>hotspot already close</source> <source>hotspot already close</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="502"/> <location filename="../mobilehotspotwidget.cpp" line="504"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="523"/> <location filename="../mobilehotspotwidget.cpp" line="525"/>
<source>Wi-Fi Name</source> <source>Wi-Fi Name</source>
<translation>Wi-Fi </translation> <translation>Wi-Fi </translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="544"/> <location filename="../mobilehotspotwidget.cpp" line="546"/>
<source>Password</source> <source>Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="588"/> <location filename="../mobilehotspotwidget.cpp" line="590"/>
<source>Frequency band</source> <source>Frequency band</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="612"/> <location filename="../mobilehotspotwidget.cpp" line="614"/>
<source>Net card</source> <source>Net card</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mobilehotspotwidget.cpp" line="735"/> <location filename="../mobilehotspotwidget.cpp" line="737"/>
<location filename="../mobilehotspotwidget.cpp" line="743"/> <location filename="../mobilehotspotwidget.cpp" line="745"/>
<source>hotspot already open</source> <source>hotspot already open</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -34,23 +34,23 @@ DeviceFrame::DeviceFrame(QString devName, QWidget *parent) : QFrame(parent)
deviceLabel = new QLabel(this); deviceLabel = new QLabel(this);
dropDownLabel = new DrownLabel(devName, this); dropDownLabel = new DrownLabel(devName, this);
deviceSwitch = new KSwitchButton(this); // deviceSwitch = new KSwitchButton(this);
deviceSwitch->installEventFilter(this); // deviceSwitch->installEventFilter(this);
deviceLayout->addWidget(deviceLabel); deviceLayout->addWidget(deviceLabel);
deviceLayout->addStretch(); deviceLayout->addStretch();
deviceLayout->addWidget(dropDownLabel); deviceLayout->addWidget(dropDownLabel);/*
deviceLayout->addWidget(deviceSwitch); deviceLayout->addWidget(deviceSwitch);*/
} }
bool DeviceFrame::eventFilter(QObject *w,QEvent *e) bool DeviceFrame::eventFilter(QObject *w,QEvent *e)
{ {
if (w == deviceSwitch) { // if (w == deviceSwitch) {
if (e->type() == QEvent::MouseButtonPress) { // if (e->type() == QEvent::MouseButtonPress) {
emit deviceSwitchClicked(!deviceSwitch->isChecked()); // emit deviceSwitchClicked(!deviceSwitch->isChecked());
return true; // return true;
} // }
} // }
return QFrame::eventFilter(w, e); return QFrame::eventFilter(w, e);
} }

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -34,6 +34,7 @@ using namespace kdk;
class DeviceFrame : public QFrame class DeviceFrame : public QFrame
{ {
Q_OBJECT Q_OBJECT
public: public:
DeviceFrame(QString devName, QWidget *parent = nullptr); DeviceFrame(QString devName, QWidget *parent = nullptr);
@ -52,7 +53,6 @@ private:
signals: signals:
void deviceSwitchClicked(bool); void deviceSwitchClicked(bool);
}; };
#endif // DEVICEFRAME_H #endif // DEVICEFRAME_H

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -31,6 +31,7 @@ class ItemFrame : public QFrame
Q_OBJECT Q_OBJECT
public: public:
ItemFrame(QString devName, QWidget *parent = nullptr); ItemFrame(QString devName, QWidget *parent = nullptr);
//单设备整体layout //单设备整体layout
QVBoxLayout * deviceLanLayout = nullptr; QVBoxLayout * deviceLanLayout = nullptr;
//单设备名称+下拉按钮Frame+d单设备开关 //单设备名称+下拉按钮Frame+d单设备开关

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -164,7 +164,7 @@ bool LanItem::eventFilter(QObject *watched, QEvent *event)
{ {
//菜单右边界与按钮右边界对齐 //菜单右边界与按钮右边界对齐
if (event->type() == QEvent::Show && watched == m_moreMenu) { if (event->type() == QEvent::Show && watched == m_moreMenu) {
int menuXPos = m_moreMenu->pos().x(); int menuXPos = mapToGlobal(m_moreButton->pos()).x();
int menuWidth = m_moreMenu->size().width(); int menuWidth = m_moreMenu->size().width();
int btnWidth = m_moreButton->size().width(); int btnWidth = m_moreButton->size().width();
@ -174,4 +174,3 @@ bool LanItem::eventFilter(QObject *watched, QEvent *event)
} }
return false; return false;
} }

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -35,7 +35,6 @@
#define KYLIN_APP_MANAGER_NAME "com.kylin.AppManager" #define KYLIN_APP_MANAGER_NAME "com.kylin.AppManager"
#define KYLIN_APP_MANAGER_PATH "/com/kylin/AppManager" #define KYLIN_APP_MANAGER_PATH "/com/kylin/AppManager"
#define KYLIN_APP_MANAGER_INTERFACE "com.kylin.AppManager" #define KYLIN_APP_MANAGER_INTERFACE "com.kylin.AppManager"
const QString KLanSymbolic = "network-wired-connected-symbolic"; const QString KLanSymbolic = "network-wired-connected-symbolic";
const QString NoNetSymbolic = "network-wired-disconnected-symbolic"; const QString NoNetSymbolic = "network-wired-disconnected-symbolic";
@ -83,6 +82,8 @@ NetConnect::NetConnect() : mFirstLoad(true) {
pluginName = tr("LAN"); pluginName = tr("LAN");
pluginType = NETWORK; pluginType = NETWORK;
needLoad = isExitWiredDevice();
} }
NetConnect::~NetConnect() { NetConnect::~NetConnect() {
@ -131,7 +132,7 @@ const QString NetConnect::name() const {
bool NetConnect::isEnable() const bool NetConnect::isEnable() const
{ {
return true; return needLoad;
} }
@ -166,61 +167,63 @@ bool NetConnect::eventFilter(QObject *w, QEvent *e) {
if (w->findChild<QWidget*>()) if (w->findChild<QWidget*>())
w->findChild<QWidget*>()->setStyleSheet("QWidget{background: palette(base);border-radius:4px;}"); w->findChild<QWidget*>()->setStyleSheet("QWidget{background: palette(base);border-radius:4px;}");
} }
if (w == wiredSwitch) {
if (e->type() == QMouseEvent::MouseButtonRelease) { // if (w == wiredSwitch) {
if (!wiredSwitch->isCheckable()) { // if (e->type() == QMouseEvent::MouseButtonRelease) {
showDesktopNotify(tr("No ethernet device avaliable")); // if (!wiredSwitch->isCheckable()) {
} else { // showDesktopNotify(tr("No ethernet device avaliable"));
UkccCommon::buriedSettings(QString("netconnect"), QString("Open"), QString("settings"),wiredSwitch->isChecked()?"false":"true"); // } else {
if (m_interface != nullptr && m_interface->isValid()) { // UkccCommon::buriedSettings(QString("netconnect"), QString("Open"), QString("settings"),wiredSwitch->isChecked()?"false":"true");
m_interface->call(QStringLiteral("setWiredSwitchEnable"), !wiredSwitch->isChecked()); // if (m_interface != nullptr && m_interface->isValid()) {
} // m_interface->call(QStringLiteral("setWiredSwitchEnable"), !wiredSwitch->isChecked());
return true; // }
} // return true;
} // }
} // }
// }
return QObject::eventFilter(w,e); return QObject::eventFilter(w,e);
} }
void NetConnect::initComponent() { void NetConnect::initComponent() {
wiredSwitch = new KSwitchButton(pluginWidget); // wiredSwitch = new KSwitchButton(pluginWidget);
ui->openWIifLayout->addWidget(wiredSwitch); // ui->openWIifLayout->addWidget(wiredSwitch);
ui->openWIifLayout->setContentsMargins(0,0,8,0); ui->openWIifLayout->setContentsMargins(0,0,8,0);
ui->openWifiFrame->hide();
ui->detailLayOut->setContentsMargins(MAIN_LAYOUT_MARGINS); ui->detailLayOut->setContentsMargins(MAIN_LAYOUT_MARGINS);
ui->verticalLayout_3->setContentsMargins(NO_MARGINS); ui->verticalLayout_3->setContentsMargins(NO_MARGINS);
ui->verticalLayout_3->setSpacing(8); ui->verticalLayout_3->setSpacing(8);
ui->availableLayout->setSpacing(SPACING); ui->availableLayout->setSpacing(SPACING);
ui->horizontalLayout->setContentsMargins(TOP_MARGINS); ui->horizontalLayout->setContentsMargins(TOP_MARGINS);
wiredSwitch->installEventFilter(this); // wiredSwitch->installEventFilter(this);
if (QGSettings::isSchemaInstalled(GSETTINGS_SCHEMA)) { // if (QGSettings::isSchemaInstalled(GSETTINGS_SCHEMA)) {
m_switchGsettings = new QGSettings(GSETTINGS_SCHEMA); // m_switchGsettings = new QGSettings(GSETTINGS_SCHEMA);
setSwitchStatus(); // setSwitchStatus();
connect(m_switchGsettings, &QGSettings::changed, this, [=] (const QString &key) { // connect(m_switchGsettings, &QGSettings::changed, this, [=] (const QString &key) {
if (key == WIRED_SWITCH) { // if (key == WIRED_SWITCH) {
setSwitchStatus(); // setSwitchStatus();
} // }
}); // });
} else { // } else {
wiredSwitch->blockSignals(true); // wiredSwitch->blockSignals(true);
wiredSwitch->setChecked(true); // wiredSwitch->setChecked(true);
wiredSwitch->blockSignals(false); // wiredSwitch->blockSignals(false);
qDebug()<<"[Netconnect] org.ukui.kylin-nm.switch is not installed!"; // qDebug()<<"[Netconnect] org.ukui.kylin-nm.switch is not installed!";
} // }
getDeviceStatusMap(deviceStatusMap); getDeviceStatusMap(deviceStatusMap);
if (deviceStatusMap.isEmpty()) { // if (deviceStatusMap.isEmpty()) {
qDebug() << "[Netconnect] no device exist when init, set switch disable"; // qDebug() << "[Netconnect] no device exist when init, set switch disable";
wiredSwitch->setChecked(false); // wiredSwitch->setChecked(false);
wiredSwitch->setCheckable(false); // wiredSwitch->setCheckable(false);
} // }
initNet(); initNet();
if (!wiredSwitch->isChecked() || deviceStatusMap.isEmpty() || !m_interface->isValid()) { if (/*!wiredSwitch->isChecked() || */deviceStatusMap.isEmpty() || !m_interface->isValid()) {
hideLayout(ui->availableLayout); hideLayout(ui->availableLayout);
} }
@ -306,19 +309,19 @@ void NetConnect::updateLanInfo(QString deviceName, QStringList lanInfo)
//总开关 //总开关
void NetConnect::setSwitchStatus() void NetConnect::setSwitchStatus()
{ {
if (QGSettings::isSchemaInstalled(GSETTINGS_SCHEMA)) { // if (QGSettings::isSchemaInstalled(GSETTINGS_SCHEMA)) {
bool status = m_switchGsettings->get(WIRED_SWITCH).toBool(); // bool status = m_switchGsettings->get(WIRED_SWITCH).toBool();
wiredSwitch->blockSignals(true); // wiredSwitch->blockSignals(true);
wiredSwitch->setChecked(status); // wiredSwitch->setChecked(status);
wiredSwitch->blockSignals(false); // wiredSwitch->blockSignals(false);
if (!status) { // if (!status) {
hideLayout(ui->availableLayout); // hideLayout(ui->availableLayout);
} else { // } else {
showLayout(ui->availableLayout); // showLayout(ui->availableLayout);
} // }
} else { // } else {
qDebug()<<"[netconnect] org.ukui.kylin-nm.switch is not installed!"; // qDebug()<<"[netconnect] org.ukui.kylin-nm.switch is not installed!";
} // }
} }
@ -529,7 +532,7 @@ void NetConnect::addDeviceFrame(QString devName)
ItemFrame *itemFrame = new ItemFrame(devName, pluginWidget); ItemFrame *itemFrame = new ItemFrame(devName, pluginWidget);
ui->availableLayout->addWidget(itemFrame); ui->availableLayout->addWidget(itemFrame);
itemFrame->deviceFrame->deviceLabel->setText(tr("card")+/*QString("%1").arg(count)+*/""+devName); itemFrame->deviceFrame->deviceLabel->setText(tr("card")+/*QString("%1").arg(count)+*/""+devName);
itemFrame->deviceFrame->deviceSwitch->setChecked(enable); // itemFrame->deviceFrame->deviceSwitch->setChecked(enable);
if (enable) { if (enable) {
itemFrame->lanItemFrame->show(); itemFrame->lanItemFrame->show();
itemFrame->deviceFrame->dropDownLabel->show(); itemFrame->deviceFrame->dropDownLabel->show();
@ -541,30 +544,30 @@ void NetConnect::addDeviceFrame(QString devName)
deviceFrameMap.insert(devName, itemFrame); deviceFrameMap.insert(devName, itemFrame);
qDebug() << "[NetConnect]deviceFrameMap insert" << devName; qDebug() << "[NetConnect]deviceFrameMap insert" << devName;
connect(itemFrame->deviceFrame, &DeviceFrame::deviceSwitchClicked ,this, [=] (bool checked) { // connect(itemFrame->deviceFrame, &DeviceFrame::deviceSwitchClicked ,this, [=] (bool checked) {
UkccCommon::buriedSettings(QString("netconnect"), "device open", QString("settings"), checked?"true":"fasle"); // UkccCommon::buriedSettings(QString("netconnect"), "device open", QString("settings"), checked?"true":"fasle");
qDebug() << "[NetConnect]call setDeviceEnable" << devName << checked << __LINE__; // qDebug() << "[NetConnect]call setDeviceEnable" << devName << checked << __LINE__;
m_interface->call(QStringLiteral("setDeviceEnable"), devName, checked); // m_interface->call(QStringLiteral("setDeviceEnable"), devName, checked);
qDebug() << "[NetConnect]call setDeviceEnable Respond" << __LINE__; // qDebug() << "[NetConnect]call setDeviceEnable Respond" << __LINE__;
}); // });
connect(itemFrame->deviceFrame->deviceSwitch, &KSwitchButton::stateChanged, this, [=] (bool checked) { // connect(itemFrame->deviceFrame->deviceSwitch, &KSwitchButton::stateChanged, this, [=] (bool checked) {
if (checked) { // if (checked) {
qDebug() << "[NetConnect]set " << devName << "status" << true; // qDebug() << "[NetConnect]set " << devName << "status" << true;
itemFrame->lanItemFrame->show(); // itemFrame->lanItemFrame->show();
itemFrame->deviceFrame->dropDownLabel->show(); // itemFrame->deviceFrame->dropDownLabel->show();
itemFrame->addLanWidget->show(); // itemFrame->addLanWidget->show();
itemFrame->deviceFrame->dropDownLabel->setDropDownStatus(true); // itemFrame->deviceFrame->dropDownLabel->setDropDownStatus(true);
deviceStatusMap[devName] = true; // deviceStatusMap[devName] = true;
} else { // } else {
qDebug() << "[NetConnect]set " << devName << "status" << false; // qDebug() << "[NetConnect]set " << devName << "status" << false;
itemFrame->lanItemFrame->hide(); // itemFrame->lanItemFrame->hide();
itemFrame->deviceFrame->dropDownLabel->hide(); // itemFrame->deviceFrame->dropDownLabel->hide();
itemFrame->addLanWidget->hide(); // itemFrame->addLanWidget->hide();
deviceStatusMap[devName] = false; // deviceStatusMap[devName] = false;
} // }
}); // });
connect(itemFrame->addLanWidget, &AddNetBtn::clicked, this, [=](){ connect(itemFrame->addLanWidget, &AddNetBtn::clicked, this, [=](){
UkccCommon::buriedSettings(pluginName, "Add net", QString("clicked")); UkccCommon::buriedSettings(pluginName, "Add net", QString("clicked"));
@ -640,22 +643,22 @@ void NetConnect::onDeviceStatusChanged()
initNetListFromDevice(addList.at(i)); initNetListFromDevice(addList.at(i));
} }
deviceStatusMap = map; deviceStatusMap = map;
if (deviceStatusMap.isEmpty()) { // if (deviceStatusMap.isEmpty()) {
wiredSwitch->setChecked(false); // wiredSwitch->setChecked(false);
wiredSwitch->setCheckable(false); // wiredSwitch->setCheckable(false);
} else { // } else {
wiredSwitch->setCheckable(true); // wiredSwitch->setCheckable(true);
setSwitchStatus(); // setSwitchStatus();
} // }
QMap<QString, ItemFrame *>::iterator iter; // QMap<QString, ItemFrame *>::iterator iter;
for (iter = deviceFrameMap.begin(); iter != deviceFrameMap.end(); iter++) { // for (iter = deviceFrameMap.begin(); iter != deviceFrameMap.end(); iter++) {
if (deviceStatusMap.contains(iter.key())) { // if (deviceStatusMap.contains(iter.key())) {
if (iter.value()->deviceFrame->deviceSwitch->isChecked() != deviceStatusMap[iter.key()]) { // if (iter.value()->deviceFrame->deviceSwitch->isChecked() != deviceStatusMap[iter.key()]) {
iter.value()->deviceFrame->deviceSwitch->setChecked(deviceStatusMap[iter.key()]); // iter.value()->deviceFrame->deviceSwitch->setChecked(deviceStatusMap[iter.key()]);
} // }
} // }
} // }
} }
void NetConnect::onDeviceNameChanged(QString oldName, QString newName, int type) void NetConnect::onDeviceNameChanged(QString oldName, QString newName, int type)
@ -967,3 +970,31 @@ bool NetConnect::LaunchApp(QString desktopFile)
return reply; return reply;
} }
} }
bool NetConnect::isExitWiredDevice()
{
QDBusInterface *interface = new QDBusInterface("com.kylin.network", "/com/kylin/network",
"com.kylin.network",
QDBusConnection::sessionBus());
if (!interface->isValid()) {
qDebug() << "/com/kylin/network is invalid";
return false;
}
QDBusMessage result = interface->call(QStringLiteral("getDeviceListAndEnabled"),0);
if(result.type() == QDBusMessage::ErrorMessage) {
qWarning() << "getWiredDeviceList error:" << result.errorMessage();
return false;
}
auto dbusArg = result.arguments().at(0).value<QDBusArgument>();
QMap<QString, bool> deviceListMap;
dbusArg >> deviceListMap;
if (deviceListMap.isEmpty()) {
qDebug() << "no wired device";
return false;
}
return true;
}

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -125,6 +125,9 @@ private:
void itemActiveConnectionStatusChanged(LanItem *item, int status); void itemActiveConnectionStatusChanged(LanItem *item, int status);
bool LaunchApp(QString desktopFile); bool LaunchApp(QString desktopFile);
bool isExitWiredDevice();
protected: protected:
bool eventFilter(QObject *w,QEvent *e); bool eventFilter(QObject *w,QEvent *e);
@ -144,6 +147,8 @@ private:
QMap<QString, bool> deviceStatusMap; QMap<QString, bool> deviceStatusMap;
QMap<QString, ItemFrame *> deviceFrameMap; QMap<QString, ItemFrame *> deviceFrameMap;
bool needLoad;
private slots: private slots:
void updateLanInfo(QString deviceName, QStringList lanInfo); void updateLanInfo(QString deviceName, QStringList lanInfo);

View File

@ -1 +0,0 @@
<クd<>箆!ソ`。スン

View File

@ -14,6 +14,26 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>LanItem</name>
<message>
<location filename="../lanitem.cpp" line="57"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="118"/>
<location filename="../lanitem.cpp" line="131"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="120"/>
<location filename="../lanitem.cpp" line="129"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>NetConnect</name> <name>NetConnect</name>
<message> <message>
@ -23,47 +43,49 @@
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="112"/> <location filename="../netconnect.ui" line="112"/>
<location filename="../netconnect.cpp" line="155"/> <location filename="../netconnect.cpp" line="159"/>
<source>open</source> <source>open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/netconnect/open</extra-contents_path> <extra-contents_path>/netconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="198"/> <location filename="../netconnect.ui" line="198"/>
<location filename="../netconnect.cpp" line="152"/> <location filename="../netconnect.cpp" line="156"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="64"/> <location filename="../netconnect.cpp" line="66"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="67"/> <location filename="../netconnect.cpp" line="69"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="81"/> <location filename="../netconnect.cpp" line="83"/>
<location filename="../netconnect.cpp" line="153"/> <location filename="../netconnect.cpp" line="157"/>
<source>LAN</source> <source>LAN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="169"/> <location filename="../netconnect.cpp" line="455"/>
<source>No ethernet device avaliable</source> <location filename="../netconnect.cpp" line="905"/>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="437"/>
<location filename="../netconnect.cpp" line="861"/>
<source>connected</source> <source>connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="504"/> <location filename="../netconnect.cpp" line="457"/>
<location filename="../netconnect.cpp" line="757"/>
<location filename="../netconnect.cpp" line="915"/>
<source>not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="534"/>
<source>card</source> <source>card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -6,7 +6,7 @@
<message> <message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/> <location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/>
<source>Add Others</source> <source>Add Others</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/> <location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/>
@ -14,6 +14,26 @@
<translation></translation> <translation></translation>
</message> </message>
</context> </context>
<context>
<name>LanItem</name>
<message>
<location filename="../lanitem.cpp" line="57"/>
<source>Delete</source>
<translation></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="118"/>
<location filename="../lanitem.cpp" line="131"/>
<source>Disconnect</source>
<translation></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="120"/>
<location filename="../lanitem.cpp" line="129"/>
<source>Connect</source>
<translation></translation>
</message>
</context>
<context> <context>
<name>NetConnect</name> <name>NetConnect</name>
<message> <message>
@ -23,14 +43,14 @@
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="112"/> <location filename="../netconnect.ui" line="112"/>
<location filename="../netconnect.cpp" line="155"/> <location filename="../netconnect.cpp" line="159"/>
<source>open</source> <source>open</source>
<translation></translation> <translation></translation>
<extra-contents_path>/netconnect/open</extra-contents_path> <extra-contents_path>/netconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="198"/> <location filename="../netconnect.ui" line="198"/>
<location filename="../netconnect.cpp" line="152"/> <location filename="../netconnect.cpp" line="156"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation></translation> <translation></translation>
<extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path>
@ -48,34 +68,40 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="64"/> <location filename="../netconnect.cpp" line="66"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="67"/> <location filename="../netconnect.cpp" line="69"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="81"/> <location filename="../netconnect.cpp" line="83"/>
<location filename="../netconnect.cpp" line="153"/> <location filename="../netconnect.cpp" line="157"/>
<source>LAN</source> <source>LAN</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="169"/>
<source>No ethernet device avaliable</source> <source>No ethernet device avaliable</source>
<translation></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="437"/> <location filename="../netconnect.cpp" line="455"/>
<location filename="../netconnect.cpp" line="861"/> <location filename="../netconnect.cpp" line="905"/>
<source>connected</source> <source>connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="504"/> <location filename="../netconnect.cpp" line="457"/>
<location filename="../netconnect.cpp" line="757"/>
<location filename="../netconnect.cpp" line="915"/>
<source>not connected</source>
<translation></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="534"/>
<source>card</source> <source>card</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -14,6 +14,26 @@
<translation>Add WiredNetork</translation> <translation>Add WiredNetork</translation>
</message> </message>
</context> </context>
<context>
<name>LanItem</name>
<message>
<location filename="../lanitem.cpp" line="57"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="118"/>
<location filename="../lanitem.cpp" line="131"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="120"/>
<location filename="../lanitem.cpp" line="129"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>NetConnect</name> <name>NetConnect</name>
<message> <message>
@ -23,14 +43,14 @@
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="112"/> <location filename="../netconnect.ui" line="112"/>
<location filename="../netconnect.cpp" line="155"/> <location filename="../netconnect.cpp" line="159"/>
<source>open</source> <source>open</source>
<translation>open</translation> <translation>open</translation>
<extra-contents_path>/netconnect/open</extra-contents_path> <extra-contents_path>/netconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="198"/> <location filename="../netconnect.ui" line="198"/>
<location filename="../netconnect.cpp" line="152"/> <location filename="../netconnect.cpp" line="156"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation>Advanced settings</translation> <translation>Advanced settings</translation>
<extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path>
@ -44,34 +64,40 @@
<translation type="vanished">ukui control center desktop message</translation> <translation type="vanished">ukui control center desktop message</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="64"/> <location filename="../netconnect.cpp" line="66"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="67"/> <location filename="../netconnect.cpp" line="69"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="81"/> <location filename="../netconnect.cpp" line="83"/>
<location filename="../netconnect.cpp" line="153"/> <location filename="../netconnect.cpp" line="157"/>
<source>LAN</source> <source>LAN</source>
<translation>LAN</translation> <translation>LAN</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="169"/>
<source>No ethernet device avaliable</source> <source>No ethernet device avaliable</source>
<translation>No ethernet device avaliable</translation> <translation type="vanished">No ethernet device avaliable</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="437"/> <location filename="../netconnect.cpp" line="455"/>
<location filename="../netconnect.cpp" line="861"/> <location filename="../netconnect.cpp" line="905"/>
<source>connected</source> <source>connected</source>
<translation>connected</translation> <translation>connected</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="504"/> <location filename="../netconnect.cpp" line="457"/>
<location filename="../netconnect.cpp" line="757"/>
<location filename="../netconnect.cpp" line="915"/>
<source>not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="534"/>
<source>card</source> <source>card</source>
<translation>card</translation> <translation>card</translation>
</message> </message>

View File

@ -14,6 +14,26 @@
<translation> </translation> <translation> </translation>
</message> </message>
</context> </context>
<context>
<name>LanItem</name>
<message>
<location filename="../lanitem.cpp" line="57"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="118"/>
<location filename="../lanitem.cpp" line="131"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="120"/>
<location filename="../lanitem.cpp" line="129"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>NetConnect</name> <name>NetConnect</name>
<message> <message>
@ -23,14 +43,14 @@
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="112"/> <location filename="../netconnect.ui" line="112"/>
<location filename="../netconnect.cpp" line="155"/> <location filename="../netconnect.cpp" line="159"/>
<source>open</source> <source>open</source>
<translation></translation> <translation></translation>
<extra-contents_path>/netconnect/open</extra-contents_path> <extra-contents_path>/netconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="198"/> <location filename="../netconnect.ui" line="198"/>
<location filename="../netconnect.cpp" line="152"/> <location filename="../netconnect.cpp" line="156"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation> </translation> <translation> </translation>
<extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path>
@ -48,34 +68,40 @@
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="64"/> <location filename="../netconnect.cpp" line="66"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="67"/> <location filename="../netconnect.cpp" line="69"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="81"/> <location filename="../netconnect.cpp" line="83"/>
<location filename="../netconnect.cpp" line="153"/> <location filename="../netconnect.cpp" line="157"/>
<source>LAN</source> <source>LAN</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="169"/>
<source>No ethernet device avaliable</source> <source>No ethernet device avaliable</source>
<translation> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="437"/> <location filename="../netconnect.cpp" line="455"/>
<location filename="../netconnect.cpp" line="861"/> <location filename="../netconnect.cpp" line="905"/>
<source>connected</source> <source>connected</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="504"/> <location filename="../netconnect.cpp" line="457"/>
<location filename="../netconnect.cpp" line="757"/>
<location filename="../netconnect.cpp" line="915"/>
<source>not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="534"/>
<source>card</source> <source>card</source>
<translation> </translation> <translation> </translation>
</message> </message>

View File

@ -1 +0,0 @@
<クd<>箆!ソ`。スン

View File

@ -14,6 +14,26 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>LanItem</name>
<message>
<location filename="../lanitem.cpp" line="57"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="118"/>
<location filename="../lanitem.cpp" line="131"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="120"/>
<location filename="../lanitem.cpp" line="129"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>NetConnect</name> <name>NetConnect</name>
<message> <message>
@ -23,47 +43,49 @@
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="112"/> <location filename="../netconnect.ui" line="112"/>
<location filename="../netconnect.cpp" line="155"/> <location filename="../netconnect.cpp" line="159"/>
<source>open</source> <source>open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/netconnect/open</extra-contents_path> <extra-contents_path>/netconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="198"/> <location filename="../netconnect.ui" line="198"/>
<location filename="../netconnect.cpp" line="152"/> <location filename="../netconnect.cpp" line="156"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="64"/> <location filename="../netconnect.cpp" line="66"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="67"/> <location filename="../netconnect.cpp" line="69"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="81"/> <location filename="../netconnect.cpp" line="83"/>
<location filename="../netconnect.cpp" line="153"/> <location filename="../netconnect.cpp" line="157"/>
<source>LAN</source> <source>LAN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="169"/> <location filename="../netconnect.cpp" line="455"/>
<source>No ethernet device avaliable</source> <location filename="../netconnect.cpp" line="905"/>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="437"/>
<location filename="../netconnect.cpp" line="861"/>
<source>connected</source> <source>connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="504"/> <location filename="../netconnect.cpp" line="457"/>
<location filename="../netconnect.cpp" line="757"/>
<location filename="../netconnect.cpp" line="915"/>
<source>not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="534"/>
<source>card</source> <source>card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -6,7 +6,7 @@
<message> <message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/> <location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/>
<source>Add Others</source> <source>Add Others</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/> <location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/>
@ -14,6 +14,26 @@
<translation>线</translation> <translation>线</translation>
</message> </message>
</context> </context>
<context>
<name>LanItem</name>
<message>
<location filename="../lanitem.cpp" line="57"/>
<source>Delete</source>
<translation></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="118"/>
<location filename="../lanitem.cpp" line="131"/>
<source>Disconnect</source>
<translation></translation>
</message>
<message>
<location filename="../lanitem.cpp" line="120"/>
<location filename="../lanitem.cpp" line="129"/>
<source>Connect</source>
<translation></translation>
</message>
</context>
<context> <context>
<name>NetConnect</name> <name>NetConnect</name>
<message> <message>
@ -23,14 +43,14 @@
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="112"/> <location filename="../netconnect.ui" line="112"/>
<location filename="../netconnect.cpp" line="155"/> <location filename="../netconnect.cpp" line="159"/>
<source>open</source> <source>open</source>
<translation></translation> <translation></translation>
<extra-contents_path>/netconnect/open</extra-contents_path> <extra-contents_path>/netconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../netconnect.ui" line="198"/> <location filename="../netconnect.ui" line="198"/>
<location filename="../netconnect.cpp" line="152"/> <location filename="../netconnect.cpp" line="156"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation></translation> <translation></translation>
<extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/netconnect/Advanced settings&quot;</extra-contents_path>
@ -48,34 +68,40 @@
<translation type="vanished">线</translation> <translation type="vanished">线</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="64"/> <location filename="../netconnect.cpp" line="66"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="67"/> <location filename="../netconnect.cpp" line="69"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="81"/> <location filename="../netconnect.cpp" line="83"/>
<location filename="../netconnect.cpp" line="153"/> <location filename="../netconnect.cpp" line="157"/>
<source>LAN</source> <source>LAN</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="169"/>
<source>No ethernet device avaliable</source> <source>No ethernet device avaliable</source>
<translation>线</translation> <translation type="vanished">线</translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="437"/> <location filename="../netconnect.cpp" line="455"/>
<location filename="../netconnect.cpp" line="861"/> <location filename="../netconnect.cpp" line="905"/>
<source>connected</source> <source>connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../netconnect.cpp" line="504"/> <location filename="../netconnect.cpp" line="457"/>
<location filename="../netconnect.cpp" line="757"/>
<location filename="../netconnect.cpp" line="915"/>
<source>not connected</source>
<translation></translation>
</message>
<message>
<location filename="../netconnect.cpp" line="534"/>
<source>card</source> <source>card</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -1,3 +1,22 @@
/*
*
* Copyright (C) 2023, KylinSoft Co., Ltd.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#ifndef APTINFO_H #ifndef APTINFO_H
#define APTINFO_H #define APTINFO_H
#include <QHash> #include <QHash>

View File

@ -1,3 +1,22 @@
/*
*
* Copyright (C) 2023, KylinSoft Co., Ltd.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#include "aptproxydialog.h" #include "aptproxydialog.h"
#include <QDebug> #include <QDebug>
#include <QLineEdit> #include <QLineEdit>

View File

@ -1,3 +1,22 @@
/*
*
* Copyright (C) 2023, KylinSoft Co., Ltd.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*
*/
#ifndef APTPROXYDIALOG_H #ifndef APTPROXYDIALOG_H
#define APTPROXYDIALOG_H #define APTPROXYDIALOG_H

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -123,7 +123,7 @@ QWidget *Proxy::pluginUi() {
initManualProxyStatus(); initManualProxyStatus();
initIgnoreHostStatus(); initIgnoreHostStatus();
initDbus(); initDbus();
initAppProxyStatus(); // initAppProxyStatus();
} else { } else {
qCritical() << "Xml needed by Proxy is not installed"; qCritical() << "Xml needed by Proxy is not installed";
} }
@ -372,10 +372,10 @@ void Proxy::initUi(QWidget *widget)
Lyt->addWidget(mIgnoreFrame); Lyt->addWidget(mIgnoreFrame);
//应用代理模块 //应用代理模块
m_appProxyLabel = new TitleLabel(widget); // m_appProxyLabel = new TitleLabel(widget);
m_appProxyLabel->setText(tr("Application Proxy")); //应用代理 // m_appProxyLabel->setText(tr("Application Proxy")); //应用代理
setAppProxyFrameUi(widget); // setAppProxyFrameUi(widget);
setAppListFrameUi(widget); // setAppListFrameUi(widget);
//APT代理模块 //APT代理模块
mAptProxyLabel = new TitleLabel(widget); mAptProxyLabel = new TitleLabel(widget);
@ -438,12 +438,13 @@ void Proxy::initUi(QWidget *widget)
mverticalLayout->addWidget(mTitleLabel); mverticalLayout->addWidget(mTitleLabel);
mverticalLayout->addWidget(mProxyFrame); mverticalLayout->addWidget(mProxyFrame);
mverticalLayout->addWidget(m_sysSpacerFrame); mverticalLayout->addWidget(m_sysSpacerFrame);
mverticalLayout->addWidget(m_appProxyLabel); // mverticalLayout->addWidget(m_appProxyLabel);
mverticalLayout->addWidget(m_appProxyFrame); // mverticalLayout->addWidget(m_appProxyFrame);
mverticalLayout->addWidget(m_appListSpacerFrame); mverticalLayout->addWidget(m_appListSpacerFrame);
mverticalLayout->addWidget(m_appListFrame); // mverticalLayout->addWidget(m_appListFrame);
mverticalLayout->addWidget(m_appSpacerFrame); // mverticalLayout->addWidget(m_appSpacerFrame);
mverticalLayout->addWidget(mAptProxyLabel); mverticalLayout->addWidget(mAptProxyLabel);
mverticalLayout->addWidget(mAPTFrame); mverticalLayout->addWidget(mAPTFrame);
mverticalLayout->addStretch(); mverticalLayout->addStretch();
@ -982,7 +983,7 @@ QMap<QString, QStringList> Proxy::getAppListProxy()
void Proxy::setUkccProxySettings() void Proxy::setUkccProxySettings()
{ {
setSystemProxyFrameHidden(false); setSystemProxyFrameHidden(false);
setAppProxyFrameHidden(false); // setAppProxyFrameHidden(false);
setAPTProxyFrameHidden(false); setAPTProxyFrameHidden(false);
QDBusInterface ukccDbusInterface("org.ukui.ukcc.session", QDBusInterface ukccDbusInterface("org.ukui.ukcc.session",
@ -1016,7 +1017,7 @@ void Proxy::setUkccProxySettings()
if (setting.contains("SystemProxyFrame") && setting.contains("false")) { if (setting.contains("SystemProxyFrame") && setting.contains("false")) {
setSystemProxyFrameHidden(true); setSystemProxyFrameHidden(true);
} else if (setting.contains("AppProxyFrame") && setting.contains("false")) { } else if (setting.contains("AppProxyFrame") && setting.contains("false")) {
setAppProxyFrameHidden(true); // setAppProxyFrameHidden(true);
} else if (setting.contains("APTProxyFrame") && setting.contains("false")) { } else if (setting.contains("APTProxyFrame") && setting.contains("false")) {
setAPTProxyFrameHidden(true); setAPTProxyFrameHidden(true);
} }
@ -1251,6 +1252,7 @@ void Proxy::setAppListFrameUi(QWidget *widget)
appListLayout->addWidget(m_allowAppProxyLabel); appListLayout->addWidget(m_allowAppProxyLabel);
appListLayout->addWidget(m_appListWidget); appListLayout->addWidget(m_appListWidget);
onPaletteChanged(); onPaletteChanged();
const QByteArray style_id(THEME_SCHAME); const QByteArray style_id(THEME_SCHAME);
if (QGSettings::isSchemaInstalled(style_id)) { if (QGSettings::isSchemaInstalled(style_id)) {

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,27 +4,27 @@
<context> <context>
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="43"/>
<source>Set APT Proxy</source> <source>Set APT Proxy</source>
<translation>APT </translation> <translation>APT </translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="41"/> <location filename="../aptproxydialog.cpp" line="60"/>
<source>Server Address</source> <source>Server Address</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="59"/> <location filename="../aptproxydialog.cpp" line="78"/>
<source>Port</source> <source>Port</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="80"/> <location filename="../aptproxydialog.cpp" line="99"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="84"/> <location filename="../aptproxydialog.cpp" line="103"/>
<source>Confirm</source> <source>Confirm</source>
<translation></translation> <translation></translation>
</message> </message>
@ -37,136 +37,135 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="200"/> <location filename="../proxy.cpp" line="201"/>
<source>Start using</source> <source>Start using</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="213"/> <location filename="../proxy.cpp" line="214"/>
<source>Proxy mode</source> <source>Proxy mode</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="217"/> <location filename="../proxy.cpp" line="218"/>
<source>Auto</source> <source>Auto</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="220"/> <location filename="../proxy.cpp" line="221"/>
<source>Manual</source> <source>Manual</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="375"/>
<source>Application Proxy</source> <source>Application Proxy</source>
<translation></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="450"/> <location filename="../proxy.cpp" line="459"/>
<source>System Proxy</source> <source>System Proxy</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="452"/> <location filename="../proxy.cpp" line="461"/>
<source>Auto url</source> <source>Auto url</source>
<translation></translation> <translation></translation>
<extra-contents_path>/Proxy/Auto url</extra-contents_path> <extra-contents_path>/Proxy/Auto url</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="454"/> <location filename="../proxy.cpp" line="463"/>
<source>Http Proxy</source> <source>Http Proxy</source>
<translation>HTTP </translation> <translation>HTTP </translation>
<extra-contents_path>/Proxy/Http Proxy</extra-contents_path> <extra-contents_path>/Proxy/Http Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="456"/> <location filename="../proxy.cpp" line="465"/>
<source>Https Proxy</source> <source>Https Proxy</source>
<translation>HTTPS </translation> <translation>HTTPS </translation>
<extra-contents_path>/Proxy/Https Proxy</extra-contents_path> <extra-contents_path>/Proxy/Https Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="458"/> <location filename="../proxy.cpp" line="467"/>
<source>Ftp Proxy</source> <source>Ftp Proxy</source>
<translation>FTP </translation> <translation>FTP </translation>
<extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path> <extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="460"/> <location filename="../proxy.cpp" line="469"/>
<source>Socks Proxy</source> <source>Socks Proxy</source>
<translation>SOCKS </translation> <translation>SOCKS </translation>
<extra-contents_path>/Proxy/Socks Proxy</extra-contents_path> <extra-contents_path>/Proxy/Socks Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="461"/> <location filename="../proxy.cpp" line="470"/>
<location filename="../proxy.cpp" line="462"/> <location filename="../proxy.cpp" line="471"/>
<location filename="../proxy.cpp" line="463"/> <location filename="../proxy.cpp" line="472"/>
<location filename="../proxy.cpp" line="464"/> <location filename="../proxy.cpp" line="473"/>
<location filename="../proxy.cpp" line="1068"/> <location filename="../proxy.cpp" line="1122"/>
<source>Port</source> <source>Port</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="465"/> <location filename="../proxy.cpp" line="474"/>
<source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source> <source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source>
<translation> (;)</translation> <translation> (;)</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="468"/> <location filename="../proxy.cpp" line="477"/>
<source>App Proxy</source> <source>App Proxy</source>
<translation></translation> <translation></translation>
<extra-contents_path>/Proxy/App Proxy</extra-contents_path> <extra-contents_path>/Proxy/App Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="480"/>
<source>APT Proxy</source> <source>APT Proxy</source>
<translation>APT </translation> <translation>APT </translation>
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="481"/>
<location filename="../proxy.cpp" line="1005"/> <location filename="../proxy.cpp" line="1059"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="473"/> <location filename="../proxy.cpp" line="482"/>
<source>Server Address : </source> <source>Server Address : </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="474"/> <location filename="../proxy.cpp" line="483"/>
<source>Port : </source> <source>Port : </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="475"/> <location filename="../proxy.cpp" line="484"/>
<source>Edit</source> <source>Edit</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="573"/> <location filename="../proxy.cpp" line="586"/>
<source>The APT proxy has been turned off and needs to be restarted to take effect</source> <source>The APT proxy has been turned off and needs to be restarted to take effect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="574"/> <location filename="../proxy.cpp" line="587"/>
<location filename="../proxy.cpp" line="814"/> <location filename="../proxy.cpp" line="824"/>
<source>Reboot Later</source> <source>Reboot Later</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="575"/> <location filename="../proxy.cpp" line="588"/>
<location filename="../proxy.cpp" line="815"/> <location filename="../proxy.cpp" line="825"/>
<source>Reboot Now</source> <source>Reboot Now</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="823"/>
<source>The system needs to be restarted to set the APT proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation>APT </translation> <translation>APT </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1017"/> <location filename="../proxy.cpp" line="1071"/>
<source>Proxy type</source> <source>Proxy type</source>
<translation></translation> <translation></translation>
</message> </message>
@ -183,49 +182,49 @@
<translation type="vanished">5</translation> <translation type="vanished">5</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1034"/> <location filename="../proxy.cpp" line="1088"/>
<source>IP address</source> <source>IP address</source>
<translation>IPས</translation> <translation>IPས</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1040"/> <location filename="../proxy.cpp" line="1094"/>
<location filename="../proxy.cpp" line="1071"/> <location filename="../proxy.cpp" line="1125"/>
<source>Required</source> <source>Required</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1061"/> <location filename="../proxy.cpp" line="1115"/>
<source>Invalid IP Address</source> <source>Invalid IP Address</source>
<translation>IPས</translation> <translation>IPས</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1082"/> <location filename="../proxy.cpp" line="1136"/>
<source>Username</source> <source>Username</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1085"/> <location filename="../proxy.cpp" line="1139"/>
<location filename="../proxy.cpp" line="1099"/> <location filename="../proxy.cpp" line="1153"/>
<source>Optional</source> <source>Optional</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1095"/> <location filename="../proxy.cpp" line="1149"/>
<source>Password</source> <source>Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1118"/> <location filename="../proxy.cpp" line="1172"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1119"/> <location filename="../proxy.cpp" line="1173"/>
<source>Save</source> <source>Save</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1181"/> <location filename="../proxy.cpp" line="1245"/>
<source>The following applications are allowed to use this configuration:</source> <source>The following applications are allowed to use this configuration:</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -4,27 +4,27 @@
<context> <context>
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="43"/>
<source>Set APT Proxy</source> <source>Set APT Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="41"/> <location filename="../aptproxydialog.cpp" line="60"/>
<source>Server Address</source> <source>Server Address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="59"/> <location filename="../aptproxydialog.cpp" line="78"/>
<source>Port</source> <source>Port</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="80"/> <location filename="../aptproxydialog.cpp" line="99"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="84"/> <location filename="../aptproxydialog.cpp" line="103"/>
<source>Confirm</source> <source>Confirm</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -37,183 +37,178 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="200"/> <location filename="../proxy.cpp" line="201"/>
<source>Start using</source> <source>Start using</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="213"/> <location filename="../proxy.cpp" line="214"/>
<source>Proxy mode</source> <source>Proxy mode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="217"/> <location filename="../proxy.cpp" line="218"/>
<source>Auto</source> <source>Auto</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="220"/> <location filename="../proxy.cpp" line="221"/>
<source>Manual</source> <source>Manual</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="375"/> <location filename="../proxy.cpp" line="459"/>
<source>Application Proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../proxy.cpp" line="450"/>
<source>System Proxy</source> <source>System Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="452"/> <location filename="../proxy.cpp" line="461"/>
<source>Auto url</source> <source>Auto url</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Auto url</extra-contents_path> <extra-contents_path>/Proxy/Auto url</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="454"/> <location filename="../proxy.cpp" line="463"/>
<source>Http Proxy</source> <source>Http Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Http Proxy</extra-contents_path> <extra-contents_path>/Proxy/Http Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="456"/> <location filename="../proxy.cpp" line="465"/>
<source>Https Proxy</source> <source>Https Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Https Proxy</extra-contents_path> <extra-contents_path>/Proxy/Https Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="458"/> <location filename="../proxy.cpp" line="467"/>
<source>Ftp Proxy</source> <source>Ftp Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path> <extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="460"/> <location filename="../proxy.cpp" line="469"/>
<source>Socks Proxy</source> <source>Socks Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Socks Proxy</extra-contents_path> <extra-contents_path>/Proxy/Socks Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="461"/> <location filename="../proxy.cpp" line="470"/>
<location filename="../proxy.cpp" line="462"/> <location filename="../proxy.cpp" line="471"/>
<location filename="../proxy.cpp" line="463"/> <location filename="../proxy.cpp" line="472"/>
<location filename="../proxy.cpp" line="464"/> <location filename="../proxy.cpp" line="473"/>
<location filename="../proxy.cpp" line="1068"/> <location filename="../proxy.cpp" line="1122"/>
<source>Port</source> <source>Port</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="465"/> <location filename="../proxy.cpp" line="474"/>
<source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source> <source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="468"/> <location filename="../proxy.cpp" line="477"/>
<source>App Proxy</source> <source>App Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/App Proxy</extra-contents_path> <extra-contents_path>/Proxy/App Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="480"/>
<source>APT Proxy</source> <source>APT Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="481"/>
<location filename="../proxy.cpp" line="1005"/> <location filename="../proxy.cpp" line="1059"/>
<source>Open</source> <source>Open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="473"/> <location filename="../proxy.cpp" line="482"/>
<source>Server Address : </source> <source>Server Address : </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="474"/> <location filename="../proxy.cpp" line="483"/>
<source>Port : </source> <source>Port : </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="475"/> <location filename="../proxy.cpp" line="484"/>
<source>Edit</source> <source>Edit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="573"/> <location filename="../proxy.cpp" line="586"/>
<source>The APT proxy has been turned off and needs to be restarted to take effect</source> <source>The APT proxy has been turned off and needs to be restarted to take effect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="574"/> <location filename="../proxy.cpp" line="587"/>
<location filename="../proxy.cpp" line="814"/> <location filename="../proxy.cpp" line="824"/>
<source>Reboot Later</source> <source>Reboot Later</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="575"/> <location filename="../proxy.cpp" line="588"/>
<location filename="../proxy.cpp" line="815"/> <location filename="../proxy.cpp" line="825"/>
<source>Reboot Now</source> <source>Reboot Now</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="823"/>
<source>The system needs to be restarted to set the APT proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1017"/> <location filename="../proxy.cpp" line="1071"/>
<source>Proxy type</source> <source>Proxy type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1034"/> <location filename="../proxy.cpp" line="1088"/>
<source>IP address</source> <source>IP address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1040"/> <location filename="../proxy.cpp" line="1094"/>
<location filename="../proxy.cpp" line="1071"/> <location filename="../proxy.cpp" line="1125"/>
<source>Required</source> <source>Required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1061"/> <location filename="../proxy.cpp" line="1115"/>
<source>Invalid IP Address</source> <source>Invalid IP Address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1082"/> <location filename="../proxy.cpp" line="1136"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1085"/> <location filename="../proxy.cpp" line="1139"/>
<location filename="../proxy.cpp" line="1099"/> <location filename="../proxy.cpp" line="1153"/>
<source>Optional</source> <source>Optional</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1095"/> <location filename="../proxy.cpp" line="1149"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1118"/> <location filename="../proxy.cpp" line="1172"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1119"/> <location filename="../proxy.cpp" line="1173"/>
<source>Save</source> <source>Save</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1181"/> <location filename="../proxy.cpp" line="1245"/>
<source>The following applications are allowed to use this configuration:</source> <source>The following applications are allowed to use this configuration:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -4,27 +4,27 @@
<context> <context>
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="43"/>
<source>Set APT Proxy</source> <source>Set APT Proxy</source>
<translation>APT </translation> <translation>APT </translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="41"/> <location filename="../aptproxydialog.cpp" line="60"/>
<source>Server Address</source> <source>Server Address</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="59"/> <location filename="../aptproxydialog.cpp" line="78"/>
<source>Port</source> <source>Port</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="80"/> <location filename="../aptproxydialog.cpp" line="99"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="84"/> <location filename="../aptproxydialog.cpp" line="103"/>
<source>Confirm</source> <source>Confirm</source>
<translation></translation> <translation></translation>
</message> </message>
@ -37,183 +37,182 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="200"/> <location filename="../proxy.cpp" line="201"/>
<source>Start using</source> <source>Start using</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="213"/> <location filename="../proxy.cpp" line="214"/>
<source>Proxy mode</source> <source>Proxy mode</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="217"/> <location filename="../proxy.cpp" line="218"/>
<source>Auto</source> <source>Auto</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="220"/> <location filename="../proxy.cpp" line="221"/>
<source>Manual</source> <source>Manual</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="375"/>
<source>Application Proxy</source> <source>Application Proxy</source>
<translation> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="450"/> <location filename="../proxy.cpp" line="459"/>
<source>System Proxy</source> <source>System Proxy</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="452"/> <location filename="../proxy.cpp" line="461"/>
<source>Auto url</source> <source>Auto url</source>
<translation>URL </translation> <translation>URL </translation>
<extra-contents_path>/Proxy/Auto url</extra-contents_path> <extra-contents_path>/Proxy/Auto url</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="454"/> <location filename="../proxy.cpp" line="463"/>
<source>Http Proxy</source> <source>Http Proxy</source>
<translation>HTTP </translation> <translation>HTTP </translation>
<extra-contents_path>/Proxy/Http Proxy</extra-contents_path> <extra-contents_path>/Proxy/Http Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="456"/> <location filename="../proxy.cpp" line="465"/>
<source>Https Proxy</source> <source>Https Proxy</source>
<translation>HTTPS </translation> <translation>HTTPS </translation>
<extra-contents_path>/Proxy/Https Proxy</extra-contents_path> <extra-contents_path>/Proxy/Https Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="458"/> <location filename="../proxy.cpp" line="467"/>
<source>Ftp Proxy</source> <source>Ftp Proxy</source>
<translation>FTP </translation> <translation>FTP </translation>
<extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path> <extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="460"/> <location filename="../proxy.cpp" line="469"/>
<source>Socks Proxy</source> <source>Socks Proxy</source>
<translation>SOCKS </translation> <translation>SOCKS </translation>
<extra-contents_path>/Proxy/Socks Proxy</extra-contents_path> <extra-contents_path>/Proxy/Socks Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="461"/> <location filename="../proxy.cpp" line="470"/>
<location filename="../proxy.cpp" line="462"/> <location filename="../proxy.cpp" line="471"/>
<location filename="../proxy.cpp" line="463"/> <location filename="../proxy.cpp" line="472"/>
<location filename="../proxy.cpp" line="464"/> <location filename="../proxy.cpp" line="473"/>
<location filename="../proxy.cpp" line="1068"/> <location filename="../proxy.cpp" line="1122"/>
<source>Port</source> <source>Port</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="465"/> <location filename="../proxy.cpp" line="474"/>
<source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source> <source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source>
<translation> (;)</translation> <translation> (;)</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="468"/> <location filename="../proxy.cpp" line="477"/>
<source>App Proxy</source> <source>App Proxy</source>
<translation> </translation> <translation> </translation>
<extra-contents_path>/Proxy/App Proxy</extra-contents_path> <extra-contents_path>/Proxy/App Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="480"/>
<source>APT Proxy</source> <source>APT Proxy</source>
<translation>APT </translation> <translation>APT </translation>
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="481"/>
<location filename="../proxy.cpp" line="1005"/> <location filename="../proxy.cpp" line="1059"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="473"/> <location filename="../proxy.cpp" line="482"/>
<source>Server Address : </source> <source>Server Address : </source>
<translation> : </translation> <translation> : </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="474"/> <location filename="../proxy.cpp" line="483"/>
<source>Port : </source> <source>Port : </source>
<translation> : </translation> <translation> : </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="475"/> <location filename="../proxy.cpp" line="484"/>
<source>Edit</source> <source>Edit</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="573"/> <location filename="../proxy.cpp" line="586"/>
<source>The APT proxy has been turned off and needs to be restarted to take effect</source> <source>The APT proxy has been turned off and needs to be restarted to take effect</source>
<translation>APT </translation> <translation>APT </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="574"/> <location filename="../proxy.cpp" line="587"/>
<location filename="../proxy.cpp" line="814"/> <location filename="../proxy.cpp" line="824"/>
<source>Reboot Later</source> <source>Reboot Later</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="575"/> <location filename="../proxy.cpp" line="588"/>
<location filename="../proxy.cpp" line="815"/> <location filename="../proxy.cpp" line="825"/>
<source>Reboot Now</source> <source>Reboot Now</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="823"/>
<source>The system needs to be restarted to set the APT proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation> APT </translation> <translation> APT </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1017"/> <location filename="../proxy.cpp" line="1071"/>
<source>Proxy type</source> <source>Proxy type</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1034"/> <location filename="../proxy.cpp" line="1088"/>
<source>IP address</source> <source>IP address</source>
<translation>IP </translation> <translation>IP </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1040"/> <location filename="../proxy.cpp" line="1094"/>
<location filename="../proxy.cpp" line="1071"/> <location filename="../proxy.cpp" line="1125"/>
<source>Required</source> <source>Required</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1061"/> <location filename="../proxy.cpp" line="1115"/>
<source>Invalid IP Address</source> <source>Invalid IP Address</source>
<translation> IP </translation> <translation> IP </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1082"/> <location filename="../proxy.cpp" line="1136"/>
<source>Username</source> <source>Username</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1085"/> <location filename="../proxy.cpp" line="1139"/>
<location filename="../proxy.cpp" line="1099"/> <location filename="../proxy.cpp" line="1153"/>
<source>Optional</source> <source>Optional</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1095"/> <location filename="../proxy.cpp" line="1149"/>
<source>Password</source> <source>Password</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1118"/> <location filename="../proxy.cpp" line="1172"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1119"/> <location filename="../proxy.cpp" line="1173"/>
<source>Save</source> <source>Save</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1181"/> <location filename="../proxy.cpp" line="1245"/>
<source>The following applications are allowed to use this configuration:</source> <source>The following applications are allowed to use this configuration:</source>
<translation> :</translation> <translation> :</translation>
</message> </message>

View File

@ -4,27 +4,27 @@
<context> <context>
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="43"/>
<source>Set APT Proxy</source> <source>Set APT Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="41"/> <location filename="../aptproxydialog.cpp" line="60"/>
<source>Server Address</source> <source>Server Address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="59"/> <location filename="../aptproxydialog.cpp" line="78"/>
<source>Port</source> <source>Port</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="80"/> <location filename="../aptproxydialog.cpp" line="99"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="84"/> <location filename="../aptproxydialog.cpp" line="103"/>
<source>Confirm</source> <source>Confirm</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -37,183 +37,178 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="200"/> <location filename="../proxy.cpp" line="201"/>
<source>Start using</source> <source>Start using</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="213"/> <location filename="../proxy.cpp" line="214"/>
<source>Proxy mode</source> <source>Proxy mode</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="217"/> <location filename="../proxy.cpp" line="218"/>
<source>Auto</source> <source>Auto</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="220"/> <location filename="../proxy.cpp" line="221"/>
<source>Manual</source> <source>Manual</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="375"/> <location filename="../proxy.cpp" line="459"/>
<source>Application Proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../proxy.cpp" line="450"/>
<source>System Proxy</source> <source>System Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="452"/> <location filename="../proxy.cpp" line="461"/>
<source>Auto url</source> <source>Auto url</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Auto url</extra-contents_path> <extra-contents_path>/Proxy/Auto url</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="454"/> <location filename="../proxy.cpp" line="463"/>
<source>Http Proxy</source> <source>Http Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Http Proxy</extra-contents_path> <extra-contents_path>/Proxy/Http Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="456"/> <location filename="../proxy.cpp" line="465"/>
<source>Https Proxy</source> <source>Https Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Https Proxy</extra-contents_path> <extra-contents_path>/Proxy/Https Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="458"/> <location filename="../proxy.cpp" line="467"/>
<source>Ftp Proxy</source> <source>Ftp Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path> <extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="460"/> <location filename="../proxy.cpp" line="469"/>
<source>Socks Proxy</source> <source>Socks Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/Socks Proxy</extra-contents_path> <extra-contents_path>/Proxy/Socks Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="461"/> <location filename="../proxy.cpp" line="470"/>
<location filename="../proxy.cpp" line="462"/> <location filename="../proxy.cpp" line="471"/>
<location filename="../proxy.cpp" line="463"/> <location filename="../proxy.cpp" line="472"/>
<location filename="../proxy.cpp" line="464"/> <location filename="../proxy.cpp" line="473"/>
<location filename="../proxy.cpp" line="1068"/> <location filename="../proxy.cpp" line="1122"/>
<source>Port</source> <source>Port</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="465"/> <location filename="../proxy.cpp" line="474"/>
<source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source> <source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="468"/> <location filename="../proxy.cpp" line="477"/>
<source>App Proxy</source> <source>App Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/App Proxy</extra-contents_path> <extra-contents_path>/Proxy/App Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="480"/>
<source>APT Proxy</source> <source>APT Proxy</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="481"/>
<location filename="../proxy.cpp" line="1005"/> <location filename="../proxy.cpp" line="1059"/>
<source>Open</source> <source>Open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="473"/> <location filename="../proxy.cpp" line="482"/>
<source>Server Address : </source> <source>Server Address : </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="474"/> <location filename="../proxy.cpp" line="483"/>
<source>Port : </source> <source>Port : </source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="475"/> <location filename="../proxy.cpp" line="484"/>
<source>Edit</source> <source>Edit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="573"/> <location filename="../proxy.cpp" line="586"/>
<source>The APT proxy has been turned off and needs to be restarted to take effect</source> <source>The APT proxy has been turned off and needs to be restarted to take effect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="574"/> <location filename="../proxy.cpp" line="587"/>
<location filename="../proxy.cpp" line="814"/> <location filename="../proxy.cpp" line="824"/>
<source>Reboot Later</source> <source>Reboot Later</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="575"/> <location filename="../proxy.cpp" line="588"/>
<location filename="../proxy.cpp" line="815"/> <location filename="../proxy.cpp" line="825"/>
<source>Reboot Now</source> <source>Reboot Now</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="823"/>
<source>The system needs to be restarted to set the APT proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1017"/> <location filename="../proxy.cpp" line="1071"/>
<source>Proxy type</source> <source>Proxy type</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1034"/> <location filename="../proxy.cpp" line="1088"/>
<source>IP address</source> <source>IP address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1040"/> <location filename="../proxy.cpp" line="1094"/>
<location filename="../proxy.cpp" line="1071"/> <location filename="../proxy.cpp" line="1125"/>
<source>Required</source> <source>Required</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1061"/> <location filename="../proxy.cpp" line="1115"/>
<source>Invalid IP Address</source> <source>Invalid IP Address</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1082"/> <location filename="../proxy.cpp" line="1136"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1085"/> <location filename="../proxy.cpp" line="1139"/>
<location filename="../proxy.cpp" line="1099"/> <location filename="../proxy.cpp" line="1153"/>
<source>Optional</source> <source>Optional</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1095"/> <location filename="../proxy.cpp" line="1149"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1118"/> <location filename="../proxy.cpp" line="1172"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1119"/> <location filename="../proxy.cpp" line="1173"/>
<source>Save</source> <source>Save</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1181"/> <location filename="../proxy.cpp" line="1245"/>
<source>The following applications are allowed to use this configuration:</source> <source>The following applications are allowed to use this configuration:</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -4,27 +4,27 @@
<context> <context>
<name>AptProxyDialog</name> <name>AptProxyDialog</name>
<message> <message>
<location filename="../aptproxydialog.cpp" line="24"/> <location filename="../aptproxydialog.cpp" line="43"/>
<source>Set APT Proxy</source> <source>Set APT Proxy</source>
<translation> APT </translation> <translation> APT </translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="41"/> <location filename="../aptproxydialog.cpp" line="60"/>
<source>Server Address</source> <source>Server Address</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="59"/> <location filename="../aptproxydialog.cpp" line="78"/>
<source>Port</source> <source>Port</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="80"/> <location filename="../aptproxydialog.cpp" line="99"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../aptproxydialog.cpp" line="84"/> <location filename="../aptproxydialog.cpp" line="103"/>
<source>Confirm</source> <source>Confirm</source>
<translation></translation> <translation></translation>
</message> </message>
@ -37,183 +37,182 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="200"/> <location filename="../proxy.cpp" line="201"/>
<source>Start using</source> <source>Start using</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="213"/> <location filename="../proxy.cpp" line="214"/>
<source>Proxy mode</source> <source>Proxy mode</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="217"/> <location filename="../proxy.cpp" line="218"/>
<source>Auto</source> <source>Auto</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="220"/> <location filename="../proxy.cpp" line="221"/>
<source>Manual</source> <source>Manual</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="375"/>
<source>Application Proxy</source> <source>Application Proxy</source>
<translation></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="450"/> <location filename="../proxy.cpp" line="459"/>
<source>System Proxy</source> <source>System Proxy</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="452"/> <location filename="../proxy.cpp" line="461"/>
<source>Auto url</source> <source>Auto url</source>
<translation> URL</translation> <translation> URL</translation>
<extra-contents_path>/Proxy/Auto url</extra-contents_path> <extra-contents_path>/Proxy/Auto url</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="454"/> <location filename="../proxy.cpp" line="463"/>
<source>Http Proxy</source> <source>Http Proxy</source>
<translation>HTTP </translation> <translation>HTTP </translation>
<extra-contents_path>/Proxy/Http Proxy</extra-contents_path> <extra-contents_path>/Proxy/Http Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="456"/> <location filename="../proxy.cpp" line="465"/>
<source>Https Proxy</source> <source>Https Proxy</source>
<translation>HTTPS </translation> <translation>HTTPS </translation>
<extra-contents_path>/Proxy/Https Proxy</extra-contents_path> <extra-contents_path>/Proxy/Https Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="458"/> <location filename="../proxy.cpp" line="467"/>
<source>Ftp Proxy</source> <source>Ftp Proxy</source>
<translation>FTP </translation> <translation>FTP </translation>
<extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path> <extra-contents_path>/Proxy/Ftp Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="460"/> <location filename="../proxy.cpp" line="469"/>
<source>Socks Proxy</source> <source>Socks Proxy</source>
<translation>SOCKS </translation> <translation>SOCKS </translation>
<extra-contents_path>/Proxy/Socks Proxy</extra-contents_path> <extra-contents_path>/Proxy/Socks Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="461"/> <location filename="../proxy.cpp" line="470"/>
<location filename="../proxy.cpp" line="462"/> <location filename="../proxy.cpp" line="471"/>
<location filename="../proxy.cpp" line="463"/> <location filename="../proxy.cpp" line="472"/>
<location filename="../proxy.cpp" line="464"/> <location filename="../proxy.cpp" line="473"/>
<location filename="../proxy.cpp" line="1068"/> <location filename="../proxy.cpp" line="1122"/>
<source>Port</source> <source>Port</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="465"/> <location filename="../proxy.cpp" line="474"/>
<source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source> <source>List of ignored hosts. more than one entry, please separate with english semicolon(;)</source>
<translation>使;</translation> <translation>使;</translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="468"/> <location filename="../proxy.cpp" line="477"/>
<source>App Proxy</source> <source>App Proxy</source>
<translation></translation> <translation></translation>
<extra-contents_path>/Proxy/App Proxy</extra-contents_path> <extra-contents_path>/Proxy/App Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="471"/> <location filename="../proxy.cpp" line="480"/>
<source>APT Proxy</source> <source>APT Proxy</source>
<translation>APT </translation> <translation>APT </translation>
<extra-contents_path>/Proxy/APT Proxy</extra-contents_path> <extra-contents_path>/Proxy/APT Proxy</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="472"/> <location filename="../proxy.cpp" line="481"/>
<location filename="../proxy.cpp" line="1005"/> <location filename="../proxy.cpp" line="1059"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="473"/> <location filename="../proxy.cpp" line="482"/>
<source>Server Address : </source> <source>Server Address : </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="474"/> <location filename="../proxy.cpp" line="483"/>
<source>Port : </source> <source>Port : </source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="475"/> <location filename="../proxy.cpp" line="484"/>
<source>Edit</source> <source>Edit</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="573"/> <location filename="../proxy.cpp" line="586"/>
<source>The APT proxy has been turned off and needs to be restarted to take effect</source> <source>The APT proxy has been turned off and needs to be restarted to take effect</source>
<translation>APT </translation> <translation>APT </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="574"/> <location filename="../proxy.cpp" line="587"/>
<location filename="../proxy.cpp" line="814"/> <location filename="../proxy.cpp" line="824"/>
<source>Reboot Later</source> <source>Reboot Later</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="575"/> <location filename="../proxy.cpp" line="588"/>
<location filename="../proxy.cpp" line="815"/> <location filename="../proxy.cpp" line="825"/>
<source>Reboot Now</source> <source>Reboot Now</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="813"/> <location filename="../proxy.cpp" line="823"/>
<source>The system needs to be restarted to set the APT proxy, whether to reboot</source> <source>The system needs to be restarted to set the APT proxy, whether to reboot</source>
<translation> APT </translation> <translation> APT </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1017"/> <location filename="../proxy.cpp" line="1071"/>
<source>Proxy type</source> <source>Proxy type</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1034"/> <location filename="../proxy.cpp" line="1088"/>
<source>IP address</source> <source>IP address</source>
<translation>IP </translation> <translation>IP </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1040"/> <location filename="../proxy.cpp" line="1094"/>
<location filename="../proxy.cpp" line="1071"/> <location filename="../proxy.cpp" line="1125"/>
<source>Required</source> <source>Required</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1061"/> <location filename="../proxy.cpp" line="1115"/>
<source>Invalid IP Address</source> <source>Invalid IP Address</source>
<translation> IP </translation> <translation> IP </translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1082"/> <location filename="../proxy.cpp" line="1136"/>
<source>Username</source> <source>Username</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1085"/> <location filename="../proxy.cpp" line="1139"/>
<location filename="../proxy.cpp" line="1099"/> <location filename="../proxy.cpp" line="1153"/>
<source>Optional</source> <source>Optional</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1095"/> <location filename="../proxy.cpp" line="1149"/>
<source>Password</source> <source>Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1118"/> <location filename="../proxy.cpp" line="1172"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1119"/> <location filename="../proxy.cpp" line="1173"/>
<source>Save</source> <source>Save</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../proxy.cpp" line="1181"/> <location filename="../proxy.cpp" line="1245"/>
<source>The following applications are allowed to use this configuration:</source> <source>The following applications are allowed to use this configuration:</source>
<translation>使</translation> <translation>使</translation>
</message> </message>

View File

@ -64,19 +64,19 @@
<context> <context>
<name>VpnItem</name> <name>VpnItem</name>
<message> <message>
<location filename="../vpnitem.cpp" line="56"/> <location filename="../vpnitem.cpp" line="55"/>
<source>Delete</source> <source>Delete</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../vpnitem.cpp" line="108"/> <location filename="../vpnitem.cpp" line="107"/>
<location filename="../vpnitem.cpp" line="121"/> <location filename="../vpnitem.cpp" line="120"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../vpnitem.cpp" line="110"/> <location filename="../vpnitem.cpp" line="109"/>
<location filename="../vpnitem.cpp" line="119"/> <location filename="../vpnitem.cpp" line="118"/>
<source>Connect</source> <source>Connect</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -64,19 +64,19 @@
<context> <context>
<name>VpnItem</name> <name>VpnItem</name>
<message> <message>
<location filename="../vpnitem.cpp" line="56"/> <location filename="../vpnitem.cpp" line="55"/>
<source>Delete</source> <source>Delete</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../vpnitem.cpp" line="108"/> <location filename="../vpnitem.cpp" line="107"/>
<location filename="../vpnitem.cpp" line="121"/> <location filename="../vpnitem.cpp" line="120"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../vpnitem.cpp" line="110"/> <location filename="../vpnitem.cpp" line="109"/>
<location filename="../vpnitem.cpp" line="119"/> <location filename="../vpnitem.cpp" line="118"/>
<source>Connect</source> <source>Connect</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -4,12 +4,12 @@
<context> <context>
<name>AddNetBtn</name> <name>AddNetBtn</name>
<message> <message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="47"/> <location filename="../../component/AddBtn/addnetbtn.cpp" line="44"/>
<source>Add Others</source> <source>Add Others</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../../component/AddBtn/addnetbtn.cpp" line="51"/> <location filename="../../component/AddBtn/addnetbtn.cpp" line="48"/>
<source>Add WiredNetork</source> <source>Add WiredNetork</source>
<translation> </translation> <translation> </translation>
</message> </message>
@ -26,6 +26,7 @@
<name>Vpn</name> <name>Vpn</name>
<message> <message>
<location filename="../vpn.ui" line="53"/> <location filename="../vpn.ui" line="53"/>
<location filename="../vpn.cpp" line="68"/>
<source>VPN</source> <source>VPN</source>
<translation></translation> <translation></translation>
</message> </message>
@ -35,19 +36,27 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../vpn.cpp" line="151"/> <location filename="../vpn.cpp" line="157"/>
<location filename="../vpn.cpp" line="284"/>
<source>Show on Taskbar</source> <source>Show on Taskbar</source>
<translation> </translation> <translation> </translation>
<extra-contents_path>/Vpn/Show on Taskbar</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../vpn.cpp" line="347"/> <location filename="../vpn.cpp" line="286"/>
<location filename="../vpn.cpp" line="454"/> <source>Add VPN</source>
<translation type="unfinished">VPN </translation>
<extra-contents_path>/Vpn/Add VPN</extra-contents_path>
</message>
<message>
<location filename="../vpn.cpp" line="372"/>
<location filename="../vpn.cpp" line="479"/>
<source>connected</source> <source>connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../vpn.cpp" line="349"/> <location filename="../vpn.cpp" line="374"/>
<location filename="../vpn.cpp" line="464"/> <location filename="../vpn.cpp" line="489"/>
<source>not connected</source> <source>not connected</source>
<translation> </translation> <translation> </translation>
</message> </message>
@ -55,19 +64,19 @@
<context> <context>
<name>VpnItem</name> <name>VpnItem</name>
<message> <message>
<location filename="../vpnitem.cpp" line="58"/> <location filename="../vpnitem.cpp" line="55"/>
<source>Delete</source> <source>Delete</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../vpnitem.cpp" line="111"/> <location filename="../vpnitem.cpp" line="107"/>
<location filename="../vpnitem.cpp" line="124"/> <location filename="../vpnitem.cpp" line="120"/>
<source>Disconnect</source> <source>Disconnect</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../vpnitem.cpp" line="113"/> <location filename="../vpnitem.cpp" line="109"/>
<location filename="../vpnitem.cpp" line="122"/> <location filename="../vpnitem.cpp" line="118"/>
<source>Connect</source> <source>Connect</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -19,7 +19,7 @@
<message> <message>
<location filename="../itemframe.cpp" line="38"/> <location filename="../itemframe.cpp" line="38"/>
<source>Add VPN</source> <source>Add VPN</source>
<translation> VPN</translation> <translation>VPN</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@ -114,7 +114,7 @@ QWidget *Vpn::pluginUi(){
const QString Vpn::name() const { const QString Vpn::name() const {
return QStringLiteral("Vpn"); return QStringLiteral("VPN");
} }
bool Vpn::isShowOnHomePage() const bool Vpn::isShowOnHomePage() const
@ -187,6 +187,7 @@ void Vpn::initComponent(){
hotspotLyt->setSpacing(0); hotspotLyt->setSpacing(0);
//列表 //列表
m_listFrame = new ItemFrame(m_pluginWidget); m_listFrame = new ItemFrame(m_pluginWidget);
ui->verticalLayout_4->addWidget(m_topFrame); ui->verticalLayout_4->addWidget(m_topFrame);

View File

@ -58,7 +58,6 @@ VpnItem::VpnItem(bool bAcitve, QWidget *parent)
m_moreMenu->addAction(m_connectAction); m_moreMenu->addAction(m_connectAction);
m_moreMenu->addAction(m_deleteAction); m_moreMenu->addAction(m_deleteAction);
m_moreButton->setMenu(m_moreMenu); m_moreButton->setMenu(m_moreMenu);
mLanLyt->addWidget(m_iconLabel); mLanLyt->addWidget(m_iconLabel);
mLanLyt->addWidget(m_titileLabel,Qt::AlignLeft); mLanLyt->addWidget(m_titileLabel,Qt::AlignLeft);
mLanLyt->addStretch(); mLanLyt->addStretch();

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -23,49 +23,49 @@
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="35"/> <location filename="../wlanconnect.ui" line="35"/>
<location filename="../wlanconnect.cpp" line="140"/> <location filename="../wlanconnect.cpp" line="144"/>
<location filename="../wlanconnect.cpp" line="211"/> <location filename="../wlanconnect.cpp" line="215"/>
<source>WLAN</source> <source>WLAN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="94"/> <location filename="../wlanconnect.ui" line="94"/>
<location filename="../wlanconnect.cpp" line="213"/> <location filename="../wlanconnect.cpp" line="217"/>
<source>open</source> <source>open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/wlanconnect/open</extra-contents_path> <extra-contents_path>/wlanconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="147"/> <location filename="../wlanconnect.ui" line="147"/>
<location filename="../wlanconnect.cpp" line="210"/> <location filename="../wlanconnect.cpp" line="214"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="123"/> <location filename="../wlanconnect.cpp" line="127"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="126"/> <location filename="../wlanconnect.cpp" line="130"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="228"/> <location filename="../wlanconnect.cpp" line="232"/>
<source>No wireless network card detected</source> <source>No wireless network card detected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="364"/> <location filename="../wlanconnect.cpp" line="369"/>
<location filename="../wlanconnect.cpp" line="1033"/> <location filename="../wlanconnect.cpp" line="1058"/>
<location filename="../wlanconnect.cpp" line="1095"/> <location filename="../wlanconnect.cpp" line="1121"/>
<source>connected</source> <source>connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="970"/> <location filename="../wlanconnect.cpp" line="994"/>
<source>card</source> <source>card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -23,21 +23,21 @@
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="35"/> <location filename="../wlanconnect.ui" line="35"/>
<location filename="../wlanconnect.cpp" line="140"/> <location filename="../wlanconnect.cpp" line="144"/>
<location filename="../wlanconnect.cpp" line="211"/> <location filename="../wlanconnect.cpp" line="215"/>
<source>WLAN</source> <source>WLAN</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="94"/> <location filename="../wlanconnect.ui" line="94"/>
<location filename="../wlanconnect.cpp" line="213"/> <location filename="../wlanconnect.cpp" line="217"/>
<source>open</source> <source>open</source>
<translation></translation> <translation></translation>
<extra-contents_path>/wlanconnect/open</extra-contents_path> <extra-contents_path>/wlanconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="147"/> <location filename="../wlanconnect.ui" line="147"/>
<location filename="../wlanconnect.cpp" line="210"/> <location filename="../wlanconnect.cpp" line="214"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation></translation> <translation></translation>
<extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path>
@ -51,29 +51,29 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="123"/> <location filename="../wlanconnect.cpp" line="127"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="126"/> <location filename="../wlanconnect.cpp" line="130"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="228"/> <location filename="../wlanconnect.cpp" line="232"/>
<source>No wireless network card detected</source> <source>No wireless network card detected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="364"/> <location filename="../wlanconnect.cpp" line="369"/>
<location filename="../wlanconnect.cpp" line="1033"/> <location filename="../wlanconnect.cpp" line="1058"/>
<location filename="../wlanconnect.cpp" line="1095"/> <location filename="../wlanconnect.cpp" line="1121"/>
<source>connected</source> <source>connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="970"/> <location filename="../wlanconnect.cpp" line="994"/>
<source>card</source> <source>card</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -23,21 +23,21 @@
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="35"/> <location filename="../wlanconnect.ui" line="35"/>
<location filename="../wlanconnect.cpp" line="140"/> <location filename="../wlanconnect.cpp" line="144"/>
<location filename="../wlanconnect.cpp" line="211"/> <location filename="../wlanconnect.cpp" line="215"/>
<source>WLAN</source> <source>WLAN</source>
<translation>WLAN</translation> <translation>WLAN</translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="94"/> <location filename="../wlanconnect.ui" line="94"/>
<location filename="../wlanconnect.cpp" line="213"/> <location filename="../wlanconnect.cpp" line="217"/>
<source>open</source> <source>open</source>
<translation>open</translation> <translation>open</translation>
<extra-contents_path>/wlanconnect/open</extra-contents_path> <extra-contents_path>/wlanconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="147"/> <location filename="../wlanconnect.ui" line="147"/>
<location filename="../wlanconnect.cpp" line="210"/> <location filename="../wlanconnect.cpp" line="214"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation>Advanced settings</translation> <translation>Advanced settings</translation>
<extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path>
@ -51,29 +51,29 @@
<translation type="vanished">ukui control center desktop message</translation> <translation type="vanished">ukui control center desktop message</translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="123"/> <location filename="../wlanconnect.cpp" line="127"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="126"/> <location filename="../wlanconnect.cpp" line="130"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="228"/> <location filename="../wlanconnect.cpp" line="232"/>
<source>No wireless network card detected</source> <source>No wireless network card detected</source>
<translation>No wireless network card detected</translation> <translation>No wireless network card detected</translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="364"/> <location filename="../wlanconnect.cpp" line="369"/>
<location filename="../wlanconnect.cpp" line="1033"/> <location filename="../wlanconnect.cpp" line="1058"/>
<location filename="../wlanconnect.cpp" line="1095"/> <location filename="../wlanconnect.cpp" line="1121"/>
<source>connected</source> <source>connected</source>
<translation>connected</translation> <translation>connected</translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="970"/> <location filename="../wlanconnect.cpp" line="994"/>
<source>card</source> <source>card</source>
<translation>card</translation> <translation>card</translation>
</message> </message>

View File

@ -23,21 +23,21 @@
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="35"/> <location filename="../wlanconnect.ui" line="35"/>
<location filename="../wlanconnect.cpp" line="140"/> <location filename="../wlanconnect.cpp" line="144"/>
<location filename="../wlanconnect.cpp" line="211"/> <location filename="../wlanconnect.cpp" line="215"/>
<source>WLAN</source> <source>WLAN</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="94"/> <location filename="../wlanconnect.ui" line="94"/>
<location filename="../wlanconnect.cpp" line="213"/> <location filename="../wlanconnect.cpp" line="217"/>
<source>open</source> <source>open</source>
<translation></translation> <translation></translation>
<extra-contents_path>/wlanconnect/open</extra-contents_path> <extra-contents_path>/wlanconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="147"/> <location filename="../wlanconnect.ui" line="147"/>
<location filename="../wlanconnect.cpp" line="210"/> <location filename="../wlanconnect.cpp" line="214"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation> </translation> <translation> </translation>
<extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path>
@ -51,29 +51,29 @@
<translation type="vanished"> </translation> <translation type="vanished"> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="123"/> <location filename="../wlanconnect.cpp" line="127"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="126"/> <location filename="../wlanconnect.cpp" line="130"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="228"/> <location filename="../wlanconnect.cpp" line="232"/>
<source>No wireless network card detected</source> <source>No wireless network card detected</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="364"/> <location filename="../wlanconnect.cpp" line="369"/>
<location filename="../wlanconnect.cpp" line="1033"/> <location filename="../wlanconnect.cpp" line="1058"/>
<location filename="../wlanconnect.cpp" line="1095"/> <location filename="../wlanconnect.cpp" line="1121"/>
<source>connected</source> <source>connected</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="970"/> <location filename="../wlanconnect.cpp" line="994"/>
<source>card</source> <source>card</source>
<translation> </translation> <translation> </translation>
</message> </message>

View File

@ -23,49 +23,49 @@
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="35"/> <location filename="../wlanconnect.ui" line="35"/>
<location filename="../wlanconnect.cpp" line="140"/> <location filename="../wlanconnect.cpp" line="144"/>
<location filename="../wlanconnect.cpp" line="211"/> <location filename="../wlanconnect.cpp" line="215"/>
<source>WLAN</source> <source>WLAN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="94"/> <location filename="../wlanconnect.ui" line="94"/>
<location filename="../wlanconnect.cpp" line="213"/> <location filename="../wlanconnect.cpp" line="217"/>
<source>open</source> <source>open</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/wlanconnect/open</extra-contents_path> <extra-contents_path>/wlanconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="147"/> <location filename="../wlanconnect.ui" line="147"/>
<location filename="../wlanconnect.cpp" line="210"/> <location filename="../wlanconnect.cpp" line="214"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
<extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="123"/> <location filename="../wlanconnect.cpp" line="127"/>
<source>Settings</source> <source>Settings</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="126"/> <location filename="../wlanconnect.cpp" line="130"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="228"/> <location filename="../wlanconnect.cpp" line="232"/>
<source>No wireless network card detected</source> <source>No wireless network card detected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="364"/> <location filename="../wlanconnect.cpp" line="369"/>
<location filename="../wlanconnect.cpp" line="1033"/> <location filename="../wlanconnect.cpp" line="1058"/>
<location filename="../wlanconnect.cpp" line="1095"/> <location filename="../wlanconnect.cpp" line="1121"/>
<source>connected</source> <source>connected</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="970"/> <location filename="../wlanconnect.cpp" line="994"/>
<source>card</source> <source>card</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -23,21 +23,21 @@
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="35"/> <location filename="../wlanconnect.ui" line="35"/>
<location filename="../wlanconnect.cpp" line="140"/> <location filename="../wlanconnect.cpp" line="144"/>
<location filename="../wlanconnect.cpp" line="211"/> <location filename="../wlanconnect.cpp" line="215"/>
<source>WLAN</source> <source>WLAN</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="94"/> <location filename="../wlanconnect.ui" line="94"/>
<location filename="../wlanconnect.cpp" line="213"/> <location filename="../wlanconnect.cpp" line="217"/>
<source>open</source> <source>open</source>
<translation></translation> <translation></translation>
<extra-contents_path>/wlanconnect/open</extra-contents_path> <extra-contents_path>/wlanconnect/open</extra-contents_path>
</message> </message>
<message> <message>
<location filename="../wlanconnect.ui" line="147"/> <location filename="../wlanconnect.ui" line="147"/>
<location filename="../wlanconnect.cpp" line="210"/> <location filename="../wlanconnect.cpp" line="214"/>
<source>Advanced settings</source> <source>Advanced settings</source>
<translation></translation> <translation></translation>
<extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path> <extra-contents_path>/wlanconnect/Advanced settings&quot;</extra-contents_path>
@ -51,29 +51,29 @@
<translation type="vanished"></translation> <translation type="vanished"></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="123"/> <location filename="../wlanconnect.cpp" line="127"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="126"/> <location filename="../wlanconnect.cpp" line="130"/>
<source>Settings desktop message</source> <source>Settings desktop message</source>
<translation> </translation> <translation> </translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="228"/> <location filename="../wlanconnect.cpp" line="232"/>
<source>No wireless network card detected</source> <source>No wireless network card detected</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="364"/> <location filename="../wlanconnect.cpp" line="369"/>
<location filename="../wlanconnect.cpp" line="1033"/> <location filename="../wlanconnect.cpp" line="1058"/>
<location filename="../wlanconnect.cpp" line="1095"/> <location filename="../wlanconnect.cpp" line="1121"/>
<source>connected</source> <source>connected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../wlanconnect.cpp" line="970"/> <location filename="../wlanconnect.cpp" line="994"/>
<source>card</source> <source>card</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
@ -283,7 +283,6 @@ void WlanConnect::initComponent() {
//网卡name处理 //网卡name处理
connect(m_interface, SIGNAL(deviceNameChanged(QString, QString, int)), this, SLOT(onDeviceNameChanged(QString, QString, int)), Qt::QueuedConnection); connect(m_interface, SIGNAL(deviceNameChanged(QString, QString, int)), this, SLOT(onDeviceNameChanged(QString, QString, int)), Qt::QueuedConnection);
connect(m_interface, SIGNAL(wirelessSwitchBtnChanged(bool)), this, SLOT(onSwitchBtnChanged(bool)), Qt::QueuedConnection); connect(m_interface, SIGNAL(wirelessSwitchBtnChanged(bool)), this, SLOT(onSwitchBtnChanged(bool)), Qt::QueuedConnection);
connect(m_interface, SIGNAL(timeToUpdate()), this, SLOT(updateList()), Qt::QueuedConnection); connect(m_interface, SIGNAL(timeToUpdate()), this, SLOT(updateList()), Qt::QueuedConnection);
//高级设置 //高级设置
connect(ui->detailBtn, &QPushButton::clicked, this, [=](bool checked) { connect(ui->detailBtn, &QPushButton::clicked, this, [=](bool checked) {

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -45,11 +45,11 @@ VpnPage::VpnPage(QWidget *parent) : SinglePage(parent)
connect(m_vpnConnectOperation, &KyVpnConnectOperation::activateConnectionError, this, &VpnPage::activateFailed); connect(m_vpnConnectOperation, &KyVpnConnectOperation::activateConnectionError, this, &VpnPage::activateFailed);
connect(m_vpnConnectOperation, &KyVpnConnectOperation::deactivateConnectionError, this, &VpnPage::deactivateFailed); connect(m_vpnConnectOperation, &KyVpnConnectOperation::deactivateConnectionError, this, &VpnPage::deactivateFailed);
connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, [&](WId activeWindowId){ // connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, [&](WId activeWindowId){
if (activeWindowId != this->winId() && activeWindowId != 0) { // if (activeWindowId != this->winId() && activeWindowId != 0) {
hide(); // hide();
} // }
}); // });
} }
VpnPage::~VpnPage() VpnPage::~VpnPage()
@ -575,6 +575,16 @@ bool VpnPage::eventFilter(QObject *watched, QEvent *event)
} }
} }
if (watched == this) {
//失焦退出
if (event->type() == QEvent::ActivationChange) {
if (QApplication::activeWindow() != this) {
hide();
return true;
}
}
}
return QWidget::eventFilter(watched, event); return QWidget::eventFilter(watched, event);
} }

View File

@ -21,6 +21,17 @@
#include <QDebug> #include <QDebug>
#include "vpnconfigpage.h" #include "vpnconfigpage.h"
#define VPNADDPAGE_SIZE 520,272
#define MAINLAYOUT_MARGINS 24, 16, 24, 24
#define MAINLAYOUT_SPACE 24
#define NULL_MARGINS 0,0,0,0
#define NULL_SPACE 0
#define VPNADDPAGE_NAME_MAX_LENGTH 32
#define VPNADDPAGE_LABLE_FIXEDWIDTH 112
#define VPNADDPAGE_COMBOBOX_FIXEDWIDTH 360
#define VPNADDPAGE_INPUTBOX_FIXEDWIDTH 360
vpnAddPage::vpnAddPage(QWidget *parent) : QWidget(parent) vpnAddPage::vpnAddPage(QWidget *parent) : QWidget(parent)
{ {
m_vpnConnOperation = new KyVpnConnectOperation(this); m_vpnConnOperation = new KyVpnConnectOperation(this);
@ -52,8 +63,8 @@ void vpnAddPage::initWindow()
void vpnAddPage::initUI() void vpnAddPage::initUI()
{ {
QVBoxLayout *mainLayout = new QVBoxLayout(this); QVBoxLayout *mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(VPNADDPAGE_MAINLAYOUT_MARGINS); mainLayout->setContentsMargins(MAINLAYOUT_MARGINS);
mainLayout->setSpacing(VPNADDPAGE_NULLSPACE); mainLayout->setSpacing(MAINLAYOUT_SPACE);
initVpnTypeFrame(); initVpnTypeFrame();
initVpnNameFrame(); initVpnNameFrame();
@ -73,11 +84,10 @@ void vpnAddPage::initVpnTypeFrame()
{ {
m_vpnTypeFrame = new QFrame(this); m_vpnTypeFrame = new QFrame(this);
m_vpnTypeFrame->setFrameShape(QFrame::Shape::NoFrame); m_vpnTypeFrame->setFrameShape(QFrame::Shape::NoFrame);
m_vpnTypeFrame->setFixedSize(VPNADDPAGE_FRAME_FIXEDSIZE);
QHBoxLayout *typeLayout = new QHBoxLayout(m_vpnTypeFrame); QHBoxLayout *typeLayout = new QHBoxLayout(m_vpnTypeFrame);
typeLayout->setContentsMargins(VPNADDPAGE_ITEM_MARGINS); typeLayout->setContentsMargins(NULL_MARGINS);
typeLayout->setSpacing(VPNADDPAGE_NULLSPACE); typeLayout->setSpacing(NULL_SPACE);
QLabel *vpnTypeLabel = new QLabel(tr("VPN Type"), this); QLabel *vpnTypeLabel = new QLabel(tr("VPN Type"), this);
vpnTypeLabel->setFixedWidth(VPNADDPAGE_LABLE_FIXEDWIDTH); vpnTypeLabel->setFixedWidth(VPNADDPAGE_LABLE_FIXEDWIDTH);
@ -102,11 +112,10 @@ void vpnAddPage::initVpnNameFrame()
{ {
m_vpnNameFrame = new QFrame(this); m_vpnNameFrame = new QFrame(this);
m_vpnNameFrame->setFrameShape(QFrame::Shape::NoFrame); m_vpnNameFrame->setFrameShape(QFrame::Shape::NoFrame);
m_vpnNameFrame->setFixedSize(VPNADDPAGE_FRAME_FIXEDSIZE);
QHBoxLayout *nameLayout = new QHBoxLayout(m_vpnNameFrame); QHBoxLayout *nameLayout = new QHBoxLayout(m_vpnNameFrame);
nameLayout->setContentsMargins(VPNADDPAGE_ITEM_MARGINS); nameLayout->setContentsMargins(NULL_MARGINS);
nameLayout->setSpacing(VPNADDPAGE_NULLSPACE); nameLayout->setSpacing(NULL_SPACE);
QLabel *vpnNameLabel = new QLabel(tr("VPN Name"), this); QLabel *vpnNameLabel = new QLabel(tr("VPN Name"), this);
vpnNameLabel->setFixedWidth(VPNADDPAGE_LABLE_FIXEDWIDTH); vpnNameLabel->setFixedWidth(VPNADDPAGE_LABLE_FIXEDWIDTH);
@ -125,11 +134,10 @@ void vpnAddPage::initVpnServerFrame()
{ {
m_vpnServerFrame = new QFrame(this); m_vpnServerFrame = new QFrame(this);
m_vpnServerFrame->setFrameShape(QFrame::Shape::NoFrame); m_vpnServerFrame->setFrameShape(QFrame::Shape::NoFrame);
m_vpnServerFrame->setFixedSize(VPNADDPAGE_FRAME_FIXEDSIZE);
QHBoxLayout *serverLayout = new QHBoxLayout(m_vpnServerFrame); QHBoxLayout *serverLayout = new QHBoxLayout(m_vpnServerFrame);
serverLayout->setContentsMargins(VPNADDPAGE_ITEM_MARGINS); serverLayout->setContentsMargins(NULL_MARGINS);
serverLayout->setSpacing(VPNADDPAGE_NULLSPACE); serverLayout->setSpacing(NULL_SPACE);
QLabel *vpnServerLabel = new QLabel(tr("VPN Server"), this); QLabel *vpnServerLabel = new QLabel(tr("VPN Server"), this);
vpnServerLabel->setFixedWidth(VPNADDPAGE_LABLE_FIXEDWIDTH); vpnServerLabel->setFixedWidth(VPNADDPAGE_LABLE_FIXEDWIDTH);
@ -151,35 +159,22 @@ void vpnAddPage::initVpnServerFrame()
void vpnAddPage::initButtonFrame() void vpnAddPage::initButtonFrame()
{ {
m_buttonFrame = new QFrame(this); m_buttonFrame = new QFrame(this);
m_buttonFrame->setFixedSize(VPNDETAILPAGE_FRAME_FIXEDSIZE);
QHBoxLayout *buttonLayout = new QHBoxLayout(m_buttonFrame); QHBoxLayout *buttonLayout = new QHBoxLayout(m_buttonFrame);
buttonLayout->setContentsMargins(VPNDETAILPAGE_ITEM_MARGINS); buttonLayout->setContentsMargins(NULL_MARGINS);
buttonLayout->setSpacing(VPNDETAILPAGE_NULLSPACE); buttonLayout->setSpacing(NULL_SPACE);
QLabel *autoConnectLabel = new QLabel(this);
m_autoConnectBox = new QCheckBox(this); m_autoConnectBox = new QCheckBox(this);
autoConnectLabel->setText(tr("Auto Connection")); m_autoConnectBox->setText(tr("Auto Connection"));
QWidget *autoConWidget = new QWidget(this);
QHBoxLayout *autoLayout = new QHBoxLayout(autoConWidget);
autoLayout->setContentsMargins(VPNDETAILPAGE_NULLMAGINS);
autoLayout->setSpacing(VPNDETAILPAGE_NULLSPACE);
autoLayout->addWidget(m_autoConnectBox);
autoLayout->addWidget(autoConnectLabel);
autoConWidget->setLayout(autoLayout);
m_confimBtn = new QPushButton(this); m_confimBtn = new QPushButton(this);
m_confimBtn->setFixedSize(VPNDETAILPAGE_BUTTON_FIXEDSIZE);
m_confimBtn->setText(tr("Confirm")); m_confimBtn->setText(tr("Confirm"));
m_cancelBtn = new QPushButton(this); m_cancelBtn = new QPushButton(this);
m_cancelBtn->setFixedSize(VPNDETAILPAGE_BUTTON_FIXEDSIZE);
m_cancelBtn->setText(tr("Cancel")); m_cancelBtn->setText(tr("Cancel"));
buttonLayout->addWidget(autoConWidget); buttonLayout->addWidget(m_autoConnectBox);
buttonLayout->addStretch(); buttonLayout->addStretch();
buttonLayout->addWidget(m_cancelBtn); buttonLayout->addWidget(m_cancelBtn);
buttonLayout->addSpacing(VPNDETAILPAGE_BUTTON_SPACE); buttonLayout->addSpacing(16);
buttonLayout->addWidget(m_confimBtn); buttonLayout->addWidget(m_confimBtn);
m_buttonFrame->setLayout(buttonLayout); m_buttonFrame->setLayout(buttonLayout);
} }
@ -251,3 +246,14 @@ vpnAddPage::~vpnAddPage()
{ {
Q_EMIT this->closed(); Q_EMIT this->closed();
} }
void vpnAddPage::paintEvent(QPaintEvent *event)
{
QPalette pal = qApp->palette();
QPainter painter(this);
painter.setBrush(pal.color(QPalette::Base));
painter.drawRect(this->rect());
painter.fillRect(rect(), QBrush(pal.color(QPalette::Base)));
return QWidget::paintEvent(event);
}

View File

@ -32,6 +32,7 @@
#include <QFormLayout> #include <QFormLayout>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QApplication> #include <QApplication>
#include <QPainter>
#include "kyvpnconnectoperation.h" #include "kyvpnconnectoperation.h"
@ -67,6 +68,9 @@ public:
void centerToScreen(); void centerToScreen();
~vpnAddPage(); ~vpnAddPage();
protected:
void paintEvent(QPaintEvent *event);
private: private:
void initWindow(); void initWindow();
void initUI(); void initUI();
@ -80,7 +84,6 @@ private:
bool checkConfimBtnIsEnabled(); bool checkConfimBtnIsEnabled();
bool createVpnConnect(); bool createVpnConnect();
private:
QFrame *m_vpnTypeFrame = nullptr; QFrame *m_vpnTypeFrame = nullptr;
QFrame *m_vpnNameFrame = nullptr; QFrame *m_vpnNameFrame = nullptr;
QFrame *m_vpnServerFrame = nullptr; QFrame *m_vpnServerFrame = nullptr;

View File

@ -17,6 +17,7 @@
* *
* *
*/ */
#ifndef VPNIPV6PAGE_H #ifndef VPNIPV6PAGE_H
#define VPNIPV6PAGE_H #define VPNIPV6PAGE_H

View File

@ -177,6 +177,7 @@ void vpnObject::showVpnAddWidget()
m_vpnAddPage = new vpnAddPage(); m_vpnAddPage = new vpnAddPage();
connect(m_vpnAddPage, &vpnAddPage::closed, [&] () {m_vpnAddPage = nullptr;}); connect(m_vpnAddPage, &vpnAddPage::closed, [&] () {m_vpnAddPage = nullptr;});
m_vpnAddPage->show(); m_vpnAddPage->show();
m_vpnAddPage->centerToScreen();
} }
m_vpnAddPage->raise(); m_vpnAddPage->raise();
#else #else

View File

@ -80,8 +80,13 @@ int main(int argc, char *argv[])
{ {
initUkuiLog4qt("kylin-vpn"); initUkuiLog4qt("kylin-vpn");
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
#endif
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
QString id = QString("kylin-vpn"+ QLatin1String(getenv("DISPLAY"))); QString id = QString("kylin-vpn"+ QLatin1String(getenv("DISPLAY")));
QtSingleApplication a(id, argc, argv); QtSingleApplication a(id, argc, argv);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

View File

@ -4,7 +4,7 @@
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,

Some files were not shown because too many files have changed in this diff Show More