Commit 7f113082 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

TextArtPreviewManager

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63493 954022d7-b5bf-4e40-9824-e11837661b57
parent 8e797149
This diff is collapsed.
...@@ -1866,15 +1866,17 @@ ...@@ -1866,15 +1866,17 @@
{ {
if(obj) if(obj)
{ {
this.Fill = obj.Fill;//asc_Fill this.Fill = obj.Fill;//asc_Fill
this.Line = obj.Line;//asc_Stroke this.Line = obj.Line;//asc_Stroke
this.Form = obj.Form;//srting this.Form = obj.Form;//srting
this.Style = obj.Style;//
} }
else else
{ {
this.Fill = undefined; this.Fill = undefined;
this.Line = undefined; this.Line = undefined;
this.Form = undefined; this.Form = undefined;
this.Style = undefined;
} }
} }
...@@ -1906,6 +1908,15 @@ ...@@ -1906,6 +1908,15 @@
{ {
return this.Form; return this.Form;
}; };
asc_TextArtProperties.prototype["asc_putStyle"] = asc_TextArtProperties.prototype.asc_putStyle = function(Style)
{
this.Style = Style;
};
asc_TextArtProperties.prototype["asc_getStyle"] = asc_TextArtProperties.prototype.asc_getStyle = function()
{
return this.Style;
};
window["asc_TextArtProperties"] = window["Asc"]["asc_TextArtProperties"] = window["asc_TextArtProperties"] = asc_TextArtProperties; window["asc_TextArtProperties"] = window["Asc"]["asc_TextArtProperties"] = window["asc_TextArtProperties"] = asc_TextArtProperties;
...@@ -2697,6 +2708,7 @@ var asc_CStroke = window["asc_CStroke"]; ...@@ -2697,6 +2708,7 @@ var asc_CStroke = window["asc_CStroke"];
var CParagraphFrame = window["CParagraphFrame"]; var CParagraphFrame = window["CParagraphFrame"];
var asc_CParagraphFrame = window["asc_CParagraphFrame"]; var asc_CParagraphFrame = window["asc_CParagraphFrame"];
var CMouseMoveData = window["CMouseMoveData"]; var CMouseMoveData = window["CMouseMoveData"];
var asc_TextArtProperties = window["asc_TextArtProperties"];
......
...@@ -120,6 +120,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -120,6 +120,9 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.isChartEditor = false; this.isChartEditor = false;
if(typeof ChartPreviewManager !== "undefined") if(typeof ChartPreviewManager !== "undefined")
this.chartPreviewManager = new ChartPreviewManager(); this.chartPreviewManager = new ChartPreviewManager();
if(typeof TextArtPreviewManager !== "undefined")
this.textArtPreviewManager = new TextArtPreviewManager();
// Chart // Chart
this.chartTranslate = new asc_CChartTranslate(); this.chartTranslate = new asc_CChartTranslate();
...@@ -2606,6 +2609,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2606,6 +2609,10 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
return this.chartPreviewManager.getChartPreviews(chartType); return this.chartPreviewManager.getChartPreviews(chartType);
}; };
spreadsheet_api.prototype.asc_getTextArtPreviews = function() {
return this.textArtPreviewManager.getWordArtStyles();
};
spreadsheet_api.prototype.asc_checkDataRange = function(dialogType, dataRange, fullCheck, isRows, chartType) { spreadsheet_api.prototype.asc_checkDataRange = function(dialogType, dataRange, fullCheck, isRows, chartType) {
return parserHelp.checkDataRange(this.wbModel, this.wb, dialogType, dataRange, fullCheck, isRows, chartType); return parserHelp.checkDataRange(this.wbModel, this.wb, dialogType, dataRange, fullCheck, isRows, chartType);
}; };
...@@ -3240,6 +3247,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -3240,6 +3247,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
} }
} }
this.chartPreviewManager.clearPreviews(); this.chartPreviewManager.clearPreviews();
this.textArtPreviewManager.clear();
} }
// На view-режиме не нужно отправлять стили // На view-режиме не нужно отправлять стили
......
...@@ -2848,6 +2848,7 @@ CPresentation.prototype = ...@@ -2848,6 +2848,7 @@ CPresentation.prototype =
{ {
text_pr = new CTextPr(); text_pr = new CTextPr();
} }
editor.textArtPreviewManager.clear();
var theme = graphic_objects.getTheme(); var theme = graphic_objects.getTheme();
if(text_pr.RFonts) if(text_pr.RFonts)
{ {
......
...@@ -153,6 +153,11 @@ function asc_docs_api(name) ...@@ -153,6 +153,11 @@ function asc_docs_api(name)
else else
this.chartTranslate = null; this.chartTranslate = null;
if(typeof TextArtPreviewManager !== "undefined")
this.textArtPreviewManager = new TextArtPreviewManager();
else
this.textArtPreviewManager = null;
// объекты, нужные для отправки в тулбар (шрифты, стили) // объекты, нужные для отправки в тулбар (шрифты, стили)
this._gui_fonts = null; this._gui_fonts = null;
this._gui_editor_themes = null; this._gui_editor_themes = null;
...@@ -5031,6 +5036,10 @@ asc_docs_api.prototype.asc_getChartPreviews = function(chartType) ...@@ -5031,6 +5036,10 @@ asc_docs_api.prototype.asc_getChartPreviews = function(chartType)
{ {
return this.chartPreviewManager.getChartPreviews(chartType); return this.chartPreviewManager.getChartPreviews(chartType);
}; };
asc_docs_api.prototype.asc_getTextArtPreviews = function()
{
return this.textArtPreviewManager.getWordArtStyles();
};
asc_docs_api.prototype.sync_closeChartEditor = function() asc_docs_api.prototype.sync_closeChartEditor = function()
{ {
......
...@@ -2767,6 +2767,7 @@ CGraphicObjects.prototype = ...@@ -2767,6 +2767,7 @@ CGraphicObjects.prototype =
this.drawingDocument.CheckGuiControlColors(); this.drawingDocument.CheckGuiControlColors();
editor.chartPreviewManager.clearPreviews(); editor.chartPreviewManager.clearPreviews();
editor.textArtPreviewManager.clear();
break; break;
} }
} }
...@@ -2781,6 +2782,7 @@ CGraphicObjects.prototype = ...@@ -2781,6 +2782,7 @@ CGraphicObjects.prototype =
this.document.theme.themeElements.clrScheme = data.newScheme; this.document.theme.themeElements.clrScheme = data.newScheme;
this.drawingDocument.CheckGuiControlColors(); this.drawingDocument.CheckGuiControlColors();
editor.chartPreviewManager.clearPreviews(); editor.chartPreviewManager.clearPreviews();
editor.textArtPreviewManager.clear();
break; break;
} }
} }
...@@ -2825,6 +2827,7 @@ CGraphicObjects.prototype = ...@@ -2825,6 +2827,7 @@ CGraphicObjects.prototype =
} }
} }
editor.chartPreviewManager.clearPreviews(); editor.chartPreviewManager.clearPreviews();
editor.textArtPreviewManager.clear();
break; break;
} }
} }
...@@ -2843,6 +2846,7 @@ CGraphicObjects.prototype = ...@@ -2843,6 +2846,7 @@ CGraphicObjects.prototype =
} }
} }
editor.chartPreviewManager.clearPreviews(); editor.chartPreviewManager.clearPreviews();
editor.textArtPreviewManager.clear();
} }
}; };
......
...@@ -508,6 +508,11 @@ function asc_docs_api(name) ...@@ -508,6 +508,11 @@ function asc_docs_api(name)
else else
this.chartPreviewManager = null; this.chartPreviewManager = null;
if(typeof TextArtPreviewManager != "undefined")
this.textArtPreviewManager = new TextArtPreviewManager();
else
this.textArtPreviewManager = null;
this.IsLongActionCurrent = 0; this.IsLongActionCurrent = 0;
this.LongActionCallbacks = []; this.LongActionCallbacks = [];
this.LongActionCallbacksParams = []; this.LongActionCallbacksParams = [];
...@@ -6084,6 +6089,7 @@ asc_docs_api.prototype.ChangeColorScheme = function(index_scheme) ...@@ -6084,6 +6089,7 @@ asc_docs_api.prototype.ChangeColorScheme = function(index_scheme)
History.Add(this.WordControl.m_oLogicDocument.DrawingObjects, data); History.Add(this.WordControl.m_oLogicDocument.DrawingObjects, data);
this.WordControl.m_oDrawingDocument.CheckGuiControlColors(); this.WordControl.m_oDrawingDocument.CheckGuiControlColors();
this.chartPreviewManager.clearPreviews(); this.chartPreviewManager.clearPreviews();
this.textArtPreviewManager.clear();
this.asc_fireCallback("asc_onUpdateChartStyles"); this.asc_fireCallback("asc_onUpdateChartStyles");
this.WordControl.m_oLogicDocument.Recalculate(); this.WordControl.m_oLogicDocument.Recalculate();
...@@ -7242,6 +7248,10 @@ asc_docs_api.prototype.asc_getChartPreviews = function(chartType) ...@@ -7242,6 +7248,10 @@ asc_docs_api.prototype.asc_getChartPreviews = function(chartType)
{ {
return this.chartPreviewManager.getChartPreviews(chartType); return this.chartPreviewManager.getChartPreviews(chartType);
}; };
asc_docs_api.prototype.asc_getTextArtPreviews = function()
{
return this.textArtPreviewManager.getWordArtStyles();
};
asc_docs_api.prototype.sync_closeChartEditor = function() asc_docs_api.prototype.sync_closeChartEditor = function()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment