mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
fix context menus and general stuff
This commit is contained in:
@@ -19,7 +19,7 @@ DankModal {
|
||||
networkSSID = ssid;
|
||||
networkData = data;
|
||||
networkInfoModalVisible = true;
|
||||
WifiService.fetchNetworkInfo(ssid);
|
||||
NetworkService.fetchNetworkInfo(ssid);
|
||||
}
|
||||
|
||||
function hideDialog() {
|
||||
@@ -117,7 +117,7 @@ DankModal {
|
||||
|
||||
anchors.fill: parent
|
||||
anchors.margins: Theme.spacingM
|
||||
text: WifiService.networkInfoDetails.replace(/\\n/g, '\n') || "No information available"
|
||||
text: NetworkService.networkInfoDetails.replace(/\\n/g, '\n') || "No information available"
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceText
|
||||
wrapMode: Text.WordWrap
|
||||
|
||||
@@ -27,6 +27,10 @@ DankModal {
|
||||
function hide() {
|
||||
processListModal.visible = false;
|
||||
SystemMonitorService.enableDetailedMonitoring(false);
|
||||
// Close any open context menus
|
||||
if (processContextMenu.visible) {
|
||||
processContextMenu.close();
|
||||
}
|
||||
}
|
||||
|
||||
function toggle() {
|
||||
@@ -276,7 +280,7 @@ DankModal {
|
||||
Component {
|
||||
id: processesTabComponent
|
||||
ProcessesTab {
|
||||
contextMenu: processContextMenuWindow
|
||||
contextMenu: processContextMenu
|
||||
}
|
||||
}
|
||||
|
||||
@@ -293,7 +297,7 @@ DankModal {
|
||||
|
||||
|
||||
ProcessContextMenu {
|
||||
id: processContextMenuWindow
|
||||
id: processContextMenu
|
||||
}
|
||||
|
||||
IpcHandler {
|
||||
|
||||
@@ -28,15 +28,15 @@ DankModal {
|
||||
// Auto-reopen dialog on invalid password
|
||||
Connections {
|
||||
function onPasswordDialogShouldReopenChanged() {
|
||||
if (WifiService.passwordDialogShouldReopen && WifiService.connectingSSID !== "") {
|
||||
wifiPasswordSSID = WifiService.connectingSSID;
|
||||
if (NetworkService.passwordDialogShouldReopen && NetworkService.connectingSSID !== "") {
|
||||
wifiPasswordSSID = NetworkService.connectingSSID;
|
||||
wifiPasswordInput = "";
|
||||
wifiPasswordModalVisible = true;
|
||||
WifiService.passwordDialogShouldReopen = false;
|
||||
NetworkService.passwordDialogShouldReopen = false;
|
||||
}
|
||||
}
|
||||
|
||||
target: WifiService
|
||||
target: NetworkService
|
||||
}
|
||||
|
||||
content: Component {
|
||||
@@ -111,7 +111,7 @@ DankModal {
|
||||
wifiPasswordInput = text;
|
||||
}
|
||||
onAccepted: {
|
||||
WifiService.connectToWifiWithPassword(wifiPasswordSSID, passwordInput.text);
|
||||
NetworkService.connectToWifiWithPassword(wifiPasswordSSID, passwordInput.text);
|
||||
wifiPasswordModalVisible = false;
|
||||
wifiPasswordInput = "";
|
||||
passwordInput.text = "";
|
||||
@@ -245,7 +245,7 @@ DankModal {
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
enabled: parent.enabled
|
||||
onClicked: {
|
||||
WifiService.connectToWifiWithPassword(wifiPasswordSSID, passwordInput.text);
|
||||
NetworkService.connectToWifiWithPassword(wifiPasswordSSID, passwordInput.text);
|
||||
wifiPasswordModalVisible = false;
|
||||
wifiPasswordInput = "";
|
||||
passwordInput.text = "";
|
||||
|
||||
Reference in New Issue
Block a user