Project merging of PC and tablet

debian/.debhelper/ukui-menu/dbgsym-build-ids

@@ -0,0 +1 @@
+c655bb8f0b2024dadcce069ee514fb4b60026151 f2bc5d6ae801b3aa68379f09464170e37a7bad5f 

debian/.debhelper/ukui-menu/dbgsym-root/DEBIAN/control

@@ -0,0 +1,13 @@
+Package: ukui-menu-dbgsym
+Package-Type: ddeb
+Source: ukui-menu
+Version: 1.0.0-1
+Auto-Built-Package: debug-symbols
+Architecture: amd64
+Maintainer: Kylin Team <[email protected]>
+Installed-Size: 4428
+Depends: ukui-menu (= 1.0.0-1)
+Section: debug
+Priority: optional
+Description: debug symbols for ukui-menu
+Build-Ids: c655bb8f0b2024dadcce069ee514fb4b60026151 f2bc5d6ae801b3aa68379f09464170e37a7bad5f

debian/.debhelper/ukui-menu/dbgsym-root/DEBIAN/md5sums

@@ -0,0 +1,3 @@
+56992fe5433d38d3c23b4795a4144b8f  usr/lib/debug/.build-id/c6/55bb8f0b2024dadcce069ee514fb4b60026151.debug
+533eb8b8dd6cfd291a4c9b56e7106721  usr/lib/debug/.build-id/f2/bc5d6ae801b3aa68379f09464170e37a7bad5f.debug
+d6477b51563640c4abe98f4003a1e120  usr/lib/debug/.dwz/x86_64-linux-gnu/ukui-menu.debug

debian/changelog

@@ -1,146 +1,5 @@
-ukui-menu (3.0.0-1) unstable; urgency=medium
+ukui-menu (1.0.0-1) unstable; urgency=medium
 
