mirror of https://github.com/procxx/kepka.git
codegen_style completely replaces style gen with MetaStyle.
codegen_numbers project started to replace MetaStyle completely.
This commit is contained in:
John Preston
parent
edd26b3224
commit
4fe70c3a12
14
Telegram.sln
14
Telegram.sln
|
|
@ -9,6 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram", "Telegram\Telegr
|
|||
{E4DF8176-4DEF-4859-962F-B497E3E7A323} = {E4DF8176-4DEF-4859-962F-B497E3E7A323}
|
||||
{E417CAA4-259B-4C99-88E3-805F1300E8EB} = {E417CAA4-259B-4C99-88E3-805F1300E8EB}
|
||||
{EB7D16AC-EACF-4577-B05A-F28E5F356794} = {EB7D16AC-EACF-4577-B05A-F28E5F356794}
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6} = {7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaStyle", "Telegram\MetaStyle.vcxproj", "{6F483617-7C84-4E7E-91D8-1FF28A4CE3A0}"
|
||||
|
|
@ -25,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packer", "Telegram\Packer.v
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codegen_style", "Telegram\build\vc\codegen_style\codegen_style.vcxproj", "{E4DF8176-4DEF-4859-962F-B497E3E7A323}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codegen_numbers", "Telegram\build\vc\codegen_numbers\codegen_numbers.vcxproj", "{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
|
|
@ -95,11 +98,22 @@ Global
|
|||
{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Release|Win32.Build.0 = Release|Win32
|
||||
{E4DF8176-4DEF-4859-962F-B497E3E7A323}.Release|x64.ActiveCfg = Release|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Deploy|Win32.ActiveCfg = Debug|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Deploy|Win32.Build.0 = Debug|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Deploy|x64.ActiveCfg = Release|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Deploy|x64.Build.0 = Release|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Release|Win32.Build.0 = Release|Win32
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}.Release|x64.ActiveCfg = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{E4DF8176-4DEF-4859-962F-B497E3E7A323} = {2F863EAD-33C9-4014-A573-93F085BA9CB1}
|
||||
{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6} = {2F863EAD-33C9-4014-A573-93F085BA9CB1}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
*/
|
||||
|
||||
// Legacy styles
|
||||
using "Resources/style_classes.txt";
|
||||
using "Resources/style.txt";
|
||||
using "Resources/basic_types.style";
|
||||
using "Resources/basic.style";
|
||||
|
||||
//using "overview/overview.style";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,413 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
|
||||
textStyle {
|
||||
linkFlags: font;
|
||||
linkFlagsOver: font;
|
||||
linkFg: color;
|
||||
linkFgDown: color;
|
||||
monoFg: color;
|
||||
selectBg: color;
|
||||
selectOverlay: color;
|
||||
lineHeight: pixels;
|
||||
}
|
||||
|
||||
linkButton {
|
||||
color: color;
|
||||
overColor: color;
|
||||
downColor: color;
|
||||
font: font;
|
||||
overFont: font;
|
||||
}
|
||||
|
||||
sysButton {
|
||||
size: size;
|
||||
img: sprite;
|
||||
color: color;
|
||||
overColor: color;
|
||||
duration: int;
|
||||
}
|
||||
|
||||
flatButton {
|
||||
color: color;
|
||||
overColor: color;
|
||||
downColor: color;
|
||||
|
||||
bgColor: color;
|
||||
overBgColor: color;
|
||||
downBgColor: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
|
||||
textTop: pixels;
|
||||
overTextTop: pixels;
|
||||
downTextTop: pixels;
|
||||
|
||||
font: font;
|
||||
overFont: font;
|
||||
duration: int;
|
||||
cursor: cursor;
|
||||
}
|
||||
|
||||
iconedButton {
|
||||
icon: sprite;
|
||||
iconPos: point;
|
||||
downIcon: sprite;
|
||||
downIconPos: point;
|
||||
|
||||
color: color;
|
||||
bgColor: color;
|
||||
overBgColor: color;
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
font: font;
|
||||
|
||||
opacity: double;
|
||||
overOpacity: double;
|
||||
|
||||
textPos: point;
|
||||
downTextPos: point;
|
||||
|
||||
duration: int;
|
||||
cursor: cursor;
|
||||
}
|
||||
|
||||
flatCheckbox {
|
||||
textColor: color;
|
||||
bgColor: color;
|
||||
disColor: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
textTop: pixels;
|
||||
textLeft: pixels;
|
||||
font: font;
|
||||
duration: int;
|
||||
bgFunc: transition;
|
||||
cursor: cursor;
|
||||
|
||||
disabledCursor: cursor;
|
||||
|
||||
imageRect: sprite;
|
||||
chkImageRect: sprite;
|
||||
overImageRect: sprite;
|
||||
chkOverImageRect: sprite;
|
||||
disImageRect: sprite;
|
||||
chkDisImageRect: sprite;
|
||||
|
||||
imagePos: point;
|
||||
}
|
||||
|
||||
flatInput {
|
||||
textColor: color;
|
||||
bgColor: color;
|
||||
bgActive: color;
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
textMrg: margins;
|
||||
align: align;
|
||||
font: font;
|
||||
cursor: cursor;
|
||||
|
||||
imgRect: sprite;
|
||||
imgPos: point;
|
||||
|
||||
borderWidth: pixels;
|
||||
borderColor: color;
|
||||
borderActive: color;
|
||||
borderError: color;
|
||||
|
||||
phColor: color;
|
||||
phFocusColor: color;
|
||||
phPos: point;
|
||||
phAlign: align;
|
||||
phShift: pixels;
|
||||
phDuration: int;
|
||||
phLeftFunc: transition;
|
||||
phAlphaFunc: transition;
|
||||
phColorFunc: transition;
|
||||
}
|
||||
|
||||
flatTextarea {
|
||||
textColor: color;
|
||||
bgColor: color;
|
||||
width: pixels;
|
||||
textMrg: margins;
|
||||
align: align;
|
||||
font: font;
|
||||
cursor: cursor;
|
||||
|
||||
phColor: color;
|
||||
phFocusColor: color;
|
||||
phPos: point;
|
||||
phAlign: align;
|
||||
phShift: pixels;
|
||||
phDuration: int;
|
||||
phLeftFunc: transition;
|
||||
phAlphaFunc: transition;
|
||||
phColorFunc: transition;
|
||||
}
|
||||
|
||||
flatScroll {
|
||||
barColor: color;
|
||||
bgColor: color;
|
||||
barOverColor: color;
|
||||
bgOverColor: color;
|
||||
|
||||
round: pixels;
|
||||
|
||||
width: pixels;
|
||||
minHeight: pixels;
|
||||
deltax: pixels;
|
||||
deltat: pixels;
|
||||
deltab: pixels;
|
||||
|
||||
topsh: pixels;
|
||||
bottomsh: pixels;
|
||||
shColor: color;
|
||||
|
||||
duration: int;
|
||||
hiding: int;
|
||||
}
|
||||
|
||||
countryInput {
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
top: pixels;
|
||||
bgColor: color;
|
||||
ptrSize: size;
|
||||
textMrg: margins;
|
||||
font: font;
|
||||
align: align;
|
||||
}
|
||||
|
||||
slider {
|
||||
color: color;
|
||||
thikness: pixels;
|
||||
|
||||
width: pixels;
|
||||
bar: sprite;
|
||||
}
|
||||
|
||||
flatLabel {
|
||||
font: font;
|
||||
minWidth: pixels;
|
||||
width: pixels;
|
||||
align: align;
|
||||
}
|
||||
|
||||
switcher {
|
||||
border: pixels;
|
||||
borderColor: color;
|
||||
|
||||
bgColor: color;
|
||||
bgHovered: color;
|
||||
bgActive: color;
|
||||
|
||||
height: pixels;
|
||||
|
||||
font: font;
|
||||
textColor: color;
|
||||
activeColor: color;
|
||||
|
||||
duration: int;
|
||||
}
|
||||
|
||||
dropdown {
|
||||
border: pixels;
|
||||
borderColor: color;
|
||||
|
||||
padding: margins;
|
||||
shadow: sprite;
|
||||
shadowShift: pixels;
|
||||
|
||||
duration: int;
|
||||
width: pixels;
|
||||
}
|
||||
|
||||
PopupMenu {
|
||||
skip: pixels;
|
||||
|
||||
shadow: sprite;
|
||||
shadowShift: pixels;
|
||||
|
||||
itemBg: color;
|
||||
itemBgOver: color;
|
||||
itemFg: color;
|
||||
itemFgOver: color;
|
||||
itemFgDisabled: color;
|
||||
itemFgShortcut: color;
|
||||
itemFgShortcutOver: color;
|
||||
itemFgShortcutDisabled: color;
|
||||
itemPadding: margins;
|
||||
itemFont: font;
|
||||
|
||||
separatorPadding: margins;
|
||||
separatorWidth: pixels;
|
||||
separatorFg: color;
|
||||
|
||||
arrow: sprite;
|
||||
|
||||
duration: int;
|
||||
|
||||
widthMin: pixels;
|
||||
widthMax: pixels;
|
||||
}
|
||||
|
||||
Tooltip {
|
||||
textBg: color;
|
||||
textFg: color;
|
||||
textFont: font;
|
||||
textBorder: color;
|
||||
textPadding: margins;
|
||||
|
||||
shift: point;
|
||||
skip: pixels;
|
||||
|
||||
widthMax: pixels;
|
||||
linesMax: int;
|
||||
}
|
||||
|
||||
botKeyboardButton {
|
||||
margin: pixels;
|
||||
padding: pixels;
|
||||
height: pixels;
|
||||
textTop: pixels;
|
||||
downTextTop: pixels;
|
||||
}
|
||||
|
||||
BoxButton {
|
||||
textFg: color;
|
||||
textFgOver: color;
|
||||
textBg: color; // rect of textBg with rounded rect of textBgOver upon it
|
||||
textBgOver: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
|
||||
textTop: pixels;
|
||||
|
||||
font: font;
|
||||
duration: int;
|
||||
}
|
||||
|
||||
Checkbox {
|
||||
textFg: color;
|
||||
textBg: color;
|
||||
|
||||
checkFg: color;
|
||||
checkFgOver: color;
|
||||
checkFgActive: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
|
||||
textPosition: point;
|
||||
diameter: pixels;
|
||||
thickness: pixels;
|
||||
checkIcon: sprite;
|
||||
|
||||
font: font;
|
||||
duration: int;
|
||||
}
|
||||
|
||||
Radiobutton {
|
||||
textFg: color;
|
||||
textBg: color;
|
||||
|
||||
checkFg: color;
|
||||
checkFgOver: color;
|
||||
checkFgActive: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
|
||||
textPosition: point;
|
||||
diameter: pixels;
|
||||
thickness: pixels;
|
||||
checkSkip: pixels;
|
||||
|
||||
font: font;
|
||||
duration: int;
|
||||
}
|
||||
|
||||
InputArea {
|
||||
textFg: color;
|
||||
textMargins: margins;
|
||||
|
||||
placeholderFg: color;
|
||||
placeholderFgActive: color;
|
||||
placeholderMargins: margins;
|
||||
placeholderAlign: align;
|
||||
placeholderShift: pixels;
|
||||
|
||||
duration: int;
|
||||
|
||||
borderFg: color;
|
||||
borderFgActive: color;
|
||||
borderFgError: color;
|
||||
|
||||
border: pixels;
|
||||
borderActive: pixels;
|
||||
borderError: pixels;
|
||||
|
||||
font: font;
|
||||
|
||||
width: pixels;
|
||||
heightMin: pixels;
|
||||
heightMax: pixels;
|
||||
}
|
||||
|
||||
InputField {
|
||||
textFg: color;
|
||||
textMargins: margins;
|
||||
textAlign: align;
|
||||
|
||||
placeholderFg: color;
|
||||
placeholderFgActive: color;
|
||||
placeholderMargins: margins;
|
||||
placeholderAlign: align;
|
||||
placeholderShift: pixels;
|
||||
|
||||
duration: int;
|
||||
|
||||
borderFg: color;
|
||||
borderFgActive: color;
|
||||
borderFgError: color;
|
||||
|
||||
border: pixels;
|
||||
borderActive: pixels;
|
||||
borderError: pixels;
|
||||
|
||||
font: font;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
|
||||
iconSprite: sprite;
|
||||
iconPosition: point;
|
||||
}
|
||||
|
||||
PeerAvatarButton {
|
||||
size: pixels;
|
||||
photoSize: pixels;
|
||||
}
|
||||
|
|
@ -18,10 +18,8 @@ to link the code of portions of this program with the OpenSSL library.
|
|||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
using "Resources/style_classes.txt";
|
||||
|
||||
defaultFontFamily: "Open Sans";
|
||||
semibold: "Open Sans Semibold";
|
||||
defaultFontFamily: 'Open Sans';
|
||||
semibold: 'Open Sans Semibold';
|
||||
|
||||
fsize: 13px;
|
||||
normalFont: font(fsize);
|
||||
|
|
@ -385,7 +383,7 @@ btnDefIconed: iconedButton {
|
|||
font: font(fsize);
|
||||
|
||||
opacity: 0.78;
|
||||
overOpacity: 1.;
|
||||
overOpacity: 1;
|
||||
|
||||
textPos: point(0px, 0px);
|
||||
downTextPos: point(0px, 0px);
|
||||
|
|
@ -433,7 +431,7 @@ titleBackButton: iconedButton(btnDefIconed) {
|
|||
width: -30px;
|
||||
height: 39px;
|
||||
|
||||
opacity: 1.;
|
||||
opacity: 1;
|
||||
cursor: cursor(default);
|
||||
|
||||
textPos: point(23px, 10px);
|
||||
|
|
@ -1117,8 +1115,8 @@ msgLinkColor: #2a6dc2;
|
|||
msgPressedLinkColor: #004bad;
|
||||
msgSkip: 40px;
|
||||
msgPtr: 8px;
|
||||
msgBG: ":/gui/art/bg.jpg";
|
||||
msgBG0: ":/gui/art/bg0.png";
|
||||
msgBG: ':/gui/art/bg.jpg';
|
||||
msgBG0: ':/gui/art/bg0.png';
|
||||
|
||||
msgCheckPos: point(3px, 1px);
|
||||
msgSendingImg: sprite(260px, 20px, 20px, 20px);
|
||||
|
|
@ -1549,7 +1547,7 @@ reportSpamButton: flatButton(reportSpamHide) {
|
|||
reportSpamSeparator: 30px;
|
||||
reportSpamBg: #fffffff0;
|
||||
|
||||
newMsgSound: ":/gui/art/newmsg.wav";
|
||||
newMsgSound: ':/gui/art/newmsg.wav';
|
||||
|
||||
unreadBarHeight: 32px;
|
||||
unreadBarMargin: 8px;
|
||||
|
|
@ -2189,7 +2187,7 @@ mvDropdown: dropdown(dropdownDef) {
|
|||
shadow: sprite(0px, 0px, 0px, 0px);
|
||||
padding: margins(11px, 12px, 11px, 12px);
|
||||
|
||||
border: 0px;
|
||||
border: 0;
|
||||
width: 182px;
|
||||
}
|
||||
mvButton: iconedButton(btnDefIconed) {
|
||||
|
|
@ -2197,8 +2195,8 @@ mvButton: iconedButton(btnDefIconed) {
|
|||
overBgColor: #505050;
|
||||
font: font(fsize);
|
||||
|
||||
opacity: 1.;
|
||||
overOpacity: 1.;
|
||||
opacity: 1;
|
||||
overOpacity: 1;
|
||||
|
||||
width: -32px;
|
||||
height: 36px;
|
||||
|
|
@ -2298,8 +2296,8 @@ overviewFileExtFont: font(18px semibold);
|
|||
|
||||
// Mac specific
|
||||
|
||||
macAccessoryWidth: 450.;
|
||||
macAccessoryHeight: 90.;
|
||||
macAccessoryWidth: 450;
|
||||
macAccessoryHeight: 90;
|
||||
macEnableFilterAdd: 2;
|
||||
macEnableFilterTop: 5;
|
||||
macSelectorTop: 6;
|
||||
|
|
@ -2312,8 +2310,8 @@ btnContext: iconedButton(btnDefIconed) {
|
|||
overBgColor: btnWhiteHover;
|
||||
font: font(14px);
|
||||
|
||||
opacity: 1.;
|
||||
overOpacity: 1.;
|
||||
opacity: 1;
|
||||
overOpacity: 1;
|
||||
|
||||
width: -32px;
|
||||
height: 36px;
|
||||
|
|
@ -2400,8 +2398,8 @@ passcodeSkip: 31px;
|
|||
|
||||
mentionHeight: 40px;
|
||||
mentionScroll: flatScroll(scrollDef) {
|
||||
topsh: 0px;
|
||||
bottomsh: 0px;
|
||||
topsh: 0;
|
||||
bottomsh: 0;
|
||||
}
|
||||
mentionPadding: margins(8px, 5px, 8px, 5px);
|
||||
mentionTop: 11px;
|
||||
|
|
@ -2421,7 +2419,7 @@ sessionsHeight: 440px;
|
|||
sessionHeight: 70px;
|
||||
sessionCurrentPadding: margins(0px, 7px, 0px, 4px);
|
||||
sessionCurrentHeight: 118px;
|
||||
sessionPadding: margins(21px, 10px, 21px, 0px);
|
||||
sessionPadding: margins(21px, 10px, 21px, 0);
|
||||
sessionNameFont: msgNameFont;
|
||||
sessionActiveFont: msgDateFont;
|
||||
sessionActiveColor: #aaa;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ textStyle {
|
|||
monoFg: color;
|
||||
selectBg: color;
|
||||
selectOverlay: color;
|
||||
lineHeight: pixels;
|
||||
lineHeight: number;
|
||||
}
|
||||
|
||||
linkButton {
|
||||
|
|
@ -42,7 +42,7 @@ sysButton {
|
|||
img: sprite;
|
||||
color: color;
|
||||
overColor: color;
|
||||
duration: int;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
flatButton {
|
||||
|
|
@ -54,16 +54,16 @@ flatButton {
|
|||
overBgColor: color;
|
||||
downBgColor: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
|
||||
textTop: pixels;
|
||||
overTextTop: pixels;
|
||||
downTextTop: pixels;
|
||||
textTop: number;
|
||||
overTextTop: number;
|
||||
downTextTop: number;
|
||||
|
||||
font: font;
|
||||
overFont: font;
|
||||
duration: int;
|
||||
duration: number;
|
||||
cursor: cursor;
|
||||
}
|
||||
|
||||
|
|
@ -76,17 +76,17 @@ iconedButton {
|
|||
color: color;
|
||||
bgColor: color;
|
||||
overBgColor: color;
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
font: font;
|
||||
|
||||
opacity: double;
|
||||
overOpacity: double;
|
||||
opacity: number;
|
||||
overOpacity: number;
|
||||
|
||||
textPos: point;
|
||||
downTextPos: point;
|
||||
|
||||
duration: int;
|
||||
duration: number;
|
||||
cursor: cursor;
|
||||
}
|
||||
|
||||
|
|
@ -95,12 +95,12 @@ flatCheckbox {
|
|||
bgColor: color;
|
||||
disColor: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
textTop: pixels;
|
||||
textLeft: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
textTop: number;
|
||||
textLeft: number;
|
||||
font: font;
|
||||
duration: int;
|
||||
duration: number;
|
||||
bgFunc: transition;
|
||||
cursor: cursor;
|
||||
|
||||
|
|
@ -120,8 +120,8 @@ flatInput {
|
|||
textColor: color;
|
||||
bgColor: color;
|
||||
bgActive: color;
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
textMrg: margins;
|
||||
align: align;
|
||||
font: font;
|
||||
|
|
@ -130,7 +130,7 @@ flatInput {
|
|||
imgRect: sprite;
|
||||
imgPos: point;
|
||||
|
||||
borderWidth: pixels;
|
||||
borderWidth: number;
|
||||
borderColor: color;
|
||||
borderActive: color;
|
||||
borderError: color;
|
||||
|
|
@ -139,8 +139,8 @@ flatInput {
|
|||
phFocusColor: color;
|
||||
phPos: point;
|
||||
phAlign: align;
|
||||
phShift: pixels;
|
||||
phDuration: int;
|
||||
phShift: number;
|
||||
phDuration: number;
|
||||
phLeftFunc: transition;
|
||||
phAlphaFunc: transition;
|
||||
phColorFunc: transition;
|
||||
|
|
@ -149,7 +149,7 @@ flatInput {
|
|||
flatTextarea {
|
||||
textColor: color;
|
||||
bgColor: color;
|
||||
width: pixels;
|
||||
width: number;
|
||||
textMrg: margins;
|
||||
align: align;
|
||||
font: font;
|
||||
|
|
@ -159,8 +159,8 @@ flatTextarea {
|
|||
phFocusColor: color;
|
||||
phPos: point;
|
||||
phAlign: align;
|
||||
phShift: pixels;
|
||||
phDuration: int;
|
||||
phShift: number;
|
||||
phDuration: number;
|
||||
phLeftFunc: transition;
|
||||
phAlphaFunc: transition;
|
||||
phColorFunc: transition;
|
||||
|
|
@ -172,26 +172,26 @@ flatScroll {
|
|||
barOverColor: color;
|
||||
bgOverColor: color;
|
||||
|
||||
round: pixels;
|
||||
round: number;
|
||||
|
||||
width: pixels;
|
||||
minHeight: pixels;
|
||||
deltax: pixels;
|
||||
deltat: pixels;
|
||||
deltab: pixels;
|
||||
width: number;
|
||||
minHeight: number;
|
||||
deltax: number;
|
||||
deltat: number;
|
||||
deltab: number;
|
||||
|
||||
topsh: pixels;
|
||||
bottomsh: pixels;
|
||||
topsh: number;
|
||||
bottomsh: number;
|
||||
shColor: color;
|
||||
|
||||
duration: int;
|
||||
hiding: int;
|
||||
duration: number;
|
||||
hiding: number;
|
||||
}
|
||||
|
||||
countryInput {
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
top: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
top: number;
|
||||
bgColor: color;
|
||||
ptrSize: size;
|
||||
textMrg: margins;
|
||||
|
|
@ -201,53 +201,53 @@ countryInput {
|
|||
|
||||
slider {
|
||||
color: color;
|
||||
thikness: pixels;
|
||||
thikness: number;
|
||||
|
||||
width: pixels;
|
||||
width: number;
|
||||
bar: sprite;
|
||||
}
|
||||
|
||||
flatLabel {
|
||||
font: font;
|
||||
minWidth: pixels;
|
||||
width: pixels;
|
||||
minWidth: number;
|
||||
width: number;
|
||||
align: align;
|
||||
}
|
||||
|
||||
switcher {
|
||||
border: pixels;
|
||||
border: number;
|
||||
borderColor: color;
|
||||
|
||||
bgColor: color;
|
||||
bgHovered: color;
|
||||
bgActive: color;
|
||||
|
||||
height: pixels;
|
||||
height: number;
|
||||
|
||||
font: font;
|
||||
textColor: color;
|
||||
activeColor: color;
|
||||
|
||||
duration: int;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
dropdown {
|
||||
border: pixels;
|
||||
border: number;
|
||||
borderColor: color;
|
||||
|
||||
padding: margins;
|
||||
shadow: sprite;
|
||||
shadowShift: pixels;
|
||||
shadowShift: number;
|
||||
|
||||
duration: int;
|
||||
width: pixels;
|
||||
duration: number;
|
||||
width: number;
|
||||
}
|
||||
|
||||
PopupMenu {
|
||||
skip: pixels;
|
||||
skip: number;
|
||||
|
||||
shadow: sprite;
|
||||
shadowShift: pixels;
|
||||
shadowShift: number;
|
||||
|
||||
itemBg: color;
|
||||
itemBgOver: color;
|
||||
|
|
@ -261,15 +261,15 @@ PopupMenu {
|
|||
itemFont: font;
|
||||
|
||||
separatorPadding: margins;
|
||||
separatorWidth: pixels;
|
||||
separatorWidth: number;
|
||||
separatorFg: color;
|
||||
|
||||
arrow: sprite;
|
||||
|
||||
duration: int;
|
||||
duration: number;
|
||||
|
||||
widthMin: pixels;
|
||||
widthMax: pixels;
|
||||
widthMin: number;
|
||||
widthMax: number;
|
||||
}
|
||||
|
||||
Tooltip {
|
||||
|
|
@ -280,18 +280,18 @@ Tooltip {
|
|||
textPadding: margins;
|
||||
|
||||
shift: point;
|
||||
skip: pixels;
|
||||
skip: number;
|
||||
|
||||
widthMax: pixels;
|
||||
linesMax: int;
|
||||
widthMax: number;
|
||||
linesMax: number;
|
||||
}
|
||||
|
||||
botKeyboardButton {
|
||||
margin: pixels;
|
||||
padding: pixels;
|
||||
height: pixels;
|
||||
textTop: pixels;
|
||||
downTextTop: pixels;
|
||||
margin: number;
|
||||
padding: number;
|
||||
height: number;
|
||||
textTop: number;
|
||||
downTextTop: number;
|
||||
}
|
||||
|
||||
BoxButton {
|
||||
|
|
@ -300,13 +300,13 @@ BoxButton {
|
|||
textBg: color; // rect of textBg with rounded rect of textBgOver upon it
|
||||
textBgOver: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
|
||||
textTop: pixels;
|
||||
textTop: number;
|
||||
|
||||
font: font;
|
||||
duration: int;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
Checkbox {
|
||||
|
|
@ -317,16 +317,16 @@ Checkbox {
|
|||
checkFgOver: color;
|
||||
checkFgActive: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
|
||||
textPosition: point;
|
||||
diameter: pixels;
|
||||
thickness: pixels;
|
||||
diameter: number;
|
||||
thickness: number;
|
||||
checkIcon: sprite;
|
||||
|
||||
font: font;
|
||||
duration: int;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
Radiobutton {
|
||||
|
|
@ -337,16 +337,16 @@ Radiobutton {
|
|||
checkFgOver: color;
|
||||
checkFgActive: color;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
|
||||
textPosition: point;
|
||||
diameter: pixels;
|
||||
thickness: pixels;
|
||||
checkSkip: pixels;
|
||||
diameter: number;
|
||||
thickness: number;
|
||||
checkSkip: number;
|
||||
|
||||
font: font;
|
||||
duration: int;
|
||||
duration: number;
|
||||
}
|
||||
|
||||
InputArea {
|
||||
|
|
@ -357,23 +357,23 @@ InputArea {
|
|||
placeholderFgActive: color;
|
||||
placeholderMargins: margins;
|
||||
placeholderAlign: align;
|
||||
placeholderShift: pixels;
|
||||
placeholderShift: number;
|
||||
|
||||
duration: int;
|
||||
duration: number;
|
||||
|
||||
borderFg: color;
|
||||
borderFgActive: color;
|
||||
borderFgError: color;
|
||||
|
||||
border: pixels;
|
||||
borderActive: pixels;
|
||||
borderError: pixels;
|
||||
border: number;
|
||||
borderActive: number;
|
||||
borderError: number;
|
||||
|
||||
font: font;
|
||||
|
||||
width: pixels;
|
||||
heightMin: pixels;
|
||||
heightMax: pixels;
|
||||
width: number;
|
||||
heightMin: number;
|
||||
heightMax: number;
|
||||
}
|
||||
|
||||
InputField {
|
||||
|
|
@ -385,28 +385,28 @@ InputField {
|
|||
placeholderFgActive: color;
|
||||
placeholderMargins: margins;
|
||||
placeholderAlign: align;
|
||||
placeholderShift: pixels;
|
||||
placeholderShift: number;
|
||||
|
||||
duration: int;
|
||||
duration: number;
|
||||
|
||||
borderFg: color;
|
||||
borderFgActive: color;
|
||||
borderFgError: color;
|
||||
|
||||
border: pixels;
|
||||
borderActive: pixels;
|
||||
borderError: pixels;
|
||||
border: number;
|
||||
borderActive: number;
|
||||
borderError: number;
|
||||
|
||||
font: font;
|
||||
|
||||
width: pixels;
|
||||
height: pixels;
|
||||
width: number;
|
||||
height: number;
|
||||
|
||||
iconSprite: sprite;
|
||||
iconPosition: point;
|
||||
}
|
||||
|
||||
PeerAvatarButton {
|
||||
size: pixels;
|
||||
photoSize: pixels;
|
||||
size: number;
|
||||
photoSize: number;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ namespace {
|
|||
|
||||
HistoryItem *hoveredItem = 0, *pressedItem = 0, *hoveredLinkItem = 0, *pressedLinkItem = 0, *contextItem = 0, *mousedItem = 0;
|
||||
|
||||
QPixmap *sprite = 0, *emoji = 0, *emojiLarge = 0;
|
||||
QPixmap *emoji = 0, *emojiLarge = 0;
|
||||
style::font monofont;
|
||||
|
||||
struct CornersPixmaps {
|
||||
|
|
@ -1993,23 +1993,6 @@ namespace {
|
|||
if (family.isEmpty()) family = QFontDatabase::systemFont(QFontDatabase::FixedFont).family();
|
||||
::monofont = style::font(st::normalFont->f.pixelSize(), 0, family);
|
||||
}
|
||||
if (!::sprite) {
|
||||
QString spriteFilePostfix;
|
||||
if (cRetina() || cScale() == dbisTwo) {
|
||||
spriteFilePostfix = qsl("_200x");
|
||||
} else if (cScale() == dbisOneAndQuarter) {
|
||||
spriteFilePostfix = qsl("_125x");
|
||||
} else if (cScale() == dbisOneAndHalf) {
|
||||
spriteFilePostfix = qsl("_150x");
|
||||
}
|
||||
QString spriteFile = qsl(":/gui/art/sprite") + spriteFilePostfix + qsl(".png");
|
||||
if (rtl()) {
|
||||
::sprite = new QPixmap(QPixmap::fromImage(QImage(spriteFile).mirrored(true, false)));
|
||||
} else {
|
||||
::sprite = new QPixmap(spriteFile);
|
||||
}
|
||||
if (cRetina()) ::sprite->setDevicePixelRatio(cRetinaFactor());
|
||||
}
|
||||
emojiInit();
|
||||
if (!::emoji) {
|
||||
::emoji = new QPixmap(QLatin1String(EName));
|
||||
|
|
@ -2070,8 +2053,6 @@ namespace {
|
|||
void deinitMedia() {
|
||||
audioFinish();
|
||||
|
||||
delete ::sprite;
|
||||
::sprite = 0;
|
||||
delete ::emoji;
|
||||
::emoji = 0;
|
||||
delete ::emojiLarge;
|
||||
|
|
@ -2149,7 +2130,7 @@ namespace {
|
|||
}
|
||||
|
||||
const QPixmap &sprite() {
|
||||
return *::sprite;
|
||||
return style::spritePixmap();
|
||||
}
|
||||
|
||||
const QPixmap &emoji() {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class LogStream;
|
|||
// Interface for reading a cleaned from comments file by basic tokens.
|
||||
class BasicTokenizedFile {
|
||||
public:
|
||||
BasicTokenizedFile(const QString &filepath);
|
||||
explicit BasicTokenizedFile(const QString &filepath);
|
||||
BasicTokenizedFile(const BasicTokenizedFile &other) = delete;
|
||||
BasicTokenizedFile &operator=(const BasicTokenizedFile &other) = delete;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ public:
|
|||
CheckedUtf8String(const CheckedUtf8String &other) = default;
|
||||
CheckedUtf8String &operator=(const CheckedUtf8String &other) = default;
|
||||
|
||||
CheckedUtf8String(const char *string, int size = -1);
|
||||
CheckedUtf8String(const QByteArray &string);
|
||||
CheckedUtf8String(const ConstUtf8String &string);
|
||||
explicit CheckedUtf8String(const char *string, int size = -1);
|
||||
explicit CheckedUtf8String(const QByteArray &string);
|
||||
explicit CheckedUtf8String(const ConstUtf8String &string);
|
||||
|
||||
bool isValid() const {
|
||||
return valid_;
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace common {
|
|||
// Reads a file removing all C-style comments.
|
||||
class CleanFile {
|
||||
public:
|
||||
CleanFile(const QString &filepath);
|
||||
explicit CleanFile(const QString &filepath);
|
||||
CleanFile(const CleanFile &other) = delete;
|
||||
CleanFile &operator=(const CleanFile &other) = delete;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace common {
|
|||
// Not null-terminated! It does not hold any ownership.
|
||||
class ConstUtf8String {
|
||||
public:
|
||||
ConstUtf8String(const char *string, int size = -1) : string_(string) {
|
||||
explicit ConstUtf8String(const char *string, int size = -1) : string_(string) {
|
||||
if (size < 0) {
|
||||
size = strlen(string);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,135 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/common/cpp_file.h"
|
||||
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QDir>
|
||||
|
||||
namespace codegen {
|
||||
namespace common {
|
||||
namespace {
|
||||
|
||||
void writeLicense(QTextStream &stream, const ProjectInfo &project) {
|
||||
stream << "\
|
||||
/*\n\
|
||||
WARNING! All changes made in this file will be lost!\n\
|
||||
Created from '" << project.source << "' by '" << project.name << "'\n\
|
||||
\n\
|
||||
This file is part of Telegram Desktop,\n\
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org\n\
|
||||
\n\
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify\n\
|
||||
it under the terms of the GNU General Public License as published by\n\
|
||||
the Free Software Foundation, either version 3 of the License, or\n\
|
||||
(at your option) any later version.\n\
|
||||
\n\
|
||||
It is distributed in the hope that it will be useful,\n\
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
|
||||
GNU General Public License for more details.\n\
|
||||
\n\
|
||||
In addition, as a special exception, the copyright holders give permission\n\
|
||||
to link the code of portions of this program with the OpenSSL library.\n\
|
||||
\n\
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
|
||||
*/\n";
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
CppFile::CppFile(const QString &path, const ProjectInfo &project)
|
||||
: stream_(&content_)
|
||||
, forceReGenerate_(project.forceReGenerate) {
|
||||
bool cpp = path.toLower().endsWith(".cpp");
|
||||
|
||||
QFileInfo info(path);
|
||||
info.dir().mkpath(".");
|
||||
filepath_ = info.absoluteFilePath();
|
||||
|
||||
writeLicense(stream_, project);
|
||||
if (cpp) {
|
||||
if (!project.precompiledHeader.isEmpty()) {
|
||||
include(project.precompiledHeader);
|
||||
}
|
||||
include(info.baseName() + ".h").newline();
|
||||
} else {
|
||||
stream() << "#pragma once";
|
||||
newline().newline();
|
||||
}
|
||||
}
|
||||
|
||||
CppFile &CppFile::include(const QString &header) {
|
||||
stream() << "#include \"" << header << "\"";
|
||||
return newline();
|
||||
}
|
||||
|
||||
CppFile &CppFile::pushNamespace(const QString &name) {
|
||||
namespaces_.push_back(name);
|
||||
|
||||
stream() << "namespace";
|
||||
if (!name.isEmpty()) {
|
||||
stream() << ' ' << name;
|
||||
}
|
||||
stream() << " {";
|
||||
return newline();
|
||||
}
|
||||
|
||||
CppFile &CppFile::popNamespace() {
|
||||
if (namespaces_.isEmpty()) {
|
||||
return *this;
|
||||
}
|
||||
auto name = namespaces_.back();
|
||||
namespaces_.pop_back();
|
||||
|
||||
stream() << "} // namespace";
|
||||
if (!name.isEmpty()) {
|
||||
stream() << ' ' << name;
|
||||
}
|
||||
return newline();
|
||||
}
|
||||
|
||||
bool CppFile::finalize() {
|
||||
while (!namespaces_.isEmpty()) {
|
||||
popNamespace();
|
||||
}
|
||||
stream_.flush();
|
||||
|
||||
QFile file(filepath_);
|
||||
if (!forceReGenerate_ && file.open(QIODevice::ReadOnly)) {
|
||||
if (file.readAll() == content_) {
|
||||
file.close();
|
||||
return true;
|
||||
}
|
||||
file.close();
|
||||
}
|
||||
|
||||
if (!file.open(QIODevice::WriteOnly)) {
|
||||
return false;
|
||||
}
|
||||
if (file.write(content_) != content_.size()) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace common
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QTextStream>
|
||||
|
||||
namespace codegen {
|
||||
namespace common {
|
||||
|
||||
struct ProjectInfo {
|
||||
QString name;
|
||||
QString source;
|
||||
QString precompiledHeader;
|
||||
bool forceReGenerate;
|
||||
};
|
||||
|
||||
// Creates a file with license header and codegen warning.
|
||||
class CppFile {
|
||||
public:
|
||||
// If "basepath" is empty the folder containing "path" will be chosen.
|
||||
// File ending with .cpp will be treated as source, otherwise like header.
|
||||
CppFile(const QString &path, const ProjectInfo &project);
|
||||
|
||||
QTextStream &stream() {
|
||||
return stream_;
|
||||
}
|
||||
|
||||
CppFile &newline() {
|
||||
stream() << "\n";
|
||||
return *this;
|
||||
}
|
||||
CppFile &include(const QString &header);
|
||||
|
||||
// Empty name adds anonymous namespace.
|
||||
CppFile &pushNamespace(const QString &name = QString());
|
||||
CppFile &popNamespace();
|
||||
|
||||
bool finalize();
|
||||
|
||||
private:
|
||||
QString filepath_;
|
||||
QByteArray content_;
|
||||
QTextStream stream_;
|
||||
QVector<QString> namespaces_;
|
||||
bool forceReGenerate_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace common
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/numbers/generator.h"
|
||||
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QSet>
|
||||
#include <functional>
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
namespace {
|
||||
|
||||
} // namespace
|
||||
|
||||
Generator::Generator(const Rules &rules, const QString &destBasePath, const common::ProjectInfo &project)
|
||||
: rules_(rules)
|
||||
, basePath_(destBasePath)
|
||||
, project_(project) {
|
||||
}
|
||||
|
||||
bool Generator::writeHeader() {
|
||||
header_ = std::make_unique<common::CppFile>(basePath_ + ".h", project_);
|
||||
|
||||
header_->stream() << "QVector<int> phoneNumberParse(const QString &number);\n";
|
||||
|
||||
return header_->finalize();
|
||||
}
|
||||
|
||||
bool Generator::writeSource() {
|
||||
source_ = std::make_unique<common::CppFile>(basePath_ + ".cpp", project_);
|
||||
|
||||
return source_->finalize();
|
||||
}
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QSet>
|
||||
#include "codegen/common/cpp_file.h"
|
||||
#include "codegen/numbers/parsed_file.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
|
||||
class Generator {
|
||||
public:
|
||||
Generator(const Rules &rules, const QString &destBasePath, const common::ProjectInfo &project);
|
||||
Generator(const Generator &other) = delete;
|
||||
Generator &operator=(const Generator &other) = delete;
|
||||
|
||||
bool writeHeader();
|
||||
bool writeSource();
|
||||
|
||||
private:
|
||||
const Rules &rules_;
|
||||
QString basePath_;
|
||||
const common::ProjectInfo &project_;
|
||||
std::unique_ptr<common::CppFile> source_, header_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
#include "codegen/numbers/options.h"
|
||||
#include "codegen/numbers/processor.h"
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
auto options = codegen::numbers::parseOptions();
|
||||
if (options.inputPath.isEmpty()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
codegen::numbers::Processor processor(options);
|
||||
return processor.launch();
|
||||
}
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/numbers/options.h"
|
||||
|
||||
#include <ostream>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include "codegen/common/logging.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
namespace {
|
||||
|
||||
constexpr int kErrorOutputPathExpected = 902;
|
||||
constexpr int kErrorInputPathExpected = 903;
|
||||
constexpr int kErrorSingleInputPathExpected = 904;
|
||||
|
||||
} // namespace
|
||||
|
||||
using common::logError;
|
||||
|
||||
Options parseOptions() {
|
||||
Options result;
|
||||
auto args(QCoreApplication::instance()->arguments());
|
||||
for (int i = 1, count = args.size(); i < count; ++i) { // skip first
|
||||
const auto &arg(args.at(i));
|
||||
|
||||
// Output path
|
||||
if (arg == "-o") {
|
||||
if (++i == count) {
|
||||
logError(kErrorOutputPathExpected, "Command Line") << "output path expected after -o";
|
||||
return Options();
|
||||
} else {
|
||||
result.outputPath = args.at(i);
|
||||
}
|
||||
} else if (arg.startsWith("-o")) {
|
||||
result.outputPath = arg.mid(2);
|
||||
|
||||
// Input path
|
||||
} else {
|
||||
if (result.inputPath.isEmpty()) {
|
||||
result.inputPath = arg;
|
||||
} else {
|
||||
logError(kErrorSingleInputPathExpected, "Command Line") << "only one input path expected";
|
||||
return Options();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (result.inputPath.isEmpty()) {
|
||||
logError(kErrorInputPathExpected, "Command Line") << "input path expected";
|
||||
return Options();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
|
||||
struct Options {
|
||||
QString outputPath = ".";
|
||||
QString inputPath;
|
||||
};
|
||||
|
||||
// Parsing failed if inputPath is empty in the result.
|
||||
Options parseOptions();
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/numbers/parsed_file.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QRegularExpression>
|
||||
#include "codegen/common/basic_tokenized_file.h"
|
||||
#include "codegen/common/logging.h"
|
||||
|
||||
using BasicToken = codegen::common::BasicTokenizedFile::Token;
|
||||
using BasicType = BasicToken::Type;
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
namespace {
|
||||
|
||||
} // namespace
|
||||
|
||||
ParsedFile::ParsedFile(const Options &options)
|
||||
: file_(options.inputPath)
|
||||
, options_(options) {
|
||||
}
|
||||
|
||||
bool ParsedFile::read() {
|
||||
if (!file_.read()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
auto filepath = QFileInfo(options_.inputPath).absoluteFilePath();
|
||||
do {
|
||||
if (auto startToken = file_.getToken(BasicType::Name)) {
|
||||
}
|
||||
if (file_.atEnd()) {
|
||||
break;
|
||||
}
|
||||
logErrorUnexpectedToken() << "numbers rule";
|
||||
} while (!failed());
|
||||
|
||||
if (failed()) {
|
||||
result_.data.clear();
|
||||
}
|
||||
return !failed();
|
||||
}
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include "codegen/common/basic_tokenized_file.h"
|
||||
#include "codegen/numbers/options.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
|
||||
struct Rule {
|
||||
};
|
||||
struct Rules {
|
||||
QVector<Rule> data;
|
||||
};
|
||||
|
||||
// Parses an input file to the internal struct.
|
||||
class ParsedFile {
|
||||
public:
|
||||
explicit ParsedFile(const Options &options);
|
||||
ParsedFile(const ParsedFile &other) = delete;
|
||||
ParsedFile &operator=(const ParsedFile &other) = delete;
|
||||
|
||||
bool read();
|
||||
|
||||
Rules getResult() {
|
||||
return result_;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
bool failed() const {
|
||||
return failed_ || file_.failed();
|
||||
}
|
||||
|
||||
// Log error to std::cerr with 'code' at the current position in file.
|
||||
common::LogStream logError(int code) {
|
||||
failed_ = true;
|
||||
return file_.logError(code);
|
||||
}
|
||||
common::LogStream logErrorUnexpectedToken() {
|
||||
failed_ = true;
|
||||
return file_.logErrorUnexpectedToken();
|
||||
}
|
||||
|
||||
common::BasicTokenizedFile file_;
|
||||
Options options_;
|
||||
bool failed_ = false;
|
||||
Rules result_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/numbers/processor.h"
|
||||
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include "codegen/common/cpp_file.h"
|
||||
#include "codegen/numbers/parsed_file.h"
|
||||
#include "codegen/numbers/generator.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
namespace {
|
||||
|
||||
constexpr int kErrorCantWritePath = 851;
|
||||
|
||||
} // namespace
|
||||
|
||||
Processor::Processor(const Options &options)
|
||||
: parser_(std::make_unique<ParsedFile>(options))
|
||||
, options_(options) {
|
||||
}
|
||||
|
||||
int Processor::launch() {
|
||||
if (!parser_->read()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
auto result = parser_->getResult();
|
||||
if (!write(result)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool Processor::write(const Rules &rules) const {
|
||||
QDir dir(options_.outputPath);
|
||||
if (!dir.mkpath(".")) {
|
||||
common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
|
||||
return false;
|
||||
}
|
||||
|
||||
QFileInfo srcFile(options_.inputPath);
|
||||
QString dstFilePath = dir.absolutePath() + "/numbers";
|
||||
|
||||
common::ProjectInfo project = {
|
||||
"codegen_style",
|
||||
srcFile.fileName(),
|
||||
"stdafx.h",
|
||||
false, // forceReGenerate
|
||||
};
|
||||
|
||||
Generator generator(rules, dstFilePath, project);
|
||||
if (!generator.writeHeader()) {
|
||||
return false;
|
||||
}
|
||||
if (!generator.writeSource()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Processor::~Processor() = default;
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <QtCore/QString>
|
||||
#include "codegen/numbers/options.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace numbers {
|
||||
class ParsedFile;
|
||||
struct Rules;
|
||||
|
||||
// Walks through a file, parses it and generates number formatter.
|
||||
class Processor {
|
||||
public:
|
||||
explicit Processor(const Options &options);
|
||||
Processor(const Processor &other) = delete;
|
||||
Processor &operator=(const Processor &other) = delete;
|
||||
|
||||
// Returns 0 on success.
|
||||
int launch();
|
||||
|
||||
~Processor();
|
||||
|
||||
private:
|
||||
bool write(const Rules &rules) const;
|
||||
|
||||
std::unique_ptr<ParsedFile> parser_;
|
||||
const Options &options_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace numbers
|
||||
} // namespace codegen
|
||||
|
|
@ -20,45 +20,533 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
*/
|
||||
#include "codegen/style/generator.h"
|
||||
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QSet>
|
||||
#include <functional>
|
||||
#include "codegen/style/parsed_file.h"
|
||||
|
||||
using Module = codegen::style::structure::Module;
|
||||
using Struct = codegen::style::structure::Struct;
|
||||
using Variable = codegen::style::structure::Variable;
|
||||
using Tag = codegen::style::structure::TypeTag;
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace {
|
||||
|
||||
} // namespace
|
||||
|
||||
Generator::Generator(const Options &options)
|
||||
: parser_(std::make_unique<ParsedFile>(options))
|
||||
, options_(options) {
|
||||
|
||||
char hexChar(uchar ch) {
|
||||
if (ch < 10) {
|
||||
return '0' + ch;
|
||||
} else if (ch < 16) {
|
||||
return 'a' + (ch - 10);
|
||||
}
|
||||
return '0';
|
||||
}
|
||||
|
||||
int Generator::process() {
|
||||
if (!parser_->read()) {
|
||||
return -1;
|
||||
}
|
||||
char hexSecondChar(char ch) {
|
||||
return hexChar((*reinterpret_cast<uchar*>(&ch)) << 4);
|
||||
}
|
||||
|
||||
const auto &result = parser_->data();
|
||||
if (!write(result)) {
|
||||
return -1;
|
||||
}
|
||||
if (options_.rebuildDependencies) {
|
||||
for (auto included : result.includes) {
|
||||
if (!write(included)) {
|
||||
return -1;
|
||||
}
|
||||
char hexFirstChar(char ch) {
|
||||
return hexChar((*reinterpret_cast<uchar*>(&ch)) & 0x0F);
|
||||
}
|
||||
|
||||
QString stringToEncodedString(const std::string &str) {
|
||||
QString result;
|
||||
result.reserve(str.size() * 4);
|
||||
for (auto ch : str) {
|
||||
if (ch == '\n') {
|
||||
result.append("\\n");
|
||||
} else if (ch == '\t') {
|
||||
result.append("\\t");
|
||||
} else if (ch == '"' || ch == '\\') {
|
||||
result.append('\\').append(ch);
|
||||
} else if (ch < 32 || ch > 127) {
|
||||
result.append("\\x").append(hexFirstChar(ch)).append(hexSecondChar(ch));
|
||||
} else {
|
||||
result.append(ch);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
return '"' + result + '"';
|
||||
}
|
||||
|
||||
bool Generator::write(const structure::Module &) const {
|
||||
QString pxValueName(int value) {
|
||||
QString result = "px";
|
||||
if (value < 0) {
|
||||
value = -value;
|
||||
result += 'm';
|
||||
}
|
||||
return result + QString::number(value);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
Generator::Generator(const structure::Module &module, const QString &destBasePath, const common::ProjectInfo &project)
|
||||
: module_(module)
|
||||
, basePath_(destBasePath)
|
||||
, baseName_(QFileInfo(basePath_).baseName())
|
||||
, project_(project) {
|
||||
}
|
||||
|
||||
bool Generator::writeHeader() {
|
||||
header_ = std::make_unique<common::CppFile>(basePath_ + ".h", project_);
|
||||
|
||||
header_->include("ui/style_core.h").newline();
|
||||
|
||||
if (!writeHeaderStyleNamespace()) {
|
||||
return false;
|
||||
}
|
||||
if (!writeRefsDeclarations()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return header_->finalize();
|
||||
}
|
||||
|
||||
bool Generator::writeSource() {
|
||||
source_ = std::make_unique<common::CppFile>(basePath_ + ".cpp", project_);
|
||||
|
||||
writeIncludesInSource();
|
||||
|
||||
if (module_.hasVariables()) {
|
||||
source_->pushNamespace().newline();
|
||||
source_->stream() << "\
|
||||
bool inited = false;\n\
|
||||
\n\
|
||||
class Module_" << baseName_ << " : public style::internal::ModuleBase {\n\
|
||||
public:\n\
|
||||
Module_" << baseName_ << "() { style::internal::registerModule(this); }\n\
|
||||
~Module_" << baseName_ << "() { style::internal::unregisterModule(this); }\n\
|
||||
\n\
|
||||
void start() override {\n\
|
||||
style::internal::init_" << baseName_ << "();\n\
|
||||
}\n\
|
||||
void stop() override {\n\
|
||||
}\n\
|
||||
};\n\
|
||||
Module_" << baseName_ << " registrator;\n";
|
||||
if (!writeVariableDefinitions()) {
|
||||
return false;
|
||||
}
|
||||
source_->newline().popNamespace();
|
||||
|
||||
source_->newline().pushNamespace("st");
|
||||
if (!writeRefsDefinition()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
source_->popNamespace().newline();
|
||||
source_->newline().pushNamespace("style").pushNamespace("internal").newline();
|
||||
if (!writeVariableInit()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return source_->finalize();
|
||||
}
|
||||
|
||||
// Empty result means an error.
|
||||
QString Generator::typeToString(structure::Type type) const {
|
||||
switch (type.tag) {
|
||||
case Tag::Invalid: return QString();
|
||||
case Tag::Int: return "int";
|
||||
case Tag::Double: return "double";
|
||||
case Tag::Pixels: return "int";
|
||||
case Tag::String: return "QString";
|
||||
case Tag::Color: return "style::color";
|
||||
case Tag::Point: return "style::point";
|
||||
case Tag::Sprite: return "style::sprite";
|
||||
case Tag::Size: return "style::size";
|
||||
case Tag::Transition: return "style::transition";
|
||||
case Tag::Cursor: return "style::cursor";
|
||||
case Tag::Align: return "style::align";
|
||||
case Tag::Margins: return "style::margins";
|
||||
case Tag::Font: return "style::font";
|
||||
case Tag::Struct: return "style::" + type.name.back();
|
||||
}
|
||||
return QString();
|
||||
}
|
||||
|
||||
// Empty result means an error.
|
||||
QString Generator::typeToDefaultValue(structure::Type type) const {
|
||||
switch (type.tag) {
|
||||
case Tag::Invalid: return QString();
|
||||
case Tag::Int: return "0";
|
||||
case Tag::Double: return "0.";
|
||||
case Tag::Pixels: return "0";
|
||||
case Tag::String: return "QString()";
|
||||
case Tag::Color: return "{ Qt::Uninitialized }";
|
||||
case Tag::Point: return "{ 0, 0 }";
|
||||
case Tag::Sprite: return "{ 0, 0, 0, 0 }";
|
||||
case Tag::Size: return "{ 0, 0 }";
|
||||
case Tag::Transition: return "anim::linear";
|
||||
case Tag::Cursor: return "style::cur_default";
|
||||
case Tag::Align: return "style::al_topleft";
|
||||
case Tag::Margins: return "{ 0, 0, 0, 0 }";
|
||||
case Tag::Font: return "{ Qt::Uninitialized }";
|
||||
case Tag::Struct: {
|
||||
if (auto realType = module_.findStruct(type.name)) {
|
||||
QStringList fields;
|
||||
for (auto field : realType->fields) {
|
||||
fields.push_back(typeToDefaultValue(field.type));
|
||||
}
|
||||
return "{ " + fields.join(", ") + " }";
|
||||
}
|
||||
return QString();
|
||||
} break;
|
||||
}
|
||||
return QString();
|
||||
}
|
||||
|
||||
// Empty result means an error.
|
||||
QString Generator::valueAssignmentCode(structure::Value value) const {
|
||||
auto copy = value.copyOf();
|
||||
if (!copy.isEmpty()) {
|
||||
return "st::" + copy.back();
|
||||
}
|
||||
|
||||
switch (value.type().tag) {
|
||||
case Tag::Invalid: return QString();
|
||||
case Tag::Int: return QString("%1").arg(value.Int());
|
||||
case Tag::Double: return QString("%1").arg(value.Double());
|
||||
case Tag::Pixels: return pxValueName(value.Int());
|
||||
case Tag::String: return QString("qsl(%1)").arg(stringToEncodedString(value.String()));
|
||||
case Tag::Color: return QString("{ %1, %2, %3, %4 }").arg(value.Color().red).arg(value.Color().green).arg(value.Color().blue).arg(value.Color().alpha);
|
||||
case Tag::Point: {
|
||||
auto v(value.Point());
|
||||
return QString("{ %1, %2 }").arg(pxValueName(v.x)).arg(pxValueName(v.y));
|
||||
}
|
||||
case Tag::Sprite: {
|
||||
auto v(value.Sprite());
|
||||
return QString("{ %1, %2, %3, %4 }").arg(pxValueName(v.left)).arg(pxValueName(v.top)).arg(pxValueName(v.width)).arg(pxValueName(v.height));
|
||||
}
|
||||
case Tag::Size: {
|
||||
auto v(value.Size());
|
||||
return QString("{ %1, %2 }").arg(pxValueName(v.width)).arg(pxValueName(v.height));
|
||||
}
|
||||
case Tag::Transition: return QString("anim::%1").arg(value.String().c_str());
|
||||
case Tag::Cursor: return QString("style::cur_%1").arg(value.String().c_str());
|
||||
case Tag::Align: return QString("style::al_%1").arg(value.String().c_str());
|
||||
case Tag::Margins: {
|
||||
auto v(value.Margins());
|
||||
return QString("{ %1, %2, %3, %4 }").arg(pxValueName(v.left)).arg(pxValueName(v.top)).arg(pxValueName(v.right)).arg(pxValueName(v.bottom));
|
||||
}
|
||||
case Tag::Font: {
|
||||
auto v(value.Font());
|
||||
QString family = "0";
|
||||
if (!v.family.empty()) {
|
||||
auto familyIndex = fontFamilyValues_.value(v.family, -1);
|
||||
if (familyIndex < 0) {
|
||||
return QString();
|
||||
} else {
|
||||
family = QString("font%1index").arg(familyIndex);
|
||||
}
|
||||
}
|
||||
return QString("{ %1, %2, %3 }").arg(pxValueName(v.size)).arg(v.flags).arg(family);
|
||||
}
|
||||
case Tag::Struct: {
|
||||
if (!value.Fields()) return QString();
|
||||
|
||||
QStringList fields;
|
||||
for (auto field : *value.Fields()) {
|
||||
fields.push_back(valueAssignmentCode(field.variable.value));
|
||||
}
|
||||
return "{ " + fields.join(", ") + " }";
|
||||
} break;
|
||||
}
|
||||
return QString();
|
||||
}
|
||||
|
||||
bool Generator::writeHeaderStyleNamespace() {
|
||||
if (!module_.hasStructs() && !module_.hasVariables()) {
|
||||
return true;
|
||||
}
|
||||
header_->pushNamespace("style");
|
||||
|
||||
if (module_.hasVariables()) {
|
||||
header_->pushNamespace("internal").newline();
|
||||
header_->stream() << "void init_" << baseName_ << "();\n\n";
|
||||
header_->popNamespace();
|
||||
}
|
||||
if (module_.hasStructs()) {
|
||||
header_->newline();
|
||||
if (!writeStructsDefinitions()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
header_->popNamespace().newline();
|
||||
return true;
|
||||
}
|
||||
|
||||
Generator::~Generator() = default;
|
||||
bool Generator::writeStructsDefinitions() {
|
||||
if (!module_.hasStructs()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool result = module_.enumStructs([this](const Struct &value) -> bool {
|
||||
header_->stream() << "struct " << value.name.back() << " {\n";
|
||||
for (const auto &field : value.fields) {
|
||||
auto type = typeToString(field.type);
|
||||
if (type.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
header_->stream() << "\t" << type << " " << field.name.back() << ";\n";
|
||||
}
|
||||
header_->stream() << "};\n\n";
|
||||
return true;
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Generator::writeRefsDeclarations() {
|
||||
if (!module_.hasVariables()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
header_->pushNamespace("st");
|
||||
|
||||
bool result = module_.enumVariables([this](const Variable &value) -> bool {
|
||||
auto name = value.name.back();
|
||||
auto type = typeToString(value.value.type());
|
||||
if (type.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
header_->stream() << "extern const " << type << " &" << name << ";\n";
|
||||
return true;
|
||||
});
|
||||
|
||||
header_->popNamespace();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Generator::writeIncludesInSource() {
|
||||
if (!module_.hasIncludes()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool result = module_.enumIncludes([this](const Module &module) -> bool {
|
||||
source_->include("style_" + QFileInfo(module.filepath()).baseName() + ".h");
|
||||
return true;
|
||||
});
|
||||
source_->newline();
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Generator::writeVariableDefinitions() {
|
||||
if (!module_.hasVariables()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
source_->newline();
|
||||
bool result = module_.enumVariables([this](const Variable &variable) -> bool {
|
||||
auto name = variable.name.back();
|
||||
auto type = typeToString(variable.value.type());
|
||||
if (type.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
source_->stream() << type << " _" << name << " = " << typeToDefaultValue(variable.value.type()) << ";\n";
|
||||
return true;
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Generator::writeRefsDefinition() {
|
||||
if (!module_.hasVariables()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
source_->newline();
|
||||
bool result = module_.enumVariables([this](const Variable &variable) -> bool {
|
||||
auto name = variable.name.back();
|
||||
auto type = typeToString(variable.value.type());
|
||||
if (type.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
source_->stream() << "const " << type << " &" << name << "(_" << name << ");\n";
|
||||
return true;
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Generator::writeVariableInit() {
|
||||
if (!module_.hasVariables()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!collectUniqueValues()) {
|
||||
return false;
|
||||
}
|
||||
bool hasUniqueValues = (!pxValues_.isEmpty() || !fontFamilyValues_.isEmpty());
|
||||
if (hasUniqueValues) {
|
||||
source_->pushNamespace();
|
||||
if (!writePxValues()) {
|
||||
return false;
|
||||
}
|
||||
if (!writeFontFamilyValues()) {
|
||||
return false;
|
||||
}
|
||||
source_->popNamespace().newline();
|
||||
}
|
||||
|
||||
source_->stream() << "\
|
||||
void init_" << baseName_ << "() {\n\
|
||||
if (inited) return;\n\
|
||||
inited = true;\n\n";
|
||||
|
||||
if (module_.hasIncludes()) {
|
||||
bool writtenAtLeastOne = false;
|
||||
bool result = module_.enumIncludes([this,&writtenAtLeastOne](const Module &module) -> bool {
|
||||
if (module.hasVariables()) {
|
||||
source_->stream() << "\tinit_style_" + QFileInfo(module.filepath()).baseName() + "();\n";
|
||||
writtenAtLeastOne = true;
|
||||
}
|
||||
return true;
|
||||
});
|
||||
if (!result) {
|
||||
return false;
|
||||
}
|
||||
if (writtenAtLeastOne) {
|
||||
source_->newline();
|
||||
}
|
||||
}
|
||||
|
||||
if (hasUniqueValues) {
|
||||
if (!pxValues_.isEmpty()) {
|
||||
source_->stream() << "\tinitPxValues();\n";
|
||||
}
|
||||
if (!fontFamilyValues_.isEmpty()) {
|
||||
source_->stream() << "\tinitFontFamilyValues();\n";
|
||||
}
|
||||
source_->newline();
|
||||
}
|
||||
|
||||
bool result = module_.enumVariables([this](const Variable &variable) -> bool {
|
||||
auto name = variable.name.back();
|
||||
auto value = valueAssignmentCode(variable.value);
|
||||
if (value.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
source_->stream() << "\t_" << name << " = " << value << ";\n";
|
||||
return true;
|
||||
});
|
||||
source_->stream() << "\
|
||||
}\n\n";
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Generator::writePxValues() {
|
||||
if (pxValues_.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
for (auto i = pxValues_.cbegin(), e = pxValues_.cend(); i != e; ++i) {
|
||||
source_->stream() << "int " << pxValueName(i.key()) << " = " << i.key() << ";\n";
|
||||
}
|
||||
source_->stream() << "\
|
||||
void initPxValues() {\n\
|
||||
if (cRetina()) return;\n\
|
||||
\n\
|
||||
switch (cScale()) {\n";
|
||||
for (int i = 1, scalesCount = scales.size(); i < scalesCount; ++i) {
|
||||
source_->stream() << "\tcase " << scaleNames.at(i) << ":\n";
|
||||
for (auto it = pxValues_.cbegin(), e = pxValues_.cend(); it != e; ++it) {
|
||||
auto value = it.key();
|
||||
int adjusted = structure::data::pxAdjust(value, scales.at(i));
|
||||
if (adjusted != value) {
|
||||
source_->stream() << "\t\t" << pxValueName(value) << " = " << adjusted << ";\n";
|
||||
}
|
||||
}
|
||||
source_->stream() << "\tbreak;\n";
|
||||
}
|
||||
source_->stream() << "\
|
||||
}\n\
|
||||
}\n\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Generator::writeFontFamilyValues() {
|
||||
if (fontFamilyValues_.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
for (auto i = fontFamilyValues_.cbegin(), e = fontFamilyValues_.cend(); i != e; ++i) {
|
||||
source_->stream() << "int font" << i.value() << "index;\n";
|
||||
}
|
||||
source_->stream() << "void initFontFamilyValues() {\n";
|
||||
for (auto i = fontFamilyValues_.cbegin(), e = fontFamilyValues_.cend(); i != e; ++i) {
|
||||
auto family = stringToEncodedString(i.key());
|
||||
source_->stream() << "\tfont" << i.value() << "index = style::internal::registerFontFamily(" << family << ");\n";
|
||||
}
|
||||
source_->stream() << "}\n\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Generator::collectUniqueValues() {
|
||||
int fontFamilyIndex = 0;
|
||||
std::function<bool(const Variable&)> collector = [this, &collector, &fontFamilyIndex](const Variable &variable) {
|
||||
auto value = variable.value;
|
||||
switch (value.type().tag) {
|
||||
case Tag::Invalid:
|
||||
case Tag::Int:
|
||||
case Tag::Double:
|
||||
case Tag::String:
|
||||
case Tag::Color:
|
||||
case Tag::Transition:
|
||||
case Tag::Cursor:
|
||||
case Tag::Align: break;
|
||||
case Tag::Pixels: pxValues_.insert(value.Int(), true); break;
|
||||
case Tag::Point: {
|
||||
auto v(value.Point());
|
||||
pxValues_.insert(v.x, true);
|
||||
pxValues_.insert(v.y, true);
|
||||
} break;
|
||||
case Tag::Sprite: {
|
||||
auto v(value.Sprite());
|
||||
pxValues_.insert(v.left, true);
|
||||
pxValues_.insert(v.top, true);
|
||||
pxValues_.insert(v.width, true);
|
||||
pxValues_.insert(v.height, true);
|
||||
} break;
|
||||
case Tag::Size: {
|
||||
auto v(value.Size());
|
||||
pxValues_.insert(v.width, true);
|
||||
pxValues_.insert(v.height, true);
|
||||
} break;
|
||||
case Tag::Margins: {
|
||||
auto v(value.Margins());
|
||||
pxValues_.insert(v.left, true);
|
||||
pxValues_.insert(v.top, true);
|
||||
pxValues_.insert(v.right, true);
|
||||
pxValues_.insert(v.bottom, true);
|
||||
} break;
|
||||
case Tag::Font: {
|
||||
auto v(value.Font());
|
||||
pxValues_.insert(v.size, true);
|
||||
if (!v.family.empty() && !fontFamilyValues_.contains(v.family)) {
|
||||
fontFamilyValues_.insert(v.family, ++fontFamilyIndex);
|
||||
}
|
||||
} break;
|
||||
case Tag::Struct: {
|
||||
auto fields = variable.value.Fields();
|
||||
if (!fields) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (auto field : *fields) {
|
||||
if (!collector(field.variable)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
} break;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
return module_.enumVariables(collector);
|
||||
}
|
||||
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
|
|||
|
|
@ -22,36 +22,53 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
|
||||
#include <memory>
|
||||
#include <QtCore/QString>
|
||||
#include "codegen/style/options.h"
|
||||
#include <QtCore/QSet>
|
||||
#include "codegen/common/cpp_file.h"
|
||||
#include "codegen/style/structure_types.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace structure {
|
||||
struct Module;
|
||||
class Module;
|
||||
} // namespace structure
|
||||
class ParsedFile;
|
||||
|
||||
// Walks through a file, parses it and parses dependency files if necessary.
|
||||
class Generator {
|
||||
public:
|
||||
Generator(const Options &options);
|
||||
Generator(const structure::Module &module, const QString &destBasePath, const common::ProjectInfo &project);
|
||||
Generator(const Generator &other) = delete;
|
||||
Generator &operator=(const Generator &other) = delete;
|
||||
|
||||
// Returns 0 on success.
|
||||
int process();
|
||||
|
||||
~Generator();
|
||||
bool writeHeader();
|
||||
bool writeSource();
|
||||
|
||||
private:
|
||||
bool write(const structure::Module &module) const;
|
||||
QString typeToString(structure::Type type) const;
|
||||
QString typeToDefaultValue(structure::Type type) const;
|
||||
QString valueAssignmentCode(structure::Value value) const;
|
||||
|
||||
std::unique_ptr<ParsedFile> parser_;
|
||||
const Options &options_;
|
||||
bool writeHeaderStyleNamespace();
|
||||
bool writeStructsDefinitions();
|
||||
bool writeRefsDeclarations();
|
||||
|
||||
// List of files we need to generate with other instance of Generator.
|
||||
// It is not empty only if rebuild_ flag is true.
|
||||
QStringList dependenciesToGenerate_;
|
||||
bool writeIncludesInSource();
|
||||
bool writeVariableDefinitions();
|
||||
bool writeRefsDefinition();
|
||||
bool writeVariableInit();
|
||||
bool writePxValues();
|
||||
bool writeFontFamilyValues();
|
||||
|
||||
bool collectUniqueValues();
|
||||
|
||||
const structure::Module &module_;
|
||||
QString basePath_, baseName_;
|
||||
const common::ProjectInfo &project_;
|
||||
std::unique_ptr<common::CppFile> source_, header_;
|
||||
|
||||
QMap<int, bool> pxValues_;
|
||||
QMap<std::string, int> fontFamilyValues_;
|
||||
|
||||
std::vector<int> scales = { 4, 5, 6, 8 }; // scale / 4 gives our 1.00, 1.25, 1.50, 2.00
|
||||
std::vector<const char *>scaleNames = { "dbisOne", "dbisOneAndQuarter", "dbisOneAndHalf", "dbisTwo" };
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,21 +19,18 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
|||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include "codegen/style/generator.h"
|
||||
#include "codegen/style/options.h"
|
||||
|
||||
using namespace codegen::style;
|
||||
#include "codegen/style/processor.h"
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
QCoreApplication app(argc, argv);
|
||||
|
||||
Options options = parseOptions();
|
||||
auto options = codegen::style::parseOptions();
|
||||
if (options.inputPath.isEmpty()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
Generator generator(options);
|
||||
return generator.process();
|
||||
codegen::style::Processor processor(options);
|
||||
return processor.launch();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/style/module.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace structure {
|
||||
namespace {
|
||||
|
||||
QString fullNameKey(const FullName &name) {
|
||||
return name.join('.');
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
Module::Module(const QString &fullpath) : fullpath_(fullpath) {
|
||||
}
|
||||
|
||||
void Module::addIncluded(std::unique_ptr<Module> &&value) {
|
||||
included_.push_back(std::move(value));
|
||||
}
|
||||
|
||||
bool Module::addStruct(const Struct &value) {
|
||||
if (findStruct(value.name)) {
|
||||
return false;
|
||||
}
|
||||
structsByName_.insert(fullNameKey(value.name), structs_.size());
|
||||
structs_.push_back(value);
|
||||
return true;
|
||||
}
|
||||
|
||||
const Struct *Module::findStruct(const FullName &name) const {
|
||||
if (auto result = findStructInModule(name, *this)) {
|
||||
return result;
|
||||
}
|
||||
for (const auto &module : included_) {
|
||||
if (auto result = findStructInModule(name, *module)) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool Module::addVariable(const Variable &value) {
|
||||
if (findVariable(value.name)) {
|
||||
return false;
|
||||
}
|
||||
variablesByName_.insert(fullNameKey(value.name), variables_.size());
|
||||
variables_.push_back(value);
|
||||
return true;
|
||||
}
|
||||
|
||||
const Variable *Module::findVariable(const FullName &name) const {
|
||||
if (auto result = findVariableInModule(name, *this)) {
|
||||
return result;
|
||||
}
|
||||
for (const auto &module : included_) {
|
||||
if (auto result = findVariableInModule(name, *module)) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const Struct *Module::findStructInModule(const FullName &name, const Module &module) const {
|
||||
auto index = module.structsByName_.value(fullNameKey(name), -1);
|
||||
if (index < 0) {
|
||||
return nullptr;
|
||||
}
|
||||
return &module.structs_.at(index);
|
||||
}
|
||||
|
||||
const Variable *Module::findVariableInModule(const FullName &name, const Module &module) const {
|
||||
auto index = module.variablesByName_.value(fullNameKey(name), -1);
|
||||
if (index < 0) {
|
||||
return nullptr;
|
||||
}
|
||||
return &module.variables_.at(index);
|
||||
}
|
||||
|
||||
} // namespace structure
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMap>
|
||||
#include <vector>
|
||||
#include "codegen/style/structure_types.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace structure {
|
||||
|
||||
class Module {
|
||||
public:
|
||||
|
||||
explicit Module(const QString &fullpath);
|
||||
|
||||
QString filepath() const {
|
||||
return fullpath_;
|
||||
}
|
||||
|
||||
void addIncluded(std::unique_ptr<Module> &&value);
|
||||
|
||||
bool hasIncludes() const {
|
||||
return !included_.empty();
|
||||
}
|
||||
template <typename F>
|
||||
bool enumIncludes(F functor) const {
|
||||
for (const auto &module : included_) {
|
||||
if (!functor(*module)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Returns false if there is a struct with such name already.
|
||||
bool addStruct(const Struct &value);
|
||||
// Returns nullptr if there is no such struct in result_ or any of included modules.
|
||||
const Struct *findStruct(const FullName &name) const;
|
||||
bool hasStructs() const {
|
||||
return !structs_.isEmpty();
|
||||
}
|
||||
|
||||
template <typename F>
|
||||
bool enumStructs(F functor) const {
|
||||
for (const auto &value : structs_) {
|
||||
if (!functor(value)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Returns false if there is a variable with such name already.
|
||||
bool addVariable(const Variable &value);
|
||||
// Returns nullptr if there is no such variable in result_ or any of included modules.
|
||||
const Variable *findVariable(const FullName &name) const;
|
||||
bool hasVariables() const {
|
||||
return !variables_.isEmpty();
|
||||
}
|
||||
|
||||
template <typename F>
|
||||
bool enumVariables(F functor) const {
|
||||
for (const auto &value : variables_) {
|
||||
if (!functor(value)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
explicit operator bool() const {
|
||||
return !fullpath_.isEmpty();
|
||||
}
|
||||
|
||||
private:
|
||||
QString fullpath_;
|
||||
std::vector<std::unique_ptr<Module>> included_;
|
||||
QList<Struct> structs_;
|
||||
QList<Variable> variables_;
|
||||
QMap<QString, int> structsByName_;
|
||||
QMap<QString, int> variablesByName_;
|
||||
|
||||
const Struct *findStructInModule(const FullName &name, const Module &module) const;
|
||||
const Variable *findVariableInModule(const FullName &name, const Module &module) const;
|
||||
|
||||
};
|
||||
|
||||
} // namespace structure
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
@ -32,6 +32,9 @@ using BasicType = BasicToken::Type;
|
|||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
|
||||
using structure::logFullName;
|
||||
|
||||
namespace {
|
||||
|
||||
constexpr int kErrorInIncluded = 801;
|
||||
|
|
@ -65,7 +68,7 @@ bool isValidColor(const QString &str) {
|
|||
|
||||
uchar readHexUchar(QChar ch) {
|
||||
auto code = ch.unicode();
|
||||
return (code >= '0' && code <= '9') ? ((code - '0') & 0xFF) : ((code - 'a') & 0xFF);
|
||||
return (code >= '0' && code <= '9') ? ((code - '0') & 0xFF) : ((code + 10 - 'a') & 0xFF);
|
||||
}
|
||||
|
||||
uchar readHexUchar(QChar char1, QChar char2) {
|
||||
|
|
@ -95,10 +98,6 @@ structure::data::color convertIntColor(int r, int g, int b, int a) {
|
|||
return { uchar(r & 0xFF), uchar(g & 0xFF), uchar(b & 0xFF), uchar(a & 0xFF) };
|
||||
}
|
||||
|
||||
std::string logFullName(const structure::FullName &name) {
|
||||
return name.join('.').toStdString();
|
||||
}
|
||||
|
||||
std::string logType(const structure::Type &type) {
|
||||
if (type.tag == structure::TypeTag::Struct) {
|
||||
return "struct " + logFullName(type.name);
|
||||
|
|
@ -121,10 +120,6 @@ std::string logType(const structure::Type &type) {
|
|||
return builtInTypes->value(type.tag, "invalid");
|
||||
}
|
||||
|
||||
QString fullNameKey(const structure::FullName &name) {
|
||||
return name.join('.');
|
||||
}
|
||||
|
||||
bool validateAnsiString(const QString &value) {
|
||||
for (auto ch : value) {
|
||||
if (ch.unicode() > 127) {
|
||||
|
|
@ -158,67 +153,61 @@ bool ParsedFile::read() {
|
|||
return false;
|
||||
}
|
||||
|
||||
bool noErrors = false;
|
||||
auto filepath = QFileInfo(options_.inputPath).absoluteFilePath();
|
||||
module_ = std::make_unique<structure::Module>(filepath);
|
||||
do {
|
||||
if (auto startToken = file_.getToken(BasicType::Name)) {
|
||||
if (tokenValue(startToken) == "using") {
|
||||
if (auto includedResult = readIncluded()) {
|
||||
result_.includes.push_back(includedResult);
|
||||
module_->addIncluded(std::move(includedResult));
|
||||
continue;
|
||||
}
|
||||
} else if (auto braceOpen = file_.getToken(BasicType::LeftBrace)) {
|
||||
if (auto structResult = readStruct(tokenValue(startToken))) {
|
||||
if (findStruct(structResult.name)) {
|
||||
logError(kErrorAlreadyDefined) << "struct '" << logFullName(structResult.name) << "' already defined";
|
||||
break;
|
||||
if (module_->addStruct(structResult)) {
|
||||
continue;
|
||||
}
|
||||
result_.structsByName.insert(fullNameKey(structResult.name), result_.structs.size());
|
||||
result_.structs.push_back(structResult);
|
||||
continue;
|
||||
logError(kErrorAlreadyDefined) << "struct '" << logFullName(structResult.name) << "' already defined";
|
||||
break;
|
||||
}
|
||||
} else if (auto colonToken = file_.getToken(BasicType::Colon)) {
|
||||
if (auto variableResult = readVariable(tokenValue(startToken))) {
|
||||
if (findVariable(variableResult.name)) {
|
||||
logError(kErrorAlreadyDefined) << "variable '" << logFullName(variableResult.name) << "' already defined";
|
||||
break;
|
||||
if (module_->addVariable(variableResult)) {
|
||||
continue;
|
||||
}
|
||||
result_.variablesByName.insert(fullNameKey(variableResult.name), result_.variables.size());
|
||||
result_.variables.push_back(variableResult);
|
||||
continue;
|
||||
logError(kErrorAlreadyDefined) << "variable '" << logFullName(variableResult.name) << "' already defined";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!file_.atEnd()) {
|
||||
logErrorUnexpectedToken() << "using keyword, or struct definition, or variable definition";
|
||||
} else {
|
||||
noErrors = !failed();
|
||||
if (file_.atEnd()) {
|
||||
break;
|
||||
}
|
||||
logErrorUnexpectedToken() << "using keyword, or struct definition, or variable definition";
|
||||
} while (!failed());
|
||||
|
||||
if (noErrors) {
|
||||
result_.fullpath = QFileInfo(options_.inputPath).absoluteFilePath();
|
||||
if (failed()) {
|
||||
module_ = nullptr;
|
||||
}
|
||||
return noErrors;
|
||||
return !failed();
|
||||
}
|
||||
|
||||
common::LogStream ParsedFile::logErrorTypeMismatch() {
|
||||
return logError(kErrorTypeMismatch) << "type mismatch: ";
|
||||
}
|
||||
|
||||
structure::Module ParsedFile::readIncluded() {
|
||||
structure::Module result;
|
||||
ParsedFile::ModulePtr ParsedFile::readIncluded() {
|
||||
if (auto usingFile = assertNextToken(BasicType::String)) {
|
||||
if (assertNextToken(BasicType::Semicolon)) {
|
||||
ParsedFile included(includedOptions(tokenValue(usingFile)));
|
||||
if (included.read()) {
|
||||
result = included.data();
|
||||
return included.getResult();
|
||||
} else {
|
||||
logError(kErrorInIncluded) << "error while parsing '" << tokenValue(usingFile).toStdString() << "'";
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
structure::Struct ParsedFile::readStruct(const QString &name) {
|
||||
|
|
@ -268,7 +257,7 @@ structure::Type ParsedFile::readType() {
|
|||
result = builtInType;
|
||||
} else {
|
||||
auto fullName = composeFullName(name);
|
||||
if (findStruct(fullName)) {
|
||||
if (module_->findStruct(fullName)) {
|
||||
result.tag = structure::TypeTag::Struct;
|
||||
result.name = fullName;
|
||||
} else {
|
||||
|
|
@ -331,11 +320,17 @@ structure::Value ParsedFile::readStructValue() {
|
|||
}
|
||||
|
||||
structure::Value ParsedFile::defaultConstructedStruct(const structure::FullName &structName) {
|
||||
if (auto pattern = findStruct(structName)) {
|
||||
QList<structure::Variable> fields;
|
||||
if (auto pattern = module_->findStruct(structName)) {
|
||||
QList<structure::data::field> fields;
|
||||
fields.reserve(pattern->fields.size());
|
||||
for (const auto &fieldType : pattern->fields) {
|
||||
fields.push_back({ fieldType.name, { fieldType.type, Qt::Uninitialized } });
|
||||
fields.push_back({
|
||||
{ // variable
|
||||
fieldType.name,
|
||||
{ fieldType.type, Qt::Uninitialized }, // value
|
||||
},
|
||||
structure::data::field::Status::Uninitialized, // status
|
||||
});
|
||||
}
|
||||
return { structName, fields };
|
||||
}
|
||||
|
|
@ -343,14 +338,14 @@ structure::Value ParsedFile::defaultConstructedStruct(const structure::FullName
|
|||
}
|
||||
|
||||
void ParsedFile::applyStructParent(structure::Value &result, const structure::FullName &parentName) {
|
||||
if (auto parent = findVariable(parentName)) {
|
||||
if (auto parent = module_->findVariable(parentName)) {
|
||||
if (parent->value.type() != result.type()) {
|
||||
logErrorTypeMismatch() << "parent '" << logFullName(parentName) << "' has type '" << logType(parent->value.type()) << "' while child value has type " << logType(result.type());
|
||||
return;
|
||||
}
|
||||
|
||||
const auto *srcFields(parent->value.Complex());
|
||||
auto *dstFields(result.Complex());
|
||||
const auto *srcFields(parent->value.Fields());
|
||||
auto *dstFields(result.Fields());
|
||||
if (!srcFields || !dstFields) {
|
||||
logAssert(false) << "struct data check failed";
|
||||
return;
|
||||
|
|
@ -358,10 +353,17 @@ void ParsedFile::applyStructParent(structure::Value &result, const structure::Fu
|
|||
|
||||
logAssert(srcFields->size() == dstFields->size()) << "struct size check failed";
|
||||
for (int i = 0, s = srcFields->size(); i != s; ++i) {
|
||||
const auto &srcValue(srcFields->at(i).value);
|
||||
auto &dstValue((*dstFields)[i].value);
|
||||
logAssert(srcValue.type() == dstValue.type()) << "struct field type check failed";
|
||||
dstValue = srcValue;
|
||||
const auto &srcField(srcFields->at(i));
|
||||
auto &dstField((*dstFields)[i]);
|
||||
using Status = structure::data::field::Status;
|
||||
if (srcField.status == Status::Explicit ||
|
||||
dstField.status == Status::Uninitialized) {
|
||||
const auto &srcValue(srcField.variable.value);
|
||||
auto &dstValue(dstField.variable.value);
|
||||
logAssert(srcValue.type() == dstValue.type()) << "struct field type check failed";
|
||||
dstValue = srcValue;
|
||||
dstField.status = Status::Implicit;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
logError(kErrorIdentifierNotFound) << "parent '" << logFullName(parentName) << "' not found";
|
||||
|
|
@ -388,18 +390,19 @@ bool ParsedFile::readStructValueInner(structure::Value &result) {
|
|||
}
|
||||
|
||||
bool ParsedFile::assignStructField(structure::Value &result, const structure::Variable &field) {
|
||||
auto *fields = result.Complex();
|
||||
auto *fields = result.Fields();
|
||||
if (!fields) {
|
||||
logAssert(false) << "struct data check failed";
|
||||
return false;
|
||||
}
|
||||
for (auto &already : *fields) {
|
||||
if (already.name == field.name) {
|
||||
if (already.value.type() == field.value.type()) {
|
||||
already.value = field.value;
|
||||
if (already.variable.name == field.name) {
|
||||
if (already.variable.value.type() == field.value.type()) {
|
||||
already.variable.value = field.value;
|
||||
already.status = structure::data::field::Status::Explicit;
|
||||
return true;
|
||||
} else {
|
||||
logErrorTypeMismatch() << "field '" << logFullName(already.name) << "' has type '" << logType(already.value.type()) << "' while value has type '" << logType(field.value.type()) << "'";
|
||||
logErrorTypeMismatch() << "field '" << logFullName(already.variable.name) << "' has type '" << logType(already.variable.value.type()) << "' while value has type '" << logType(field.value.type()) << "'";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
@ -429,7 +432,7 @@ structure::Value ParsedFile::readPositiveValue() {
|
|||
if (numericToken.type == BasicType::Int) {
|
||||
return { structure::TypeTag::Int, tokenValue(numericToken).toInt() };
|
||||
} else if (numericToken.type == BasicType::Double) {
|
||||
return { tokenValue(numericToken).toDouble() };
|
||||
return { structure::TypeTag::Double, tokenValue(numericToken).toDouble() };
|
||||
} else if (numericToken.type == BasicType::Name) {
|
||||
auto value = tokenValue(numericToken);
|
||||
auto match = QRegularExpression("^\\d+px$").match(value);
|
||||
|
|
@ -717,7 +720,7 @@ structure::Value ParsedFile::readFontValue() {
|
|||
structure::Value ParsedFile::readCopyValue() {
|
||||
if (auto copyName = file_.getToken(BasicType::Name)) {
|
||||
structure::FullName name = { tokenValue(copyName) };
|
||||
if (auto variable = findVariable(name)) {
|
||||
if (auto variable = module_->findVariable(name)) {
|
||||
return variable->value.makeCopy(variable->name);
|
||||
}
|
||||
logError(kErrorIdentifierNotFound) << "identifier '" << logFullName(name) << "' not found";
|
||||
|
|
@ -725,48 +728,6 @@ structure::Value ParsedFile::readCopyValue() {
|
|||
return {};
|
||||
}
|
||||
|
||||
// Returns nullptr if there is no such struct in result_ or any of included modules.
|
||||
const structure::Struct *ParsedFile::findStruct(const structure::FullName &name) {
|
||||
if (auto result = findStructInModule(name, result_)) {
|
||||
return result;
|
||||
}
|
||||
for (const auto &included : result_.includes) {
|
||||
if (auto result = findStructInModule(name, included)) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const structure::Struct *ParsedFile::findStructInModule(const structure::FullName &name, const structure::Module &module) {
|
||||
auto index = module.structsByName.value(fullNameKey(name), -1);
|
||||
if (index < 0) {
|
||||
return nullptr;
|
||||
}
|
||||
return &module.structs.at(index);
|
||||
}
|
||||
|
||||
// Returns nullptr if there is no such variable in result_ or any of included modules.
|
||||
const structure::Variable *ParsedFile::findVariable(const structure::FullName &name) {
|
||||
if (auto result = findVariableInModule(name, result_)) {
|
||||
return result;
|
||||
}
|
||||
for (const auto &included : result_.includes) {
|
||||
if (auto result = findVariableInModule(name, included)) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
const structure::Variable *ParsedFile::findVariableInModule(const structure::FullName &name, const structure::Module &module) {
|
||||
auto index = module.variablesByName.value(fullNameKey(name), -1);
|
||||
if (index < 0) {
|
||||
return nullptr;
|
||||
}
|
||||
return &module.variables.at(index);
|
||||
}
|
||||
|
||||
BasicToken ParsedFile::assertNextToken(BasicToken::Type type) {
|
||||
auto result = file_.getToken(type);
|
||||
if (!result) {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
#include <string>
|
||||
#include "codegen/common/basic_tokenized_file.h"
|
||||
#include "codegen/style/options.h"
|
||||
#include "codegen/style/structure.h"
|
||||
#include "codegen/style/module.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
|
|
@ -32,14 +32,15 @@ namespace style {
|
|||
// Parses an input file to the internal struct.
|
||||
class ParsedFile {
|
||||
public:
|
||||
ParsedFile(const Options &options);
|
||||
explicit ParsedFile(const Options &options);
|
||||
ParsedFile(const ParsedFile &other) = delete;
|
||||
ParsedFile &operator=(const ParsedFile &other) = delete;
|
||||
|
||||
bool read();
|
||||
|
||||
const structure::Module &data() const {
|
||||
return result_;
|
||||
using ModulePtr = std::unique_ptr<structure::Module>;
|
||||
ModulePtr getResult() {
|
||||
return std::move(module_);
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
@ -66,7 +67,7 @@ private:
|
|||
}
|
||||
|
||||
// Helper methods for context-dependent reading.
|
||||
structure::Module readIncluded();
|
||||
ModulePtr readIncluded();
|
||||
structure::Struct readStruct(const QString &name);
|
||||
structure::Variable readVariable(const QString &name);
|
||||
|
||||
|
|
@ -96,14 +97,6 @@ private:
|
|||
structure::Value readFontValue();
|
||||
structure::Value readCopyValue();
|
||||
|
||||
// Returns nullptr if there is no such struct in result_ or any of included modules.
|
||||
const structure::Struct *findStruct(const structure::FullName &name);
|
||||
const structure::Struct *findStructInModule(const structure::FullName &name, const structure::Module &module);
|
||||
|
||||
// Returns nullptr if there is no such variable in result_ or any of included modules.
|
||||
const structure::Variable *findVariable(const structure::FullName &name);
|
||||
const structure::Variable *findVariableInModule(const structure::FullName &name, const structure::Module &module);
|
||||
|
||||
// Read next token and fire unexpected token error if it is not of "type".
|
||||
using BasicToken = common::BasicTokenizedFile::Token;
|
||||
BasicToken assertNextToken(BasicToken::Type type);
|
||||
|
|
@ -117,7 +110,7 @@ private:
|
|||
common::BasicTokenizedFile file_;
|
||||
Options options_;
|
||||
bool failed_ = false;
|
||||
structure::Module result_;
|
||||
ModulePtr module_;
|
||||
|
||||
QMap<std::string, structure::Type> typeNames_ = {
|
||||
{ "int" , { structure::TypeTag::Int } },
|
||||
|
|
|
|||
|
|
@ -0,0 +1,103 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/style/processor.h"
|
||||
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include "codegen/common/cpp_file.h"
|
||||
#include "codegen/style/parsed_file.h"
|
||||
#include "codegen/style/generator.h"
|
||||
#include "codegen/style/sprite_generator.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace {
|
||||
|
||||
constexpr int kErrorCantWritePath = 851;
|
||||
|
||||
QString destFileBaseName(const structure::Module &module) {
|
||||
return "style_" + QFileInfo(module.filepath()).baseName();
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
Processor::Processor(const Options &options)
|
||||
: parser_(std::make_unique<ParsedFile>(options))
|
||||
, options_(options) {
|
||||
}
|
||||
|
||||
int Processor::launch() {
|
||||
if (!parser_->read()) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
auto module = parser_->getResult();
|
||||
if (options_.rebuildDependencies) {
|
||||
bool result = module->enumIncludes([this](const structure::Module &included) -> bool {
|
||||
return write(included);
|
||||
});
|
||||
if (!result) {
|
||||
return -1;
|
||||
}
|
||||
} else if (!write(*module)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool Processor::write(const structure::Module &module) const {
|
||||
QDir dir(options_.outputPath);
|
||||
if (!dir.mkpath(".")) {
|
||||
common::logError(kErrorCantWritePath, "Command Line") << "can not open path for writing: " << dir.absolutePath().toStdString();
|
||||
return false;
|
||||
}
|
||||
|
||||
QFileInfo srcFile(module.filepath());
|
||||
QString dstFilePath = dir.absolutePath() + '/' + destFileBaseName(module);
|
||||
|
||||
common::ProjectInfo project = {
|
||||
"codegen_style",
|
||||
srcFile.fileName(),
|
||||
"stdafx.h",
|
||||
!options_.rebuildDependencies, // forceReGenerate
|
||||
};
|
||||
|
||||
SpriteGenerator spriteGenerator(module);
|
||||
if (!spriteGenerator.writeSprites()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Generator generator(module, dstFilePath, project);
|
||||
if (!generator.writeHeader()) {
|
||||
return false;
|
||||
}
|
||||
if (!generator.writeSource()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Processor::~Processor() = default;
|
||||
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <QtCore/QString>
|
||||
#include "codegen/style/options.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace structure {
|
||||
class Module;
|
||||
} // namespace structure
|
||||
class ParsedFile;
|
||||
|
||||
// Walks through a file, parses it and parses dependency files if necessary.
|
||||
// Uses Generator class to produce the final output.
|
||||
class Processor {
|
||||
public:
|
||||
explicit Processor(const Options &options);
|
||||
Processor(const Processor &other) = delete;
|
||||
Processor &operator=(const Processor &other) = delete;
|
||||
|
||||
// Returns 0 on success.
|
||||
int launch();
|
||||
|
||||
~Processor();
|
||||
|
||||
private:
|
||||
bool write(const structure::Module &module) const;
|
||||
|
||||
std::unique_ptr<ParsedFile> parser_;
|
||||
const Options &options_;
|
||||
|
||||
// List of files we need to generate with other instance of Generator.
|
||||
// It is not empty only if rebuild_ flag is true.
|
||||
QStringList dependenciesToGenerate_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
@ -0,0 +1,180 @@
|
|||
/*
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop version of Telegram messaging app, see https://telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
It is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
In addition, as a special exception, the copyright holders give permission
|
||||
to link the code of portions of this program with the OpenSSL library.
|
||||
|
||||
Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
|
||||
Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
||||
*/
|
||||
#include "codegen/style/sprite_generator.h"
|
||||
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QColor>
|
||||
#include <functional>
|
||||
#include "codegen/style/parsed_file.h"
|
||||
|
||||
using Module = codegen::style::structure::Module;
|
||||
using Struct = codegen::style::structure::Struct;
|
||||
using Variable = codegen::style::structure::Variable;
|
||||
using Tag = codegen::style::structure::TypeTag;
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
|
||||
using structure::logFullName;
|
||||
|
||||
namespace {
|
||||
|
||||
constexpr int kErrorFileNotFound = 881;
|
||||
constexpr int kErrorSpritesIntersect = 882;
|
||||
constexpr int kErrorCouldNotGenerate = 886;
|
||||
constexpr int kErrorCouldNotSerialize = 886;
|
||||
constexpr int kErrorCouldNotOpen = 886;
|
||||
constexpr int kErrorCouldNotWrite = 886;
|
||||
|
||||
} // namespace
|
||||
|
||||
SpriteGenerator::SpriteGenerator(const structure::Module &module)
|
||||
: module_(module)
|
||||
, basePath_(QFileInfo(module.filepath()).dir().absolutePath()) {
|
||||
}
|
||||
|
||||
bool SpriteGenerator::writeSprites() {
|
||||
if (!collectSprites()) {
|
||||
return false;
|
||||
}
|
||||
if (sprites_.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
sprite2x_ = QImage(basePath_ + "/art/sprite_200x.png");
|
||||
if (sprite2x_.isNull()) {
|
||||
common::logError(kErrorFileNotFound, "/art/sprite_200x.png") << "sprite file was not found";
|
||||
return false;
|
||||
}
|
||||
std::vector<int> sizes = { 5, 6 };
|
||||
std::vector<const char *> postfixes = { "125", "150" };
|
||||
for (int i = 0, l = sizes.size(); i < l; ++i) {
|
||||
auto sprite = generateSprite(sizes[i]);
|
||||
QString filepath = basePath_ + "/art/sprite_" + postfixes[i] + "x.png";
|
||||
if (sprite.isNull()) {
|
||||
common::logError(kErrorCouldNotGenerate, filepath) << "could not generate sprite file";
|
||||
return false;
|
||||
}
|
||||
QByteArray spriteData;
|
||||
{
|
||||
QBuffer spriteBuffer(&spriteData);
|
||||
if (!sprite.save(&spriteBuffer, "PNG")) {
|
||||
common::logError(kErrorCouldNotSerialize, filepath) << "could not serialize sprite file";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
QFile file(filepath);
|
||||
if (file.open(QIODevice::ReadOnly)) {
|
||||
if (file.readAll() == spriteData) {
|
||||
continue;
|
||||
}
|
||||
file.close();
|
||||
}
|
||||
if (!file.open(QIODevice::WriteOnly)) {
|
||||
common::logError(kErrorCouldNotOpen, filepath) << "could not open sprite file for write";
|
||||
return false;
|
||||
}
|
||||
if (file.write(spriteData) != spriteData.size()) {
|
||||
common::logError(kErrorCouldNotWrite, filepath) << "could not write sprite file";
|
||||
return false;
|
||||
}
|
||||
|
||||
// Touch resource file.
|
||||
filepath = basePath_ + "/telegram.qrc";
|
||||
QFile qrc(filepath);
|
||||
if (qrc.open(QIODevice::ReadOnly)) {
|
||||
auto qrcContent = qrc.readAll();
|
||||
qrc.close();
|
||||
if (!qrc.open(QIODevice::WriteOnly)) {
|
||||
common::logError(kErrorCouldNotOpen, filepath) << "could not open .qrc file for write";
|
||||
return false;
|
||||
}
|
||||
if (qrc.write(qrcContent) != qrcContent.size()) {
|
||||
common::logError(kErrorCouldNotWrite, filepath) << "could not write .qrc file";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SpriteGenerator::collectSprites() {
|
||||
std::function<bool(const Variable&)> collector = [this, &collector](const Variable &variable) {
|
||||
auto value = variable.value;
|
||||
if (value.type().tag == Tag::Sprite) {
|
||||
auto v(value.Sprite());
|
||||
if (!v.width || !v.height) return true;
|
||||
|
||||
QRect vRect(v.left, v.top, v.width, v.height);
|
||||
bool found = false;
|
||||
for (auto var : sprites_) {
|
||||
auto sprite = var.value.Sprite();
|
||||
QRect spriteRect(sprite.left, sprite.top, sprite.width, sprite.height);
|
||||
if (spriteRect == vRect) {
|
||||
found = true;
|
||||
} else if (spriteRect.intersects(vRect)) {
|
||||
common::logError(kErrorSpritesIntersect, module_.filepath()) << "sprite '" << logFullName(variable.name) << "' intersects with '" << logFullName(var.name) << "'";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
sprites_.push_back(variable);
|
||||
}
|
||||
} else if (value.type().tag == Tag::Struct) {
|
||||
auto fields = variable.value.Fields();
|
||||
if (!fields) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (auto field : *fields) {
|
||||
if (!collector(field.variable)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
return module_.enumVariables(collector);
|
||||
}
|
||||
|
||||
QImage SpriteGenerator::generateSprite(int scale) {
|
||||
auto convert = [scale](int value) -> int { return structure::data::pxAdjust(value, scale); };
|
||||
QImage result(convert(sprite2x_.width() / 2), convert(sprite2x_.height() / 2), sprite2x_.format());
|
||||
{
|
||||
QPainter p(&result);
|
||||
p.setCompositionMode(QPainter::CompositionMode_Source);
|
||||
p.fillRect(0, 0, result.width(), result.height(), QColor(0, 0, 0, 0));
|
||||
for (auto variable : sprites_) {
|
||||
auto sprite = variable.value.Sprite();
|
||||
auto copy = sprite2x_.copy(sprite.left * 2, sprite.top * 2, sprite.width * 2, sprite.height * 2);
|
||||
copy = copy.scaled(convert(sprite.width), convert(sprite.height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||
p.drawImage(convert(sprite.left), convert(sprite.top), copy);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
@ -20,55 +20,37 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
*/
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtGui/QImage>
|
||||
#include "codegen/style/structure_types.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace structure {
|
||||
|
||||
struct Variable {
|
||||
FullName name;
|
||||
Value value;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !name.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
struct StructField {
|
||||
FullName name;
|
||||
Type type;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !name.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
struct Struct {
|
||||
FullName name;
|
||||
QList<StructField> fields;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !name.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
struct Module {
|
||||
QString fullpath;
|
||||
QList<Module> includes;
|
||||
QList<Struct> structs;
|
||||
QList<Variable> variables;
|
||||
QMap<QString, int> structsByName;
|
||||
QMap<QString, int> variablesByName;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !fullpath.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
class Module;
|
||||
} // namespace structure
|
||||
|
||||
class SpriteGenerator {
|
||||
public:
|
||||
SpriteGenerator(const structure::Module &module);
|
||||
SpriteGenerator(const SpriteGenerator &other) = delete;
|
||||
SpriteGenerator &operator=(const SpriteGenerator &other) = delete;
|
||||
|
||||
bool writeSprites();
|
||||
|
||||
private:
|
||||
|
||||
bool collectSprites();
|
||||
QImage generateSprite(int scale); // scale = 5 for 125% and 6 for 150%.
|
||||
|
||||
const structure::Module &module_;
|
||||
QString basePath_;
|
||||
QImage sprite2x_;
|
||||
QList<structure::Variable> sprites_;
|
||||
|
||||
};
|
||||
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
@ -20,8 +20,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
*/
|
||||
#include "codegen/style/structure_types.h"
|
||||
|
||||
#include "codegen/style/structure.h"
|
||||
|
||||
namespace codegen {
|
||||
namespace style {
|
||||
namespace structure {
|
||||
|
|
@ -117,15 +115,15 @@ struct Value::DataTypes {
|
|||
data::font value_;
|
||||
|
||||
};
|
||||
class TComplex : public DataBase {
|
||||
class TFields : public DataBase {
|
||||
public:
|
||||
TComplex(data::complex value) : value_(value) {
|
||||
TFields(data::fields value) : value_(value) {
|
||||
}
|
||||
const data::complex *Complex() const override { return &value_; }
|
||||
data::complex *Complex() override { return &value_; }
|
||||
const data::fields *Fields() const override { return &value_; }
|
||||
data::fields *Fields() override { return &value_; }
|
||||
|
||||
private:
|
||||
data::complex value_;
|
||||
data::fields value_;
|
||||
|
||||
};
|
||||
};
|
||||
|
|
@ -133,9 +131,6 @@ struct Value::DataTypes {
|
|||
Value::Value() : Value(TypeTag::Invalid, std::make_shared<DataBase>()) {
|
||||
}
|
||||
|
||||
Value::Value(double value) : Value(TypeTag::Double, std::make_shared<DataTypes::TDouble>(value)) {
|
||||
}
|
||||
|
||||
Value::Value(data::point value) : Value(TypeTag::Point, std::make_shared<DataTypes::TPoint>(value)) {
|
||||
}
|
||||
|
||||
|
|
@ -154,9 +149,16 @@ Value::Value(data::margins value) : Value(TypeTag::Margins, std::make_shared<Dat
|
|||
Value::Value(data::font value) : Value(TypeTag::Font, std::make_shared<DataTypes::TFont>(value)) {
|
||||
}
|
||||
|
||||
Value::Value(const FullName &type, data::complex value)
|
||||
Value::Value(const FullName &type, data::fields value)
|
||||
: type_ { TypeTag::Struct, type }
|
||||
, data_(std::make_shared<DataTypes::TComplex>(value)) {
|
||||
, data_(std::make_shared<DataTypes::TFields>(value)) {
|
||||
}
|
||||
|
||||
Value::Value(TypeTag type, double value) : Value(type, std::make_shared<DataTypes::TDouble>(value)) {
|
||||
if (type_.tag != TypeTag::Double) {
|
||||
type_.tag = TypeTag::Invalid;
|
||||
data_ = std::make_shared<DataBase>();
|
||||
}
|
||||
}
|
||||
|
||||
Value::Value(TypeTag type, int value) : Value(type, std::make_shared<DataTypes::TInt>(value)) {
|
||||
|
|
@ -189,10 +191,10 @@ Value::Value(Type type, Qt::Initialization) : type_(type) {
|
|||
case TypeTag::Size: data_ = std::make_shared<DataTypes::TSize>(data::size { 0, 0 }); break;
|
||||
case TypeTag::Transition: data_ = std::make_shared<DataTypes::TString>("linear"); break;
|
||||
case TypeTag::Cursor: data_ = std::make_shared<DataTypes::TString>("default"); break;
|
||||
case TypeTag::Align: data_ = std::make_shared<DataTypes::TString>("left"); break;
|
||||
case TypeTag::Align: data_ = std::make_shared<DataTypes::TString>("topleft"); break;
|
||||
case TypeTag::Margins: data_ = std::make_shared<DataTypes::TMargins>(data::margins { 0, 0, 0, 0 }); break;
|
||||
case TypeTag::Font: data_ = std::make_shared<DataTypes::TFont>(data::font { "", 13, 0 }); break;
|
||||
case TypeTag::Struct: data_ = std::make_shared<DataTypes::TComplex>(data::complex {}); break;
|
||||
case TypeTag::Struct: data_ = std::make_shared<DataTypes::TFields>(data::fields {}); break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,9 @@ namespace structure {
|
|||
|
||||
// List of names, like overview.document.bg
|
||||
using FullName = QStringList;
|
||||
inline std::string logFullName(const FullName &name) {
|
||||
return name.join('.').toStdString();
|
||||
}
|
||||
|
||||
struct Variable;
|
||||
|
||||
|
|
@ -68,6 +71,10 @@ inline bool operator!=(const Type &a, const Type &b) {
|
|||
|
||||
namespace data {
|
||||
|
||||
inline int pxAdjust(int value, int scale) {
|
||||
return qRound((value * scale / 4.) + (value > 0 ? -0.01 : 0.01));
|
||||
}
|
||||
|
||||
struct point {
|
||||
int x, y;
|
||||
};
|
||||
|
|
@ -85,29 +92,32 @@ struct margins {
|
|||
};
|
||||
struct font {
|
||||
enum Flag {
|
||||
Bold = 0x01,
|
||||
Italic = 0x02,
|
||||
Bold = 0x01,
|
||||
Italic = 0x02,
|
||||
Underline = 0x04,
|
||||
};
|
||||
std::string family;
|
||||
int size;
|
||||
int flags;
|
||||
};
|
||||
using complex = QList<Variable>;
|
||||
struct field; // defined after Variable is defined
|
||||
using fields = QList<field>;
|
||||
|
||||
} // namespace data
|
||||
|
||||
class Value {
|
||||
public:
|
||||
Value();
|
||||
Value(double value);
|
||||
Value(data::point value);
|
||||
Value(data::sprite value);
|
||||
Value(data::size value);
|
||||
Value(data::color value);
|
||||
Value(data::margins value);
|
||||
Value(data::font value);
|
||||
Value(const FullName &type, data::complex value);
|
||||
Value(const FullName &type, data::fields value);
|
||||
|
||||
// Can be only double.
|
||||
Value(TypeTag type, double value);
|
||||
|
||||
// Can be int / pixels.
|
||||
Value(TypeTag type, int value);
|
||||
|
|
@ -128,8 +138,8 @@ public:
|
|||
data::color Color() const { return data_->Color(); };
|
||||
data::margins Margins() const { return data_->Margins(); };
|
||||
data::font Font() const { return data_->Font(); };
|
||||
const data::complex *Complex() const { return data_->Complex(); };
|
||||
data::complex *Complex() { return data_->Complex(); };
|
||||
const data::fields *Fields() const { return data_->Fields(); };
|
||||
data::fields *Fields() { return data_->Fields(); };
|
||||
|
||||
explicit operator bool() const {
|
||||
return type_.tag != TypeTag::Invalid;
|
||||
|
|
@ -141,6 +151,10 @@ public:
|
|||
return result;
|
||||
}
|
||||
|
||||
const FullName ©Of() const {
|
||||
return copyOf_;
|
||||
}
|
||||
|
||||
private:
|
||||
class DataBase {
|
||||
public:
|
||||
|
|
@ -153,8 +167,8 @@ private:
|
|||
virtual data::color Color() const { return {}; };
|
||||
virtual data::margins Margins() const { return {}; };
|
||||
virtual data::font Font() const { return {}; };
|
||||
virtual const data::complex *Complex() const { return nullptr; };
|
||||
virtual data::complex *Complex() { return nullptr; };
|
||||
virtual const data::fields *Fields() const { return nullptr; };
|
||||
virtual data::fields *Fields() { return nullptr; };
|
||||
virtual ~DataBase() {
|
||||
}
|
||||
};
|
||||
|
|
@ -169,6 +183,45 @@ private:
|
|||
|
||||
};
|
||||
|
||||
struct Variable {
|
||||
FullName name;
|
||||
Value value;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !name.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
namespace data {
|
||||
struct field {
|
||||
enum class Status {
|
||||
Uninitialized,
|
||||
Implicit,
|
||||
Explicit
|
||||
};
|
||||
Variable variable;
|
||||
Status status;
|
||||
};
|
||||
} // namespace data
|
||||
|
||||
struct StructField {
|
||||
FullName name;
|
||||
Type type;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !name.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
struct Struct {
|
||||
FullName name;
|
||||
QList<StructField> fields;
|
||||
|
||||
explicit operator bool() const {
|
||||
return !name.isEmpty();
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace structure
|
||||
} // namespace style
|
||||
} // namespace codegen
|
||||
|
|
|
|||
|
|
@ -813,8 +813,7 @@ inline QSharedPointer<T> MakeShared(Args&&... args) {
|
|||
template <typename T>
|
||||
class NeverFreedPointer {
|
||||
public:
|
||||
explicit NeverFreedPointer() {
|
||||
}
|
||||
NeverFreedPointer() = default;
|
||||
NeverFreedPointer(const NeverFreedPointer<T> &other) = delete;
|
||||
NeverFreedPointer &operator=(const NeverFreedPointer<T> &other) = delete;
|
||||
|
||||
|
|
@ -861,7 +860,7 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
T *_p = nullptr;
|
||||
T *_p;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2876,7 +2876,7 @@ void EmojiPan::paintEvent(QPaintEvent *e) {
|
|||
}
|
||||
|
||||
if (rtl()) selx = width() - selx - st::rbEmoji.width;
|
||||
p.setOpacity(skip ? qMax(1., selx / (skip * st::rbEmoji.width)) : 1.);
|
||||
p.setOpacity(skip ? qMax(1., selx / float64(skip * st::rbEmoji.width)) : 1.);
|
||||
p.fillRect(selx, _iconsTop + st::rbEmoji.height - st::stickerIconPadding, st::rbEmoji.width, st::stickerIconSel, st::stickerIconSelColor);
|
||||
|
||||
float64 o_left = snap(float64(_iconsX.current()) / st::stickerIconLeft.pxWidth(), 0., 1.);
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ void BoxButton::resizeToText() {
|
|||
resize(_textWidth - _st.width, _st.height);
|
||||
} else {
|
||||
if (_st.width < _textWidth + (_st.height - _st.font->height)) {
|
||||
_text = _st.font->elided(_fullText, qMax(_st.width - (_st.height - _st.font->height), 1.));
|
||||
_text = _st.font->elided(_fullText, qMax(_st.width - (_st.height - _st.font->height), 1));
|
||||
_textWidth = _st.font->width(_text);
|
||||
}
|
||||
resize(_st.width, _st.height);
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ Checkbox::Checkbox(QWidget *parent, const QString &text, bool checked, const sty
|
|||
resize(_textWidth - _st.width, _st.height);
|
||||
} else {
|
||||
if (_st.width < _st.textPosition.x() + _textWidth + (_st.textPosition.x() - _st.diameter)) {
|
||||
_text = _st.font->elided(_fullText, qMax(_st.width - (_st.textPosition.x() + (_st.textPosition.x() - _st.diameter)), 1.));
|
||||
_text = _st.font->elided(_fullText, qMax(_st.width - (_st.textPosition.x() + (_st.textPosition.x() - _st.diameter)), 1));
|
||||
_textWidth = _st.font->width(_text);
|
||||
}
|
||||
resize(_st.width, _st.height);
|
||||
|
|
@ -392,7 +392,7 @@ Radiobutton::Radiobutton(QWidget *parent, const QString &group, int32 value, con
|
|||
resize(_textWidth - _st.width, _st.height);
|
||||
} else {
|
||||
if (_st.width < _st.textPosition.x() + _textWidth + (_st.textPosition.x() - _st.diameter)) {
|
||||
_text = _st.font->elided(_fullText, qMax(_st.width - (_st.textPosition.x() + (_st.textPosition.x() - _st.diameter)), 1.));
|
||||
_text = _st.font->elided(_fullText, qMax(_st.width - (_st.textPosition.x() + (_st.textPosition.x() - _st.diameter)), 1));
|
||||
_textWidth = _st.font->width(_text);
|
||||
}
|
||||
resize(_st.width, _st.height);
|
||||
|
|
|
|||
|
|
@ -21,5 +21,5 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
#pragma once
|
||||
|
||||
#include "ui/style_core.h"
|
||||
#include "GeneratedFiles/style_classes.h"
|
||||
#include "GeneratedFiles/style_auto.h"
|
||||
#include "GeneratedFiles/styles/style_basic_types.h"
|
||||
#include "GeneratedFiles/styles/style_basic.h"
|
||||
|
|
|
|||
|
|
@ -20,13 +20,63 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
|
|||
*/
|
||||
#include "stdafx.h"
|
||||
|
||||
namespace style {
|
||||
namespace {
|
||||
typedef QMap<QString, uint32> FontFamilyMap;
|
||||
FontFamilyMap _fontFamilyMap;
|
||||
using ModulesList = QList<internal::ModuleBase*>;
|
||||
NeverFreedPointer<ModulesList> styleModules;
|
||||
|
||||
typedef QMap<QString, int> FontFamilyMap;
|
||||
FontFamilyMap fontFamilyMap;
|
||||
|
||||
typedef QVector<QString> FontFamilies;
|
||||
FontFamilies _fontFamilies;
|
||||
|
||||
typedef QMap<uint32, FontData*> FontDatas;
|
||||
FontDatas fontsMap;
|
||||
|
||||
typedef QMap<uint32, ColorData*> ColorDatas;
|
||||
ColorDatas colorsMap;
|
||||
|
||||
int spriteWidthValue = 0;
|
||||
QPixmap *spriteData = nullptr;
|
||||
|
||||
inline uint32 fontKey(int size, uint32 flags, int family) {
|
||||
return (((uint32(family) << 10) | uint32(size)) << 3) | flags;
|
||||
}
|
||||
|
||||
namespace style {
|
||||
FontData::FontData(uint32 size, uint32 flags, uint32 family, Font *other) : f(_fontFamilies[family]), m(f), _size(size), _flags(flags), _family(family) {
|
||||
} // namespace
|
||||
|
||||
namespace internal {
|
||||
|
||||
void registerModule(ModuleBase *module) {
|
||||
styleModules.makeIfNull();
|
||||
styleModules->push_back(module);
|
||||
}
|
||||
|
||||
void unregisterModule(ModuleBase *module) {
|
||||
styleModules->removeOne(module);
|
||||
if (styleModules->isEmpty()) {
|
||||
styleModules.clear();
|
||||
}
|
||||
}
|
||||
|
||||
int registerFontFamily(const QString &family) {
|
||||
auto result = fontFamilyMap.value(family, -1);
|
||||
if (result < 0) {
|
||||
result = _fontFamilies.size();
|
||||
fontFamilyMap.insert(family, result);
|
||||
_fontFamilies.push_back(family);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
int spriteWidth() {
|
||||
return spriteWidthValue;
|
||||
}
|
||||
|
||||
} // namespace internal
|
||||
|
||||
FontData::FontData(int size, uint32 flags, int family, Font *other) : f(_fontFamilies[family]), m(f), _size(size), _flags(flags), _family(family) {
|
||||
if (other) {
|
||||
memcpy(modified, other, sizeof(modified));
|
||||
} else {
|
||||
|
|
@ -60,7 +110,7 @@ namespace style {
|
|||
return otherFlagsFont(FontUnderline, set);
|
||||
}
|
||||
|
||||
uint32 FontData::size() const {
|
||||
int FontData::size() const {
|
||||
return _size;
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +118,7 @@ namespace style {
|
|||
return _flags;
|
||||
}
|
||||
|
||||
uint32 FontData::family() const {
|
||||
int FontData::family() const {
|
||||
return _family;
|
||||
}
|
||||
|
||||
|
|
@ -80,34 +130,34 @@ namespace style {
|
|||
return modified[newFlags];
|
||||
}
|
||||
|
||||
Font::Font(uint32 size, uint32 flags, const QString &family) {
|
||||
if (_fontFamilyMap.isEmpty()) {
|
||||
Font::Font(int size, uint32 flags, const QString &family) {
|
||||
if (fontFamilyMap.isEmpty()) {
|
||||
for (uint32 i = 0, s = style::_fontFamilies.size(); i != s; ++i) {
|
||||
_fontFamilyMap.insert(style::_fontFamilies.at(i), i);
|
||||
fontFamilyMap.insert(style::_fontFamilies.at(i), i);
|
||||
}
|
||||
}
|
||||
|
||||
FontFamilyMap::const_iterator i = _fontFamilyMap.constFind(family);
|
||||
if (i == _fontFamilyMap.cend()) {
|
||||
auto i = fontFamilyMap.constFind(family);
|
||||
if (i == fontFamilyMap.cend()) {
|
||||
style::_fontFamilies.push_back(family);
|
||||
i = _fontFamilyMap.insert(family, style::_fontFamilies.size() - 1);
|
||||
i = fontFamilyMap.insert(family, style::_fontFamilies.size() - 1);
|
||||
}
|
||||
init(size, flags, i.value(), 0);
|
||||
}
|
||||
|
||||
Font::Font(uint32 size, uint32 flags, uint32 family) {
|
||||
Font::Font(int size, uint32 flags, int family) {
|
||||
init(size, flags, family, 0);
|
||||
}
|
||||
|
||||
Font::Font(uint32 size, uint32 flags, uint32 family, Font *modified) {
|
||||
Font::Font(int size, uint32 flags, int family, Font *modified) {
|
||||
init(size, flags, family, modified);
|
||||
}
|
||||
|
||||
void Font::init(uint32 size, uint32 flags, uint32 family, Font *modified) {
|
||||
uint32 key = _fontKey(size, flags, family);
|
||||
FontDatas::const_iterator i = _fontsMap.constFind(key);
|
||||
if (i == _fontsMap.cend()) {
|
||||
i = _fontsMap.insert(key, new FontData(size, flags, family, modified));
|
||||
void Font::init(int size, uint32 flags, int family, Font *modified) {
|
||||
uint32 key = fontKey(size, flags, family);
|
||||
auto i = fontsMap.constFind(key);
|
||||
if (i == fontsMap.cend()) {
|
||||
i = fontsMap.insert(key, new FontData(size, flags, family, modified));
|
||||
}
|
||||
ptr = i.value();
|
||||
}
|
||||
|
|
@ -141,9 +191,9 @@ namespace style {
|
|||
}
|
||||
void Color::init(uchar r, uchar g, uchar b, uchar a) {
|
||||
uint32 key = colorKey(r, g, b, a);
|
||||
ColorDatas::const_iterator i = _colorsMap.constFind(key);
|
||||
if (i == _colorsMap.cend()) {
|
||||
i = _colorsMap.insert(key, new ColorData(r, g, b, a));
|
||||
auto i = colorsMap.constFind(key);
|
||||
if (i == colorsMap.cend()) {
|
||||
i = colorsMap.insert(key, new ColorData(r, g, b, a));
|
||||
}
|
||||
ptr = i.value();
|
||||
}
|
||||
|
|
@ -163,16 +213,57 @@ namespace style {
|
|||
b = QBrush(color);
|
||||
}
|
||||
|
||||
void stopManager() {
|
||||
for (FontDatas::const_iterator i = _fontsMap.cbegin(), e = _fontsMap.cend(); i != e; ++i) {
|
||||
delete i.value();
|
||||
void startManager() {
|
||||
if (cRetina()) {
|
||||
cSetRealScale(dbisOne);
|
||||
}
|
||||
_fontsMap.clear();
|
||||
|
||||
for (ColorDatas::const_iterator i = _colorsMap.cbegin(), e = _colorsMap.cend(); i != e; ++i) {
|
||||
delete i.value();
|
||||
internal::registerFontFamily(qsl("Open Sans"));
|
||||
QString spriteFilePostfix;
|
||||
if (cRetina() || cScale() == dbisTwo) {
|
||||
spriteFilePostfix = qsl("_200x");
|
||||
} else if (cScale() == dbisOneAndQuarter) {
|
||||
spriteFilePostfix = qsl("_125x");
|
||||
} else if (cScale() == dbisOneAndHalf) {
|
||||
spriteFilePostfix = qsl("_150x");
|
||||
}
|
||||
_colorsMap.clear();
|
||||
QString spriteFile = qsl(":/gui/art/sprite") + spriteFilePostfix + qsl(".png");
|
||||
if (rtl()) {
|
||||
spriteData = new QPixmap(QPixmap::fromImage(QImage(spriteFile).mirrored(true, false)));
|
||||
} else {
|
||||
spriteData = new QPixmap(spriteFile);
|
||||
}
|
||||
if (cRetina()) spriteData->setDevicePixelRatio(cRetinaFactor());
|
||||
spriteWidthValue = spriteData->width();
|
||||
|
||||
if (styleModules) {
|
||||
for_const (auto module, *styleModules) {
|
||||
module->start();
|
||||
}
|
||||
}
|
||||
_fontFamilies.push_back(qsl("Open Sans"));
|
||||
}
|
||||
|
||||
void stopManager() {
|
||||
if (styleModules) {
|
||||
for_const (auto module, *styleModules) {
|
||||
module->stop();
|
||||
}
|
||||
}
|
||||
|
||||
for (auto fontData : fontsMap) {
|
||||
delete fontData;
|
||||
}
|
||||
fontsMap.clear();
|
||||
|
||||
for (auto colorData : colorsMap) {
|
||||
delete colorData;
|
||||
}
|
||||
colorsMap.clear();
|
||||
}
|
||||
|
||||
const QPixmap &spritePixmap() {
|
||||
return *spriteData;
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -46,14 +46,31 @@ inline QRect centerrect(const QRect &inRect, const QRect &rect) {
|
|||
}
|
||||
|
||||
namespace style {
|
||||
namespace internal {
|
||||
|
||||
// Objects of derived classes are created in global scope.
|
||||
// They call [un]registerModule() in [de|con]structor.
|
||||
class ModuleBase {
|
||||
public:
|
||||
virtual void start() = 0;
|
||||
virtual void stop() = 0;
|
||||
};
|
||||
void registerModule(ModuleBase *module);
|
||||
void unregisterModule(ModuleBase *module);
|
||||
|
||||
int registerFontFamily(const QString &family);
|
||||
|
||||
int spriteWidth();
|
||||
|
||||
} // namespace internal
|
||||
|
||||
class FontData;
|
||||
class Font {
|
||||
public:
|
||||
Font(Qt::Initialization = Qt::Uninitialized) : ptr(0) {
|
||||
}
|
||||
Font(uint32 size, uint32 flags, const QString &family);
|
||||
Font(uint32 size, uint32 flags = 0, uint32 family = 0);
|
||||
Font(int size, uint32 flags, const QString &family);
|
||||
Font(int size, uint32 flags = 0, int family = 0);
|
||||
|
||||
Font &operator=(const Font &other) {
|
||||
ptr = other.ptr;
|
||||
|
|
@ -76,36 +93,24 @@ namespace style {
|
|||
private:
|
||||
FontData *ptr;
|
||||
|
||||
void init(uint32 size, uint32 flags, uint32 family, Font *modified);
|
||||
void init(int size, uint32 flags, int family, Font *modified);
|
||||
friend void startManager();
|
||||
|
||||
Font(FontData *p) : ptr(p) {
|
||||
}
|
||||
Font(uint32 size, uint32 flags, uint32 family, Font *modified);
|
||||
Font(int size, uint32 flags, int family, Font *modified);
|
||||
friend class FontData;
|
||||
|
||||
};
|
||||
|
||||
enum FontFlagBits {
|
||||
FontBoldBit,
|
||||
FontItalicBit,
|
||||
FontUnderlineBit,
|
||||
|
||||
FontFlagsBits
|
||||
};
|
||||
|
||||
enum FontFlags {
|
||||
FontBold = (1 << FontBoldBit),
|
||||
FontItalic = (1 << FontItalicBit),
|
||||
FontUnderline = (1 << FontUnderlineBit),
|
||||
FontBold = 0x01,
|
||||
FontItalic = 0x02,
|
||||
FontUnderline = 0x04,
|
||||
|
||||
FontDifferentFlags = (1 << FontFlagsBits)
|
||||
FontDifferentFlags = 0x08,
|
||||
};
|
||||
|
||||
inline uint32 _fontKey(uint32 size, uint32 flags, uint32 family) {
|
||||
return (((family << 10) | size) << FontFlagsBits) | flags;
|
||||
}
|
||||
|
||||
class FontData {
|
||||
public:
|
||||
|
||||
|
|
@ -126,9 +131,9 @@ namespace style {
|
|||
Font italic(bool set = true) const;
|
||||
Font underline(bool set = true) const;
|
||||
|
||||
uint32 size() const;
|
||||
int size() const;
|
||||
uint32 flags() const;
|
||||
uint32 family() const;
|
||||
int family() const;
|
||||
|
||||
QFont f;
|
||||
QFontMetrics m;
|
||||
|
|
@ -138,10 +143,12 @@ namespace style {
|
|||
mutable Font modified[FontDifferentFlags];
|
||||
|
||||
Font otherFlagsFont(uint32 flag, bool set) const;
|
||||
FontData(uint32 size, uint32 flags, uint32 family, Font *other);
|
||||
FontData(int size, uint32 flags, int family, Font *other);
|
||||
|
||||
friend class Font;
|
||||
uint32 _size, _flags, _family;
|
||||
int _size;
|
||||
uint32 _flags;
|
||||
int _family;
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -159,7 +166,7 @@ namespace style {
|
|||
class ColorData;
|
||||
class Color {
|
||||
public:
|
||||
Color(Qt::Initialization = Qt::Uninitialized) : ptr(0), owner(false) {
|
||||
Color(Qt::Initialization = Qt::Uninitialized) {
|
||||
}
|
||||
Color(const Color &c);
|
||||
Color(const QColor &c);
|
||||
|
|
@ -185,8 +192,8 @@ namespace style {
|
|||
}
|
||||
|
||||
private:
|
||||
ColorData *ptr;
|
||||
bool owner;
|
||||
ColorData *ptr = nullptr;
|
||||
bool owner = false;
|
||||
|
||||
void init(uchar r, uchar g, uchar b, uchar a);
|
||||
|
||||
|
|
@ -233,17 +240,6 @@ namespace style {
|
|||
return ptr->p;
|
||||
}
|
||||
|
||||
typedef QVector<QString> FontFamilies;
|
||||
extern FontFamilies _fontFamilies;
|
||||
|
||||
typedef QMap<uint32, FontData*> FontDatas;
|
||||
extern FontDatas _fontsMap;
|
||||
|
||||
typedef QMap<uint32, ColorData*> ColorDatas;
|
||||
extern ColorDatas _colorsMap;
|
||||
|
||||
extern int _spriteWidth;
|
||||
|
||||
typedef float64 number;
|
||||
typedef QString string;
|
||||
typedef QRect rect;
|
||||
|
|
@ -252,7 +248,7 @@ namespace style {
|
|||
public:
|
||||
sprite() {
|
||||
}
|
||||
sprite(int left, int top, int width, int height) : rect(rtl() ? (_spriteWidth - left - width) : left, top, width, height) {
|
||||
sprite(int left, int top, int width, int height) : rect(rtl() ? (internal::spriteWidth() - left - width) : left, top, width, height) {
|
||||
}
|
||||
inline int pxWidth() const {
|
||||
return rect::width() / cIntRetinaFactor();
|
||||
|
|
@ -314,8 +310,9 @@ namespace style {
|
|||
|
||||
void startManager();
|
||||
void stopManager();
|
||||
const QPixmap &spritePixmap();
|
||||
|
||||
};
|
||||
} // namespace style
|
||||
|
||||
inline QRect centersprite(const QRect &inRect, const style::sprite &sprite) {
|
||||
return centerrect(inRect, QRect(QPoint(0, 0), sprite.pxSize()));
|
||||
|
|
|
|||
|
|
@ -1051,7 +1051,13 @@
|
|||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\style_auto.cpp" />
|
||||
<ClCompile Include="GeneratedFiles\styles\style_basic.cpp" />
|
||||
<ClCompile Include="GeneratedFiles\styles\style_basic_types.cpp" />
|
||||
<ClCompile Include="GeneratedFiles\style_auto.cpp">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="SourceFiles\apiwrap.cpp" />
|
||||
<ClCompile Include="SourceFiles\app.cpp" />
|
||||
<ClCompile Include="SourceFiles\application.cpp" />
|
||||
|
|
@ -1245,6 +1251,8 @@
|
|||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/core/basic_types.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\openssl\Release\include" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\..\..\Libraries\breakpad\src" "-I.\ThirdParty\minizip" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I.\..\..\Libraries\QtStatic\qtbase\include\QtCore\5.5.1\QtCore" "-I.\..\..\Libraries\QtStatic\qtbase\include\QtGui\5.5.1\QtGui"</Command>
|
||||
</CustomBuild>
|
||||
<ClInclude Include="GeneratedFiles\styles\style_basic.h" />
|
||||
<ClInclude Include="GeneratedFiles\styles\style_basic_types.h" />
|
||||
<ClInclude Include="SourceFiles\core\click_handler.h" />
|
||||
<ClInclude Include="SourceFiles\core\click_handler_types.h" />
|
||||
<ClInclude Include="SourceFiles\dialogs\dialogs_common.h" />
|
||||
|
|
@ -1608,8 +1616,16 @@
|
|||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
</CustomBuild>
|
||||
<ClInclude Include="GeneratedFiles\lang_auto.h" />
|
||||
<ClInclude Include="GeneratedFiles\style_auto.h" />
|
||||
<ClInclude Include="GeneratedFiles\style_classes.h" />
|
||||
<ClInclude Include="GeneratedFiles\style_auto.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GeneratedFiles\style_classes.h">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</ClInclude>
|
||||
<ClInclude Include="resource.h" />
|
||||
<CustomBuild Include="SourceFiles\apiwrap.h">
|
||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
|
||||
|
|
@ -2379,7 +2395,13 @@
|
|||
<None Include="Version" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CodegenStyleItem Include="Resources\all_files.style" />
|
||||
<CodegenStyleItem Include="Resources\all_files.style">
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">true</ExcludedFromBuild>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
</CodegenStyleItem>
|
||||
<CodegenStyleItem Include="Resources\basic.style" />
|
||||
<CodegenStyleItem Include="Resources\basic_types.style" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
|
|||
|
|
@ -82,6 +82,9 @@
|
|||
<Extensions>cpp;moc</Extensions>
|
||||
<SourceControlFiles>False</SourceControlFiles>
|
||||
</Filter>
|
||||
<Filter Include="GeneratedFiles\styles">
|
||||
<UniqueIdentifier>{3397dfda-79f1-4a4c-940b-be26b001baf5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="SourceFiles\main.cpp">
|
||||
|
|
@ -1077,6 +1080,12 @@
|
|||
<ClCompile Include="SourceFiles\ui\text\text_block.cpp">
|
||||
<Filter>SourceFiles\ui\text</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\styles\style_basic.cpp">
|
||||
<Filter>GeneratedFiles\styles</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="GeneratedFiles\styles\style_basic_types.cpp">
|
||||
<Filter>GeneratedFiles\styles</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="SourceFiles\stdafx.h">
|
||||
|
|
@ -1235,6 +1244,12 @@
|
|||
<ClInclude Include="SourceFiles\ui\text\text_block.h">
|
||||
<Filter>SourceFiles\ui\text</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GeneratedFiles\styles\style_basic.h">
|
||||
<Filter>GeneratedFiles\styles</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="GeneratedFiles\styles\style_basic_types.h">
|
||||
<Filter>GeneratedFiles\styles</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuild Include="SourceFiles\application.h">
|
||||
|
|
@ -1539,5 +1554,11 @@
|
|||
<CodegenStyleItem Include="Resources\all_files.style">
|
||||
<Filter>Resources</Filter>
|
||||
</CodegenStyleItem>
|
||||
<CodegenStyleItem Include="Resources\basic.style">
|
||||
<Filter>Resources</Filter>
|
||||
</CodegenStyleItem>
|
||||
<CodegenStyleItem Include="Resources\basic_types.style">
|
||||
<Filter>Resources</Filter>
|
||||
</CodegenStyleItem>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\basic_tokenized_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\checked_utf8_string.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\clean_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\cpp_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\logging.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\generator.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\main.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\options.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\parsed_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\processor.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\basic_tokenized_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\checked_utf8_string.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\clean_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\clean_file_reader.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\const_utf8_string.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\cpp_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\logging.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\generator.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\options.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\parsed_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\processor.h" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{7C25BFBD-7930-4DE2-AF33-27CE1CC521E6}</ProjectGuid>
|
||||
<Keyword>Qt4VSv1.0</Keyword>
|
||||
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>14.0.24730.2</_ProjectFileVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>$(SolutionDir)$(Platform)\codegen\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>$(SolutionDir)$(Platform)\codegen\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)$(Platform)\obj\$(ProjectName)\$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>UNICODE;WIN32;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);.\..\..\..\SourceFiles;$(QTDIR)\include\QtCore;.\..\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<AdditionalOptions>/w44062 /wd4127 %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>ws2_32.lib;qtmaind.lib;qtharfbuzzngd.lib;qtpcred.lib;qtfreetyped.lib;Qt5Cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>UNICODE;WIN32;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DebugInformationFormat />
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);.\..\..\..\SourceFiles;$(QTDIR)\include\QtCore;.\..\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<AdditionalOptions>/w44062 /wd4127 %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>ws2_32.lib;qtmain.lib;qtharfbuzzng.lib;qtpcre.lib;qtfreetype.lib;Qt5Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties MocDir=".\GeneratedFiles\$(ConfigurationName)" UicDir=".\GeneratedFiles" RccDir=".\GeneratedFiles" lupdateOptions="" lupdateOnBuild="0" lreleaseOptions="" Qt5Version_x0020_Win32="QtStatic" MocOptions="" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="src">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;cxx;c;def</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="src\common">
|
||||
<UniqueIdentifier>{77524fac-2d55-437d-810f-c271326c7f95}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="src\numbers">
|
||||
<UniqueIdentifier>{48ba9931-338f-4476-8d83-600d0ac4440e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\basic_tokenized_file.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\checked_utf8_string.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\clean_file.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\cpp_file.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\logging.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\main.cpp">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\options.cpp">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\processor.cpp">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\parsed_file.cpp">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\numbers\generator.cpp">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\basic_tokenized_file.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\checked_utf8_string.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\clean_file.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\clean_file_reader.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\const_utf8_string.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\cpp_file.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\logging.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\options.h">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\processor.h">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\parsed_file.h">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\numbers\generator.h">
|
||||
<Filter>src\numbers</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -15,6 +15,6 @@
|
|||
Inputs="%(CodegenStyleItem.Identity)"
|
||||
Outputs=".\GeneratedFiles\styles\style_%(CodegenStyleItem.Filename).h;.\GeneratedFiles\styles\style_%(CodegenStyleItem.Filename).cpp">
|
||||
<Message Text="Generating style: %(CodegenStyleItem.Identity)" />
|
||||
<Exec Command="$(SolutionDir)$(Platform)\codegen\$(Configuration)\codegen_style.exe %(CodegenStyleItem.Identity)"/>
|
||||
<Exec Command="$(SolutionDir)$(Platform)\codegen\$(Configuration)\codegen_style.exe "-I.\SourceFiles" "-o.\GeneratedFiles\styles" %(CodegenStyleItem.Identity)"/>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -14,11 +14,15 @@
|
|||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\checked_utf8_string.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\basic_tokenized_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\clean_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\cpp_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\logging.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\generator.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\processor.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\module.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\options.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\parsed_file.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\main.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\sprite_generator.cpp" />
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\structure_types.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -27,11 +31,14 @@
|
|||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\basic_tokenized_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\clean_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\const_utf8_string.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\cpp_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\logging.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\generator.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\processor.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\options.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\structure.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\module.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\parsed_file.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\sprite_generator.h" />
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\structure_types.h" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
|
|
@ -86,7 +93,7 @@
|
|||
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>ws2_32.lib;qtmaind.lib;qtharfbuzzngd.lib;qtpcred.lib;qtfreetyped.lib;imageformats\qwebpd.lib;Qt5Cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;qtmaind.lib;qtharfbuzzngd.lib;qtpcred.lib;qtfreetyped.lib;imageformats\qwebpd.lib;Qt5Cored.lib;Qt5Guid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
|
|
@ -94,7 +101,7 @@
|
|||
<PreprocessorDefinitions>UNICODE;WIN32;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<DebugInformationFormat />
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);.\..\..\..\SourceFiles;$(QTDIR)\include\QtCore;.\..\%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
|
|
@ -105,7 +112,7 @@
|
|||
<OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<AdditionalDependencies>qtmain.lib;Qt5Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>ws2_32.lib;qtmain.lib;qtharfbuzzng.lib;qtpcre.lib;qtfreetype.lib;imageformats\qwebp.lib;Qt5Core.lib;Qt5Gui.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
|
|
|||
|
|
@ -22,9 +22,6 @@
|
|||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\logging.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\generator.cpp">
|
||||
<Filter>src\style</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\clean_file.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -40,11 +37,23 @@
|
|||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\structure_types.cpp">
|
||||
<Filter>src\style</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\module.cpp">
|
||||
<Filter>src\style</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\common\cpp_file.cpp">
|
||||
<Filter>src\common</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\processor.cpp">
|
||||
<Filter>src\style</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\generator.cpp">
|
||||
<Filter>src\style</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\SourceFiles\codegen\style\sprite_generator.cpp">
|
||||
<Filter>src\style</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\generator.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\checked_utf8_string.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -66,14 +75,26 @@
|
|||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\options.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\structure.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\parsed_file.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\structure_types.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\module.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\common\cpp_file.h">
|
||||
<Filter>src\common</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\processor.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\generator.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\SourceFiles\codegen\style\sprite_generator.h">
|
||||
<Filter>src\style</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Loading…
Reference in New Issue