From d69425265dbddd269c885ad29fa145d28dc195d0 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sat, 24 Oct 2015 00:12:37 +0200 Subject: [PATCH] Cherry-picking upstream version 0.9.0+20151007. --- debian/changelog | 6 +++--- liblxqt-config-cursor/man/lxqt-config-mouse.1 | 10 +++++----- lxqt-config-appearance/fontsconfig.cpp | 2 +- lxqt-config-appearance/styleconfig.cpp | 4 ++-- lxqt-config-file-associations/mimetypeviewer.cpp | 1 - lxqt-config-input/mouseconfig.cpp | 2 -- lxqt-config-monitor/info-for-developers.txt | 2 +- lxqt-config-monitor/magnetic_attraction.html | 8 ++++---- man/lxqt-config.1 | 12 ++++++------ 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d38a05..5651ffb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -lxqt-config (0.9.0+20150923-1) experimental; urgency=medium +lxqt-config (0.9.0+20151007-1) experimental; urgency=medium - * Cherry-picked upstream versuib 0.9.0+20150923 + * Cherry-picked upstream version 0.9.0+20151007. * Removed debian/patches, fixed upstream * Fixed .gitignore * Fixed and sorted copyright @@ -10,7 +10,7 @@ lxqt-config (0.9.0+20150923-1) experimental; urgency=medium * Switched to experimental because of LXQt namespace change * Added minimum version for liblxqt0-dev (>= 0.9.0+20150911) - -- Alf Gaida Thu, 24 Sep 2015 00:56:46 +0200 + -- Alf Gaida Sat, 24 Oct 2015 00:12:25 +0200 lxqt-config (0.9.0+20150806-1) unstable; urgency=medium diff --git a/liblxqt-config-cursor/man/lxqt-config-mouse.1 b/liblxqt-config-cursor/man/lxqt-config-mouse.1 index 6b50157..b69b08e 100644 --- a/liblxqt-config-cursor/man/lxqt-config-mouse.1 +++ b/liblxqt-config-cursor/man/lxqt-config-mouse.1 @@ -1,12 +1,12 @@ .TH lxqt-config-cursor "1" "September 2012" "LXQt\ 0.7.0" "LXQt\ Cursor settings" .SH NAME -lxqt-config-cursor \- Application of \fBLXQt\fR: the faster and lighter QT Desktop Environment +lxqt-config-cursor \- Application of \fBLXQt\fR: the faster and lighter Qt Desktop Environment .SH SYNOPSIS .B lxqt-config-cursor .br .SH DESCRIPTION -This its a simple GUI cursor theme configuraton (by the moment) for the LXQt desktop environment. -Also can manage theme installation for it (localy for/per user only). +This is a simple GUI cursor theme configuration (at the moment) for the LXQt desktop environment. +Also can manage theme installation for it (locally for/per user only). .P \fBLXQt\fR is an advanced, easy-to-use, and fast desktop environment based on Qt technologies, ships several core desktop components, all of which are optional: @@ -28,11 +28,11 @@ Manager. .SH "REPORTING BUGS" Report bugs to https://github.com/lxde/lxqt/issues .SH "SEE ALSO" -\fBLXQt\fR it has been tailored for users who value simplicity, speed, and +\fBLXQt\fR has been tailored for users who value simplicity, speed, and an intuitive interface, also intended for less powerful machines. See also: .\" any module must refers to session app, for more info on start it .P -\fBlxqt-config.1\fR LXQt application for performing settings on many applications +\fBlxqt-config(1)\fR LXQt application for performing settings on many applications .P .SH AUTHOR This manual page was created by \fBPICCORO Lenz McKAY\fR \fI\fR diff --git a/lxqt-config-appearance/fontsconfig.cpp b/lxqt-config-appearance/fontsconfig.cpp index 762bed9..687fe83 100644 --- a/lxqt-config-appearance/fontsconfig.cpp +++ b/lxqt-config-appearance/fontsconfig.cpp @@ -48,8 +48,8 @@ static const char* hintStyleNames[] = {"hintnone", "hintslight", "hintmedium", " FontsConfig::FontsConfig(LXQt::Settings* settings, QSettings* qtSettings, QWidget* parent) : QWidget(parent), ui(new Ui::FontsConfig), - mSettings(settings), mQtSettings(qtSettings), + mSettings(settings), mFontConfigFile() { ui->setupUi(this); diff --git a/lxqt-config-appearance/styleconfig.cpp b/lxqt-config-appearance/styleconfig.cpp index 8bd9b17..1a99596 100644 --- a/lxqt-config-appearance/styleconfig.cpp +++ b/lxqt-config-appearance/styleconfig.cpp @@ -44,8 +44,8 @@ extern void qt_x11_apply_settings_in_all_apps(); StyleConfig::StyleConfig(LXQt::Settings* settings, QSettings* qtSettings, QWidget* parent) : QWidget(parent), ui(new Ui::StyleConfig), - mSettings(settings), - mQtSettings(qtSettings) + mQtSettings(qtSettings), + mSettings(settings) { ui->setupUi(this); diff --git a/lxqt-config-file-associations/mimetypeviewer.cpp b/lxqt-config-file-associations/mimetypeviewer.cpp index c5b970f..062520f 100644 --- a/lxqt-config-file-associations/mimetypeviewer.cpp +++ b/lxqt-config-file-associations/mimetypeviewer.cpp @@ -217,7 +217,6 @@ void MimetypeViewer::filter(const QString& pattern) { QMimeDatabase db; MimeTypeData mimeData; - const int count = widget.mimetypeTreeWidget->topLevelItemCount(); for (int i = 0; i < widget.mimetypeTreeWidget->topLevelItemCount(); ++i) { widget.mimetypeTreeWidget->topLevelItem(i)->setHidden(true); diff --git a/lxqt-config-input/mouseconfig.cpp b/lxqt-config-input/mouseconfig.cpp index 23969c1..0db04a5 100644 --- a/lxqt-config-input/mouseconfig.cpp +++ b/lxqt-config-input/mouseconfig.cpp @@ -87,7 +87,6 @@ void MouseConfig::initControls() { void MouseConfig::onMouseAccelChanged(int value) { - QSlider* slider = static_cast(sender()); accel = value; XChangePointerControl(QX11Info::display(), True, False, accel, 10, 0); @@ -95,7 +94,6 @@ void MouseConfig::onMouseAccelChanged(int value) { } void MouseConfig::onMouseThresholdChanged(int value) { - QSlider* slider = static_cast(sender()); /* threshold = 110 - sensitivity. The lower the threshold, the higher the sensitivity */ threshold = 110 - value; XChangePointerControl(QX11Info::display(), False, True, diff --git a/lxqt-config-monitor/info-for-developers.txt b/lxqt-config-monitor/info-for-developers.txt index 4a24eba..08ab287 100644 --- a/lxqt-config-monitor/info-for-developers.txt +++ b/lxqt-config-monitor/info-for-developers.txt @@ -28,7 +28,7 @@ Module Monitor Contains 4 classes: -- Backend: Ii is an abstract class. It have to be implemented by monitor drivers. In X11 this driver is XRandR +- Backend: It is an abstract class. It has to be implemented by monitor drivers. In X11 this driver is XRandR - MonitorInfo: This class contains all information about one monitor. It is obtained from Backend::getMonitorsInfo method. - MonitorSettings: This class is used by Backend::setMonitorsSettings method. This class contains settings for one monitor. - Monitor: This class is used by MonitorSettingsDialog in order to store monitor settings. diff --git a/lxqt-config-monitor/magnetic_attraction.html b/lxqt-config-monitor/magnetic_attraction.html index 1fc4fd3..0fd6900 100644 --- a/lxqt-config-monitor/magnetic_attraction.html +++ b/lxqt-config-monitor/magnetic_attraction.html @@ -5,9 +5,9 @@

