Commit f5b1eb5b authored by Alf Gaida's avatar Alf Gaida

Cherry-picking new upstream version 0.13.0.

* Bumped build dependencies:
  - liblxqt0-dev to >= 0.13.0~
  - liblxqt-globalkeys0-dev to >= 0.13.0~
  - liblxqt-globalkeys-ui0-dev to >= 0.13.0~
* Removed not used build dependency qtbase5-private-dev
* Moved debian/.gitignore to ./.gitignore
parent b66e0e87
debian/*.debhelper
debian/*.log
debian/*.substvars
debian/debhelper-build-stamp
debian/files
debian/lxqt-runner/
Upstream Authors:
LXQt team: http://lxqt.org
LXQt team: https://lxqt.org
Razor team: http://razor-qt.org
Copyright:
......
lxqt-runner-0.12.0 / 2017-10-21
lxqt-runner-0.13.0 / 2018-05-21
===============================
* Spanish translation update
* CMake: Prevent in-source builds
* USE_MENU_CACHE default OFF
* fix razor-qt -> lxqt and http -> https
* Fixed mentions of LXDE
* runner: Use the QIcon::fromTheme()
* Drop Qt foreach
* AppLinkItem: Make genericName searchable
0.12.0 / 2017-10-21
===================
* Release 0.12.0: Update changelog
* Set patch version
* Don't export github templates
* Update CMakeLists.txt
......
......@@ -8,13 +8,13 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(REQUIRED_MENUCACHE_VERSION "0.3.3")
set(REQUIRED_MENUCACHE_VERSION "1.1.0")
include(CMakeDependentOption)
include(GNUInstallDirs)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
option(USE_MENU_CACHE "Use libmenu-cache from LXDE to generate the app menu" ON)
option(USE_MENU_CACHE "Use libmenu-cache from LXDE to generate the app menu" OFF)
option(RUNNER_MATH "Math operations support" ON)
option(RUNNER_VBOX "Virtual Box support" ON)
cmake_dependent_option(RUNNER_VBOX_HEADLESS
......@@ -31,12 +31,16 @@ find_package(lxqt-globalkeys REQUIRED)
find_package(lxqt-globalkeys-ui REQUIRED)
message(STATUS "Building with Qt${Qt5Core_VERSION}")
include(LXQtPreventInSourceBuilds)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
# Patch Version
set(LXQT_RUNNER_PATCH_VERSION 0)
set(LXQT_RUNNER_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_RUNNER_PATCH_VERSION})
add_definitions("-DLXQT_RUNNER_VERSION=\"${LXQT_RUNNER_VERSION}\"")
add_definitions(
"-DLXQT_RUNNER_VERSION=\"${LXQT_RUNNER_VERSION}\""
"-DQT_NO_FOREACH"
)
set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml)
......
......@@ -12,8 +12,8 @@ Technically it consists of a single binary `lxqt-runner`. The binary is run in a
### Compiling source code
Runtime dependencies are muparser, KWindowSystem, menu-cache and [lxqt-globalkeys](https://github.com/lxde/lxqt-globalkeys).
Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Runtime dependencies are muparser, KWindowSystem, menu-cache and [lxqt-globalkeys](https://github.com/lxqt/lxqt-globalkeys).
Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxqt/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information.
Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems.
......@@ -25,9 +25,9 @@ Official binary packages are provided by all major Linux distributions like Arch
## Configuration, Usage
Launching binary `lxqt-runner` as LXQt Module can be adjusted from section "Basic Settings" in configuration dialogue "LXQt Session Settings" (binary `lxqt-config-session`) of [lxqt-session](https://github.com/lxde/lxqt-session).
Launching binary `lxqt-runner` as LXQt Module can be adjusted from section "Basic Settings" in configuration dialogue "LXQt Session Settings" (binary `lxqt-config-session`) of [lxqt-session](https://github.com/lxqt/lxqt-session).
The keyboard shortcut to launch the GUI can be configured in "Global Actions Manager" (binary `lxqt-config-globalkeyshortcuts`) of [lxqt-globalkeys](https://github.com/lxde/lxqt-globalkeys).
The keyboard shortcut to launch the GUI can be configured in "Global Actions Manager" (binary `lxqt-config-globalkeyshortcuts`) of [lxqt-globalkeys](https://github.com/lxqt/lxqt-globalkeys).
The GUI comes with a configuration dialogue to customize settings like the position where it's displayed. It's accessible from a menu that's in turn opened by an icon left of the one to close the GUI, "arrow down" in screenshot above.
......
# Translations
Name[es]=Lanzador
Name[es]=Lanzador de aplicaciones
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......@@ -274,7 +274,7 @@ CommandSourceItemModel::CommandSourceItemModel(bool useHistory, QObject *parent)
}
settings.endArray();
foreach(CommandProvider* provider, mProviders)
for(const CommandProvider* provider : qAsConst(mProviders))
{
connect(provider, SIGNAL(changed()), this, SIGNAL(layoutChanged()));
connect(provider, SIGNAL(aboutToBeChanged()), this, SIGNAL(layoutAboutToBeChanged()));
......@@ -300,7 +300,7 @@ CommandSourceItemModel::~CommandSourceItemModel()
int CommandSourceItemModel::rowCount(const QModelIndex& /*parent*/) const
{
int ret=0;
foreach(CommandProvider* provider, mProviders)
for(const CommandProvider* provider : qAsConst(mProviders))
ret += provider->count();
return ret;
......@@ -429,7 +429,7 @@ const CommandProviderItem *CommandSourceItemModel::command(const QModelIndex &in
void CommandSourceItemModel::setCommand(const QString& command)
{
mCustomCommandProvider->setCommand(command);
foreach (ExternalProvider* externalProvider, mExternalProviders)
for (ExternalProvider* const externalProvider : qAsConst(mExternalProviders))
{
externalProvider->setSearchTerm(command);
}
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/*.debhelper
/*.log
/*.substvars
/debhelper-build-stamp
/files
/lxqt-runner/
lxqt-runner (0.13.0-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.13.0.
* Bumped build dependencies:
- liblxqt0-dev to >= 0.13.0~
- liblxqt-globalkeys0-dev to >= 0.13.0~
- liblxqt-globalkeys-ui0-dev to >= 0.13.0~
* Removed not used build dependency qtbase5-private-dev
* Moved debian/.gitignore to ./.gitignore
-- Alf Gaida <agaida@siduction.org> Fri, 25 May 2018 00:30:26 +0200
lxqt-runner (0.12.0-6) unstable; urgency=medium
* Changed Source and watch to lxqt
......
......@@ -6,14 +6,13 @@ Section: x11
Priority: optional
Build-Depends: debhelper (>= 11~),
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.12.0),
liblxqt-globalkeys0-dev (>= 0.12.0),
liblxqt-globalkeys-ui0-dev (>= 0.12.0),
liblxqt0-dev (>= 0.13.0~),
liblxqt-globalkeys0-dev (>= 0.13.0~),
liblxqt-globalkeys-ui0-dev (>= 0.13.0~),
libmuparser-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
qtbase5-private-dev
libx11-dev
Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-runner
Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-runner.git
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......@@ -34,7 +34,6 @@
#include <LXQt/Settings>
#include <LXQt/HtmlDelegate>
#include <XdgIcon>
#include <LXQt/PowerManager>
#include <LXQt/ScreenSaver>
#include <LXQtGlobalKeys/Action>
......@@ -91,11 +90,11 @@ Dialog::Dialog(QWidget *parent) :
ui->commandList->setItemDelegate(new LXQt::HtmlDelegate(QSize(32, 32), ui->commandList));
// Popup menu ...............................
QAction *a = new QAction(XdgIcon::fromTheme("configure"), tr("Configure"), this);
QAction *a = new QAction(QIcon::fromTheme("configure"), tr("Configure"), this);
connect(a, SIGNAL(triggered()), this, SLOT(showConfigDialog()));
addAction(a);
a = new QAction(XdgIcon::fromTheme("edit-clear-history"), tr("Clear History"), this);
a = new QAction(QIcon::fromTheme("edit-clear-history"), tr("Clear History"), this);
connect(a, SIGNAL(triggered()), mCommandItemModel, SLOT(clearHistory()));
addAction(a);
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
......@@ -34,7 +34,7 @@ such as \fBlxqt-globalkeyshortcuts\fR.
This module only shows at \fBLXQt\fR desktop environment, but you can use in others desktops, by
setting an configuring into session startup.
.SH "REPORTING BUGS"
Report bugs to https://github.com/lxde/lxqt/issues
Report bugs to https://github.com/lxqt/lxqt/issues
.SH "SEE ALSO"
\fBLXQt\fR it has been tailored for users who value simplicity, speed, and
an intuitive interface, also intended for less powerful machines. See also:
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://lxqt.org
* https://lxqt.org
*
* Copyright: 2017 LXQt team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2013 Razor team
* Authors:
......@@ -31,7 +31,6 @@
#include "providers.h"
#include "yamlparser.h"
#include <XdgIcon>
#include <XdgDesktopFile>
#include <XdgMenu>
#include <XmlHelper>
......@@ -97,7 +96,7 @@ static QString which(const QString &progName)
const QStringList dirs = QString(getenv("PATH")).split(":");
foreach (const QString &dir, dirs)
for (const QString &dir : dirs)
{
QFileInfo fileInfo(QDir(dir), progName);
if (fileInfo.isExecutable() && fileInfo.isFile())
......@@ -192,8 +191,8 @@ AppLinkItem::AppLinkItem(MenuCacheApp* app):
MenuCacheItem* item = MENU_CACHE_ITEM(app);
mIconName = QString::fromUtf8(menu_cache_item_get_icon(item));
mTitle = QString::fromUtf8(menu_cache_item_get_name(item));
mComment = QString::fromUtf8(menu_cache_item_get_comment(item));
mToolTip = mComment;
mComment = QString::fromUtf8(menu_cache_app_get_generic_name(app));
mToolTip = QString::fromUtf8(menu_cache_item_get_comment(item));
mCommand = menu_cache_app_get_exec(app);
mProgram = QFileInfo(mCommand).baseName().section(" ", 0, 0);
char* path = menu_cache_item_get_file_path(MENU_CACHE_ITEM(app));
......@@ -214,7 +213,7 @@ void AppLinkItem::updateIcon()
// qDebug() << hex << this;
// qDebug() << Q_FUNC_INFO;
if (mIcon.isNull())
mIcon = XdgIcon::fromTheme(mIconName);
mIcon = QIcon::fromTheme(mIconName);
// qDebug() << "*****************************************";
}
......@@ -271,8 +270,10 @@ bool AppLinkItem::compare(const QRegExp &regExp) const
if (regExp.isEmpty())
return false;
return mProgram.contains(regExp) ||
mTitle.contains(regExp) ;
return mProgram.contains(regExp)
|| mTitle.contains(regExp)
|| mComment.contains(regExp)
|| mToolTip.contains(regExp);
}
......@@ -438,7 +439,7 @@ void AppLinkProvider::update()
HistoryItem::HistoryItem(const QString &command):
CommandProviderItem()
{
mIcon = XdgIcon::defaultApplicationIcon();
mIcon = QIcon::fromTheme(QLatin1String("application-x-executable"));
mTitle = command;
mComment = QObject::tr("History");
mCommand = command;
......@@ -544,7 +545,7 @@ CustomCommandItem::CustomCommandItem(CustomCommandProvider *provider):
CommandProviderItem(),
mProvider(provider)
{
mIcon = XdgIcon::fromTheme("utilities-terminal");
mIcon = QIcon::fromTheme("utilities-terminal");
}
......@@ -820,7 +821,7 @@ MathItem::MathItem():
mParser{new Parser}
{
mToolTip =QObject::tr("Mathematics");
mIcon = XdgIcon::fromTheme("accessories-calculator");
mIcon = QIcon::fromTheme("accessories-calculator");
}
......@@ -924,7 +925,7 @@ bool ExternalProviderItem::setData(QMap<QString,QString> & data)
mToolTip = data["tooltip"];
mCommand = data["command"];
if (data.contains("icon"))
mIcon = XdgIcon::fromTheme(data["icon"]);
mIcon = QIcon::fromTheme(data["icon"]);
return true;
}
......@@ -966,8 +967,7 @@ void ExternalProvider::newListOfMaps(QList<QMap<QString,QString> > maps)
qDeleteAll(*this);
clear();
QMap<QString, QString> map;
foreach(map, maps)
for(auto map : qAsConst(maps))
{
ExternalProviderItem *item = new ExternalProviderItem();
if (item->setData(map))
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2013 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2013 Razor team
* Authors:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment