Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: kmenuedit

kmenuedit (4:5.18.4.1-0ubuntu1) focal; urgency=medium * New upstream release (5.18.4.1) -- Rik Mills <rikmills@kde.org> Thu, 02 Apr 2020 19:46:17 +0100 kmenuedit (4:5.18.3-0ubuntu1) focal; urgency=medium * New upstream release (5.18.3) -- Rik Mills <rikmills@kde.org> Tue, 10 Mar 2020 18:07:42 +0000 kmenuedit (4:5.18.2-0ubuntu1) focal; urgency=medium * New upstream release (5.18.2) -- Rik Mills <rikmills@kde.org> Tue, 25 Feb 2020 18:29:53 +0000 kmenuedit (4:5.18.1-0ubuntu1) focal; urgency=medium * New upstream release (5.18.1) -- Rik Mills <rikmills@kde.org> Tue, 18 Feb 2020 14:36:42 +0000 kmenuedit (4:5.18.0-0ubuntu1) focal; urgency=medium * Drop upstream_fix-saving-new-shortcuts.patch * New upstream release (5.18.0) -- Rik Mills <rikmills@kde.org> Tue, 11 Feb 2020 07:44:02 +0000 kmenuedit (4:5.17.90-0ubuntu2) focal; urgency=medium * Add upstream_fix-saving-new-shortcuts.patch -- Rik Mills <rikmills@kde.org> Mon, 20 Jan 2020 20:14:27 +0000 kmenuedit (4:5.17.90-0ubuntu1) focal; urgency=medium * New upstream (beta) release (5.17.90) -- Rik Mills <rikmills@kde.org> Thu, 16 Jan 2020 18:07:56 +0000 kmenuedit (4:5.17.5-0ubuntu1) focal; urgency=medium * New upstream release (5.17.5) -- Rik Mills <rikmills@kde.org> Wed, 08 Jan 2020 06:44:32 +0000 kmenuedit (4:5.17.4-0ubuntu1) focal; urgency=medium * New upstream release (5.17.4) -- Rik Mills <rikmills@kde.org> Tue, 03 Dec 2019 19:23:49 +0000 kmenuedit (4:5.17.3-0ubuntu1) focal; urgency=medium * New upstream release (5.17.3) -- Rik Mills <rikmills@kde.org> Tue, 12 Nov 2019 17:04:38 +0000 kmenuedit (4:5.17.2-0ubuntu1) focal; urgency=medium * Move qdebug categories file to new location. * New upstream (beta) release (5.16.90) * New upstream release (5.17.0) * New upstream release (5.17.1) * New upstream release (5.17.2) -- Rik Mills <rikmills@kde.org> Thu, 31 Oct 2019 17:49:52 +0000 kmenuedit (4:5.16.5-0ubuntu1) eoan; urgency=medium * New upstream release (5.16.5) -- Rik Mills <rikmills@kubuntu.org> Wed, 04 Sep 2019 09:24:03 +0100 kmenuedit (4:5.16.4-0ubuntu1) eoan; urgency=medium * New upstream release (5.16.4) -- Rik Mills <rikmills@kubuntu.org> Tue, 30 Jul 2019 18:44:52 +0100 kmenuedit (4:5.16.3-0ubuntu1) eoan; urgency=medium * New upstream release (5.16.3) -- Rik Mills <rikmills@kubuntu.org> Tue, 09 Jul 2019 22:22:11 +0100 kmenuedit (4:5.16.2-0ubuntu1) eoan; urgency=medium * New upstream release (5.16.2) -- Rik Mills <rikmills@kubuntu.org> Tue, 25 Jun 2019 18:23:08 +0100 kmenuedit (4:5.16.1-0ubuntu1) eoan; urgency=medium * New upstream release (5.16.1) -- Rik Mills <rikmills@kubuntu.org> Tue, 18 Jun 2019 22:23:39 +0100 kmenuedit (4:5.16.0-0ubuntu1) eoan; urgency=medium * New upstream release (5.16.0) -- Rik Mills <rikmills@kubuntu.org> Tue, 11 Jun 2019 11:35:50 +0100 kmenuedit (4:5.15.90-0ubuntu1) eoan; urgency=medium * New upstream (beta) release (5.15.90) -- Rik Mills <rikmills@kubuntu.org> Sat, 18 May 2019 08:48:58 +0100 kmenuedit (4:5.15.5-0ubuntu1) eoan; urgency=medium * New upstream release (5.15.5) -- Rik Mills <rikmills@kubuntu.org> Fri, 10 May 2019 13:47:51 +0100 kmenuedit (4:5.15.4-0ubuntu1) disco; urgency=medium * New upstream bugfix release (5.15.4) -- Rik Mills <rikmills@kubuntu.org> Thu, 04 Apr 2019 17:09:25 +0100 kmenuedit (4:5.15.3-0ubuntu1) disco; urgency=medium * New upstream release (5.15.3) -- Rik Mills <rikmills@kubuntu.org> Wed, 13 Mar 2019 09:08:52 +0000 kmenuedit (4:5.15.2-0ubuntu1) disco; urgency=medium * New upstream release (5.15.2) -- Rik Mills <rikmills@kubuntu.org> Tue, 26 Feb 2019 19:13:32 +0000 kmenuedit (4:5.15.1-0ubuntu1) disco; urgency=medium * New upstream release (5.15.1) -- Rik Mills <rikmills@kubuntu.org> Tue, 19 Feb 2019 21:33:21 +0000 kmenuedit (4:5.15.0-0ubuntu1) disco; urgency=medium * New upstream release (5.15.0) -- Rik Mills <rikmills@kubuntu.org> Tue, 12 Feb 2019 09:52:58 +0000 kmenuedit (4:5.14.90-0ubuntu1) disco; urgency=medium * New upstream (beta) release (5.14.90) -- Rik Mills <rikmills@kubuntu.org> Sat, 19 Jan 2019 08:24:12 +0000 kmenuedit (4:5.14.5-0ubuntu1) disco; urgency=medium * New upstream release (5.14.5) -- Rik Mills <rikmills@kubuntu.org> Tue, 08 Jan 2019 23:48:04 +0000 kmenuedit (4:5.14.4-0ubuntu1) disco; urgency=medium * New upstream release (5.13.90) * New upstream release (5.14.0) * New upstream release (5.14.1) * New upstream release (5.14.2) * New upstream release (5.14.3) * New upstream release (5.14.4) -- Rik Mills <rikmills@kubuntu.org> Tue, 27 Nov 2018 23:15:07 +0000 kmenuedit (4:5.13.5-0ubuntu1) cosmic; urgency=medium * New upstream release (5.13.5) -- Rik Mills <rikmills@kubuntu.org> Fri, 07 Sep 2018 16:34:47 +0100 kmenuedit (4:5.13.4-1ubuntu1) cosmic; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/control: Kubuntu packaging Vcs fields. - debian/control: Bumped Frameworks, Qt & Plasma build deps. -- Rik Mills <rikmills@kubuntu.org> Tue, 28 Aug 2018 17:59:18 +0100

