Skip to content

Commit

Permalink
Shell|GUI: Minor UI tweaks
Browse files Browse the repository at this point in the history
Display local addresses as "localhost", and include the name of the
local server in the window title.
  • Loading branch information
skyjake committed Nov 8, 2016
1 parent 5632821 commit 3cd215c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions doomsday/tools/shell/src/guishellapp.cpp
Expand Up @@ -225,7 +225,8 @@ void GuiShellApp::startLocalServer()
}
sv.start(dlg.port(), dlg.gameMode(), opts, dlg.runtimeFolder());

newOrReusedConnectionWindow()->waitForLocalConnection(dlg.port(), sv.errorLogPath());
newOrReusedConnectionWindow()->waitForLocalConnection
(dlg.port(), sv.errorLogPath(), dlg.name());
}
}
catch (Error const &er)
Expand Down Expand Up @@ -273,7 +274,7 @@ void GuiShellApp::aboutShell()

void GuiShellApp::showHelp()
{
QDesktopServices::openUrl(QUrl(tr("http://dengine.net/dew/index.php?title=Shell_Help")));
QDesktopServices::openUrl(QUrl(tr("http://wiki.dengine.net/w/Shell_Help")));
}

void GuiShellApp::openWebAddress(QString url)
Expand Down
5 changes: 3 additions & 2 deletions doomsday/tools/shell/src/linkwindow.cpp
Expand Up @@ -393,7 +393,8 @@ void LinkWindow::closeEvent(QCloseEvent *event)
QMainWindow::closeEvent(event);
}

void LinkWindow::waitForLocalConnection(duint16 localPort, NativePath const &errorLogPath)
void LinkWindow::waitForLocalConnection(duint16 localPort, NativePath const &errorLogPath,
QString name)
{
closeConnection();

Expand All @@ -404,7 +405,7 @@ void LinkWindow::waitForLocalConnection(duint16 localPort, NativePath const &err
d->startedWaitingAt = Time();
d->errorLog = errorLogPath;

d->linkName = tr("Local Server %1").arg(localPort);
d->linkName = name + " - " + tr("Local Server %1").arg(localPort);
setTitle(d->linkName);

d->console->root().setOverlaidMessage(tr("Waiting for local server..."));
Expand Down
2 changes: 1 addition & 1 deletion doomsday/tools/shell/src/linkwindow.h
Expand Up @@ -49,7 +49,7 @@ class LinkWindow : public QMainWindow

public slots:
void openConnection(QString address);
void waitForLocalConnection(de::duint16 localPort, de::NativePath const &errorLogPath);
void waitForLocalConnection(de::duint16 localPort, de::NativePath const &errorLogPath, QString name);
void openConnection(de::shell::Link *link, de::String name = "");
void closeConnection();
void sendCommandToServer(de::String command);
Expand Down

0 comments on commit 3cd215c

Please sign in to comment.