Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dxGantt: Fix toolbar items #12744

Merged
merged 3 commits into from
Apr 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions images/widgets/common/gantt/add-sub-task.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions images/widgets/common/gantt/add-task.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions images/widgets/common/gantt/add.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions images/widgets/common/gantt/collapse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 5 additions & 6 deletions images/widgets/common/gantt/delete-dependency.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions images/widgets/common/gantt/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions images/widgets/common/gantt/expand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions images/widgets/common/gantt/full-screen.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions images/widgets/common/gantt/redo.svg
Loading
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 images/widgets/common/gantt/task-details.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions images/widgets/common/gantt/undo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions images/widgets/common/gantt/zoom-in.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions images/widgets/common/gantt/zoom-out.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion js/docEnums.js
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@

/**
* @typedef {string} Enums.GanttToolbarItem
* @enum {'separator'|'undo'|'redo'|'zoomIn'|'zoomOut'}
* @enum {'separator'|'undo'|'redo'|'expandAll'|'collapseAll'|'addTask'|'deleteTask'|'zoomIn'| 'zoomOut'}
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions js/ui/gantt.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export interface dxGanttToolbar {
* @prevFileNamespace DevExpress.ui
* @public
*/
items?: Array<dxGanttToolbarItem | 'separator' | 'undo' | 'redo' | 'zoomIn' | 'zoomOut'>;
items?: Array<dxGanttToolbarItem | 'separator' | 'undo' | 'redo' | 'expandAll' | 'collapseAll' | 'addTask' | 'deleteTask' | 'zoomIn' | 'zoomOut'>;
}

export interface dxGanttToolbarItem extends dxToolbarItem {
Expand All @@ -187,7 +187,7 @@ export interface dxGanttToolbarItem extends dxToolbarItem {
* @prevFileNamespace DevExpress.ui
* @public
*/
name?: 'separator' | 'undo' | 'redo' | 'zoomIn' | 'zoomOut' | string;
name?: 'separator' | 'undo' | 'redo' | 'expandAll' | 'collapseAll' | 'addTask' | 'deleteTask' | 'zoomIn' | 'zoomOut' | string;
/**
* @docid dxGanttToolbarItem.location
* @default "before"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"license": "SEE LICENSE IN README.md",
"dependencies": {
"devexpress-diagram": "0.2.42",
"devexpress-gantt": "0.1.18",
"devexpress-gantt": "0.1.20",
"jszip": "^2.0.0 || ^3.0.0",
"quill": "^1.3.7",
"showdown": "^1.8.6",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1624,6 +1624,7 @@
@gantt-collapsable-row-bg: darken(@base-bg, 5%);
@gantt-selection-bg: fade(@datagrid-selection-bg, 25%);
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: lighten(@base-text-color, 20%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1538,6 +1538,7 @@
@gantt-collapsable-row-bg: lighten(@base-bg, 5%);
@gantt-selection-bg: fade(@datagrid-selection-bg, 30%);
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: @base-text-color;

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,7 @@
@gantt-collapsable-row-bg: lighten(@base-bg, 5%);
@gantt-selection-bg: @datagrid-selection-bg;
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: darken(@base-text-color, 20%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1643,6 +1643,7 @@
@gantt-collapsable-row-bg: lighten(@base-bg, 4%);
@gantt-selection-bg: fade(@datagrid-selection-bg, 30%);
@gantt-parent-task-bg: @base-danger;
@gantt-icon-color: darken(@base-text-color, 20%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1630,6 +1630,7 @@
@gantt-collapsable-row-bg: lighten(@base-bg, 4%);
@gantt-selection-bg: fade(@datagrid-selection-bg, 30%);
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: darken(@base-text-color, 20%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,7 @@
@gantt-collapsable-row-bg: darken(@base-bg, 4%);
@gantt-selection-bg: fade(@datagrid-selection-bg, 25%);
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: lighten(@base-text-color, 15%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1623,6 +1623,7 @@
@gantt-collapsable-row-bg: darken(@base-bg, 4%);
@gantt-selection-bg: @datagrid-selection-bg;
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: lighten(@base-text-color, 20%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1674,6 +1674,7 @@
@gantt-collapsable-row-bg: darken(@base-bg, 4%);
@gantt-selection-bg: @datagrid-selection-bg;
@gantt-parent-task-bg: @base-success;
@gantt-icon-color: lighten(@base-text-color, 20%);

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
2 changes: 1 addition & 1 deletion styles/widgets/generic/gantt.generic.less
Original file line number Diff line number Diff line change
Expand Up @@ -305,4 +305,4 @@
}
}

.gantt-icons-mixin(@datagrid-columnchooser-item-color);
.gantt-icons-mixin(@gantt-icon-color);
1 change: 1 addition & 0 deletions styles/widgets/material/color-schemes/material.dark.less
Original file line number Diff line number Diff line change
Expand Up @@ -1573,6 +1573,7 @@

// Gantt
@gantt-collapsable-row-bg: lighten(@base-bg, 5%);
@gantt-icon-color: @datagrid-columnchooser-item-color;

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
1 change: 1 addition & 0 deletions styles/widgets/material/color-schemes/material.light.less
Original file line number Diff line number Diff line change
Expand Up @@ -1532,6 +1532,7 @@

// Gantt
@gantt-collapsable-row-bg: darken(@base-bg, 5%);
@gantt-icon-color: @datagrid-columnchooser-item-color;

// Splitter
@splitter-inactive-color: @base-border-color;
Expand Down
2 changes: 1 addition & 1 deletion styles/widgets/material/gantt.material.less
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,4 @@
}
}

.gantt-icons-mixin(@datagrid-columnchooser-item-color);
.gantt-icons-mixin(@gantt-icon-color);
4 changes: 2 additions & 2 deletions ts/dx.all.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4169,14 +4169,14 @@ declare module DevExpress.ui {
/** @name dxGanttToolbar */
export interface dxGanttToolbar {
/** @name dxGanttToolbar.items */
items?: Array<dxGanttToolbarItem | 'separator' | 'undo' | 'redo' | 'zoomIn' | 'zoomOut'>;
items?: Array<dxGanttToolbarItem | 'separator' | 'undo' | 'redo' | 'expandAll' | 'collapseAll' | 'addTask' | 'deleteTask' | 'zoomIn' | 'zoomOut'>;
}
/** @name dxGanttToolbarItem */
export interface dxGanttToolbarItem extends dxToolbarItem {
/** @name dxGanttToolbarItem.location */
location?: 'after' | 'before' | 'center';
/** @name dxGanttToolbarItem.name */
name?: 'separator' | 'undo' | 'redo' | 'zoomIn' | 'zoomOut' | string;
name?: 'separator' | 'undo' | 'redo' | 'expandAll' | 'collapseAll' | 'addTask' | 'deleteTask' | 'zoomIn' | 'zoomOut' | string;
}
/** @name dxHtmlEditor.Options */
export interface dxHtmlEditorOptions extends EditorOptions<dxHtmlEditor> {
Expand Down