Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/gui/UserStatusSetStatusView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -44,57 +44,57 @@ ColumnLayout {
}

UserStatusSelectorButton {
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.UserStatus.Online
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.userStatus.Online
checkable: true
icon.source: userStatusSelectorModel ? userStatusSelectorModel.onlineIcon : ""
icon.color: "transparent"
text: qsTr("Online")
Layout.fillWidth: true
onClicked: handleStatusClick(NC.UserStatus.Online)
onClicked: handleStatusClick(NC.userStatus.Online)
}

UserStatusSelectorButton {
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.UserStatus.Away
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.userStatus.Away
checkable: true
icon.source: userStatusSelectorModel ? userStatusSelectorModel.awayIcon : ""
icon.color: "transparent"
text: qsTr("Away")
Layout.fillWidth: true
onClicked: handleStatusClick(NC.UserStatus.Away)
onClicked: handleStatusClick(NC.userStatus.Away)
}

UserStatusSelectorButton {
visible: userStatusSelectorModel && userStatusSelectorModel.busyStatusSupported
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.UserStatus.Busy
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.userStatus.Busy
checkable: true
icon.source: userStatusSelectorModel ? userStatusSelectorModel.busyIcon : ""
icon.color: "transparent"
text: qsTr("Busy")
Layout.fillWidth: true
onClicked: handleStatusClick(NC.UserStatus.Busy)
onClicked: handleStatusClick(NC.userStatus.Busy)
}

UserStatusSelectorButton {
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.UserStatus.DoNotDisturb
checked: userStatusSelectorModel && userStatusSelectorModel.onlineStatus === NC.userStatus.DoNotDisturb
checkable: true
icon.source: userStatusSelectorModel ? userStatusSelectorModel.dndIcon : ""
icon.color: "transparent"
text: qsTr("Do not disturb")
secondaryText: qsTr("Mute all notifications")
Layout.fillWidth: true
onClicked: handleStatusClick(NC.UserStatus.DoNotDisturb)
onClicked: handleStatusClick(NC.userStatus.DoNotDisturb)
}

UserStatusSelectorButton {
checked: userStatusSelectorModel && (userStatusSelectorModel.onlineStatus === NC.UserStatus.Invisible
|| userStatusSelectorModel.onlineStatus === NC.UserStatus.Offline)
checked: userStatusSelectorModel && (userStatusSelectorModel.onlineStatus === NC.userStatus.Invisible
|| userStatusSelectorModel.onlineStatus === NC.userStatus.Offline)
checkable: true
icon.source: userStatusSelectorModel ? userStatusSelectorModel.invisibleIcon : ""
icon.color: "transparent"
text: qsTr("Invisible")
secondaryText: qsTr("Appear offline")
Layout.fillWidth: true
onClicked: handleStatusClick(NC.UserStatus.Invisible)
onClicked: handleStatusClick(NC.userStatus.Invisible)
}

Item {
Expand Down
7 changes: 4 additions & 3 deletions src/gui/filedetails/ShareeSearchField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import QtQuick.Layouts
import QtQuick.Controls

import com.nextcloud.desktopclient
import com.nextcloud.desktopclient as NC
import Style
import "../tray"

Expand Down Expand Up @@ -189,8 +190,8 @@ TextField {
delegate: ShareeDelegate {
width: shareeListView.contentItem.width

enabled: model.type !== Sharee.LookupServerSearchResults
hoverEnabled: model.type !== Sharee.LookupServerSearchResults
enabled: model.type !== NC.sharee.LookupServerSearchResults
hoverEnabled: model.type !== NC.sharee.LookupServerSearchResults

function selectSharee() {
root.shareeSelected(model.sharee);
Expand All @@ -200,7 +201,7 @@ TextField {
}

function selectItem() {
if (model.type === Sharee.LookupServerSearch) {
if (model.type === NC.sharee.LookupServerSearch) {
shareeListView.currentIndex = -1
root.shareeModel.searchGlobally()
} else {
Expand Down
8 changes: 4 additions & 4 deletions src/gui/owncloudgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ ownCloudGui::ownCloudGui(Application *parent)
qmlRegisterType<SyncConflictsModel>("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel");

qmlRegisterUncreatableType<QAbstractItemModel>("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel");
qmlRegisterUncreatableType<Activity>("com.nextcloud.desktopclient", 1, 0, "Activity", "Activity");
qmlRegisterUncreatableType<TalkNotificationData>("com.nextcloud.desktopclient", 1, 0, "TalkNotificationData", "TalkNotificationData");
qmlRegisterUncreatableType<Activity>("com.nextcloud.desktopclient", 1, 0, "activity", "Activity");
qmlRegisterUncreatableType<TalkNotificationData>("com.nextcloud.desktopclient", 1, 0, "talkNotificationData", "TalkNotificationData");
qmlRegisterUncreatableType<UnifiedSearchResultsListModel>("com.nextcloud.desktopclient", 1, 0, "UnifiedSearchResultsListModel", "UnifiedSearchResultsListModel");
qmlRegisterUncreatableType<UserStatus>("com.nextcloud.desktopclient", 1, 0, "UserStatus", "Access to Status enum");
qmlRegisterUncreatableType<Sharee>("com.nextcloud.desktopclient", 1, 0, "Sharee", "Access to Type enum");
qmlRegisterUncreatableType<UserStatus>("com.nextcloud.desktopclient", 1, 0, "userStatus", "Access to Status enum");
qmlRegisterUncreatableType<Sharee>("com.nextcloud.desktopclient", 1, 0, "sharee", "Access to Type enum");
qmlRegisterUncreatableType<ClientSideEncryptionTokenSelector>("com.nextcloud.desktopclient", 1, 0, "ClientSideEncryptionTokenSelector", "Access to the certificate selector");

qRegisterMetaType<ActivityListModel *>("ActivityListModel*");
Expand Down
9 changes: 5 additions & 4 deletions src/gui/tray/CurrentAccountHeaderButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import "../filedetails/"

import Style
import com.nextcloud.desktopclient
import com.nextcloud.desktopclient as NC

Button {
id: root
Expand Down Expand Up @@ -246,8 +247,8 @@ Button {
id: currentAccountStatusIndicatorBackground
visible: UserModel.currentUser && UserModel.currentUser.isConnected
&& UserModel.currentUser.serverHasUserStatus
&& UserModel.currentUser.status !== UserStatus.Invisible
&& UserModel.currentUser.status !== UserStatus.Offline
&& UserModel.currentUser.status !== NC.userStatus.Invisible
&& UserModel.currentUser.status !== NC.userStatus.Offline
width: Style.accountAvatarStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
height: width
color: "white"
Expand All @@ -260,8 +261,8 @@ Button {
id: currentAccountStatusIndicator
visible: UserModel.currentUser && UserModel.currentUser.isConnected
&& UserModel.currentUser.serverHasUserStatus
&& UserModel.currentUser.status !== UserStatus.Invisible
&& UserModel.currentUser.status !== UserStatus.Offline
&& UserModel.currentUser.status !== NC.userStatus.Invisible
&& UserModel.currentUser.status !== NC.userStatus.Offline
source: UserModel.currentUser ? UserModel.currentUser.statusIcon : ""
cache: false
x: currentAccountStatusIndicatorBackground.x + Style.trayFolderStatusIndicatorSizeOffset / 2
Expand Down
Loading