!14 分支修改合入upstream

Merge pull request !14 from lixueman/upstream

.github/workflows/build.yml

@@ -1,86 +0,0 @@
-name: Check build
-
-on:
-  push:
-    branches:
-      - master
-    
-  pull_request:
-    branches:
-      - master
-
-  schedule:
-    - cron: '0 0 * * *'
-  
-jobs:
-  archlinux:
-    name: on Archlinux
-    runs-on: ubuntu-20.04
-    container: docker.io/library/archlinux:latest
-    steps:
-      - name: Checkout ukui-menu source code
-        uses: actions/checkout@v2
-      - name: Refresh pacman repository
-        run: pacman -Sy
-      - name: Install build dependencies
-        run: pacman -S --noconfirm base-devel qt5-base bamf gsettings-qt qt5-svg qt5-x11extras qt5-tools kwindowsystem
-      - name: QMake configure & Make
-        run: |
-          mkdir build;
-          cd build;
-          qmake-qt5 ..;
-          make -j$(nproc);
-  debian:
-    name: on Debian Sid
-    runs-on: ubuntu-20.04
-    container: docker.io/library/debian:sid
-    env:
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - name: Checkout ukui-menu source code
-        uses: actions/checkout@v2
-      - name: Update apt repository
-        run: apt-get update -y
-      - name: Install build dependcies
-        run: apt-get install -y build-essential qt5-default qttools5-dev-tools debhelper-compat qtbase5-dev libqt5svg5-dev libglib2.0-dev libgsettings-qt-dev libbamf3-dev libxrandr-dev libxtst-dev libx11-dev libqt5x11extras5-dev libkf5windowsystem-dev
-      - name: QMake configure & Make
-        run: |
-          mkdir build;
-          cd build;
-          qmake ..;
-          make -j$(nproc);
-  
-  fedora:
-    name: on Fedora 32
-    runs-on: ubuntu-20.04
-    container: docker.io/library/fedora:32
-    steps:
-      - name: Checkout ukui-menu source code
-        uses: actions/checkout@v2
-      - name: Install build dependencies
-        run: dnf install -y which gcc gcc-c++ make cmake cmake-rpm-macros autoconf automake intltool rpm-build qt5-rpm-macros   qt5-qtbase-devel qt5-qtsvg-devel qt5-qtx11extras-devel qt5-linguist glib2-devel gsettings-qt-devel bamf-devel libXrandr-devel libXtst-devel libX11-devel kf5-kwindowsystem-devel
-      - name: QMake configure & Make
-        run: |
-          mkdir build;
-          cd build;
-          qmake-qt5 ..;
-          make -j$(nproc);
-  ubuntu:
-    name: on Ubuntu 20.04
-    runs-on: ubuntu-20.04
-    container: docker.io/library/ubuntu:focal
-    env:
-      DEBIAN_FRONTEND: noninteractive
-    steps:
-      - name: Checkout ukui-menu source code
-        uses: actions/checkout@v2
-      - name: Update apt repository
-        run: apt-get update -y
-      - name: Install build dependcies
-        run: apt-get install -y build-essential qt5-default qttools5-dev-tools debhelper-compat qtbase5-dev libqt5svg5-dev libglib2.0-dev libgsettings-qt-dev libbamf3-dev libxrandr-dev libxtst-dev libx11-dev libqt5x11extras5-dev libkf5windowsystem-dev
-      - name: QMake configure & Make
-        run: |
-          mkdir build;
-          cd build;
-          qmake ..;
-          make -j$(nproc);

README.md

