Skip to content

Commit

Permalink
fix:暂时屏蔽dns高级设置(开源后端无相关接口)
Browse files Browse the repository at this point in the history
  • Loading branch information
jzxc95 committed Sep 22, 2023
1 parent c051d72 commit a756603
Show file tree
Hide file tree
Showing 212 changed files with 4,622 additions and 2,268 deletions.
140 changes: 140 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
kylin-nm (4.0.0.0-ok8.1) yangtze; urgency=medium

* rebuild with no changes.

-- handsome_feng <[email protected]> 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 <[email protected]> Tue, 30 May 2023 13:52:06 +0800

kylin-nm (4.0.0.0-ok7) yangtze; urgency=medium

* issue #I73I44 #I71WH5

-- zhaoshixu <[email protected]> Wed, 24 May 2023 15:36:21 +0800

kylin-nm (4.0.0.0-ok6) yangtze; urgency=medium

* issue #I7357J

-- zhaoshixu <[email protected]> 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 <[email protected]> Sat, 13 May 2023 16:52:05 +0800

kylin-nm (4.0.0.0-ok4) yangtz; urgency=medium

* remove kysec

-- zhaoshixu <[email protected]> Wed, 12 Apr 2023 19:28:57 +0800

kylin-nm (4.0.0.0-ok3) yangtze; urgency=medium

* #include <QPainterPath>

-- zhaoshixu <[email protected]> Wed, 12 Apr 2023 19:05:00 +0800

kylin-nm (4.0.0.0-ok2) yangtze; urgency=medium

* remove wired switch

-- zhaoshixu <[email protected]> Wed, 12 Apr 2023 18:44:10 +0800

kylin-nm (4.0.0.0-ok1) yangtze; urgency=medium

* merge upstream

-- zhaoshixu <[email protected]> Wed, 12 Apr 2023 17:09:37 +0800

kylin-nm (3.14.0.0+0512-3k15) yangtze; urgency=medium

* QSystemTrayIcon register

-- zhaoshixu <[email protected]> Fri, 06 Jan 2023 16:22:59 +0800

kylin-nm (3.14.0.0+0512-3k14) yangtze; urgency=medium

* add include QPainterPath

-- zhaoshixu <[email protected]> Thu, 05 Jan 2023 16:27:10 +0800

kylin-nm (3.14.0.0+0512-3k13) yangtze; urgency=medium

* 增加三种企业网加密方式LEAP PWD FAST

-- zhaoshixu <[email protected]> Mon, 26 Dec 2022 16:11:31 +0800

kylin-nm (3.14.0.0+0512-3k12) yangtze; urgency=medium

* vpn页面增加
* dns优化
* tabBar圆角

-- zhaoshixu <[email protected]> Fri, 16 Dec 2022 12:04:41 +0800

kylin-nm (3.14.0.0+0512-3k11) yangtz; urgency=medium

* 合并3.22需求

-- zhaoshixu <[email protected]> Mon, 21 Nov 2022 15:31:28 +0800

kylin-nm (3.14.0.0+0512-2k11) yangtz; urgency=medium

* 修改因有线连接未指定网卡造成VPN托盘崩溃的问题

-- zhaoshixu <[email protected]> Fri, 21 Oct 2022 16:35:19 +0800

kylin-nm (3.14.0.0+0512-2k10) yangtz; urgency=medium

* 托盘vpn需求

-- zhaoshixu <[email protected]> Thu, 20 Oct 2022 20:21:39 +0800

kylin-nm (3.14.0.0+0512-1k10) yangtz; urgency=medium

* 同步3.22需求

-- zhaoshixu <[email protected]> Wed, 19 Oct 2022 10:01:07 +0800

kylin-nm (3.14.0.0+0512-0k10) yangtz; urgency=medium

* close-cd #131075 【网络】普通用户在详情界面修改网络IP信息时会弹出授权框,如果不进行授权详情界面也会显示修改成功,但是实际未修改

-- zhaoshixu <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Wed, 22 Jun 2022 09:44:33 +0800

kylin-nm (3.14.0.0+0512-0k5) yangtz; urgency=medium

* set window frameless.

-- zhaoshixu <[email protected]> Mon, 20 Jun 2022 16:01:48 +0800

kylin-nm (3.14.0.0+0512-0k4) yangtze; urgency=medium

* Initial for openKylin.

-- zhaoshixu <[email protected]> Fri, 17 Jun 2022 11:46:09 +0800
1 change: 1 addition & 0 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
49 changes: 49 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
Source: kylin-nm
Section: utils
Priority: optional
Maintainer: Kylin Team <[email protected]>
Uploaders: handsome_feng <[email protected]>
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 changes: 25 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: kylin-nm
Upstream-Contact: Kylin Team <[email protected]>
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 change: 1 addition & 0 deletions debian/kylin-nm.manpages
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
man/kylin-nm.1
14 changes: 14 additions & 0 deletions debian/kylin-nm.postinst
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 0 deletions debian/kylin-nm.preinst
Original file line number Diff line number Diff line change
@@ -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 changes: 34 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions debian/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (native)
2 changes: 2 additions & 0 deletions debian/watch
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
version=4
https://github.com/ukui/kylin-nm/releases .*/kylin-nm_(\d\S+)\.orig\.tar\.gz
1 change: 1 addition & 0 deletions kylin-nm.pro
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
TEMPLATE = subdirs


CONFIG += \
ordered \
qt \
Expand Down
3 changes: 2 additions & 1 deletion plugins/component/AddBtn/addnetbtn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down Expand Up @@ -82,6 +82,7 @@ void AddNetBtn::paintEvent(QPaintEvent *event)
QPainter painter(this);
painter.setRenderHint(QPainter:: Antialiasing, true); //设置渲染,启动反锯齿
painter.setPen(Qt::NoPen);

painter.setBrush(this->palette().base().color());

QPalette pal = qApp->palette();
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/AddBtn/addnetbtn.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/AddBtn/grayinfobutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/AddBtn/grayinfobutton.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/DrownLabel/drownlabel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
3 changes: 2 additions & 1 deletion plugins/component/DrownLabel/drownlabel.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@

/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* Copyright (C) 2022 Tianjin KYLIN Information Technology 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/InfoButton/infobutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/InfoButton/infobutton.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/SwitchButton/switchbutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
2 changes: 1 addition & 1 deletion plugins/component/SwitchButton/switchbutton.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* 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 2 of the License, or
* 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,
Expand Down
Loading

0 comments on commit a756603

Please sign in to comment.