[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/phosh][debian/master] 10 commits: debian: Depend on gnome-shell-common
Arnaud Ferraris
gitlab at salsa.debian.org
Thu Nov 5 13:33:47 GMT 2020
Arnaud Ferraris pushed to branch debian/master at Debian On Mobile / phosh
Commits:
1edb787b by Guido Günther at 2020-10-28T18:32:58+01:00
debian: Depend on gnome-shell-common
We use that schema for the keybindings.
Signed-off-by: Guido Günther <guido.gunther at puri.sm>
- - - - -
7fe04621 by Yuri Chornoivan at 2020-11-02T17:46:39+00:00
po: Update Ukrainian translation
- - - - -
945f0299 by Марко М. Костић (Marko M. Kostić) at 2020-11-03T09:13:51+01:00
po: Update Serbian translation
- - - - -
9cfac19d by Arnaud Ferraris at 2020-11-03T13:43:22+01:00
docked-manager: make tablets dockable too
The current code considers that only phones are dockable. This patch
improves the device mode check so that tablets also benefit from auto
mode switch (tested on the PineTab).
- - - - -
c72fcb6c by Guido Günther at 2020-11-03T14:39:56+00:00
ci: Don't depend on gnome-session
This would have avoided the missing schema regression
Signed-off-by: Guido Günther <guido.gunther at puri.sm>
- - - - -
e938e162 by Guido Günther at 2020-11-03T14:39:56+00:00
osk-button: Remove unused defines
Signed-off-by: Guido Günther <guido.gunther at puri.sm>
- - - - -
613154cc by Guido Günther at 2020-11-03T14:39:56+00:00
Don't hide OSK on lock screen
Let is pop up if requested, only hide it when locking.
Signed-off-by: Guido Günther <guido.gunther at puri.sm>
- - - - -
b5531cb4 by Guido Günther at 2020-11-03T14:39:56+00:00
osk-manager: Fix availability->visibility sync
Things like osk-button should look unpressed when the dbus name
goes away.
Signed-off-by: Guido Günther <guido.gunther at puri.sm>
- - - - -
2782f77e by Guido Günther at 2020-11-03T17:19:41+01:00
Document changes and release 0.5.1
- - - - -
2ed90d47 by Arnaud Ferraris at 2020-11-05T14:33:24+01:00
New upstream version 0.5.1
- - - - -
8 changed files:
- .gitlab-ci.yml
- debian/control
- meson.build
- po/sr.po
- po/uk.po
- src/docked-manager.c
- src/osk-manager.c
- src/osk/osk-button.c
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -44,7 +44,7 @@ variables:
variables: &smoketest_vars
CI_REPO: "deb http://ci.puri.sm/ scratch librem5"
DIST: buster
- DEPS: phoc wget gnome-session gdb weston valgrind
+ DEPS: phoc wget gnome-session-bin gdb weston valgrind
libhandy-1-0-dbgsym libgtk-3-0-dbgsym libglib2.0-0-dbgsym
dconf-gsettings-backend-dbgsym libfeedback-0.0-0-dbgsym
xvfb imagemagick
=====================================
debian/control
=====================================
@@ -42,6 +42,7 @@ Depends:
fonts-lato,
gnome-shell-common,
gsettings-desktop-schemas,
+ gnome-shell-common,
phoc (>= 0.4.4),
Recommends:
feedbackd,
=====================================
meson.build
=====================================
@@ -1,5 +1,5 @@
project('phosh', 'c',
- version: '0.5.0',
+ version: '0.5.1',
license: 'GPLv3+',
meson_version: '>= 0.49.0',
default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
=====================================
po/sr.po
=====================================
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phosh master\n"
"Report-Msgid-Bugs-To: https://source.puri.sm/Librem5/phosh/issues\n"
-"POT-Creation-Date: 2020-10-08 15:31+0000\n"
-"PO-Revision-Date: 2020-10-25 05:32+0100\n"
+"POT-Creation-Date: 2020-10-29 15:33+0000\n"
+"PO-Revision-Date: 2020-10-30 02:03+0100\n"
"Last-Translator: Марко М. Костић <marko.m.kostic at gmail.com>\n"
"Language-Team: Serbian <gnome-sr at googlegroups.org>\n"
"Language: sr\n"
@@ -45,6 +45,14 @@ msgstr "Укљ."
msgid "Bluetooth"
msgstr "Блутут"
+#: src/docked-info.c:81
+msgid "Docked"
+msgstr "Усидрен"
+
+#: src/docked-info.c:195
+msgid "Undocked"
+msgstr "Одсидрен"
+
#. Translators: quiet and silent are fbd profiles names:
#. see https://source.puri.sm/Librem5/feedbackd#profiles
#. for details
@@ -83,12 +91,12 @@ msgstr "Непознат наслов"
msgid "Unknown Artist"
msgstr "Непознат извођач"
-#: src/monitor-manager.c:64
+#: src/monitor-manager.c:71
msgid "Built-in display"
msgstr "Уграђени екран"
#. Translators: An unknown monitor type
-#: src/monitor-manager.c:68
+#: src/monitor-manager.c:75
msgid "Unknown"
msgstr "Непознато"
=====================================
po/uk.po
=====================================
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phosh\n"
"Report-Msgid-Bugs-To: https://source.puri.sm/Librem5/phosh/issues\n"
-"POT-Creation-Date: 2020-10-08 15:31+0000\n"
-"PO-Revision-Date: 2020-10-09 15:22+0300\n"
+"POT-Creation-Date: 2020-10-27 15:31+0000\n"
+"PO-Revision-Date: 2020-10-28 18:28+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
"Language: uk\n"
@@ -45,6 +45,14 @@ msgstr "Увімкнено"
msgid "Bluetooth"
msgstr "Bluetooth"
+#: src/docked-info.c:81
+msgid "Docked"
+msgstr "Зафіксовано"
+
+#: src/docked-info.c:195
+msgid "Undocked"
+msgstr "Від'єднано"
+
#. Translators: quiet and silent are fbd profiles names:
#. see https://source.puri.sm/Librem5/feedbackd#profiles
#. for details
@@ -83,12 +91,12 @@ msgstr "Невідома назва"
msgid "Unknown Artist"
msgstr "Невідомий виконавець"
-#: src/monitor-manager.c:64
+#: src/monitor-manager.c:71
msgid "Built-in display"
msgstr "Вбудований дисплей"
#. Translators: An unknown monitor type
-#: src/monitor-manager.c:68
+#: src/monitor-manager.c:75
msgid "Unknown"
msgstr "Нетиповий"
=====================================
src/docked-manager.c
=====================================
@@ -121,7 +121,8 @@ mode_changed_cb (PhoshDockedManager *self, GParamSpec *pspec, PhoshModeManager *
* Desktops, laptops and phones with enough external hardware should get floating
* windows, etc
*/
- if (phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_PHONE)
+ if (phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_PHONE &&
+ phosh_mode_manager_get_mimicry (manager) != PHOSH_MODE_DEVICE_TYPE_TABLET)
can_dock = TRUE;
if (can_dock == self->can_dock)
=====================================
src/osk-manager.c
=====================================
@@ -104,9 +104,9 @@ on_availability_changed (PhoshOskManager *self, GParamSpec *pspec, gpointer unus
{
g_return_if_fail (PHOSH_IS_OSK_MANAGER (self));
- /* When there's no OSK we always want the manager to be unpressed */
- if (!self->available || phosh_lockscreen_manager_get_locked (self->lockscreen_manager))
- set_visible_real (self, FALSE);
+ /* Sync on visibility when osk is unavailable so buttons, etc look correct */
+ if (!self->available)
+ phosh_osk_manager_set_visible (self, FALSE);
}
@@ -119,12 +119,7 @@ on_visible_changed (PhoshOskManager *self, GParamSpec *pspec, PhoshOsk0SmPuriOSK
g_return_if_fail (G_IS_DBUS_PROXY (proxy));
visible = phosh_osk0_sm_puri_osk0_get_visible (proxy);
- /* Make sure the OSK stays hidden on the lockscreen... */
- if (visible && phosh_lockscreen_manager_get_locked (self->lockscreen_manager)) {
- set_visible_real (self, FALSE);
- return;
- }
- /* ...otherwise just sync the properties */
+ /* Just need to sync the property, osk shows/hides itself */
if (visible != self->visible) {
self->visible = visible;
g_object_notify_by_pspec (G_OBJECT (self), props[PHOSH_OSK_MANAGER_PROP_VISIBLE]);
@@ -139,7 +134,7 @@ on_lockscreen_manager_locked_changed (PhoshOskManager *self, GParamSpec *pspec,
/* Hide OSK on lock screen lock */
if (phosh_lockscreen_manager_get_locked (self->lockscreen_manager))
- set_visible_real (self, FALSE);
+ set_visible_real (self, FALSE);
}
=====================================
src/osk/osk-button.c
=====================================
@@ -15,9 +15,6 @@
#include <gio/gio.h>
#include <gtk/gtk.h>
-#define VIRTBOARD_DBUS_NAME "sm.puri.OSK0"
-#define VIRTBOARD_DBUS_OBJECT "/sm/puri/OSK0"
-
/**
* SECTION:osk-button
* @short_description: A button that toggles the OSK
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phosh/-/compare/d57cd7f5c9c9171f5c6256e07af83c5ac1047630...2ed90d47caf741e5d69d9f3a63fa525e75fb4d7e
--
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/phosh/-/compare/d57cd7f5c9c9171f5c6256e07af83c5ac1047630...2ed90d47caf741e5d69d9f3a63fa525e75fb4d7e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20201105/eea525f1/attachment-0001.html>
More information about the Debian-on-mobile-maintainers
mailing list