4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-22 09:40:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fluffypony/monero-core into fluffypony-master

Browse Source
This commit is contained in:
Ilya Kitaev 2016-06-21 11:09:19 +03:00
commit 30f0bce569
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.qml
View File

@ -43,7 +43,7 @@ ApplicationWindow {
property var currentItem property var currentItem
property bool whatIsEnable: false property bool whatIsEnable: false
property bool ctrlPressed: false property bool ctrlPressed: false
property bool rightPanelExpanded: true property bool rightPanelExpanded: false
property bool osx: false property bool osx: false
property alias persistentSettings : persistentSettings property alias persistentSettings : persistentSettings
property var wallet; property var wallet;

3
tabs/TweetsModel.qml
View File

@ -60,6 +60,8 @@ Item {
if (from == "" && phrase == "") if (from == "" && phrase == "")
return; return;
if (appWindow.rightPanelExpanded) {
//! [requesting] //! [requesting]
var req = new XMLHttpRequest; var req = new XMLHttpRequest;
req.open("GET", "https://api.twitter.com/1.1/search/tweets.json?from=" + from + req.open("GET", "https://api.twitter.com/1.1/search/tweets.json?from=" + from +
@ -85,6 +87,7 @@ Item {
req.send(); req.send();
//! [requesting] //! [requesting]
} }
}
Component.onCompleted: { Component.onCompleted: {