~nicohman/signal-rs

504c8521425b07bffb98572c1143e04e5c5b7689 — nicohman 9 months ago fe8c162 master
Update gettext version
M Cargo.lock => Cargo.lock +15 -6
@@ 1339,9 1339,9 @@ dependencies = [

[[package]]
name = "gettext-rs"
version = "0.4.4"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df454a42d8a718280c78666efe0707c120873736961ae91ead898f17ac66ce7c"
checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364"
dependencies = [
 "gettext-sys",
 "locale_config",


@@ 1349,11 1349,12 @@ dependencies = [

[[package]]
name = "gettext-sys"
version = "0.19.9"
version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e034c4ba5bb796730a6cc5eb0d654c16885006a7c3d6c6603581ed809434f153"
checksum = "afa9e06ab9e7514cc9ae668ea3b71ea1536259d767dff0289ac23ad134f99929"
dependencies = [
 "cc",
 "temp-dir",
]

[[package]]


@@ 1925,11 1926,13 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"

[[package]]
name = "locale_config"
version = "0.2.3"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ac19ebe45489e5d53b4346d8b90bb3dd03275c5fdf2ce22a982516d86b535c"
checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934"
dependencies = [
 "lazy_static",
 "objc",
 "objc-foundation",
 "regex",
 "winapi 0.3.9",
]


@@ 3821,6 3824,12 @@ dependencies = [
]

[[package]]
name = "temp-dir"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"

[[package]]
name = "tempdir"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"

M Cargo.toml => Cargo.toml +1 -1
@@ 6,7 6,7 @@ edition = "2018"
build = "src/build.rs"
[dependencies]
qmetaobject = { version = "0.2.0", features = ["webengine"]} 
gettext-rs = "0.4"
gettext-rs = "0.7.0"
cstr = "0.1.0"
cpp = "0.5"
url = "2.1.0"

M qml/Settings.qml => qml/Settings.qml +1 -1
@@ 58,7 58,7 @@ Kirigami.Page {
        }
        Row {
            Layout.leftMargin: 10
            Layout.topMargin: 20
            Layout.topMargin: 0
            Layout.alignment: Qt.AlignTop
            Label {
                font.pixelSize: Qt.application.font.pixelSize * 0.9

M qml/chats/CreateChat.qml => qml/chats/CreateChat.qml +29 -27
@@ 28,42 28,44 @@ Kirigami.ScrollablePage {
			width: createChatPage.width //+ crAv.width
			height: 40
			anchors.leftMargin: 10
			anchors.bottomMargin: 10
			onClicked: {
				// Dumb hack to get around fact that we don't have an official Chat yet
                signalState.currentChat = {
                	is_group: false
                };
                signalState.currentIsGroup = false;
                console.log(model.uuid);
                signalState.currentName = model.name;
                signalState.setCurrent(model.uuid);
                SignalUI.show_chat(model.uuid);
                signalState.openView("chatHistory");
                window.pageStack.layers.pop();
				signalState.currentChat = {
					is_group: false
				};
				signalState.currentIsGroup = false;
				console.log(model.uuid);
				signalState.currentName = model.name;
				signalState.setCurrent(model.uuid);
				SignalUI.show_chat(model.uuid);
				signalState.openView("chatHistory");
				window.pageStack.layers.pop();
			}
							Rectangle {
								anchors.horizontalCenter: parent.horizontalCenter
					Kirigami.Theme.colorSet:   Kirigami.Theme.Complementary 
					width: Math.min(300, crLa.implicitWidth)
					height: 25
					color: Kirigami.Theme.alternateBackgroundColor
					radius: 5
					anchors.top: parent.top
			Row {
			Layout.alignment: Qt.AlignHCenter | Qt.AlignTop	
			Rectangle {
				anchors.bottomMargin: 10
				anchors.left: parent.left
				Kirigami.Theme.colorSet:   Kirigami.Theme.Complementary 
				width: Math.min(300, crLa.implicitWidth) + 40
				height: 40
				color: Kirigami.Theme.alternateBackgroundColor
				radius: 5
				anchors.top: parent.top
				Row {
					Layout.alignment: Qt.AlignLeft | Qt.AlignTop	

				/*Avatar {
				Avatar {
					id: crAv
					tel: model.uuid
					width: 40
					height: 40
				}*/
					}

				Label {
					id: crLa
					height: 20
					text: model.name
				}
					Label {
						id: crLa
						height: 40
						text: model.name
					}
				}

			}

M qml/messages/ChatHistory.qml => qml/messages/ChatHistory.qml +12 -0
@@ 124,6 124,12 @@ Kirigami.ScrollablePage {
                }
            }
            Button {
    hoverEnabled: true

    ToolTip.delay: 1000
    ToolTip.timeout: 5000
    ToolTip.visible: hovered
                    ToolTip.text: "Send an attachment"
                id: addAttachmentButton
                icon.name: "edit-add"
                display:AbstractButton.IconOnly


@@ 132,6 138,12 @@ Kirigami.ScrollablePage {
                }
            }
            Button {
    hoverEnabled: true

    ToolTip.delay: 1000
    ToolTip.timeout: 5000
    ToolTip.visible: hovered
                    ToolTip.text: "Send the current message"
                id: sendButton
                icon.name: "document-send"
                display:AbstractButton.IconOnly

M src/main.rs => src/main.rs +1 -3
@@ 50,9 50,7 @@ async fn main() -> Result<(), std::boxed::Box<dyn std::error::Error>> {
        .start()
        .unwrap();
    let conf: Config = confy::load("signal-rs").unwrap();
    let data_dir = conf
        .data_dir
        .replace("~", home::home_dir().unwrap().to_str().unwrap());
    let data_dir = conf.data_dir();
    let config_store =
        SledConfigStore::new(PathBuf::from(data_dir).join(PathBuf::from("cstore"))).unwrap();
    // Check if the user is registered or not

M src/presage/parsing.rs => src/presage/parsing.rs +0 -1
@@ 208,7 208,6 @@ pub async fn parse_content<C: ConfigStore>(
                            .unwrap_or_default()
                            .to_string()
                            .to_uppercase();
                        println!("{:?}", scontact);
                        if let Some(avatar) = scontact.avatar {
                            let path = PathBuf::from(&data_dir)
                                .join("avatars")

M src/registration.rs => src/registration.rs +1 -3
@@ 42,9 42,7 @@ impl RegistrationController {
        });
        execute_async(async move {
            let conf: Config = confy::load("signal-rs").unwrap();
            let data_dir = conf
                .data_dir
                .replace("~", home::home_dir().unwrap().to_str().unwrap());
            let data_dir = conf.data_dir();
            let config_store =
                SledConfigStore::new(PathBuf::from(data_dir).join(PathBuf::from("cstore")))
                    .unwrap();