merge debian changes to fix lintian warning

ukui · Feb 10, 2022 · 00b2542 · 00b2542
1 parent 5168bc4
commit 00b2542
Show file tree

Hide file tree

Showing 15 changed files with 217 additions and 53 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,6 +1,6 @@
 ukui-notebook authors
 ------------------
-
+lixin <lixin@kylinos.cn>
 yueshuai <yueshuai@kylinos.cn>
 
 
diff --git a/README.md b/README.md
@@ -1,48 +1,24 @@
-# ukui-sidebar
-
-![build](https://github.com/ukui/ukui-sidebar/workflows/Check%20build/badge.svg?branch=master)
-
-The sidebar mainly consists of two parts: notification center and cutting board. It starts from the start-up and is placed in the tray bar in the form of a tray. After clicking, it can pop up dynamically from the right side of the screen.
-
-  + The notification center can display the pop-up messages sent by each application to mate notification teamon in a list form. Unimportant information can be stored in the storage box for viewing. At the same time, it can call the control panel directly.
-
-
-  + The main function of the clipboard is to save the latest cutting information, and display it under the sidebar in the form of a list. At the same time, it can also put the previous cutting information at the top, so that it can be pasted directly. In addition, it can record the cut text information as well as the URL.
-
-The ukui-sidebar is a shortcut tool on the right side of the screen for UKUI.
-
-# How to test notification-center
-`notify-send -a wechat -i "/home/ccn/heart.png" Summary Body`
-
-# How to report bugs
-Bugs should be reported to the UKUI bug tracking system:
-
-	https://github.com/ukui/ukui-sidebar/issues
-
-You will need to create an account for yourself.
-
-Please read the HACKING file for information on where to send changes or
-bugfixes for this package.
-
-# How to build
-## Preparation
-You can build pre-depends with such command:
-
-`sudo apt install libglib2.0-dev qtbase5-dev libqt5svg5-dev qttools5-dev-tools`
-
-Note: build-depends references the paragraph in debian/control.
-
-## Build from source and test
-
-> git clone https://github.com/ukui/ukui-sidebar
-
-> cd ukui-sidebar && mkdir build && cd build
-
-> qmake .. && make
-
-> sudo make install
-
-Note: If you want to run ukui-sidebar, you need to make some changes in the code after build.
-  + Find `libnotification_plugin.so` in your build path like `/home/XX/ukui-sidebar/build/src/plugins/notification_plugins`. Then set this path as pluginDir in file widget.cpp fuction `bool Widget::loadNotificationPlugin()`.
-
-  + Find `libclipboardPlugin.so` in your build path like `/home/XX/ukui-sidebar/build/src/plugins/sidebar_pushbutton_plugins`. Then set this path as pluginDir in file pluginmanage.cpp fuction `PluginManager::PluginManager(QObject *parent) : QObject(parent)`.
+# ukui-notebook
+
+麒麟便签是ukui桌面环境的一个组件，提供便捷的文本记录和灵活的界面展示,
+具有使用方便，界面简洁等优点。欢迎各位下载并试用。
+
+## 目前实现的功能
+* 便签列表
+  * 实时按照修改时间倒序排序
+  * 显示每条便签的修改时间和部分文本内容
+  * 新建：列表条目增加并打开一个便签页
+  * 搜索：匹配列表中所有便签的文本内容进行搜索
+  * 删除：删除当前列表选中条目，删除后自动选中列表中上一条便签，若删除时，对应条目的便签为打开状态，则同时关闭此便签页；若无列表中无条目选中，则删除无效
+  * 支持双击列表/图标条目，打开或重新激活置顶便签并获取输入焦点
+* 便签页
+  * 支持文本修改自动保存
+  * 支持用户自定义便签头颜色并保存数据库
+  * 文本修改后，此便签页对应便签列表中条目自动置顶排序
+  * 便签头颜色修改后，此便签页对应便签列表中条目自动更新同步
+  * 删除此便签：删除此便签，并删除此便签页对应便签列表中对应条目
+  * 打开便签本：任意便签可重新唤起便签列表
+  * 新建：在任一便签页新建会创建新便签页，同步到便签本
+  * 关闭：关闭当前便签页，若当前便签页文本内容为空，则删除此便签，并删除此便签页对应便签本列表中条目
+  * 支持加粗、斜体、下划线、删除线、无序列表、有序列表
+  * 支持修改字体大小，字体颜色
diff --git a/data/ukui-notebook.desktop b/data/ukui-notebook.desktop
@@ -2,15 +2,12 @@
 Name=Notes
 Name[zh_CN]=便签贴
 Name[tr_TR]=Not
-Name[bo_CN]=སྟབས་བདེ་བྱང་བུ།
 GenericName=Notes
 GenericName[zh_CN]=便签贴
 GenericName[tr_TR]=Not
-GenericName[bo_CN]=སྟབས་བདེ་བྱང་བུ།
 Comment=Notes
 Comment[zh_CN]=便签贴
 Comment[tr_TR]=Not
-Comment[bo_CN]=སྟབས་བདེ་བྱང་བུ།
 Keywords=guide;
 Exec=/usr/bin/ukui-notebook
 Icon=kylin-notebook

diff --git a/man/ukui-notebook-server.1 b/man/ukui-notebook-server.1
@@ -0,0 +1,22 @@
+.\" Man Page for ukui-notebook-server
+.TH UKUI-NOTEBOOK 1 "2020-02-03" "UKUI Desktop Environment"
+.\" Please adjust this date when revising the manpage.
+.\"
+.SH "NAME"
+\fBukui-notebook-server\fR \- A NOTEBOOK PLUGIN IN UKUI
+.SH "SYNOPSIS"
+.B ukui-notebook-server [OPTIONS]
+.SH "DESCRIPTION"
+A notebook plugin for UKUI.
+.SH "OPTIONS"
+.TP
+\fB\-v, \-\-version\fR
+Output version information and exit.
+.SH "BUGS"
+.SS Should you encounter any bugs, they may be reported at:
+http://github.com/ukui/ukui-notebook/issues
+.SH "AUTHORS"
+.SS This Manual Page has been written for the UKUI Desktop Environment by:
+liuliang <liuliang@kylinos.cn> (2020)
+.SH "SEE ALSO"
+.SS Further information may also be available at: http://wiki.ukui-desktop.org/docs
diff --git a/man/ukui-notebook.1 b/man/ukui-notebook.1
@@ -14,7 +14,7 @@ A notebook plugin for UKUI.
 Output version information and exit.
 .SH "BUGS"
 .SS Should you encounter any bugs, they may be reported at:
-http://github.com/ukui/ukui-sidebar/issues
+http://github.com/ukui/ukui-notebook/issues
 .SH "AUTHORS"
 .SS This Manual Page has been written for the UKUI Desktop Environment by:
 liuliang <liuliang@kylinos.cn> (2020)

diff --git a/src/CloseButton/closebutton.cpp b/src/CloseButton/closebutton.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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/>.
+ */
+
 /* CloseButton by David Peng
  * 2020 10.20
  * Version Beta 1.0

diff --git a/src/CloseButton/closebutton.h b/src/CloseButton/closebutton.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 CLOSEBUTTON_H
 #define CLOSEBUTTON_H
 

diff --git a/src/about.cpp b/src/about.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 "about.h"
 #include "ui_about.h"
 #include "utils/xatom-helper.h"

diff --git a/src/about.h b/src/about.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 ABOUT_H
 #define ABOUT_H
 

diff --git a/src/common/CloseButton/closebutton.cpp b/src/common/CloseButton/closebutton.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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/>.
+ */
+
 /* CloseButton by David Peng
  * 2020 10.20
  * Version Beta 1.0

diff --git a/src/common/CloseButton/closebutton.h b/src/common/CloseButton/closebutton.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 CLOSEBUTTON_H
 #define CLOSEBUTTON_H
 

diff --git a/src/utils/utils.cpp b/src/utils/utils.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 "utils.h"
 
 void Utils::setCLIName(QCommandLineParser &parser) {

diff --git a/src/utils/utils.h b/src/utils/utils.h
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 UTILS_H
 #define UTILS_H
 

diff --git a/uNoteDbusServer/main.cpp b/uNoteDbusServer/main.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2020, 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 <QCoreApplication>
 #include <QDebug>

diff --git a/uNoteDbusServer/uNoteDbusServer.cpp b/uNoteDbusServer/uNoteDbusServer.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2020, 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 "uNoteDbusServer.h"
 
 UNoteDbusServer::UNoteDbusServer()