개정판 24c5e56c
- final pdf Font 추가
- Markus navi 속도 최적화 Key input 최적화
Change-Id: I7f2cf1933e86017d7b1df9ef4bd3048a8e80a653
| KCOM/Common/InitData.cs | ||
|---|---|---|
| 4 | 4 |
using System.Windows.Media; |
| 5 | 5 |
using System.Drawing.Text; |
| 6 | 6 |
using KCOM.Common; |
| 7 |
using Markus.Fonts; |
|
| 7 | 8 |
|
| 8 | 9 |
namespace KCOM.Views |
| 9 | 10 |
{
|
| ... | ... | |
| 33 | 34 |
}; |
| 34 | 35 |
cbDashStyle.ItemsSource = dashSet.ToList(); |
| 35 | 36 |
|
| 36 |
List<string> fontList = new List<string>(); |
|
| 37 |
fontList.Add("Arial");
|
|
| 38 |
//fontList.Add("Calibri (Body)");
|
|
| 39 |
//fontList.Add("Tahoma");
|
|
| 40 |
fontList.Add("Verdana");
|
|
| 41 |
fontList.Add("Times New Roman");
|
|
| 42 |
fontList.Add("Cambria");
|
|
| 43 |
//fontList.Add("나눔바른펜");
|
|
| 44 |
List<string> fontSet = new List<string>(); |
|
| 45 |
foreach (var font in fontList) |
|
| 46 |
{
|
|
| 47 |
if (IsFontInstalled(font)) |
|
| 48 |
{
|
|
| 49 |
fontSet.Add(font.ToString()); |
|
| 50 |
} |
|
| 51 |
} |
|
| 52 |
comboFontFamily.ItemsSource = fontSet.ToList(); |
|
| 37 |
//List<string> fontList = new List<string>(); |
|
| 38 |
//fontList.Add("Arial");
|
|
| 39 |
////fontList.Add("Calibri (Body)");
|
|
| 40 |
////fontList.Add("Tahoma");
|
|
| 41 |
//fontList.Add("Verdana");
|
|
| 42 |
//fontList.Add("Times New Roman");
|
|
| 43 |
//fontList.Add("Cambria");
|
|
| 44 |
////fontList.Add("나눔바른펜");
|
|
| 45 |
//List<string> fontSet = new List<string>(); |
|
| 46 |
//foreach (var font in fontList) |
|
| 47 |
//{
|
|
| 48 |
// if (IsFontInstalled(font)) |
|
| 49 |
// {
|
|
| 50 |
// fontSet.Add(font.ToString()); |
|
| 51 |
// } |
|
| 52 |
//} |
|
| 53 |
var fontsItems = Markus.Fonts.FontDictionary.GetMarkusFonts(); |
|
| 54 |
comboFontFamily.ItemsSource = fontsItems; |
|
| 53 | 55 |
|
| 54 |
if (KCOM.Properties.Settings.Default.FontFamily != null) |
|
| 55 |
{
|
|
| 56 |
comboFontFamily.SelectedItem = KCOM.Properties.Settings.Default.FontFamily; |
|
| 57 |
} |
|
| 56 |
comboFontFamily.SelectedItem = fontsItems.FirstOrDefault(x => x.IsDefault); |
|
| 58 | 57 |
} |
| 59 | 58 |
|
| 60 | 59 |
public void SetFont(FontFamily fontFamily) |
| 61 | 60 |
{
|
| 62 | 61 |
foreach (var item in comboFontFamily.Items) |
| 63 | 62 |
{
|
| 64 |
if(fontFamily.FamilyNames.Select(x=>x.Value).Contains((string)item))
|
|
| 63 |
if((item as Markus.Fonts.MarkusFont).FontFamily.FontName() == fontFamily.FontName())
|
|
| 65 | 64 |
{
|
| 66 | 65 |
comboFontFamily.SelectedItem = item; |
| 67 | 66 |
return; |
내보내기 Unified diff
