Skip to content

Commit

Permalink
Shell|GUI: Toolbar icons v1
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Apr 2, 2013
1 parent 000e160 commit cade303
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions doomsday/tools/shell/shell-gui/res/shell.qrc
Expand Up @@ -3,5 +3,7 @@
<file>shell.png</file>
<file>shell@2x.png</file>
<file>toolbar_placeholder.png</file>
<file>toolbar_console.png</file>
<file>toolbar_status.png</file>
</qresource>
</RCC>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions doomsday/tools/shell/shell-gui/src/linkwindow.cpp
Expand Up @@ -249,17 +249,17 @@ LinkWindow::LinkWindow(QWidget *parent)
statusBar()->addPermanentWidget(d->currentHost);
statusBar()->addPermanentWidget(d->timeCounter);

QIcon icon(":/images/toolbar_placeholder.png");

d->tools = addToolBar(tr("View"));
d->tools->setMovable(false);
d->tools->setFloatable(false);

d->statusButton = d->addToolButton(tr("Status"), icon);
d->statusButton = d->addToolButton(tr("Status"), QIcon(":/images/toolbar_status.png"));
connect(d->statusButton, SIGNAL(pressed()), this, SLOT(switchToStatus()));
d->statusButton->setChecked(true);

#ifdef DENG2_DEBUG
QIcon icon(":/images/toolbar_placeholder.png");

QToolButton *btn = d->addToolButton(tr("Frags"), icon);
btn->setDisabled(true);

Expand All @@ -270,7 +270,7 @@ LinkWindow::LinkWindow(QWidget *parent)
btn->setDisabled(true);
#endif

d->consoleButton = d->addToolButton(tr("Console"), icon);
d->consoleButton = d->addToolButton(tr("Console"), QIcon(":/images/toolbar_console.png"));
connect(d->consoleButton, SIGNAL(pressed()), this, SLOT(switchToConsole()));

// Initial state for the window.
Expand Down

0 comments on commit cade303

Please sign in to comment.