Name changes

This commit is contained in:
obscuren 2014-08-12 12:21:50 +02:00
parent 59d9746849
commit dc3b0e170c
3 changed files with 16 additions and 12 deletions

View File

@ -318,14 +318,6 @@ ApplicationWindow {
} }
function importApp(path) {
var ext = path.split('.').pop()
if(ext == "html" || ext == "htm") {
ui.openHtml(path)
}else if(ext == "qml"){
ui.openQml(path)
}
}
/****************** /******************
* Dialogs * Dialogs
@ -340,6 +332,17 @@ ApplicationWindow {
} }
/******************
* Wallet functions
*****************/
function importApp(path) {
var ext = path.split('.').pop()
if(ext == "html" || ext == "htm") {
ui.openHtml(path)
}else if(ext == "qml"){
ui.openQml(path)
}
}
function setWalletValue(value) { function setWalletValue(value) {
walletValueLabel.text = value walletValueLabel.text = value
@ -381,9 +384,9 @@ ApplicationWindow {
return time; return time;
} }
// ****************************************** /**********************
// Windows * Windows
// ****************************************** *********************/
Window { Window {
id: peerWindow id: peerWindow
//flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint //flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint

View File

@ -106,11 +106,13 @@ func (gui *Gui) Start(assetPath string) {
logger.Infoln("Starting GUI") logger.Infoln("Starting GUI")
gui.open = true gui.open = true
win.Show() win.Show()
// only add the gui logger after window is shown otherwise slider wont be shown // only add the gui logger after window is shown otherwise slider wont be shown
if addlog { if addlog {
ethlog.AddLogSystem(gui) ethlog.AddLogSystem(gui)
} }
win.Wait() win.Wait()
// need to silence gui logger after window closed otherwise logsystem hangs (but do not save loglevel) // need to silence gui logger after window closed otherwise logsystem hangs (but do not save loglevel)
gui.logLevel = ethlog.Silence gui.logLevel = ethlog.Silence
gui.open = false gui.open = false

View File

@ -112,7 +112,6 @@ func (self *UiLib) StartDbWithCode(code string) {
func (self *UiLib) StartDebugger() { func (self *UiLib) StartDebugger() {
dbWindow := NewDebuggerWindow(self) dbWindow := NewDebuggerWindow(self)
//self.DbWindow = dbWindow
dbWindow.Show() dbWindow.Show()
} }