Skip to content

Commit

Permalink
Fixup start with new controls
Browse files Browse the repository at this point in the history
  • Loading branch information
neochapay committed Feb 16, 2025
1 parent cfc3360 commit 31b27a7
Show file tree
Hide file tree
Showing 31 changed files with 38 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/qml/AppLauncher.qml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import QtQuick

import org.nemomobile.lipstick
import Nemo.Configuration

import Nemo
import Nemo.Controls

import "applauncher"
Expand Down
3 changes: 2 additions & 1 deletion src/qml/AppSwitcher.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

import QtQuick
import org.nemomobile.lipstick
import Nemo
import Nemo.Controls
import org.nemomobile.glacier

Expand Down Expand Up @@ -178,7 +179,7 @@ Item {
color: Theme.fillDarkColor
opacity: 0.3
border {
width: size.dp(1)
width: Theme.dp(1)
color: Theme.backgroundColor
}
}
Expand Down
1 change: 1 addition & 0 deletions src/qml/FeedsPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/

import QtQuick
import Nemo
import Nemo.Controls

import org.nemomobile.lipstick
Expand Down
2 changes: 1 addition & 1 deletion src/qml/GlacierCompositor.qml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import QtQuick
import QtQuick.Window
import Nemo
import Nemo.Configuration

import org.nemomobile.lipstick
import org.nemomobile.devicelock
import Nemo.Configuration

import "compositor"

Expand Down
1 change: 1 addition & 0 deletions src/qml/Lockscreen.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls

import Amber.Mpris
Expand Down
2 changes: 1 addition & 1 deletion src/qml/MainScreen.qml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

import QtQuick
import QtQml.Models

import Nemo
import Nemo.Controls
import Nemo.Time
import Nemo.Configuration
Expand Down
1 change: 1 addition & 0 deletions src/qml/Statusbar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import QtQuick
import QtQuick.Layouts
import Nemo
import Nemo.Controls

import Amber.Mpris 1.0
Expand Down
1 change: 1 addition & 0 deletions src/qml/applauncher/FolderView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// Copyright (c) 2020-2024, Chupigin Sergey <[email protected]>

import QtQuick
import Nemo
import Nemo.Controls

import org.nemomobile.lipstick
Expand Down
1 change: 1 addition & 0 deletions src/qml/applauncher/LauncherItemDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@


import QtQuick
import Nemo
import Nemo.Controls
import org.nemomobile.lipstick

Expand Down
1 change: 1 addition & 0 deletions src/qml/applauncher/LauncherItemFolder.qml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
// Copyright (c) 2011, Tom Swindell <[email protected]>

import QtQuick
import Nemo
import Nemo.Controls
import org.nemomobile.lipstick

Expand Down
1 change: 1 addition & 0 deletions src/qml/applauncher/LauncherItemWrapper.qml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
// Copyright (c) 2011, Tom Swindell <[email protected]>

import QtQuick
import Nemo
import Nemo.Controls
import org.nemomobile.lipstick

Expand Down
1 change: 1 addition & 0 deletions src/qml/applauncher/SearchListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
**
****************************************************************************************/
import QtQuick
import Nemo
import Nemo.Controls
import Nemo.DBus

Expand Down
3 changes: 2 additions & 1 deletion src/qml/compositor/ScreenGestureArea.qml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ import QtQuick
import QtQuick.Window
import org.nemomobile.lipstick

import Nemo
import Nemo.Configuration

MouseArea {
id: root

property int boundary: size.dp(20)
property int boundary: Theme.dp(20)
property bool delayReset

signal gestureStarted(string gesture)
Expand Down
7 changes: 4 additions & 3 deletions src/qml/compositor/WindowWrapperMystic.qml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import QtQuick
import QtQuick.Window
import Nemo
import org.nemomobile.lipstick

WindowWrapperBase {
Expand Down Expand Up @@ -57,10 +58,10 @@ WindowWrapperBase {

MouseArea{
id: windowHeader
width: parent.width + size.dp(8)
height: parent.height - y + size.dp(8)
width: parent.width + Theme.dp(8)
height: parent.height - y + Theme.dp(8)
y: -Theme.itemHeightMedium
x: -size.dp(4)
x: -Theme.dp(4)
z: (window) ? window.z - 1 : 0
visible: (window) ? (window.width != Screen.width || window.height != Screen.height) : false

Expand Down
1 change: 1 addition & 0 deletions src/qml/dialogs/RebootDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import Nemo.DBus

Expand Down
5 changes: 3 additions & 2 deletions src/qml/feedspage/ControlButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

import QtQuick
import Nemo
import Nemo.Controls

Item {
Expand Down Expand Up @@ -53,8 +54,8 @@ Item {
width: parent.width*0.6
height: parent.height*0.6

sourceSize.width: size.dp(86)
sourceSize.height: size.dp(86)
sourceSize.width: Theme.dp(86)
sourceSize.height: Theme.dp(86)

color: activated ? Theme.textColor : Theme.fillColor
}
Expand Down
1 change: 1 addition & 0 deletions src/qml/feedspage/ControlCenter.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls

import org.nemomobile.statusnotifier
Expand Down
1 change: 1 addition & 0 deletions src/qml/lockscreen/DeviceLockUI.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls

import org.nemomobile.lipstick
Expand Down
1 change: 1 addition & 0 deletions src/qml/lockscreen/LockscreenClock.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@


import QtQuick
import Nemo
import Nemo.Controls

import org.nemomobile.devicelock
Expand Down
1 change: 1 addition & 0 deletions src/qml/lockscreen/MediaControls.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls

import Amber.Mpris 1.0
Expand Down
1 change: 1 addition & 0 deletions src/qml/lockscreen/OperatorLine.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import QOfono

Expand Down
1 change: 1 addition & 0 deletions src/qml/notifications/NotificationItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import Nemo.DBus

Expand Down
1 change: 1 addition & 0 deletions src/qml/notifications/NotificationPreview.qml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
// Copyright (C) 2018-2024 Chupligin Sergey <[email protected]>
*/
import QtQuick
import Nemo
import Nemo.Controls

import org.nemomobile.lipstick 0.1
Expand Down
1 change: 1 addition & 0 deletions src/qml/statusbar/CommonPanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import org.nemomobile.lipstick

Expand Down
1 change: 1 addition & 0 deletions src/qml/statusbar/DataStatusItem.qml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
**
****************************************************************************************/
import QtQuick
import Nemo
import Nemo.Controls

import Connman
Expand Down
1 change: 1 addition & 0 deletions src/qml/statusbar/MediaController.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls

import Amber.Mpris 1.0
Expand Down
2 changes: 1 addition & 1 deletion src/qml/statusbar/SimIndicator.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

import QtQuick
import QtQuick.Layouts

import Nemo
import QOfono

import org.nemomobile.lipstick
Expand Down
1 change: 1 addition & 0 deletions src/qml/statusbar/WifiPanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import Connman 0.2

Expand Down
2 changes: 1 addition & 1 deletion src/qml/system/Screenshot.qml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import Nemo.Controls
import org.nemomobile.lipstick
import Nemo.Notifications
import Nemo.Ngf

import Nemo
import org.nemomobile.glacier 1

Item {
Expand Down
1 change: 1 addition & 0 deletions src/qml/system/ShutdownScreen.qml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import org.nemomobile.lipstick
import ".."
Expand Down
1 change: 1 addition & 0 deletions src/qml/volumecontrol/VolumeControl.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
****************************************************************************************/

import QtQuick
import Nemo
import Nemo.Controls
import org.nemomobile.lipstick

Expand Down

0 comments on commit 31b27a7

Please sign in to comment.