-  * New upstream release.
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 
- -- handsome_feng <[email protected]>  Wed, 26 Aug 2020 20:18:25 +0800
-
-ukui-menu (2.0.8-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- handsome_feng <[email protected]>  Wed, 15 Jul 2020 20:16:14 +0800
-
-ukui-menu (2.0.7-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- handsome_feng <[email protected]>  Mon, 06 Jul 2020 14:57:00 +0800
-
-ukui-menu (2.0.6-1) unstable; urgency=medium
-
-  * New upstream bugfix release.
-    - Fix that the 'recent' page is empty. (LP: #1870954)
-    - Fix the focus issue.
-    - Fix the issues when change primary screen.
-  * debian/control:
-    - Add bamfdaemon to depends and libbamf3-dev to build-depends.
-
- -- handsome_feng <[email protected]>  Mon, 13 Apr 2020 15:47:37 +0800
-
-ukui-menu (2.0.5-1) unstable; urgency=medium
-
-  * New upstream bugfix release.
-    - Fix startup failure when panel profile does not exist.
-    - Fix the icon dragging problem.
-    - Fix that right-click menu popup abnormally.
-    - Fix the wrong position when switch from fullscreen to normal mode.
-  * debian/watch:
-    - Update to monitor upstream org.tar.gz file.
-
- -- handsome_feng <[email protected]>  Tue, 07 Apr 2020 10:54:28 +0800
-
-ukui-menu (2.0.4-1) unstable; urgency=medium
-
-  * New upstream bugfix release.
-    - Fix the icon problem with newly installed software.
-    - Fix the crash during software installation and uninstallation.
-    - Not hardcode the font name.
-
- -- handsome_feng <[email protected]>  Mon, 30 Mar 2020 11:21:48 +0800
-
-ukui-menu (2.0.3-1) unstable; urgency=medium
-
-  * New upstream bugfix release.
-    - Get the panel position to avoid popup at wrong place.
-    - Fix the stuck when scroll the area.
-    - Fix the focus issue.
-    - Fix the display problem of 'recent app" bar.
-    - Adjust the style of right-click menu.
-
- -- handsome_feng <[email protected]>  Sat, 14 Mar 2020 14:33:14 +0800
-
-ukui-menu (2.0.1-1) unstable; urgency=medium
-
-  * New upstream release.
-    - Migrate from python to qt.
-  * debian/control:
-    - Bump Standards-Versions to 4.5.0.
-  * debian/{control,compat}:
-    - Use debhelper-compat notation.
-
- -- handsome_feng <[email protected]>  Sat, 08 Feb 2020 15:51:47 +0800
-
-ukui-menu (1.1.12-1) unstable; urgency=medium
-
-  * Remove the duplicated timed-shutdown.py file.
-
- -- handsome_feng <[email protected]>  Mon, 19 Aug 2019 14:57:14 +0800
-
-ukui-menu (1.1.11-1) unstable; urgency=medium
-
-  * Upload to unstable.
-  * Add network detection for feedback.
-  * Update some labels.
-  * Update tr.po.
-  * debian/control:
-    - Bump standards-version to 4.4.0.
-
- -- handsome_feng <[email protected]>  Wed, 07 Aug 2019 09:52:56 +0800
-
-ukui-menu (1.1.10-1) experimental; urgency=medium
-
-  * Update the default icon of user face.
-  * Fix the error when show popup menu.
-  * Change the timing of update recent files.
-
- -- handsome_feng <[email protected]>  Thu, 21 Mar 2019 17:29:11 +0800
-
-ukui-menu (1.1.9-1) unstable; urgency=medium
-
-  * Add transparency effect.
-  * Add a shutdown timer.
-  * Deal with the situation when get_desktop_file_path is None.
-  * Update the code of keybinding.
-  * Update the icon of start menu.
-  * Bump standards-version to 4.3.0.
-
- -- handsome_feng <[email protected]>  Fri, 04 Jan 2019 14:27:45 +0800
-
-ukui-menu (1.1.7-2) unstable; urgency=medium
-
-  * Debian/control:
-    - Remove gvfs-open. (Closes: 906326)
-
- -- handsome_feng <[email protected]>  Fri, 16 Nov 2018 17:04:47 +0800
-
-ukui-menu (1.1.7-1) unstable; urgency=medium
-
-  * Skip 'Education' for 'Normal Menu'.
-  * Add fr.po, pt.po, ru.po, es.po.
-  * Update start.svg.
-  * Deal with filename which contain '&'.
-
- -- handsome_feng <[email protected]>  Wed, 07 Nov 2018 12:55:21 +0800
-
-ukui-menu (1.1.5-1) UNRELEASED; urgency=medium
-
-  * Use mate-terminal instead of gnome-terminal.
-  * Port to python3.
-  * Update for ukui-panel.
-  * Add support for resize the menu icon.
-  * Add right-click menu for recent files.
-  * Add feedback window.
-
- -- handsome_feng <[email protected]>  Mon, 17 Sep 2018 16:11:00 +0800
-
-ukui-menu (1.0.2-2) unstable; urgency=medium
-
-  * Use tracker.d.o team address (Closes: #899863)
-
- -- Aron Xu <[email protected]>  Mon, 09 Jul 2018 14:47:31 +0800
-
-ukui-menu (1.0.2-1) unstable; urgency=medium
-
-  * Initial release (Closes: #872967)
-
- -- Aron Xu <[email protected]>  Sat, 26 Aug 2017 14:57:14 +0800
+ -- wangguixi <[email protected]>  Tue, 01 Sep 2020 15:39:23 +0800

debian/copyright

@@ -1,14 +1,15 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ukui-menu
-Upstream-Contact: liuhao <[email protected]>
-Source: https://github.com/ukui/ukui-menu
+Upstream-Contact: <preferred name and address to reach the upstream project>
+Source: <url://example.com>
 
 Files: *
-Copyright: 2019 Tianjin KYLIN Information Technology Co., Ltd.
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
 License: GPL-3.0+
 
 Files: debian/*
-Copyright: 2019 liuhao <liuhao@kylinos.cn>
+Copyright: 2020 wangguixi <wangguixi@kylinos.cn>
 License: GPL-3.0+
 
 License: GPL-3.0+
@@ -27,3 +28,12 @@ License: GPL-3.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+#
+# If you need, there are some extra license texts available in two places:
+#   /usr/share/debhelper/dh_make/licenses/
+#   /usr/share/common-licenses/

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

debian/ukui-menu-tablet.manpages

@@ -0,0 +1 @@
+pad/man/ukui-menu-tablet.1

debian/ukui-menu.manpages

@@ -1 +1 @@
-man/ukui-menu.1
+pc/man/ukui-menu.1

debian/ukui-menu/DEBIAN/conffiles

@@ -0,0 +1,2 @@
+/etc/xdg/autostart/ukui-menu-tablet.desktop
+/etc/xdg/autostart/ukui-menu.desktop

debian/ukui-menu/DEBIAN/control

@@ -0,0 +1,14 @@
+Package: ukui-menu
+Version: 1.0.0-1
+Architecture: amd64
+Maintainer: Kylin Team <[email protected]>
+Installed-Size: 821
+Depends: libbamf3-2 (>= 0.2.20), libc6 (>= 2.14), libgcc-s1 (>= 3.0), libglib2.0-0 (>= 2.36), libgsettings-qt1 (>= 0.1+14.04.20140408), libkf5windowsystem5 (>= 4.96.0), libqt5core5a (>= 5.12.2), libqt5dbus5 (>= 5.0.2), libqt5gui5 (>= 5.8.0) | libqt5gui5-gles (>= 5.8.0), libqt5network5 (>= 5.0.2), libqt5svg5 (>= 5.6.0~beta), libqt5widgets5 (>= 5.11.0~rc1), libstdc++6 (>= 5), libx11-6, libxtst6, accountsservice, libqt5x11extras5, bamfdaemon, libxrandr2
+Section: x11
+Priority: optional
+Homepage: https://github.com/ukui/ukui-menu
+Description: Advanced ukui menu
+ UKUI menu provides start menu development library and advanced
+ graphical user interface.
+ .
+ The package contains executable file.

debian/ukui-menu/DEBIAN/md5sums

@@ -0,0 +1,7 @@
+f6136f143060286a826370d04c9dacb6  usr/bin/ukui-menu
+7cda052dd3291dddd2fca69231c36557  usr/bin/ukui-menu-tablet
+c66659d4929aa96ee8a1d187f1563a72  usr/share/doc/ukui-menu/changelog.Debian.gz
+ac948457fd37306fddb054f80fdbe9fd  usr/share/doc/ukui-menu/copyright
+bcebcf42735c6849bdecbb77451021dd  usr/share/ukui-menu/translations/ukui-menu_bo.qm
+9d6b1e9f3ae7b9fa63b3142ba5ae721f  usr/share/ukui-menu/translations/ukui-menu_tr.qm
+bec92e1eb95297c57f15f7768b1146e9  usr/share/ukui-menu/translations/ukui-menu_zh_CN.qm

debian/ukui-menu/etc/xdg/autostart/ukui-menu-tablet.desktop

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=ukui-menu-tablet
+comment=ukui-menu
+Comment[zh_CN]=开始菜单
+Comment[tr_TR]=Başlangıç menüsü
+Exec=/usr/bin/ukui-menu-tablet
+Terminal=false
+Type=Application
+Icon=ukui-menu
+X-UKUI-AutoRestart=true
+OnlyShowIn=UKUI
+X-UKUI-Autostart-Phase=Application
+NoDisplay=true

debian/ukui-menu/usr/share/doc/ukui-menu/copyright

@@ -0,0 +1,39 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ukui-menu
+Upstream-Contact: <preferred name and address to reach the upstream project>
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: GPL-3.0+
+
+Files: debian/*
+Copyright: 2020 wangguixi <[email protected]>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ 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 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 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/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+#
+# If you need, there are some extra license texts available in two places:
+#   /usr/share/debhelper/dh_make/licenses/
+#   /usr/share/common-licenses/

debian/ukui-menu/usr/share/ukui-menu/translations/ukui-menu_bo.qm

@@ -0,0 +1 @@
+<�d��!�`���

pad/README.md

@@ -0,0 +1,35 @@
+# ukui-menu-tablet
+
+![build](https://github.com/ukui/ukui-menu-tablet/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.
+
+# How to report bugs
+Bugs should be reported to the UKUI bug tracking system:
+
+	https://github.com/ukui/ukui-menu-tablet/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 libgsettings-qt-dev`
+
+Note: build-depends references the paragraph in debian/control.
+
+## Build from source and test
+
+> git clone https://github.com/ukui/ukui-menu-tablet
+
+> cd ukui-menu-tablet && mkdir build && cd build
+
+> qmake .. && make
+
+> sudo make install
+
+Note: If you want to run ukui-menu-tablet, You just need to execute the ukui-menu-tablet command at the terminal.

pad/img.qrc

@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>img/search.svg</file>
+        <file>img/search.png</file>
+    </qresource>
+</RCC>

pad/main.cpp

@@ -0,0 +1,59 @@
+#include "mainwindow.h"
+#include <QApplication>
+#include <QDebug>
+#include <QTranslator>
+#include <QLocale>
+#include <QtSingleApplication>
+#include <QSettings>
+#define TABLED_SCHEMA "org.ukui.SettingsDaemon.plugins.tablet-mode"
+
+int main(int argc, char *argv[])
+{
+//    QApplication a(argc, argv);
+
+
+
+    //单例
+    QtSingleApplication a("ukui-menu-tablet", argc, argv);
+    if(a.isRunning())
+    {
+        a.sendMessage("raise_window_noop");
+        return EXIT_SUCCESS;
+    }
+
+    MainWindow w;
+   // w.removeEventFilter(QMoveEvent);
+    a.setActivationWindow(&w);//单例
+
+
+    int x=QApplication::primaryScreen()->geometry().x();
+    int y=QApplication::primaryScreen()->geometry().y();
+    w.setGeometry(x,y,QApplication::primaryScreen()->geometry().width(),QApplication::primaryScreen()->geometry().height()-46);
+
+     QTranslator translator;
+    if(QLocale().language()==QLocale::Chinese)
+    {
+        translator.load(":/translation/tr_zh.qm");
+        a.installTranslator(&translator);
+    }
+
+    QGSettings* tabletMode= new QGSettings(TABLED_SCHEMA);
+    bool res = tabletMode->get("tablet-mode").toBool();
+    qDebug()<<res;
+    if(!res)
+    {
+        w.hide();
+    }
+
+
+    else
+    {
+        w.show();
+        w.raise();
+        w.activateWindow();
+    }
+
+    //w.show();
+
+    return a.exec();
+}