pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-nix] added OFORM in "new doc" list

Browse Source
This commit is contained in:
Maxim Kadushkin
2021-10-30 00:32:21 +03:00
parent 34e1e491c8
commit 34fd2a109c
8 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/loginpage/src/index.html
View File

@ -136,6 +136,12 @@
<span class="text" l10n>PRESENTATION</span>
</a>
</li>
<li class="menu-item">
<a action="new:oform">
<i class="icon img-el"></i>
<span class="text" l10n>MASTER FORM</span>
</a>
</li>
</div>
<!-- <button id="btn-add">Add</button> -->
<!-- <button id="btn-add2">Add 2</button> -->

6
common/loginpage/src/index.html.deploy
View File

@ -123,6 +123,12 @@
<span class="text" l10n>PRESENTATION</span>
</a>
</li>
<li class="menu-item">
<a action="new:oform">
<i class="icon img-el"></i>
<span class="text" l10n>MASTER FORM</span>
</a>
</li>
</div>
<li class="menu-item separator"></li>
</div>

1
common/loginpage/src/locale.js
View File

@ -81,6 +81,7 @@ l10n.en = {
newDoc: 'DOCUMENT',
newXlsx: 'SPREADSHEET',
newPptx: 'PRESENTATION',
newOform: 'MASTER FORM',
actCreateNew: 'Create new',
actRecentFiles: 'Recent files',
actOpenLocal: 'Open local file',

2
common/loginpage/src/panels.js
View File

@ -51,6 +51,7 @@ $(document).ready(function() {
$('a[action="new:docx"] > .text').text(utils.Lang.newDoc);
$('a[action="new:xlsx"] > .text').text(utils.Lang.newXlsx);
$('a[action="new:pptx"] > .text').text(utils.Lang.newPptx);
$('a[action="new:oform"] > .text').text(utils.Lang.newOform);
if (!localStorage.welcome) {
@ -165,6 +166,7 @@ function onNewFileClick(e) {
case 'new:docx': t = 'word'; break;
case 'new:xlsx': t = 'cell'; break;
case 'new:pptx': t = 'slide'; break;
case 'new:oform': t = 'oform'; break;
default: break;
}

12
common/loginpage/src/styles.less
View File

@ -168,6 +168,8 @@ h4 {
}
> li {
@new-doc-icon-width: 36px;
&.menu-item{
padding: 5px 20px 5px 0;
a {
@ -180,7 +182,7 @@ h4 {
line-height: 48px;
.icon {
width: 36px;
width: @new-doc-icon-width;
height: 48px;
display: block;
margin-right: 19px;
@ -199,6 +201,12 @@ h4 {
}
}
a[action='new:oform'] {
.icon {
background-position-x: -3 * @new-doc-icon-width;
}
}
&.disabled {
opacity: 0.6;
a {
@ -211,7 +219,7 @@ h4 {
.img-el, .img-before-el:before {
background: -webkit-image-set(data-uri('sprite.png') 1x, data-uri('sprite@1.25x.png') 1.25x,
data-uri('sprite@1.5x.png') 1.5x, data-uri('sprite@1.75x.png') 1.75x, data-uri('sprite@2x.png') 2x) no-repeat;
background-size: 142px auto;
background-size: 144px auto;
}
.img-el {

1
win-linux/src/asctabwidget.cpp
View File

@ -569,6 +569,7 @@ void CAscTabWidget::updateTabIcon(int index)
switch ( tab_type ) {
case etPresentation: active_tab_color = QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabSlideActive)); break;
case etSpreadsheet: active_tab_color = QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabCellActive)); break;
case 3:
case etDocument: active_tab_color = QString::fromStdWString(ui_theme.value(CTheme::ColorRole::ecrTabWordActive)); break;
case etNewPortal:
case etPortal:

1
win-linux/src/cascapplicationmanagerwrapper_private.h
View File

@ -222,6 +222,7 @@ public:
const std::wstring & format = data.get_Param();
int _f = format == L"word" ? AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX :
format == L"cell" ? AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX :
format == L"oform" ? AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM :
format == L"slide" ? AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX : AVS_OFFICESTUDIO_FILE_UNKNOWN;
COpenOptions opts{m_appmanager.newFileName(_f), etNewFile};

3
win-linux/src/ceditortools.cpp
View File

@ -229,6 +229,9 @@ namespace CEditorTools
}
auto editorTypeFromFormat(int format) -> AscEditorType {
if ( format == AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM ) {
return (AscEditorType)3;
} else
if ( (format > AVS_OFFICESTUDIO_FILE_DOCUMENT && format < AVS_OFFICESTUDIO_FILE_PRESENTATION) ||
format == AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF || format == AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDFA ||
format == AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU )