[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/nemomobile-ux/glacier-home.git</param>
<param name="branch">master</param>
- <param name="revision">1147b0583394afd7dc51009f4cfa09da63be80f0</param>
+ <param name="revision">0d338fd6afc983babb13514528899d1e63b8745a</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/Statusbar.qml
^
|
@@ -173,6 +173,10 @@
}
DeveloperModeIndicator{
+ id: developerModeIndicator
+ }
+
+ USBModeIndicator{
id: usbModedIndicator
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/feedspage/BluetoothControlButton.qml
^
|
@@ -22,7 +22,7 @@
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.Connman 0.2
+import Connman 0.2
import org.kde.bluezqt 1.0 as BluezQt
ControlButton {
@@ -42,7 +42,6 @@
onPoweredChanged: {
bluetoothButton.activated = bluetoothModel.powered
- updateLabel()
}
}
@@ -52,7 +51,6 @@
target: _bluetoothManager
function onUsableAdapterChanged() {
_adapter = _bluetoothManager.usableAdapter
- bluetoothButton.updateLabel()
}
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/feedspage/CellularDataControlButton.qml
^
|
@@ -22,17 +22,15 @@
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.Connman 0.2
-import MeeGo.QOfono 0.2
+import Connman 0.2
+import QOfono 0.2
import Nemo.Connectivity 1.0
ControlButton{
id: cellularDataControlButton
- image: "image://theme/exchange-alt"
-
+ image: cellularRegistration.status ? "image://theme/exchange-alt" :"/usr/share/lipstick-glacier-home-qt5/qml/theme/nosim.png"
assignedSettingsPage: "mobile"
-
activated: cellularNetworkTechnology.connected
NetworkTechnology {
@@ -44,6 +42,17 @@
id: manager
}
+ OfonoConnMan {
+ id: ofonoConnMan
+ modemPath: manager.defaultModem
+ }
+
+ OfonoContextConnection {
+ id: contextConnection
+ contextPath: (ofonoConnMan.contexts !== undefined && ofonoConnMan.contexts.length > 0) ? ofonoConnMan.contexts[0] : ""
+ }
+
+
MobileDataConnection{
id: mobileData
}
@@ -51,17 +60,14 @@
OfonoNetworkRegistration{
id: cellularRegistration
modemPath: manager.defaultModem
-
- onStatusChanged: if(!status) {
- cellularDataControlButton.image = "/usr/share/lipstick-glacier-home-qt5/qml/theme/nosim.png"
- } else {
- cellularDataControlButton.image = "image://theme/exchange-alt"
- }
}
onClicked: {
if(mobileData.presentSimCount != 0) {
mobileData.autoConnect = !mobileData.autoConnect
+ console.log("mobileData.autoConnect " + mobileData.autoConnect)
}
+ contextConnection.active = !contextConnection.active
+
}
}
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/feedspage/NetworkControlButton.qml
^
|
@@ -22,7 +22,7 @@
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.Connman 0.2
+import Connman 0.2
ControlButton {
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/feedspage/WiFiControlButton.qml
^
|
@@ -22,7 +22,7 @@
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.Connman 0.2
+import Connman 0.2
ControlButton {
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/lockscreen/OperatorLine.qml
^
|
@@ -33,7 +33,7 @@
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.QOfono 0.2
+import QOfono 0.2
Row{
id: operatorLine
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/statusbar/BluetoothIndicator.qml
^
|
@@ -1,5 +1,5 @@
import QtQuick 2.6
-import MeeGo.Connman 0.2
+import Connman 0.2
StatusbarItem {
id: bluetoothIndicator
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/statusbar/DataStatusItem.qml
^
|
@@ -33,8 +33,8 @@
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.Connman 0.2
-import MeeGo.QOfono 0.2
+import Connman 0.2
+import QOfono 0.2
StatusbarItem{
id: dataStatus
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/statusbar/SimIndicator.qml
^
|
@@ -32,7 +32,7 @@
import QtQuick 2.6
import QtQuick.Layouts 1.0
-import MeeGo.QOfono 0.2
+import QOfono 0.2
import org.nemomobile.lipstick 0.1
|
[-]
[+]
|
Added |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/statusbar/USBModeIndicator.qml
^
|
@@ -0,0 +1,58 @@
+/****************************************************************************************
+**
+** Copyright (C) 2020-2022 Sergey Chupligin (NeoChapay) <neochapay@gmail.com>
+** All rights reserved.
+**
+** You may use this file under the terms of BSD license as follows:
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in the
+** documentation and/or other materials provided with the distribution.
+** * Neither the name of the author nor the
+** names of its contributors may be used to endorse or promote products
+** derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+****************************************************************************************/
+
+import QtQuick 2.6
+import org.nemomobile.systemsettings 1.0
+
+StatusbarItem {
+ id: developerModeIndicator
+ iconSize: statusbarRight.height
+
+ visible: modeIsVisible(usbModeSettings.currentMode)
+
+ function modeIsVisible(current) {
+ var modes = [ "developer_mode", "mtp_mode" ]
+
+ for (var i = 0; i < modes.length; i++) {
+ if (modes[i] == current) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ source: "image://theme/usb"
+
+ USBSettings{
+ id: usbModeSettings
+ }
+
+}
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/statusbar/WifiIndicator.qml
^
|
@@ -31,7 +31,7 @@
import QtQuick 2.6
-import MeeGo.Connman 0.2
+import Connman 0.2
StatusbarItem {
id: wifiStatus
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/src/qml/statusbar/WifiPanel.qml
^
|
@@ -33,7 +33,7 @@
import QtQuick 2.6
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
-import MeeGo.Connman 0.2
+import Connman 0.2
Component {
CommonPanel {
|
[-]
[+]
|
Changed |
_service:tar_git:lipstick-glacier-home-qt5-0.38.tar.bz2/translations/glacier-home_ru.ts
^
|
@@ -1,18 +1,18 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ru">
<context>
<name>AppSwitcher</name>
<message>
- <location filename="../src/qml/AppSwitcher.qml" line="194"/>
+ <location filename="../src/qml/AppSwitcher.qml" line="209"/>
<source>Done</source>
<translation>Закончить</translation>
</message>
<message>
- <location filename="../src/qml/AppSwitcher.qml" line="210"/>
+ <location filename="../src/qml/AppSwitcher.qml" line="225"/>
<source>Close All</source>
<translation>Закрыть всё</translation>
</message>
<message>
- <location filename="../src/qml/AppSwitcher.qml" line="220"/>
+ <location filename="../src/qml/AppSwitcher.qml" line="235"/>
<source>Nothing open yet</source>
<translation>Нет открытых приложений</translation>
</message>
@@ -99,19 +99,32 @@
</message>
</context>
<context>
+ <name>DesktopSettingsPlugin</name>
+ <message>
+ <location filename="../settings-plugins/desktop/desktopsettingsplugin.h" line="33"/>
+ <source>Desktop</source>
+ <translation>Рабочий стол</translation>
+ </message>
+ <message>
+ <location filename="../settings-plugins/desktop/desktopsettingsplugin.h" line="34"/>
+ <source>Setup desktop behavior</source>
+ <translation>Настроить поведение рабочего стола</translation>
+ </message>
+</context>
+<context>
<name>DeviceLockUI</name>
<message>
- <location filename="../src/qml/lockscreen/DeviceLockUI.qml" line="166"/>
+ <location filename="../src/qml/lockscreen/DeviceLockUI.qml" line="194"/>
<source>Enter security code</source>
<translation>Введите код безопастности</translation>
</message>
<message>
- <location filename="../src/qml/lockscreen/DeviceLockUI.qml" line="170"/>
+ <location filename="../src/qml/lockscreen/DeviceLockUI.qml" line="198"/>
<source>Incorrect code</source>
<translation>Неверный код</translation>
</message>
<message>
- <location filename="../src/qml/lockscreen/DeviceLockUI.qml" line="178"/>
+ <location filename="../src/qml/lockscreen/DeviceLockUI.qml" line="206"/>
<source>Temporarily locked</source>
<translation>Временно заблокирован</translation>
</message>
@@ -119,7 +132,7 @@
<context>
<name>FileUtils</name>
<message>
- <location filename="../src/fileutils.cpp" line="49"/>
+ <location filename="../src/fileutils.cpp" line="50"/>
<source>Screenshot</source>
<translation>Снимок экрана</translation>
</message>
@@ -164,37 +177,37 @@
<context>
<name>NotificationItem</name>
<message numerus="yes">
- <location filename="../src/qml/notifications/NotificationItem.qml" line="103"/>
+ <location filename="../src/qml/notifications/NotificationItem.qml" line="99"/>
<source>%n year(s) ago</source>
<comment>notifications</comment>
<translation><numerusform>год назад</numerusform><numerusform>лет назад</numerusform><numerusform>лет назад</numerusform><numerusform>%n лет назад</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/qml/notifications/NotificationItem.qml" line="105"/>
+ <location filename="../src/qml/notifications/NotificationItem.qml" line="101"/>
<source>%n months(s) ago</source>
<comment>notifications</comment>
<translation><numerusform>месяц назад</numerusform><numerusform>месяцев назад</numerusform><numerusform>месяцев назад</numerusform><numerusform>%n месяцев назад</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/qml/notifications/NotificationItem.qml" line="107"/>
+ <location filename="../src/qml/notifications/NotificationItem.qml" line="103"/>
<source>%n day(s) ago</source>
<comment>notifications</comment>
<translation><numerusform>день назад</numerusform><numerusform>дней назад</numerusform><numerusform>дней назад</numerusform><numerusform>%n дней назад</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/qml/notifications/NotificationItem.qml" line="109"/>
+ <location filename="../src/qml/notifications/NotificationItem.qml" line="105"/>
<source>%n hours(s) ago</source>
<comment>notifications</comment>
<translation><numerusform>час назад</numerusform><numerusform>часов назад</numerusform><numerusform>часов назад</numerusform><numerusform>%n часов назад</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/qml/notifications/NotificationItem.qml" line="111"/>
+ <location filename="../src/qml/notifications/NotificationItem.qml" line="107"/>
<source>%n minutes(s) ago</source>
<comment>notifications</comment>
<translation><numerusform>минута назад</numerusform><numerusform>минут назад</numerusform><numerusform>минут назад</numerusform><numerusform>%n минут назад</numerusform></translation>
</message>
<message>
- <location filename="../src/qml/notifications/NotificationItem.qml" line="113"/>
+ <location filename="../src/qml/notifications/NotificationItem.qml" line="109"/>
<source>Just now</source>
<translation>Только что</translation>
</message>
@@ -223,41 +236,41 @@
<context>
<name>SearchListView</name>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="117"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="119"/>
<source>Search</source>
<translation>Поиск</translation>
</message>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="143"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="150"/>
<source>Hide search panel</source>
<translation>Скрыть панель поиска</translation>
</message>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="143"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="150"/>
<source>Pinup search panel</source>
<translation>Закрепить панель поиска</translation>
</message>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="191"/>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="268"/>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="278"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="198"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="275"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="285"/>
<source>Application</source>
<translation>Приложение</translation>
</message>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="193"/>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="289"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="200"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="296"/>
<source>Contact</source>
<translation>Контакт</translation>
</message>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="195"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="202"/>
<source>Content</source>
<translation>Содержимое</translation>
</message>
<message>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="269"/>
- <location filename="../src/qml/applauncher/SearchListView.qml" line="279"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="276"/>
+ <location filename="../src/qml/applauncher/SearchListView.qml" line="286"/>
<source>installed on your device</source>
<translation>установлен на ваше устройство</translation>
</message>
@@ -265,7 +278,7 @@
<context>
<name>ShutdownScreen</name>
<message>
- <location filename="../src/qml/system/ShutdownScreen.qml" line="73"/>
+ <location filename="../src/qml/system/ShutdownScreen.qml" line="74"/>
<source>Shutting down</source>
<translation>Выключение</translation>
</message>
@@ -337,6 +350,19 @@
</message>
</context>
<context>
+ <name>WallpaperSettingsPlugin</name>
+ <message>
+ <location filename="../settings-plugins/wallpaper/wallpapersettingsplugin.h" line="33"/>
+ <source>Wallpaper</source>
+ <translation>Обои</translation>
+ </message>
+ <message>
+ <location filename="../settings-plugins/wallpaper/wallpapersettingsplugin.h" line="34"/>
+ <source>Select background image</source>
+ <translation>Выберите обои</translation>
+ </message>
+</context>
+<context>
<name>WiFiControlButton</name>
<message>
<location filename="../src/qml/feedspage/WiFiControlButton.qml" line="32"/>
@@ -355,17 +381,17 @@
<context>
<name>desktop</name>
<message>
- <location filename="../src/settings-plugins/desktop/desktop.qml" line="32"/>
+ <location filename="../settings-plugins/desktop/desktop.qml" line="32"/>
|