Modifications :
  1. Download patch po/mr/kmenuedit.po
  2. Download patch po/id/kmenuedit.po
  3. Download patch po/eo/kmenuedit.po
  4. Download patch po/bg/kmenuedit.po
  5. Download patch po/es/kmenuedit.po
  6. Download patch po/sq/kmenuedit.po
  7. Download patch po/lt/kmenuedit.po
  8. Download patch kmenuedit.cpp

    --- 4:5.17.5-2/kmenuedit.cpp 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/kmenuedit.cpp 2020-03-31 14:12:50.000000000 +0000 @@ -181,7 +181,7 @@ void KMenuEdit::setupView() sizes << 1 << 3; } m_splitter->setSizes(sizes); - m_tree->setFocus(); + m_searchLine->setFocus(); setCentralWidget(m_splitter); }
  9. Download patch kconf_update/globalaccel.cpp

    --- 4:5.17.5-2/kconf_update/globalaccel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/kconf_update/globalaccel.cpp 2020-03-31 14:12:50.000000000 +0000 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2019 David Redondo <kde@david-redondo.de> + * + * 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 + * (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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <QAction> +#include <QCoreApplication> +#include <QDBusInterface> + +#include <KConfig> +#include <KConfigGroup> +#include <KGlobalAccel> + +#include "../globalaccel.h" + +int main(int argc, char **argv) +{ + QCoreApplication app(argc, argv); + QDBusInterface khotkeys(QStringLiteral("org.kde.kded5"), QStringLiteral("/modules/khotkeys"), + QStringLiteral("org.kde.khotkeys")); + khotkeys.call(QStringLiteral("declareConfigOutDated")); + KConfig khotkeysrc(QStringLiteral("khotkeysrc"), KConfig::SimpleConfig); + const int dataCount = KConfigGroup(&khotkeysrc, "Data").readEntry("DataCount", 0); + bool foundKmenuedit = false; + int kmenueditIndex; + KConfigGroup kmenueditGroup; + for (int i = 1; i <= dataCount; ++i) { + kmenueditGroup = KConfigGroup(&khotkeysrc, QStringLiteral("Data_%1").arg(i)); + if (kmenueditGroup.readEntry("Name", QString()) == QLatin1String("KMenuEdit")) { + foundKmenuedit = true; + kmenueditIndex = i; + break; + } + } + if (!foundKmenuedit) { + return 0; + } + const int numShortcuts = kmenueditGroup.readEntry("DataCount", 0); + for (int i = 1; i <= numShortcuts; ++i) { + const QString groupName = QStringLiteral("Data_%1_%2").arg(kmenueditIndex).arg(i); + // only migrate the launch actions for now, not the default search action + if (KConfigGroup(&khotkeysrc, groupName).readEntry("Type") != QLatin1String("MENUENTRY_SHORTCUT_ACTION_DATA")) { + continue; + } + const QString storageId = KConfigGroup(&khotkeysrc, groupName + QStringLiteral("Actions0")).readEntry("CommandURL"); + const QString id = KConfigGroup(&khotkeysrc, groupName + QStringLiteral("Triggers0")).readEntry("Uuid"); + //ask globalaccel about the current shortcut rather than parsing it ourselves + const QList<QKeySequence> shortcut = KGlobalAccel::self()->globalShortcut(QStringLiteral("khotkeys"), id); + QAction action; + action.setObjectName(id); + action.setProperty("componentName", QStringLiteral("khotkeys")); + KGlobalAccel::self()->setShortcut(&action, {}); + KGlobalAccel::self()->removeAllShortcuts(&action); + if (!shortcut.isEmpty() && !shortcut[0].isEmpty()) { + GlobalAccel::changeMenuEntryShortcut(KService::serviceByStorageId(storageId), shortcut[0]); + } + khotkeysrc.deleteGroup(groupName); + khotkeysrc.deleteGroup(groupName + QStringLiteral("Actions")); + khotkeysrc.deleteGroup(groupName + QStringLiteral("Actions0")); + khotkeysrc.deleteGroup(groupName + QStringLiteral("Conditions")); + khotkeysrc.deleteGroup(groupName + QStringLiteral("Triggers")); + khotkeysrc.deleteGroup(groupName + QStringLiteral("Triggers0")); + } + khotkeysrc.sync(); + khotkeys.call(QStringLiteral("reread_configuration")); +}
  10. Download patch po/en_GB/kmenuedit.po
  11. Download patch po/bn_IN/kmenuedit.po
  12. Download patch po/hr/kmenuedit.po
  13. Download patch po/cs/kmenuedit.po
  14. Download patch po/gl/kmenuedit.po
  15. Download patch po/km/kmenuedit.po
  16. Download patch basictab.h

    --- 4:5.17.5-2/basictab.h 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/basictab.h 2020-03-31 14:12:50.000000000 +0000 @@ -25,7 +25,7 @@ #include <KService> class KKeySequenceWidget; -class KLineEdit; +class QLineEdit; class KIconButton; class QCheckBox; class QGroupBox; @@ -85,13 +85,13 @@ protected: void enableWidgets(bool isDF, bool isDeleted); protected: - KLineEdit *_nameEdit = nullptr; + QLineEdit *_nameEdit = nullptr; KLineSpellChecking *_commentEdit = nullptr; KLineSpellChecking *_descriptionEdit = nullptr; KKeySequenceWidget *_keyBindingEdit = nullptr; KUrlRequester *_execEdit, *_pathEdit = nullptr; - KLineEdit *_terminalOptionsEdit = nullptr; - KLineEdit *_userNameEdit = nullptr; + QLineEdit *_terminalOptionsEdit = nullptr; + QLineEdit *_userNameEdit = nullptr; QCheckBox *_terminalCB = nullptr; QCheckBox *_userCB = nullptr; QCheckBox *_launchCB = nullptr;
  17. Download patch po/fr/kmenuedit.po
  18. Download patch debian/rules

    --- 4:5.17.5-2/debian/rules 2020-01-19 18:05:49.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/debian/rules 2020-04-02 18:46:17.000000000 +0000 @@ -3,5 +3,15 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed +l10npkgs_firstversion_ok := 4:4.14.0-2 +include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk + %: dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp + +override_dh_strip: + dh_strip --dbgsym-migration='kmenuedit-dbg (<= 4:5.5.5-1~~)' + +override_dh_gencontrol: l10npkgs_firstversion_ok + dh_gencontrol +
  19. Download patch po/ms/kmenuedit.po
  20. Download patch doc/index.docbook

    --- 4:5.17.5-2/doc/index.docbook 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/doc/index.docbook 2020-03-31 14:12:50.000000000 +0000 @@ -540,8 +540,8 @@ item.</action></para></listitem> <para> &kmenuedit; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> -menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" ->Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> +menu items, for more information read the sections about the <ulink url="help:/fundamentals/menus.html#menus-settings" +>Settings Menu</ulink> and <ulink url="help:/fundamentals/menus.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. </para>
  21. Download patch po/fa/kmenuedit.po
  22. Download patch po/et/kmenuedit.po
  23. Download patch debian/compat

    --- 4:5.17.5-2/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/debian/compat 2020-04-02 18:46:17.000000000 +0000 @@ -0,0 +1 @@ +11
  24. Download patch po/sv/kmenuedit.po
  25. Download patch po/hne/kmenuedit.po
  26. Download patch po/fi/kmenuedit.po
  27. Download patch po/tg/kmenuedit.po
  28. Download patch po/ca/docs/kmenuedit/index.docbook

    --- 4:5.17.5-2/po/ca/docs/kmenuedit/index.docbook 2020-01-07 15:28:26.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/po/ca/docs/kmenuedit/index.docbook 2020-03-31 14:13:19.000000000 +0000 @@ -965,11 +965,11 @@ >Arranjament</guimenu > i <guimenu >Ajuda</guimenu ->, per obtenir més informació llegiu les seccions sobre <ulink url="help:/fundamentals/ui.html#menus-settings" +>, per obtenir més informació llegiu les seccions sobre <ulink url="help:/fundamentals/menus.html#menus-settings" >El menú Arranjament</ulink -> i <ulink url="help:/fundamentals/ui.html#menus-help" +> i <ulink url="help:/fundamentals/menus.html#menus-help" >El menú Ajuda</ulink -> dels fonaments del &kde;. </para> +> dels Fonaments del &kde;. </para> </chapter>
  29. Download patch po/ar/kmenuedit.po
  30. Download patch debian/upstream/signing-key.asc
  31. Download patch debian/control

    --- 4:5.17.5-2/debian/control 2020-02-15 07:32:52.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/debian/control 2020-04-02 18:46:17.000000000 +0000 @@ -4,30 +4,33 @@ Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Maximiliano Curia <maxy@debian.org> Build-Depends: cmake (>= 2.8.12), - debhelper-compat (= 12), - extra-cmake-modules (>= 1.7.0~), - gettext, - khotkeys-dev, - kinit-dev, - libkf5dbusaddons-dev, - libkf5doctools-dev, - libkf5i18n-dev (>= 5.2.0), - libkf5iconthemes-dev (>= 5.2.0), - libkf5kdelibs4support-dev (>= 5.42~), - libkf5kio-dev (>= 5.2.0), - libkf5sonnet-dev (>= 5.2.0), - libkf5xmlgui-dev (>= 5.2.0), + debhelper (>= 11~), + extra-cmake-modules (>= 5.66.0~), + khotkeys-dev (>= 4:5.18.4.1~), + kinit-dev (>= 5.66.0~), + libkf5dbusaddons-dev (>= 5.66.0~), + libkf5i18n-dev (>= 5.66.0~), + libkf5iconthemes-dev (>= 5.66.0~), + libkf5itemmodels-dev (>= 5.66.0~), + libkf5kdelibs4support-dev (>= 5.66.0~), + libkf5kio-dev (>= 5.66.0~), + libkf5sonnet-dev (>= 5.66.0~), + libkf5xmlgui-dev (>= 5.66.0~), pkg-kde-tools (>= 0.15.18~), - qtbase5-dev (>= 5.12.0~), -Standards-Version: 4.5.0 + qtbase5-dev (>= 5.6.1~), + xauth, + xvfb, +Standards-Version: 4.1.4 Homepage: https://projects.kde.org/projects/kde/workspace/kmenuedit -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kmenuedit -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kmenuedit.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmenuedit +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmenuedit Package: kmenuedit Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: khotkeys (>= 4:5.14) +Recommends: khotkeys (>= 4:5.18.0) +Breaks: ${kde-l10n:all} +Replaces: ${kde-l10n:all} Description: XDG menu editor This package provides a menu editor which may be used to edit the KDE Plasma workspaces menu or any other XDG menu.
  32. Download patch po/se/kmenuedit.po
  33. Download patch po/si/kmenuedit.po
  34. Download patch po/pa/kmenuedit.po
  35. Download patch po/de/kmenuedit.po
  36. Download patch po/nn/kmenuedit.po
  37. Download patch po/hsb/kmenuedit.po
  38. Download patch po/gu/kmenuedit.po
  39. Download patch po/oc/kmenuedit.po
  40. Download patch po/kn/kmenuedit.po
  41. Download patch po/ro/kmenuedit.po
  42. Download patch po/it/docs/kmenuedit/index.docbook

    --- 4:5.17.5-2/po/it/docs/kmenuedit/index.docbook 2020-01-07 15:28:29.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/po/it/docs/kmenuedit/index.docbook 2020-03-31 14:13:22.000000000 +0000 @@ -1035,9 +1035,9 @@ >Impostazioni</guimenu > e <guimenu >Aiuto</guimenu ->, per altre informazioni, leggere le sezioni relative al <ulink url="help:/fundamentals/ui.html#menus-settings" +>, per altre informazioni, leggere le sezioni relative al <ulink url="help:/fundamentals/menus.html#menus-settings" >Menu Impostazioni</ulink -> e <ulink url="help:/fundamentals/ui.html#menus-help" +> e <ulink url="help:/fundamentals/menus.html#menus-help" >Menu Aiuto</ulink > dei fondamentali di &kde;. </para>
  43. Download patch CMakeLists.txt

    --- 4:5.17.5-2/CMakeLists.txt 2020-01-07 15:28:35.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/CMakeLists.txt 2020-03-31 14:13:27.000000000 +0000 @@ -1,10 +1,12 @@ project(kmenuedit) -set(PROJECT_VERSION "5.17.5") +set(PROJECT_VERSION "5.18.4") cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + set(QT_MIN_VERSION "5.12.0") +set(KF5_MIN_VERSION "5.66.0") -find_package(ECM 1.7.0 REQUIRED NO_MODULE) +find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -14,6 +16,7 @@ include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMQtDeclareLoggingCategory) +include(KDEClangFormat) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core @@ -21,44 +24,38 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFI Xml ) -find_package(KF5 REQUIRED COMPONENTS +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n XmlGui DBusAddons IconThemes KIO + ItemViews Sonnet DocTools Init - KDELibs4Support + GlobalAccel ) -find_package(KHotKeysDBusInterface QUIET) - +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) +endif() #add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY) -add_definitions(-DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY) +add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY) add_subdirectory( pixmaps ) add_subdirectory( doc ) +add_subdirectory(kconf_update) -set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab.cpp treeview.cpp kmenuedit.cpp menufile.cpp menuinfo.cpp configurationmanager.cpp ) +set(kmenueditcommon_STAT_SRCS preferencesdlg.cpp klinespellchecking.cpp basictab.cpp treeview.cpp kmenuedit.cpp menufile.cpp menuinfo.cpp configurationmanager.cpp globalaccel.cpp) ########### next target ############### qt5_add_dbus_adaptor( kmenueditcommon_STAT_SRCS org.kde.kmenuedit.xml kmenuedit.h KMenuEdit) ecm_qt_declare_logging_category(kmenueditcommon_STAT_SRCS HEADER kmenuedit_debug.h IDENTIFIER KMENUEDIT_LOG CATEGORY_NAME org.kde.kmenuedit) -if(NOT WIN32 AND KHotKeysDBusInterface_FOUND) -qt5_add_dbus_interface( - kmenueditcommon_STAT_SRCS - ${KHOTKEYS_DBUS_INTERFACE} - khotkeys_interface) -set(kmenueditcommon_STAT_SRCS ${kmenueditcommon_STAT_SRCS} khotkeys.cpp) - -add_definitions(-DWITH_HOTKEYS) -endif() - set(kmenuedit_KDEINIT_SRCS main.cpp ${kmenueditcommon_STAT_SRCS}) kf5_add_kdeinit_executable( kmenuedit ${kmenuedit_KDEINIT_SRCS}) @@ -68,16 +65,21 @@ target_link_libraries(kdeinit_kmenuedit Qt5::DBus Qt5::Xml KF5::DBusAddons + KF5::GlobalAccel KF5::I18n KF5::IconThemes KF5::KIOCore KF5::KIOWidgets + KF5::ItemViews KF5::SonnetCore KF5::SonnetUi KF5::XmlGui - KF5::KDELibs4Support ) +# add clang-format target for all our real source files +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) + install(TARGETS kdeinit_kmenuedit DESTINATION ${KDE_INSTALL_LIBDIR} ) target_link_libraries( kmenuedit kdeinit_kmenuedit ) @@ -91,11 +93,7 @@ install( FILES kmenueditui.rc DESTINATI ecm_install_icons( ICONS 16-apps-kmenuedit.png 22-apps-kmenuedit.png 32-apps-kmenuedit.png 48-apps-kmenuedit.png DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor ) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -if (${ECM_VERSION} STRGREATER "5.58.0") - install(FILES kmenuedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -else() - install(FILES kmenuedit.categories DESTINATION ${KDE_INSTALL_CONFDIR}) -endif() +install(FILES kmenuedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) find_package(KF5I18n CONFIG REQUIRED) ki18n_install(po)
  44. Download patch po/ne/kmenuedit.po
  45. Download patch po/eu/kmenuedit.po
  46. Download patch kconf_update/globalaccel.upd

    --- 4:5.17.5-2/kconf_update/globalaccel.upd 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/kconf_update/globalaccel.upd 2020-03-31 14:12:50.000000000 +0000 @@ -0,0 +1,4 @@ +Version=5 +Id=kmenuedit_globalaccel +File=khotkeysrc +Script=kmenuedit_globalaccel
  47. Download patch po/lv/kmenuedit.po
  48. Download patch po/mk/kmenuedit.po
  49. Download patch debian/kmenuedit.maintscript

    --- 4:5.17.5-2/debian/kmenuedit.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/debian/kmenuedit.maintscript 2020-04-02 18:46:17.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/xdg/kmenuedit.categories
  50. Download patch po/ia/kmenuedit.po
  51. Download patch po/el/kmenuedit.po
  52. Download patch po/de/docs/kmenuedit/index.docbook

    --- 4:5.17.5-2/po/de/docs/kmenuedit/index.docbook 2020-01-07 15:28:27.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/po/de/docs/kmenuedit/index.docbook 2020-03-31 14:13:19.000000000 +0000 @@ -985,9 +985,9 @@ >Einstellungen</guimenu > und <guimenu >Hilfe</guimenu ->. Mehr dazu erfahren Sie in den Abschnitten zu den Menüs <ulink url="help:/fundamentals/ui.html#menus-settings" +>. Mehr dazu erfahren Sie in den Abschnitten zu den Menüs <ulink url="help:/fundamentals/menus.html#menus-settings" >Einstellungen</ulink -> und <ulink url="help:/fundamentals/ui.html#menus-help" +> und <ulink url="help:/fundamentals/menus.html#menus-help" >Hilfe</ulink > in den &kde;-Grundlagen. </para> @@ -1047,8 +1047,7 @@ ></listitem ></itemizedlist ></para -> -&underFDL; &underGPL; </chapter> +> &underFDL; &underGPL; </chapter> <glossary id="glossary"> <title
  53. Download patch po/ca@valencia/kmenuedit.po
  54. Download patch kconf_update/CMakeLists.txt

    --- 4:5.17.5-2/kconf_update/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/kconf_update/CMakeLists.txt 2020-03-31 14:12:50.000000000 +0000 @@ -0,0 +1,5 @@ +add_executable(kmenuedit_globalaccel globalaccel.cpp ../globalaccel.cpp) + +target_link_libraries(kmenuedit_globalaccel Qt5::DBus KF5::ConfigCore KF5::ConfigCore KF5::GlobalAccel KF5::I18n KF5::Service) + +install(TARGETS kmenuedit_globalaccel DESTINATION ${KDE_INSTALL_LIBDIR}/kconf_update_bin)
  55. Download patch po/cy/kmenuedit.po
  56. Download patch po/pt_BR/kmenuedit.po
  57. Download patch po/kk/kmenuedit.po
  58. Download patch po/af/kmenuedit.po
  59. Download patch po/ko/kmenuedit.po
  60. Download patch khotkeys.cpp

    --- 4:5.17.5-2/khotkeys.cpp 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/khotkeys.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,133 +0,0 @@ -/* - * Copyright (C) 2000 Matthias Elter <elter@kde.org> - * Lubos Lunak <l.lunak@email.cz> - * - * 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 - * (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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "khotkeys.h" -#include "khotkeys_interface.h" - -#include "kmenuedit_debug.h" -#include <KLocalizedString> -#include <KMessageBox> - -#include "kmenuedit_debug.h" - -static bool khotkeys_present = false; -static bool khotkeys_inited = false; -static OrgKdeKhotkeysInterface *khotkeysInterface = nullptr; - -bool KHotKeys::init() -{ - khotkeys_inited = true; - - // Check if khotkeys is running - QDBusConnection bus = QDBusConnection::sessionBus(); - khotkeysInterface = new OrgKdeKhotkeysInterface( - QStringLiteral("org.kde.kded5"), - QStringLiteral("/modules/khotkeys"), - bus, - NULL); - - if (!khotkeysInterface->isValid()) { - QDBusError err = khotkeysInterface->lastError(); - if (err.isValid()) { - qCCritical(KMENUEDIT_LOG) << err.name() << ":" << err.message(); - } - KMessageBox::error( - NULL, - QStringLiteral("<qt>") + i18n("Unable to contact khotkeys. Your changes are saved, but they could not be activated.") + QStringLiteral("</qt>")); - } - - khotkeys_present = khotkeysInterface->isValid(); - - qCDebug(KMENUEDIT_LOG) << khotkeys_present; - return true; -} - -void KHotKeys::cleanup() -{ - if (khotkeys_inited && khotkeys_present) { - // CleanUp ??? - } - - khotkeys_inited = false; -} - -bool KHotKeys::present() -{ - qCDebug(KMENUEDIT_LOG) << khotkeys_inited; - - if (!khotkeys_inited) { - init(); - } - - qCDebug(KMENUEDIT_LOG) << khotkeys_present; - - return khotkeys_present; -} - -QString KHotKeys::getMenuEntryShortcut(const QString &entry_P) -{ - if (!khotkeys_inited) { - init(); - } - - if (!khotkeys_present || !khotkeysInterface->isValid()) { - return QLatin1String(""); - } - qCDebug(KMENUEDIT_LOG) << khotkeys_inited; - qCDebug(KMENUEDIT_LOG) << khotkeys_present; - qCDebug(KMENUEDIT_LOG) << entry_P; - QDBusReply<QString> reply = khotkeysInterface->get_menuentry_shortcut(entry_P); - if (!reply.isValid()) { - qCCritical(KMENUEDIT_LOG) << reply.error(); - return QLatin1String(""); - } else { - qCDebug(KMENUEDIT_LOG) << reply; - return reply; - } -} - -QString KHotKeys::changeMenuEntryShortcut( - const QString &entry_P, const QString shortcut_P) -{ - if (!khotkeys_inited) { - init(); - } - - if (!khotkeys_present || !khotkeysInterface->isValid()) { - return QLatin1String(""); - } - - qCDebug(KMENUEDIT_LOG) << khotkeys_inited; - qCDebug(KMENUEDIT_LOG) << khotkeys_present; - qCDebug(KMENUEDIT_LOG) << entry_P; - qCDebug(KMENUEDIT_LOG) << shortcut_P; - - QDBusReply<QString> reply = khotkeysInterface->register_menuentry_shortcut( - entry_P, - shortcut_P); - - if (!reply.isValid()) { - qCCritical(KMENUEDIT_LOG) << reply.error(); - return QLatin1String(""); - } else { - qCDebug(KMENUEDIT_LOG) << reply; - return reply; - } -}
  61. Download patch debian/salsa-ci.yml

    --- 4:5.17.5-2/debian/salsa-ci.yml 2020-01-19 17:47:14.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -include: -- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml -- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml -variables: - SALSA_CI_DISABLE_MISSING_BREAKS: 'no' - SALSA_CI_DISABLE_RC_BUGS: 'no'
  62. Download patch po/ga/kmenuedit.po
  63. Download patch po/nb/kmenuedit.po
  64. Download patch po/da/kmenuedit.po
  65. Download patch org.kde.kmenuedit.desktop

    --- 4:5.17.5-2/org.kde.kmenuedit.desktop 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/org.kde.kmenuedit.desktop 2020-03-31 14:12:50.000000000 +0000 @@ -74,7 +74,7 @@ Name[ro]=Editor de meniuri Name[ru]=Редактор меню Name[se]=Fállodoaimmaheaddji Name[si]=මෙනු සකසනය -Name[sk]=Editor menu +Name[sk]=Editor ponuky Name[sl]=Urejevalnik menijev Name[sr]=Уређивач менија Name[sr@ijekavian]=Уређивач менија
  66. Download patch po/bn/kmenuedit.po
  67. Download patch khotkeys.h

    --- 4:5.17.5-2/khotkeys.h 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/khotkeys.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2000 Matthias Elter <elter@kde.org> - * Lubos Lunak <l.lunak@email.cz> - * - * 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 - * (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, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef khotkeys_public_h -#define khotkeys_public_h - -#include <QString> - -// see kdebase/khotkeys/kcontrol for info on these - -class KHotKeys -{ -public: - static bool init(); - static void cleanup(); - static bool present(); - static QString getMenuEntryShortcut(const QString &entry_P); - static QString changeMenuEntryShortcut(const QString &entry_P, const QString shortcut_P); -}; - -#endif
  68. Download patch po/br/kmenuedit.po
  69. Download patch po/is/kmenuedit.po
  70. Download patch po/pt/kmenuedit.po
  71. Download patch po/nl/docs/kmenuedit/index.docbook

    --- 4:5.17.5-2/po/nl/docs/kmenuedit/index.docbook 2020-01-07 15:28:31.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/po/nl/docs/kmenuedit/index.docbook 2020-03-31 14:13:23.000000000 +0000 @@ -969,9 +969,9 @@ >Instellingen</guimenu > en <guimenu >Help</guimenu -> menu-items, voor meer informatie lees de secties over de <ulink url="help:/fundamentals/ui.html#menus-settings" +> menu-items, voor meer informatie lees de secties over de <ulink url="help:/fundamentals/menus.html#menus-settings" >Menu Instellingen</ulink -> en <ulink url="help:/fundamentals/ui.html#menus-help" +> en <ulink url="help:/fundamentals/menus.html#menus-help" >Menu Help</ulink > van &kde;-fundamentals. </para>
  72. Download patch po/ml/kmenuedit.po
  73. Download patch po/hu/kmenuedit.po
  74. Download patch po/be/kmenuedit.po
  75. Download patch po/sk/kmenuedit.po
  76. Download patch po/nds/kmenuedit.po
  77. Download patch po/id/docs/kmenuedit/index.docbook

    --- 4:5.17.5-2/po/id/docs/kmenuedit/index.docbook 2020-01-07 15:28:29.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/po/id/docs/kmenuedit/index.docbook 2020-03-31 14:13:21.000000000 +0000 @@ -394,7 +394,7 @@ >Firefox (Browser Web)</quote >. </para ></note ->Kita perlu mengisi di dalam nama yang dapat dieksekusi dalam bidang <guilabel +>Kita perlu mengisi di dalam nama dapat-dilaksanakan dalam bidang <guilabel >Perintah:</guilabel >, dalam hal ini kita akan mengetikkan <userinput ><command @@ -404,7 +404,7 @@ <para >Perintah tersebut harus berada di variabel <envar >PATH</envar ->-mu atau kamu harus menentukan alur lengkap ke dapat dieksekusi. Jika kamu tidak tahu nama aplikasi yang dapat dieksekusi gunakanlah perintah <userinput +>-mu atau kamu harus menspesifikasikan alur lengkap ke dapat-dilaksanakan. Jika kamu tidak tahu nama aplikasi yang dapat-dilaksanakan gunakanlah perintah <userinput ><command >locate</command ></userinput @@ -542,7 +542,7 @@ ></term> <listitem ><para ->Ini adalah nama programmu sebagaimana yang muncul di menu peluncur aplikasi. Ini bisa berbeda dari nama yang dapat dieksekusi yang sesungguhnya. Misalnya nama dapat dieksekusi <command +>Ini adalah nama programmu sebagaimana yang muncul di menu peluncur aplikasi. Ini bisa berbeda dari nama yang dapat-dilaksanakan yang sesungguhnya. Misalnya nama dapat-dilaksanakan <command >mc</command > adalah "<application >Midnight Commander</application @@ -576,7 +576,7 @@ ></term> <listitem ><para ->Ini adalah nama program yang dapat dieksekusi. Pastikan bahwa kamu memiliki perizinan untuk menjalankan program.</para +>Ini adalah nama program yang dapat-dilaksanakan. Pastikan bahwa kamu memiliki perizinan untuk menjalankan program.</para ></listitem> </varlistentry> <varlistentry> @@ -624,7 +624,7 @@ ></term> <listitem ><para ->Tentukan alur kerja program. Ini akan menjadi alur saat ini ketika peluncuran program.ini tidaklah harus sama sebagaimana lokasi yang dapat dieksekusi.</para +>Tentukan alur kerja program. Ini akan menjadi alur saat ini ketika peluncuran program.ini tidaklah harus sama sebagaimana lokasi yang dapat-dilaksanakan.</para ></listitem> </varlistentry> <varlistentry>
  78. Download patch menuinfo.cpp

    --- 4:5.17.5-2/menuinfo.cpp 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/menuinfo.cpp 2020-03-31 14:12:50.000000000 +0000 @@ -26,10 +26,8 @@ #include <KConfigGroup> #include <QStandardPaths> +#include "globalaccel.h" #include "menufile.h" -#ifdef WITH_HOTKEYS -#include "khotkeys.h" -#endif // // MenuFolderInfo @@ -179,14 +177,12 @@ void MenuFolderInfo::setDirty() void MenuFolderInfo::save(MenuFile *menuFile) { if (s_deletedApps) { -#ifdef WITH_HOTKEYS // Remove hotkeys for applications that have been deleted for (QStringList::ConstIterator it = s_deletedApps->constBegin(); it != s_deletedApps->constEnd(); ++it) { // The shorcut is deleted if we set a empty sequence - KHotKeys::changeMenuEntryShortcut(*it, QLatin1String("")); + GlobalAccel::changeMenuEntryShortcut(KService::serviceByStorageId(*it), QKeySequence()); } -#endif delete s_deletedApps; s_deletedApps = nullptr; } @@ -327,14 +323,10 @@ void MenuEntryInfo::save() m_desktopFile->sync(); dirty = false; } -#ifdef WITH_HOTKEYS if (shortcutDirty) { - if (KHotKeys::present()) { - KHotKeys::changeMenuEntryShortcut(service->storageId(), shortCut.toString()); - } + GlobalAccel::changeMenuEntryShortcut(service, shortCut); shortcutDirty = false; } -#endif } void MenuEntryInfo::setCaption(const QString &_caption) @@ -370,14 +362,10 @@ void MenuEntryInfo::setIcon(const QStrin QKeySequence MenuEntryInfo::shortcut() { -#ifdef WITH_HOTKEYS if (!shortcutLoaded) { shortcutLoaded = true; - if (KHotKeys::present()) { - shortCut = QKeySequence(KHotKeys::getMenuEntryShortcut(service->storageId())); - } + shortCut = GlobalAccel::getMenuEntryShortcut(service); } -#endif return shortCut; }
  79. Download patch debian/kmenuedit.lintian-overrides

    --- 4:5.17.5-2/debian/kmenuedit.lintian-overrides 2020-01-19 18:06:09.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/debian/kmenuedit.lintian-overrides 2020-04-02 18:46:17.000000000 +0000 @@ -3,4 +3,3 @@ kmenuedit: binary-without-manpage usr/bi kmenuedit: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kmenuedit.so libkdeinit5_kmenuedit.so kmenuedit: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_kmenuedit.so kmenuedit: package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit5_kmenuedit.so -kmenuedit: no-symbols-control-file usr/lib/*/libkdeinit5_kmenuedit.so
  80. Download patch po/ru/kmenuedit.po
  81. Download patch po/mai/kmenuedit.po
  82. Download patch po/fy/kmenuedit.po
  83. Download patch globalaccel.cpp

    --- 4:5.17.5-2/globalaccel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/globalaccel.cpp 2020-03-31 14:12:50.000000000 +0000 @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2019 David Redondo <kde@david-redondo.de> + * + * 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 + * (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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "globalaccel.h" + +#include <QAction> +#include <QFile> +#include <QStandardPaths> + +#include <KGlobalAccel> +#include <KLocalizedString> +#include <KService> + +void GlobalAccel::changeMenuEntryShortcut(const KService::Ptr service, const QKeySequence &shortcut) +{ + const QString desktopFile = QStringLiteral("%1.desktop").arg(service->desktopEntryName()); + + if (!KGlobalAccel::isComponentActive(desktopFile)) { + const QString destination = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + + QStringLiteral("/kglobalaccel/") + desktopFile; + QFile::copy(service->entryPath(), destination); + } + QAction action(i18n("Launch %1", service->name())); + action.setProperty("componentName", desktopFile); + action.setProperty("componentDisplayName", service->name()); + action.setObjectName(QStringLiteral("_launch")); + //Make sure that the action is marked active + KGlobalAccel::self()->setShortcut(&action, {shortcut}); + action.setProperty("isConfigurationAction", true); + KGlobalAccel::self()->setShortcut(&action, {shortcut}, KGlobalAccel::NoAutoloading); + +} + +QKeySequence GlobalAccel::getMenuEntryShortcut(const KService::Ptr service) +{ + const QString desktopFile = QStringLiteral("%1.desktop").arg(service->desktopEntryName()); + const QList<QKeySequence> shortcut = KGlobalAccel::self()->globalShortcut(desktopFile, QStringLiteral("_launch")); + if (!shortcut.isEmpty()) { + return shortcut[0]; + } + return QKeySequence(); +} + +
  84. Download patch po/sv/docs/kmenuedit/index.docbook

    --- 4:5.17.5-2/po/sv/docs/kmenuedit/index.docbook 2020-01-07 15:28:34.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/po/sv/docs/kmenuedit/index.docbook 2020-03-31 14:13:26.000000000 +0000 @@ -975,9 +975,9 @@ >Inställningar</guimenu > och <guimenu >Hjälp</guimenu ->. För mer information läs avsnitten om <ulink url="help:/fundamentals/ui.html#menus-settings" +>. För mer information läs avsnitten om <ulink url="help:/fundamentals/menus.html#menus-settings" >Menyn Inställningar</ulink -> och <ulink url="help:/fundamentals/ui.html#menus-help" +> och <ulink url="help:/fundamentals/menus.html#menus-help" >Menyn Hjälp</ulink > i &kde;:s grunder. </para>
  85. Download patch po/csb/kmenuedit.po
  86. Download patch po/bs/kmenuedit.po
  87. Download patch po/ja/kmenuedit.po
  88. Download patch po/it/kmenuedit.po
  89. Download patch po/sl/kmenuedit.po
  90. Download patch po/ta/kmenuedit.po
  91. Download patch po/pl/kmenuedit.po
  92. Download patch po/he/kmenuedit.po
  93. Download patch globalaccel.h

    --- 4:5.17.5-2/globalaccel.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/globalaccel.h 2020-03-31 14:12:50.000000000 +0000 @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2019 David Redondo <kde@david-redondo.de> + * + * 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 + * (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, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#ifndef GLOBALACCEL_H +#define GLOBALACCEL_H + +#include <KService> +#include <QKeySequence> + +class GlobalAccel +{ +public: + static QKeySequence getMenuEntryShortcut(const KService::Ptr service); + static void changeMenuEntryShortcut(const KService::Ptr service, const QKeySequence &shortcut); +}; + +#endif // GLOBALACCEL_H
  94. Download patch po/te/kmenuedit.po
  95. Download patch po/hi/kmenuedit.po
  96. Download patch po/ku/kmenuedit.po
  97. Download patch po/nl/kmenuedit.po
  98. Download patch main.cpp

    --- 4:5.17.5-2/main.cpp 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/main.cpp 2020-03-31 14:12:50.000000000 +0000 @@ -27,9 +27,6 @@ #include <QApplication> #include <QCommandLineParser> #include "kmenuedit.h" -#ifndef Q_OS_WIN -#include "khotkeys.h" -#endif static const char description[] = I18N_NOOP("KDE menu editor"); @@ -46,14 +43,6 @@ public: QCoreApplication::setOrganizationDomain(QStringLiteral("kde.org")); QApplication::setApplicationDisplayName(i18n("KDE Menu Editor")); } - -#ifdef WITH_HOTKEYS - virtual ~KMenuApplication() - { - KHotKeys::cleanup(); - } - -#endif }; extern "C" int Q_DECL_EXPORT kdemain(int argc, char **argv)
  99. Download patch po/ca/kmenuedit.po
  100. Download patch basictab.cpp

    --- 4:5.17.5-2/basictab.cpp 2020-01-07 15:27:51.000000000 +0000 +++ 4:5.18.4.1-0ubuntu1/basictab.cpp 2020-03-31 14:12:50.000000000 +0000 @@ -26,18 +26,16 @@ #include <QVBoxLayout> #include <QGridLayout> +#include <KConfigGroup> #include <KLocalizedString> -#include <KDialog> #include <KKeySequenceWidget> -#include <KLineEdit> +#include <QLineEdit> #include <KIconButton> #include <KDesktopFile> #include <KUrlRequester> #include <KShell> -#ifndef Q_OS_WIN -#include "khotkeys.h" -#endif +#include "globalaccel.h" #include "klinespellchecking.h" #include "menuinfo.h" @@ -49,11 +47,6 @@ BasicTab::BasicTab(QWidget *parent) initAdvancedTab(); initConnections(); -#ifdef WITH_HOTKEYS - if (!KHotKeys::present()) { - _keyBindingGroup->hide(); - } -#endif slotDisableAction(); } @@ -62,15 +55,14 @@ void BasicTab::initGeneralTab() // general tab QWidget *generalTab = new QWidget(); QGridLayout *generalTabLayout = new QGridLayout(generalTab); - generalTabLayout->setMargin(KDialog::marginHint()); - generalTabLayout->setSpacing(KDialog::spacingHint()); generalTab->setAcceptDrops(false); // name _nameLabel = new QLabel(i18n("&Name:")); generalTabLayout->addWidget(_nameLabel, 0, 0); - _nameEdit = new KLineEdit(); + _nameEdit = new QLineEdit(); _nameEdit->setAcceptDrops(false); + _nameEdit->setClearButtonEnabled(true); _nameLabel->setBuddy(_nameEdit); generalTabLayout->addWidget(_nameEdit, 0, 1, 1, 1); @@ -143,8 +135,6 @@ void BasicTab::initAdvancedTab() // work path _workPathGroup = new QGroupBox(); QHBoxLayout *workPathGroupLayout = new QHBoxLayout(_workPathGroup); - workPathGroupLayout->setSpacing(KDialog::spacingHint()); - workPathGroupLayout->setMargin(KDialog::marginHint()); _pathLabel = new QLabel(i18n("&Work path:")); workPathGroupLayout->addWidget(_pathLabel); _pathEdit = new KUrlRequester(); @@ -157,17 +147,15 @@ void BasicTab::initAdvancedTab() // terminal CB _terminalGroup = new QGroupBox(); QVBoxLayout *terminalGroupLayout = new QVBoxLayout(_terminalGroup); - terminalGroupLayout->setMargin(KDialog::marginHint()); - terminalGroupLayout->setSpacing(KDialog::spacingHint()); _terminalCB = new QCheckBox(i18n("Run in term&inal")); terminalGroupLayout->addWidget(_terminalCB); // terminal options QWidget *terminalOptionsGroup = new QWidget(); QHBoxLayout *terminalOptionsGroupLayout = new QHBoxLayout(terminalOptionsGroup); - terminalOptionsGroupLayout->setSpacing(KDialog::spacingHint()); _terminalOptionsLabel = new QLabel(i18n("Terminal &options:")); terminalOptionsGroupLayout->addWidget(_terminalOptionsLabel); - _terminalOptionsEdit = new KLineEdit(); + _terminalOptionsEdit = new QLineEdit(); + _terminalOptionsEdit->setClearButtonEnabled(true); _terminalOptionsEdit->setAcceptDrops(false); _terminalOptionsEdit->setEnabled(false); _terminalOptionsLabel->setBuddy(_terminalOptionsEdit); @@ -178,17 +166,15 @@ void BasicTab::initAdvancedTab() // user name CB _userGroup = new QGroupBox(); QVBoxLayout *userGroupLayout = new QVBoxLayout(_userGroup); - userGroupLayout->setMargin(KDialog::marginHint()); - userGroupLayout->setSpacing(KDialog::spacingHint()); _userCB = new QCheckBox(i18n("&Run as a different user")); userGroupLayout->addWidget(_userCB); // user name QWidget *userNameGroup = new QWidget(); QHBoxLayout *userNameGroupLayout = new QHBoxLayout(userNameGroup); - userNameGroupLayout->setSpacing(KDialog::spacingHint()); _userNameLabel = new QLabel(i18n("&Username:")); userNameGroupLayout->addWidget(_userNameLabel); - _userNameEdit = new KLineEdit(); + _userNameEdit = new QLineEdit(); + _userNameEdit->setClearButtonEnabled(true); _userNameEdit->setAcceptDrops(false); _userNameEdit->setEnabled(false); _userNameLabel->setBuddy(_userNameEdit); @@ -199,8 +185,6 @@ void BasicTab::initAdvancedTab() // key binding _keyBindingGroup = new QGroupBox(); QHBoxLayout *keyBindingGroupLayout = new QHBoxLayout(_keyBindingGroup); - keyBindingGroupLayout->setMargin(KDialog::marginHint()); - keyBindingGroupLayout->setSpacing(KDialog::spacingHint()); _keyBindingLabel = new QLabel(i18n("Current shortcut &key:")); keyBindingGroupLayout->addWidget(_keyBindingLabel); _keyBindingEdit = new KKeySequenceWidget(); @@ -218,7 +202,7 @@ void BasicTab::initAdvancedTab() void BasicTab::initConnections() { // general tab's components - connect(_nameEdit, &KLineEdit::textChanged, this, &BasicTab::slotChanged); + connect(_nameEdit, &QLineEdit::textChanged, this, &BasicTab::slotChanged); connect(_descriptionEdit, &KLineSpellChecking::textChanged, this, &BasicTab::slotChanged); connect(_commentEdit, &KLineSpellChecking::textChanged, this, &BasicTab::slotChanged); connect(_execEdit, &KUrlRequester::textChanged, this, &BasicTab::slotChanged); @@ -231,9 +215,9 @@ void BasicTab::initConnections() // advanced tab's components connect(_pathEdit, &KUrlRequester::textChanged, this, &BasicTab::slotChanged); connect(_terminalCB, &QCheckBox::clicked, this, &BasicTab::termcb_clicked); - connect(_terminalOptionsEdit, &KLineEdit::textChanged, this, &BasicTab::slotChanged); + connect(_terminalOptionsEdit, &QLineEdit::textChanged, this, &BasicTab::slotChanged); connect(_userCB, &QCheckBox::clicked, this, &BasicTab::uidcb_clicked); - connect(_userNameEdit, &KLineEdit::textChanged, this, &BasicTab::slotChanged); + connect(_userNameEdit, &QLineEdit::textChanged, this, &BasicTab::slotChanged); connect(_keyBindingEdit, &KKeySequenceWidget::keySequenceChanged, this, &BasicTab::slotCapturedKeySequence); } @@ -358,15 +342,11 @@ void BasicTab::setEntryInfo(MenuEntryInf _iconButton->setIcon(df->readIcon()); // key binding part -#ifdef WITH_HOTKEYS - if (KHotKeys::present()) { - if (!entryInfo->shortcut().isEmpty()) { - _keyBindingEdit->setKeySequence(entryInfo->shortcut()); - } else { - _keyBindingEdit->clearKeySequence(); - } + if (!entryInfo->shortcut().isEmpty()) { + _keyBindingEdit->setKeySequence(entryInfo->shortcut()); + } else { + _keyBindingEdit->clearKeySequence(); } -#endif _execEdit->lineEdit()->setText(df->desktopGroup().readEntry("Exec")); _pathEdit->lineEdit()->setText(df->readPath()); @@ -505,14 +485,12 @@ void BasicTab::slotCapturedKeySequence(c return; } QKeySequence cut(seq); -#ifdef WITH_HOTKEYS - if (_menuEntryInfo->isShortcutAvailable(cut) && KHotKeys::present()) { + if (_menuEntryInfo->isShortcutAvailable(cut)) { _menuEntryInfo->setShortcut(cut); } else { // We will not assign the shortcut so reset the visible key sequence _keyBindingEdit->setKeySequence(QKeySequence()); } -#endif if (_menuEntryInfo) { emit changed(_menuEntryInfo); }
  101. ...
  1. kmenuedit