Small tweaks and improvements.
This commit is contained in:
parent
816380e9d0
commit
5e3570d210
|
@ -7,7 +7,7 @@ import Matrique.Settings 0.1
|
|||
import "qrc:/js/util.js" as Util
|
||||
|
||||
RowLayout {
|
||||
readonly property bool avatarVisible: !sentByMe && (aboveAuthor !== author || aboveSection !== section || aboveEventType === "state" || aboveEventType === "emote")
|
||||
readonly property bool avatarVisible: !sentByMe && (aboveAuthor !== author || aboveSection !== section || aboveEventType === "state" || aboveEventType === "emote" || aboveEventType === "other")
|
||||
readonly property bool highlighted: !(sentByMe || eventType === "notice" )
|
||||
readonly property bool sentByMe: author === currentRoom.localUser
|
||||
readonly property bool isText: eventType === "notice" || eventType === "message"
|
||||
|
|
|
@ -409,6 +409,8 @@ Item {
|
|||
|
||||
parent: ApplicationWindow.overlay
|
||||
|
||||
Material.elevation: 2
|
||||
|
||||
textArea: inputField
|
||||
}
|
||||
}
|
||||
|
|
14
qml/main.qml
14
qml/main.qml
|
@ -33,16 +33,12 @@ ApplicationWindow {
|
|||
Controller {
|
||||
id: matriqueController
|
||||
|
||||
onToggleWindow: {
|
||||
console.log("Activating window...")
|
||||
if (window.visible) {
|
||||
window.hide()
|
||||
} else {
|
||||
window.show()
|
||||
window.raise()
|
||||
window.requestActivate()
|
||||
}
|
||||
onShowWindow: {
|
||||
window.show()
|
||||
window.raise()
|
||||
window.requestActivate()
|
||||
}
|
||||
onHideWindow: window.hide()
|
||||
}
|
||||
|
||||
AccountListModel {
|
||||
|
|
|
@ -31,10 +31,10 @@ Controller::Controller(QObject* parent) : QObject(parent) {
|
|||
tray->setToolTip("Matrique");
|
||||
connect(tray, &QSystemTrayIcon::activated,
|
||||
[this](QSystemTrayIcon::ActivationReason r) {
|
||||
if (r != QSystemTrayIcon::Context) emit toggleWindow();
|
||||
if (r != QSystemTrayIcon::Context) emit showWindow();
|
||||
});
|
||||
connect(tray, &QSystemTrayIcon::messageClicked, [=] { emit toggleWindow(); });
|
||||
trayMenu->addAction("Toggle Window", [=] { emit toggleWindow(); });
|
||||
connect(tray, &QSystemTrayIcon::messageClicked, [=] { emit showWindow(); });
|
||||
trayMenu->addAction("Hide Window", [=] { emit hideWindow(); });
|
||||
trayMenu->addAction("Quit", [=] { QApplication::quit(); });
|
||||
tray->setContextMenu(trayMenu);
|
||||
tray->show();
|
||||
|
@ -168,7 +168,7 @@ bool Controller::saveAccessToken(const AccountSettings& account,
|
|||
auto fileDir = QFileInfo(accountTokenFile).dir();
|
||||
if (!((fileDir.exists() || fileDir.mkpath(".")) &&
|
||||
accountTokenFile.open(QFile::WriteOnly))) {
|
||||
emit errorOccured();
|
||||
emit errorOccured("Cannot save access token.");
|
||||
} else {
|
||||
// Try to restrict access rights to the file. The below is useless
|
||||
// on Windows: FAT doesn't control access at all and NTFS is
|
||||
|
|
|
@ -66,8 +66,9 @@ class Controller : public QObject {
|
|||
|
||||
signals:
|
||||
void busyChanged();
|
||||
void errorOccured();
|
||||
void toggleWindow();
|
||||
void errorOccured(QString error);
|
||||
void showWindow();
|
||||
void hideWindow();
|
||||
void connectionAdded(Connection* conn);
|
||||
void connectionDropped(Connection* conn);
|
||||
void initiated();
|
||||
|
|
Loading…
Reference in New Issue