@@ -2,7 +2,34 @@
 
 ![build](https://github.com/ukui/ukui-menu/workflows/Check%20build/badge.svg?branch=master)
 
-An advanced menu for UKUI, providing common and all software mixed sort module, alphabet classification module, functional classification module and search module.
+An advanced menu for UKUI, providing common and all software mixed sort module, alphabet classification module, functional classification module and search module. Provides favorites and recent file functions, You can fix it to your favorites area by right-clicking the application. Provides two display modes: default window and full-screen window.
+
+# The project structure
+
+## data/img
+
+Provide icon files for the projec.
+
+## src/BackProcess
+
+Background data processing function realization, Includes DBUS, path listening, data acquisition, and search functions.
+
+## src/QtSingleApplication
+
+Singleton pattern processing.
+
+## src/UserInterface
+
+The UI implementation.
+
+## src/UtilityFunction
+
+Implementation of common functions, including database operations.
+
+## translations
+
+Translation files
+
 
 # How to report bugs
 Bugs should be reported to the UKUI bug tracking system:
@@ -15,6 +42,7 @@ 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:
 
@@ -33,3 +61,24 @@ Note: build-depends references the paragraph in debian/control.
 > sudo make install
 
 Note: If you want to run ukui-menu, You just need to execute the ukui-menu command at the terminal.
+
+# DBUS interface
+
+BUS Name：org.ukui.menu
+
+path：/org/ukui/menu
+
+Interface：org.ukui.menu
+
+Method name：
+
+GetMenuStatus () <--->  Get ukui-menu display hidden status
+
+WinKeyResponse () <--->  ukui-menu display hidden state change interface
+
+GetSecurityConfigPath ()  <--->  Get security control profile path
+
+# Configuration file
+
+.config/ukui/Ukuimenu.db
+

data/img/mainviewwidget/DM-all.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g id="DM-icon-所有应用" transform="translate(-441 -38)">
+    <rect id="尺寸-16" width="16" height="16" transform="translate(441 38)" fill="none"/>
+    <path id="所有应用" d="M5.5,0H2.3A1.2,1.2,0,0,0,1.1,1.2V4.4A1.2,1.2,0,0,0,2.3,5.6H5.5A1.2,1.2,0,0,0,6.7,4.4V1.2A1.2,1.2,0,0,0,5.5,0ZM2.3.8H5.5a.4.4,0,0,1,.4.4V4.4a.4.4,0,0,1-.4.4H2.3a.4.4,0,0,1-.4-.4V1.2A.4.4,0,0,1,2.3.8ZM11.9,0H8.7A1.2,1.2,0,0,0,7.5,1.2V4.4A1.2,1.2,0,0,0,8.7,5.6h3.2a1.2,1.2,0,0,0,1.2-1.2V1.2A1.2,1.2,0,0,0,11.9,0ZM8.7.8h3.2a.4.4,0,0,1,.4.4V4.4a.4.4,0,0,1-.4.4H8.7a.4.4,0,0,1-.4-.4V1.2A.4.4,0,0,1,8.7.8Zm3.2,5.6H8.7A1.2,1.2,0,0,0,7.5,7.6v3.2A1.2,1.2,0,0,0,8.7,12h3.2a1.2,1.2,0,0,0,1.2-1.2V7.6a1.2,1.2,0,0,0-1.2-1.2Zm-3.2.8h3.2a.4.4,0,0,1,.4.4v3.2a.4.4,0,0,1-.4.4H8.7a.4.4,0,0,1-.4-.4V7.6a.4.4,0,0,1,.4-.4ZM5.5,6.4H2.3A1.2,1.2,0,0,0,1.1,7.6v3.2A1.2,1.2,0,0,0,2.3,12H5.5a1.2,1.2,0,0,0,1.2-1.2V7.6A1.2,1.2,0,0,0,5.5,6.4Zm-3.2.8H5.5a.4.4,0,0,1,.4.4v3.2a.4.4,0,0,1-.4.4H2.3a.4.4,0,0,1-.4-.4V7.6a.4.4,0,0,1,.4-.4Z" transform="translate(441.898 40)" fill="#e0e0e0"/>
+  </g>
+</svg>

data/img/mainviewwidget/DM-arrow.svg

@@ -0,0 +1,4 @@
+<svg id="DM-icon-_arrow" data-name="DM-icon- arrow" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="热点区域" width="16" height="16" fill="#fff" opacity="0"/>
+  <path id="arrow" d="M303.35,388.438l-2.091,2.364-2.091-2.364a.478.478,0,0,0-.751,0,.64.64,0,0,0,0,.849l2.466,2.788a.478.478,0,0,0,.751,0l2.466-2.788a.657.657,0,0,0,0-.849.489.489,0,0,0-.751,0Z" transform="translate(-293.256 -382.256)" fill="#fff" opacity="0.45"/>
+</svg>

data/img/mainviewwidget/DM-close.svg

@@ -0,0 +1,13 @@
+<svg id="DM-icon-关闭" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+  <defs>
+    <clipPath id="clip-path">
+      <rect x="1" y="1" width="16" height="16" fill="none"/>
+    </clipPath>
+  </defs>
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <g id="icon-关闭" transform="translate(-1 -1)" clip-path="url(#clip-path)" style="isolation: isolate">
+    <g id="icon-关闭-2" data-name="icon-关闭" transform="translate(-261.743 -495)">
+      <path id="联合_10" data-name="联合 10" d="M6.5,6.5h0v0h0v0Z" transform="translate(261.743 504.194) rotate(-45)" fill="none" stroke="#e0e0e0" stroke-width="1"/>
+    </g>
+  </g>
+</svg>

data/img/mainviewwidget/DM-function.svg

@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g id="DM-icon-功能排序" transform="translate(-412 -38)">
+    <rect id="尺寸-16" width="16" height="16" transform="translate(412 38)" fill="none"/>
+    <g id="功能" transform="translate(153 -597)">
+      <g id="矩形_218" data-name="矩形 218" transform="translate(261 637)" fill="none" stroke="#e0e0e0" stroke-width="1">
+        <rect width="12" height="12" rx="2" stroke="none"/>
+        <rect x="0.5" y="0.5" width="11" height="11" rx="1.5" fill="none"/>
+      </g>
+      <rect id="矩形_219" data-name="矩形 219" width="5" height="1" transform="translate(267 642)" fill="#e0e0e0" opacity="0.752"/>
+      <rect id="矩形_220" data-name="矩形 220" width="1" height="10" transform="translate(266 638)" fill="#e0e0e0" opacity="0.752"/>
+    </g>
+  </g>
+</svg>

data/img/mainviewwidget/DM-icon-check.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g id="DM-icon-check" transform="translate(-317 -38)">
+    <rect id="矩形" width="16" height="16" rx="1" transform="translate(317 38)" fill="#d8d8d8" opacity="0"/>
+    <path id="路径" d="M8.489.287A1.068,1.068,0,0,1,9.22,0H10.6a.2.2,0,0,1,.146.354l-6.977,6.5a.535.535,0,0,1-.795-.076L-.147,2.455a.205.205,0,0,1,.172-.324h.99a1.062,1.062,0,0,1,.862.437L3.422,4.715a.214.214,0,0,0,.319.03Z" transform="translate(320.186 43)" fill="#e0e0e0"/>
+  </g>
+</svg>

data/img/mainviewwidget/DM-icon-option.svg

@@ -0,0 +1,4 @@
+<svg id="DM-icon-选项" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <path id="icon-三杠" d="M12682-11771v-1h14v1Zm0-5v-1h14v1Zm0-5v-1h14v1Z" transform="translate(-12681 11783.998)" fill="#e0e0e0"/>
+</svg>

data/img/mainviewwidget/DM-icon-search.svg

@@ -0,0 +1,10 @@
+<svg id="DM-icon-search" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <g id="搜索" transform="translate(-230 -499)">
+    <g id="椭圆_83" data-name="椭圆 83" transform="translate(232 501)" fill="none" stroke="#e0e0e0" stroke-width="1">
+      <circle cx="6" cy="6" r="6" stroke="none"/>
+      <circle cx="6" cy="6" r="5.5" fill="none"/>
+    </g>
+    <line id="直线_105" data-name="直线 105" x2="2" y2="2" transform="translate(242 511)" fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.2"/>
+  </g>
+</svg>

data/img/mainviewwidget/DM-icon-返回.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g id="DM-icon-返回" transform="translate(-520 -38)">
+    <rect id="尺寸-16" width="16" height="16" transform="translate(520 38)" fill="none"/>
+    <path id="icon-back" d="M20.309,14.869l-5.621,5.194,6,4.806" transform="translate(510.313 26.131)" fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" opacity="0.604"/>
+  </g>
+</svg>

data/img/mainviewwidget/DM-letter.svg

@@ -0,0 +1,7 @@
+<svg id="DM-icon-字母排序" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <g id="字母" transform="translate(-259.451 -579.866)">
+    <path id="路径_324" data-name="路径 324" d="M-22710,10451.866l5-12,5,12" transform="translate(22972.451 -9858)" fill="none" stroke="#e0e0e0" stroke-linejoin="bevel" stroke-width="1"/>
+    <rect id="矩形_217" data-name="矩形 217" width="7" height="1" transform="translate(264 589)" fill="#e0e0e0"/>
+  </g>
+</svg>

data/img/mainviewwidget/DM-max.svg

@@ -0,0 +1,8 @@
+<svg id="DM-icon-放大" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="尺寸" width="16" height="16" fill="none"/>
+  <g id="icon" transform="translate(-622.5 -494.5)">
+    <path id="路径_16" data-name="路径 16" d="M.45,10v4.5h4.5" transform="translate(623.551 494.5)" fill="none" stroke="#e6e6e6" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+    <path id="路径_17" data-name="路径 17" d="M0,0V4.5H4.5" transform="translate(636.999 500.5) rotate(180)" fill="none" stroke="#e6e6e6" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
+    <circle id="椭圆_12" data-name="椭圆 12" cx="2" cy="2" r="2" transform="translate(628.5 500.5)" fill="#e6e6e6"/>
+  </g>
+</svg>

data/img/mainviewwidget/all.svg

@@ -0,0 +1,4 @@
+<svg id="icon-_所有应用" data-name="icon- 所有应用" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <path id="所有应用" d="M5.5,0H2.3A1.2,1.2,0,0,0,1.1,1.2V4.4A1.2,1.2,0,0,0,2.3,5.6H5.5A1.2,1.2,0,0,0,6.7,4.4V1.2A1.2,1.2,0,0,0,5.5,0ZM2.3.8H5.5a.4.4,0,0,1,.4.4V4.4a.4.4,0,0,1-.4.4H2.3a.4.4,0,0,1-.4-.4V1.2A.4.4,0,0,1,2.3.8ZM11.9,0H8.7A1.2,1.2,0,0,0,7.5,1.2V4.4A1.2,1.2,0,0,0,8.7,5.6h3.2a1.2,1.2,0,0,0,1.2-1.2V1.2A1.2,1.2,0,0,0,11.9,0ZM8.7.8h3.2a.4.4,0,0,1,.4.4V4.4a.4.4,0,0,1-.4.4H8.7a.4.4,0,0,1-.4-.4V1.2A.4.4,0,0,1,8.7.8Zm3.2,5.6H8.7A1.2,1.2,0,0,0,7.5,7.6v3.2A1.2,1.2,0,0,0,8.7,12h3.2a1.2,1.2,0,0,0,1.2-1.2V7.6a1.2,1.2,0,0,0-1.2-1.2Zm-3.2.8h3.2a.4.4,0,0,1,.4.4v3.2a.4.4,0,0,1-.4.4H8.7a.4.4,0,0,1-.4-.4V7.6a.4.4,0,0,1,.4-.4ZM5.5,6.4H2.3A1.2,1.2,0,0,0,1.1,7.6v3.2A1.2,1.2,0,0,0,2.3,12H5.5a1.2,1.2,0,0,0,1.2-1.2V7.6A1.2,1.2,0,0,0,5.5,6.4Zm-3.2.8H5.5a.4.4,0,0,1,.4.4v3.2a.4.4,0,0,1-.4.4H2.3a.4.4,0,0,1-.4-.4V7.6a.4.4,0,0,1,.4-.4Z" transform="translate(0.898 2)"/>
+</svg>

data/img/mainviewwidget/close.svg

@@ -0,0 +1,13 @@
+<svg id="icon-_关闭" data-name="icon- 关闭" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+  <defs>
+    <clipPath id="clip-path">
+      <rect x="1" y="1" width="16" height="16" fill="none"/>
+    </clipPath>
+  </defs>
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <g id="icon-关闭" transform="translate(-1 -1)" clip-path="url(#clip-path)" style="isolation: isolate">
+    <g id="icon-关闭-2" data-name="icon-关闭" transform="translate(-261.743 -495)">
+      <path id="联合_10" data-name="联合 10" d="M6.5,6.5h0v0h0v0Z" transform="translate(261.743 504.194) rotate(-45)" fill="none" stroke="#262626" stroke-width="1"/>
+    </g>
+  </g>
+</svg>

data/img/mainviewwidget/drop-down.svg

@@ -0,0 +1,4 @@
+<svg id="icon-_下拉_小" data-name="icon- 下拉 小" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="热点区域" width="16" height="16" fill="#fff" opacity="0"/>
+  <path id="arrow" d="M303.35,388.438l-2.091,2.364-2.091-2.364a.478.478,0,0,0-.751,0,.64.64,0,0,0,0,.849l2.466,2.788a.478.478,0,0,0,.751,0l2.466-2.788a.657.657,0,0,0,0-.849.489.489,0,0,0-.751,0Z" transform="translate(-293.256 -382.256)" opacity="0.504"/>
+</svg>

data/img/mainviewwidget/full-close.svg

@@ -0,0 +1,4 @@
+<svg id="全屏_icon-关闭_" data-name="全屏 icon-关闭 " xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="尺寸-16" width="16" height="16" fill="none"/>
+  <path id="联合_10" data-name="联合 10" d="M5.658,5.657h0v0h0v0Z" transform="translate(0 8) rotate(-45)" fill="none" stroke="#333" stroke-width="1"/>
+</svg>

data/img/mainviewwidget/full-drop-down.svg

@@ -0,0 +1,4 @@
+<svg id="全屏_icon-_下拉_" data-name="全屏 icon- 下拉 " xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <rect id="矩形_237" data-name="矩形 237" width="16" height="16" fill="none"/>
+  <path id="icon-_arrow_白" data-name="icon- arrow 白" d="M306.746,388.528l-3.485,3.546-3.485-3.546a.854.854,0,0,0-1.251,0,.89.89,0,0,0,0,1.273l4.111,4.182a.854.854,0,0,0,1.251,0L308,389.8a.911.911,0,0,0,0-1.273.874.874,0,0,0-1.251,0Z" transform="translate(-295.256 -383.256)" fill="#fff" opacity="0.351"/>
+</svg>