diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
| commit | 7e0ccc9de53e788ddc1879248bceb33a9ccdbae0 (patch) | |
| tree | 816ff2e06aaa78721a22eee7f2c8493fbf313fb4 /cmd/mist/assets | |
| parent | ce595b9266d658a5eae626d78aec7f47c04222ca (diff) | |
| parent | eba4f389a6c494bc3e15b3bbc6516b51a5e61236 (diff) | |
| download | go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.gz go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.bz2 go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.lz go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.xz go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.zst go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.zip | |
Merge branch 'develop' into rpcfrontier
Conflicts:
rpc/api.go
rpc/args.go
Diffstat (limited to 'cmd/mist/assets')
| -rw-r--r-- | cmd/mist/assets/qml/main.qml | 5 | ||||
| -rw-r--r-- | cmd/mist/assets/qml/views/info.qml | 41 |
2 files changed, 5 insertions, 41 deletions
diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml index e06ddbd71..8558ebd51 100644 --- a/cmd/mist/assets/qml/main.qml +++ b/cmd/mist/assets/qml/main.qml @@ -190,6 +190,11 @@ ApplicationWindow { } } + MenuItem { + text: "Generate key" + shortcut: "Ctrl+k" + onTriggered: gui.generateKey() + } } Menu { diff --git a/cmd/mist/assets/qml/views/info.qml b/cmd/mist/assets/qml/views/info.qml index b2d2f521c..0187bba6d 100644 --- a/cmd/mist/assets/qml/views/info.qml +++ b/cmd/mist/assets/qml/views/info.qml @@ -54,7 +54,6 @@ Rectangle { height: 200 anchors { left: parent.left - right: logLevelSlider.left bottom: parent.bottom top: parent.top } @@ -107,46 +106,6 @@ Rectangle { } } } - - /* - TableView { - id: logView - headerVisible: false - anchors { - right: logLevelSlider.left - left: parent.left - bottom: parent.bottom - top: parent.top - } - - TableViewColumn{ role: "description" ; title: "log" } - - model: logModel - } - */ - - Slider { - id: logLevelSlider - value: gui.getLogLevelInt() - anchors { - right: parent.right - top: parent.top - bottom: parent.bottom - - rightMargin: 5 - leftMargin: 5 - topMargin: 5 - bottomMargin: 5 - } - - orientation: Qt.Vertical - maximumValue: 5 - stepSize: 1 - - onValueChanged: { - gui.setLogLevel(value) - } - } } property var logModel: ListModel { |