Fix schema compare dialog font sizes (#5353)

* make font sizes consistent

* fix order of source dialog options

* update fontsize to 13

* make fontsize a constant
This commit is contained in:
kisantia
2019-05-04 10:48:25 +12:00
committed by GitHub
parent db387eb770
commit ec9fdc517f

View File

@@ -23,6 +23,7 @@ const ServerDropdownLabel: string = localize('schemaCompareDialog.serverDropdown
const DatabaseDropdownLabel: string = localize('schemaCompareDialog.databaseDropdownTitle', 'Database'); const DatabaseDropdownLabel: string = localize('schemaCompareDialog.databaseDropdownTitle', 'Database');
const NoActiveConnectionsLabel: string = localize('schemaCompare.noActiveConnectionsText', 'No active connections'); const NoActiveConnectionsLabel: string = localize('schemaCompare.noActiveConnectionsText', 'No active connections');
const SchemaCompareLabel: string = localize('schemaCompare.dialogTitle', 'Schema Compare'); const SchemaCompareLabel: string = localize('schemaCompare.dialogTitle', 'Schema Compare');
const titleFontSize: number = 13;
export class SchemaCompareDialog { export class SchemaCompareDialog {
public dialog: azdata.window.Dialog; public dialog: azdata.window.Dialog;
@@ -194,7 +195,8 @@ export class SchemaCompareDialog {
] ]
} }
], { ], {
horizontal: true horizontal: true,
titleFontSize: titleFontSize
}); });
} else { } else {
this.formBuilder = view.modelBuilder.formContainer() this.formBuilder = view.modelBuilder.formContainer()
@@ -213,7 +215,8 @@ export class SchemaCompareDialog {
] ]
} }
], { ], {
horizontal: true horizontal: true,
titleFontSize: titleFontSize
}); });
} }
let formModel = this.formBuilder.component(); let formModel = this.formBuilder.component();
@@ -284,17 +287,17 @@ export class SchemaCompareDialog {
this.formBuilder.removeFormItem(this.sourceNoActiveConnectionsText); this.formBuilder.removeFormItem(this.sourceNoActiveConnectionsText);
this.formBuilder.removeFormItem(this.sourceServerComponent); this.formBuilder.removeFormItem(this.sourceServerComponent);
this.formBuilder.removeFormItem(this.sourceDatabaseComponent); this.formBuilder.removeFormItem(this.sourceDatabaseComponent);
this.formBuilder.insertFormItem(this.sourceDacpacComponent, 1, { horizontal: true }); this.formBuilder.insertFormItem(this.sourceDacpacComponent, 2, { horizontal: true, titleFontSize: titleFontSize });
}); });
// show server and db dropdowns or 'No active connections' text // show server and db dropdowns or 'No active connections' text
databaseRadioButton.onDidClick(() => { databaseRadioButton.onDidClick(() => {
this.sourceIsDacpac = false; this.sourceIsDacpac = false;
if ((this.sourceServerDropdown.value as ConnectionDropdownValue)) { if ((this.sourceServerDropdown.value as ConnectionDropdownValue)) {
this.formBuilder.insertFormItem(this.sourceServerComponent, 1, { horizontal: true, componentWidth: 300 }); this.formBuilder.insertFormItem(this.sourceServerComponent, 2, { horizontal: true, componentWidth: 300, titleFontSize: titleFontSize });
this.formBuilder.insertFormItem(this.sourceDatabaseComponent, 2, { horizontal: true, componentWidth: 300 }); this.formBuilder.insertFormItem(this.sourceDatabaseComponent, 3, { horizontal: true, componentWidth: 300, titleFontSize: titleFontSize });
} else { } else {
this.formBuilder.insertFormItem(this.sourceNoActiveConnectionsText, 1, { horizontal: true }); this.formBuilder.insertFormItem(this.sourceNoActiveConnectionsText, 2, { horizontal: true, titleFontSize: titleFontSize });
} }
this.formBuilder.removeFormItem(this.sourceDacpacComponent); this.formBuilder.removeFormItem(this.sourceDacpacComponent);
}); });
@@ -336,7 +339,7 @@ export class SchemaCompareDialog {
this.formBuilder.removeFormItem(this.targetNoActiveConnectionsText); this.formBuilder.removeFormItem(this.targetNoActiveConnectionsText);
this.formBuilder.removeFormItem(this.targetServerComponent); this.formBuilder.removeFormItem(this.targetServerComponent);
this.formBuilder.removeFormItem(this.targetDatabaseComponent); this.formBuilder.removeFormItem(this.targetDatabaseComponent);
this.formBuilder.addFormItem(this.targetDacpacComponent, { horizontal: true }); this.formBuilder.addFormItem(this.targetDacpacComponent, { horizontal: true, titleFontSize: titleFontSize });
}); });
// show server and db dropdowns or 'No active connections' text // show server and db dropdowns or 'No active connections' text
@@ -344,10 +347,10 @@ export class SchemaCompareDialog {
this.targetIsDacpac = false; this.targetIsDacpac = false;
this.formBuilder.removeFormItem(this.targetDacpacComponent); this.formBuilder.removeFormItem(this.targetDacpacComponent);
if ((this.targetServerDropdown.value as ConnectionDropdownValue)) { if ((this.targetServerDropdown.value as ConnectionDropdownValue)) {
this.formBuilder.addFormItem(this.targetServerComponent, { horizontal: true, componentWidth: 300 }); this.formBuilder.addFormItem(this.targetServerComponent, { horizontal: true, componentWidth: 300, titleFontSize: titleFontSize });
this.formBuilder.addFormItem(this.targetDatabaseComponent, { horizontal: true, componentWidth: 300 }); this.formBuilder.addFormItem(this.targetDatabaseComponent, { horizontal: true, componentWidth: 300, titleFontSize: titleFontSize });
} else { } else {
this.formBuilder.addFormItem(this.targetNoActiveConnectionsText, { horizontal: true }); this.formBuilder.addFormItem(this.targetNoActiveConnectionsText, { horizontal: true, titleFontSize: titleFontSize });
} }
}); });