Permalink
Browse files

Roll about dialog into settings. Misc other cleanup (#376)

  • Loading branch information...
eanders-MS committed Dec 21, 2017
1 parent c18c9e1 commit ac67f3cca9ad09d504b4e315d6c00f6c5182b26c
View
@@ -1,4 +1,4 @@
# Microsoft Bot Framework Channel Emulator
# Microsoft Bot Framework Emulator
The [Microsoft Bot Framework](https://botframework.com) is a service and [SDK](https://github.com/Microsoft/BotBuilder) that enables organizations to build and deploy intelligent agents, known as bots.
@@ -154,7 +154,7 @@ export class AddressBarMenu extends React.Component<{}, {}> {
type: 'separator'
},
{
label: 'App Settings',
label: 'Settings',
click: () => AddressBarActions.showAppSettings()
},
{
@@ -191,19 +191,6 @@ export class AddressBarMenu extends React.Component<{}, {}> {
{
type: 'separator'
},
/*
{
label: 'Help',
//click: () => AddressBarActions.showHelp()
},
*/
{
label: 'About',
click: () => AddressBarActions.showAbout()
},
{
type: 'separator'
},
{
label: 'Legal',
click: () => window.open('https://g.microsoftonline.com/0BX20en/721')
@@ -102,12 +102,12 @@
.wc-message-content.selected {
color: white;
background-color: #1e1e1e;
background-color: #555;
box-shadow: 0px 1px 1px 0px rgba(0,0,0,0.2);
}
.wc-message-content.selected>svg.wc-message-callout>path {
fill: #1e1e1e;
fill: #555;
}
.wc-card {
@@ -500,7 +500,7 @@
}
.about-logo {
padding-top: 50px;
padding-top: 8px;
width: 100%;
text-align: center;
}

This file was deleted.

Oops, something went wrong.
@@ -33,11 +33,13 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import * as Constants from '../constants';
import { remote } from 'electron';
import { getSettings, Settings, addSettingsListener } from '../settings';
import { AddressBarActions, ServerSettingsActions } from '../reducers';
import * as path from 'path';
import CommonDialog from './commonDialog';
var pjson = require('../../../package.json');
interface AppSettingsDialogState extends React.Props<AppSettingsDialog> {
@@ -171,11 +173,12 @@ export class AppSettingsDialog extends React.Component<{}, AppSettingsDialogStat
onFocusLast={ this.handleFocusLast }
onFocusNatural={ this.handleFocusNatural }
>
<h2 className="dialog-header">App Settings</h2>
<h2 className="dialog-header">Settings</h2>
<div className="appsettings-lowerpane">
<ul className="emu-navbar">
{this.renderNavItem("service", "Service")}
{this.renderNavItem("state", "Bot State")}
{this.renderNavItem("about", "About")}
</ul>
<hr className='enu-navhdr' />
{this.renderNavTab("service", (<div>
@@ -239,6 +242,13 @@ export class AppSettingsDialog extends React.Component<{}, AppSettingsDialogStat
defaultValue={String(serverSettings.framework.stateSizeLimit) || '64'} /> KB
</div>
</div>) )}
{this.renderNavTab("about", (<div>
<div className='about-logo' dangerouslySetInnerHTML={{ __html: Constants.botFrameworkIcon('about-logo-fill', 142) }} />
<div className="about-name">Bot Framework Emulator</div>
<div className="about-link"><a href='https://aka.ms/bf-emulator'>https://aka.ms/bf-emulator</a></div>
<div className="about-version">{`v${pjson.version}`}</div>
<div className="about-copyright">&copy; 2016 - 2018 Microsoft</div>
</div>) )}
</div>
<div className="dialog-buttons">
<button type="button" className="appsettings-savebtn" onClick={() => this.onAccept()}>Save</button>

This file was deleted.

Oops, something went wrong.
View
@@ -41,9 +41,7 @@ import { AddressBar } from './addressBar/addressBar';
import { InspectorView } from './inspectorView'
import { LogView } from './logView';
import { IUser } from '../types/userTypes';
import { AboutDialog } from './dialogs/aboutDialog';
import { AppSettingsDialog } from './dialogs/appSettingsDialog';
import { ConversationSettingsDialog } from './dialogs/conversationSettingsDialog';
import * as Constants from './constants';
import { Emulator } from './emulator';
import { BotEmulatorContext } from './botEmulatorContext';
@@ -328,9 +326,7 @@ export class MainView extends React.Component<{}, {}> {
</div>
</Splitter>
</div>
<AboutDialog />
<AppSettingsDialog />
<ConversationSettingsDialog />
</div>
);
}
View
@@ -91,7 +91,7 @@ var windowIsOffScreen = function(windowBounds: Electron.Rectangle): boolean {
const createMainWindow = () => {
const windowTitle = "Bot Framework Channel Emulator";
const windowTitle = "Bot Framework Emulator";
const settings = getSettings();
let initBounds: Electron.Rectangle = {
Oops, something went wrong.

0 comments on commit ac67f3c

Please sign in to comment.