Magnetic attraction algorithm

-

The algorithm used to move monitors to the nearest one in "position dialog" is explained here.

-

Segment equation is used. Let's explain segment equation in order to understand the proccess:

-

If you have two points, p0, p1 ∈ ℝ 2, the equation of straigh line between p0 and p1 is:

+

The algorithm used to move monitors to the nearest one in “position dialog” is explained here.

+

Segment equation is used. Let’s explain segment equation in order to understand the proccess:

+

If you have two points, p0, p1 ∈ ℝ 2, the equation of straight line between p0 and p1 is:

r = v · t + p0 @@ -39,4 +39,4 @@

r2 = v· t2 + c0

Iff t2<t1, c0 monitor must be moved, and its displacement is provided by r = r1-r2

- \ No newline at end of file + diff --git a/man/lxqt-config.1 b/man/lxqt-config.1 index 1457602..69a9de2 100644 --- a/man/lxqt-config.1 +++ b/man/lxqt-config.1 @@ -39,20 +39,20 @@ All of this also can be find in Settings or Preferences menu, please consult the .SH "REPORTING BUGS" Report bugs to https://github.com/lxde/lxqt/issues .SH "SEE ALSO" -\fBLXQt\fR it has been tailored for users who value simplicity, speed, and +\fBLXQt\fR has been tailored for users who value simplicity, speed, and an intuitive interface. LXQt is also intended for less powerful machines. See: .\" any module must refers to session app, for more info on start it .P - * Mouse settings: \fBlxqt-config-mouse.1\fR + * Mouse settings: \fBlxqt-config-mouse(1)\fR .P - * Desktop settings: \fBlxqt-config-desktop.1\fR + * Desktop settings: \fBlxqt-config-desktop(1)\fR .P - * Appeareance settings: \fBlxqt-config-appearance.1\fR + * Appeareance settings: \fBlxqt-config-appearance(1)\fR .P - * Session settings: \fBlxqt-config-session.1\fR + * Session settings: \fBlxqt-config-session(1)\fR .P - * Notification settings: \fBlxqt-config-notificationd.1\fR + * Notification settings: \fBlxqt-config-notificationd(1)\fR .P .SH AUTHOR This manual page was created by \fBPICCORO Lenz McKAY\fR \fI\fR