Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new PCN format for settings config file

Browse Source
This commit is contained in:
miruka
2020-10-07 20:12:32 -04:00
parent 6ce3059322
commit db12036372
52 changed files with 1305 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainPane/AccountBar.qml
View File

@@ -81,7 +81,7 @@ Rectangle {
HShortcut {
sequences: window.settings.keys.goToPreviousAccount
sequences: window.settings.Keys.Accounts.previous
onActivated: {
accountList.moveCurrentIndexLeft()
accountList.currentItem.leftClicked()
@@ -89,7 +89,7 @@ Rectangle {
}
HShortcut {
sequences: window.settings.keys.goToNextAccount
sequences: window.settings.Keys.Accounts.next
onActivated: {
accountList.moveCurrentIndexRight()
accountList.currentItem.leftClicked()

16
src/gui/MainPane/AccountDelegate.qml
View File

@@ -26,7 +26,7 @@ HTile {
function setCollapse(collapse) {
window.uiState.collapseAccounts[model.id] = collapse
window.uiStateChanged()
window.saveUIState()
py.callCoro("set_account_collapse", [model.id, collapse])
}
@@ -162,7 +162,7 @@ HTile {
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.addNewChat
sequences: window.settings.Keys.Rooms.add
onActivated: addChat.clicked()
}
}
@@ -210,37 +210,37 @@ HTile {
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.accountSettings
sequences: window.settings.Keys.Accounts.settings
onActivated: leftClicked()
}
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.toggleCollapseAccount
sequences: window.settings.Keys.Accounts.collapse
onActivated: toggleCollapse()
}
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.openPresenceMenu
sequences: window.settings.Keys.Accounts.menu
onActivated: account.doRightClick(false)
}
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.togglePresenceUnavailable
sequences: window.settings.Keys.Accounts.unavailable
onActivated: account.togglePresence("unavailable")
}
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.togglePresenceInvisible
sequences: window.settings.Keys.Accounts.invisible
onActivated: account.togglePresence("invisible")
}
HShortcut {
enabled: enableKeybinds
sequences: window.settings.keys.togglePresenceOffline
sequences: window.settings.Keys.Accounts.offline
onActivated: account.togglePresence("offline")
}

10
src/gui/MainPane/BottomBar.qml
View File

@@ -32,7 +32,7 @@ Rectangle {
Layout.fillHeight: true
HShortcut {
sequences: window.settings.keys.addNewAccount
sequences: window.settings.Keys.Accounts.add
onActivated: addAccountButton.clicked()
}
}
@@ -57,7 +57,7 @@ Rectangle {
Keys.onEnterPressed: Keys.onReturnPressed(event)
Keys.onReturnPressed: {
roomList.showItemAtIndex()
if (window.settings.clearRoomFilterOnEnter) text = ""
if (window.settings.RoomList.enter_clears_filter) text = ""
}
Keys.onMenuPressed:
@@ -66,19 +66,19 @@ Rectangle {
Keys.onEscapePressed: {
mainPane.toggleFocus()
if (window.settings.clearRoomFilterOnEscape) text = ""
if (window.settings.RoomList.escape_clears_filter) text = ""
}
Behavior on opacity { HNumberAnimation {} }
HShortcut {
sequences: window.settings.keys.clearRoomFilter
sequences: window.settings.Keys.Rooms.clear_filter
onActivated: filterField.text = ""
}
HShortcut {
sequences: window.settings.keys.toggleFocusMainPane
sequences: window.settings.Keys.Rooms.focus_filter
onActivated: mainPane.toggleFocus()
}
}

3
src/gui/MainPane/MainPane.qml
View File

@@ -25,8 +25,9 @@ HDrawer {
saveName: "mainPane"
background: Rectangle { color: theme.mainPane.background }
minimumSize: theme.mainPane.minimumSize
requireDefaultSize: bottomBar.filterField.activeFocus
minimumSize:
window.settings.RoomList.min_width * window.settings.General.zoom
Behavior on opacity { HNumberAnimation {} }

29
src/gui/MainPane/RoomList.qml
View File

@@ -73,12 +73,12 @@ HListView {
) :
pageLoader.showRoom(item.for_account, item.id)
if (fromClick && ! window.settings.centerRoomListOnClick)
if (fromClick && ! window.settings.RoomList.click_centers)
keepListCentered = false
currentIndex = index
if (fromClick && ! window.settings.centerRoomListOnClick)
if (fromClick && ! window.settings.RoomList.click_centers)
keepListCentered = true
}
@@ -245,54 +245,53 @@ HListView {
}
HShortcut {
sequences: window.settings.keys.goToPreviousRoom
sequences: window.settings.Keys.Rooms.previous
onActivated: { decrementCurrentIndex(); showItemLimiter.restart() }
}
HShortcut {
sequences: window.settings.keys.goToNextRoom
sequences: window.settings.Keys.Rooms.next
onActivated: { incrementCurrentIndex(); showItemLimiter.restart() }
}
HShortcut {
sequences: window.settings.keys.goToPreviousUnreadRoom
sequences: window.settings.Keys.Rooms.previous_unread
onActivated: { cycleUnreadRooms(false) && showItemLimiter.restart() }
}
HShortcut {
sequences: window.settings.keys.goToNextUnreadRoom
sequences: window.settings.Keys.Rooms.next_unread
onActivated: { cycleUnreadRooms(true) && showItemLimiter.restart() }
}
HShortcut {
sequences: window.settings.keys.goToPreviousMentionedRoom
sequences: window.settings.Keys.Rooms.previous_urgent
onActivated: cycleUnreadRooms(false, true) && showItemLimiter.restart()
}
HShortcut {
sequences: window.settings.keys.goToNextMentionedRoom
sequences: window.settings.Keys.Rooms.next_urgent
onActivated: cycleUnreadRooms(true, true) && showItemLimiter.restart()
}
Repeater {
model: Object.keys(window.settings.keys.focusAccountAtIndex)
model: Object.keys(window.settings.Keys.Accounts.at_index)
Item {
HShortcut {
sequence: window.settings.keys.focusAccountAtIndex[modelData]
onActivated: goToAccountNumber(parseInt(modelData - 1, 10))
sequence: window.settings.Keys.Accounts.at_index[modelData]
onActivated: goToAccountNumber(parseInt(modelData, 10) - 1)
}
}
}
Repeater {
model: Object.keys(window.settings.keys.focusRoomAtIndex)
model: Object.keys(window.settings.Keys.Rooms.at_index)
Item {
HShortcut {
sequence: window.settings.keys.focusRoomAtIndex[modelData]
onActivated:
showAccountRoomAtIndex(parseInt(modelData - 1, 10))
sequence: window.settings.Keys.Rooms.at_index[modelData]
onActivated: showAccountRoomAtIndex(parseInt(modelData,10) - 1)
}
}
}