Skip to content

Commit

Permalink
Assembly v 6.0.11 (5.07.23)
Browse files Browse the repository at this point in the history
  • Loading branch information
adslbarxatov committed Jul 5, 2023
1 parent 3d03872 commit edb2706
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Константы, используемые далее по тексту
env:
PROJ: ${{ github.event.repository.name }}
TAG: '6.0.7'
TAG: '6.0.11'

steps:
# Проверка состава репозитория (без анализа, как может показаться)
Expand Down
Binary file added .release/DPArray.sfx.exe
Binary file not shown.
7 changes: 4 additions & 3 deletions .release/Release.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
_Changes for v 6.0.7_:
- Added UTF32 encoding
_Changes for v 6.0.11_:
- App size has been decreased by removing extraneous functionality;
- Implemented the app publisher (*only internal assembly*);
- Added UTF32 encoding;
- The interface was adapted to Windows 10, incorrect window borders were fixed;
- Updated the Policy window;
- XPUN control now able to send user to the webpage with its description;
- Implemented the direct info URLs for the packages manager (without their downloading);
- Packages manager now has new interface with faster data downloader and automatic grouping;
- All options for packages in the list are now available through the context menu (use right mouse button);
- Added special processing methods for non-standard conditions;
- Alternative downloading server (VK) has been disabled
4 changes: 4 additions & 0 deletions Changes.log
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
DPArray: changes log

Version 6.0.11:
• App size has been decreased by removing extraneous functionality;
• Implemented the app publisher (only internal assembly)

Version 6.0.7:
• Added UTF32 encoding;
• The interface was adapted to Windows 10, incorrect window borders were fixed
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# DPArray v 6.0.7
> PCC: 000A007D2788792E
# DPArray v 6.0.11
> PCC: 0009FE81233D0DE8
> CRC32: 7613A701
> CRC32: C7971D14


Expand Down
Binary file modified packages/DPArray.dp
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/_packages.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
```
Packages, available for download:
DPArray 6.0.7 DEFSTORAGE/DPArray.dp DPArray.dp 0x000A007D 0
DPArray 6.0.11 DEFSTORAGE/DPArray.dp DPArray.dp 0x0009FE81 0 INFOPAGE
#Apps
Batch image convertor 3.3.7 DEFSTORAGE/DEFFILE BatchImageConvertor.dp 0x00058F60 1 INFOLINK
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 1 addition & 3 deletions src/AboutForm.cs → src/Generics/AboutForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,7 @@ private void PolicyLoader (object sender, DoWorkEventArgs e)
html = html.Replace ("\x01", "\x0D\x0A");
html = html.Replace (" \x0D\x0A", "\x0D\x0A"); // Устранение оставшихся лишних пробелов

//File.WriteAllText (RDGenerics.AppStartupPath + "Policy.dmp", html,
// System.Text.Encoding.GetEncoding (1251));
//File.WriteAllText (RDGenerics.AppStartupPath + "Policy.dmp", html);
html = html.Substring (1, html.Length - 48); // Финальная обрезка
}
else
Expand Down Expand Up @@ -533,7 +532,6 @@ private void ExitButton_Click (object sender, EventArgs e)
private void AboutForm_Resize (object sender, EventArgs e)
{
DescriptionBox.Width = this.ClientSize.Width - 28;
ExitButton.Left = this.ClientSize.Width - 120;

DescriptionBox.Height = this.ClientSize.Height - 195;
ExitButton.Top = MisacceptButton.Top = HypeHelpFlag.Top = this.ClientSize.Height - 33;
Expand Down
File renamed without changes.
38 changes: 25 additions & 13 deletions src/RDMessageForm.cs → src/Generics/RDMessageForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,18 @@ public RDMessageButtons ResultButton
/// </summary>
/// <param name="Message">Сообщение для пользователя</param>
/// <param name="Type">Тип создаваемого окна</param>
/// <param name="Timeout">Таймаут (в миллисекундах), по истечении которого
/// <param name="Timeout">Таймаут (в миллисекундах), по истечении которого
/// сообщение автоматически закроется (от 100 до 60000 мс)</param>
public RDMessageForm (RDMessageTypes Type, string Message, uint Timeout)
/// <param name="CenterText">Флаг размещения текста по центру</param>
public RDMessageForm (RDMessageTypes Type, string Message, uint Timeout, bool CenterText)
{
uint to = Timeout;
if (to < 100)
to = 100;
if (to > 60000)
to = 60000;

RDMessageFormInit (Type, Message, "-", null, null, SupportedLanguages.en_us, to);
RDMessageFormInit (Type, Message, "-", null, null, SupportedLanguages.en_us, to, CenterText);
}

/// <summary>
Expand All @@ -127,7 +128,7 @@ public RDMessageForm (SupportedLanguages CurrentInterfaceLanguage)
Localization.GetDefaultText (LzDefaultTextValues.Message_LanguageSelection),
Localization.GetDefaultText (LzDefaultTextValues.Button_Apply),
Localization.GetDefaultText (LzDefaultTextValues.Button_Cancel),
null, CurrentInterfaceLanguage, 0);
null, CurrentInterfaceLanguage, 0, false);
}

/// <summary>
Expand All @@ -138,7 +139,7 @@ public RDMessageForm (SupportedLanguages CurrentInterfaceLanguage)
public RDMessageForm (RDMessageTypes Type, string Message)
{
RDMessageFormInit (Type, Message, Localization.GetDefaultText (LzDefaultTextValues.Button_OK),
null, null, SupportedLanguages.en_us, 0);
null, null, SupportedLanguages.en_us, 0, false);
}

/// <summary>
Expand All @@ -149,7 +150,8 @@ public RDMessageForm (RDMessageTypes Type, string Message)
/// <param name="Type">Тип создаваемого окна</param>
public RDMessageForm (RDMessageTypes Type, string Message, string ButtonOneName)
{
RDMessageFormInit (Type, Message, ButtonOneName, null, null, SupportedLanguages.en_us, 0);
RDMessageFormInit (Type, Message, ButtonOneName, null, null, SupportedLanguages.en_us,
0, false);
}

/// <summary>
Expand All @@ -161,7 +163,8 @@ public RDMessageForm (RDMessageTypes Type, string Message, string ButtonOneName)
/// <param name="Type">Тип создаваемого окна</param>
public RDMessageForm (RDMessageTypes Type, string Message, string ButtonOneName, string ButtonTwoName)
{
RDMessageFormInit (Type, Message, ButtonOneName, ButtonTwoName, null, SupportedLanguages.en_us, 0);
RDMessageFormInit (Type, Message, ButtonOneName, ButtonTwoName, null, SupportedLanguages.en_us,
0, false);
}

/// <summary>
Expand All @@ -176,12 +179,12 @@ public RDMessageForm (RDMessageTypes Type, string Message, string ButtonOneName,
string ButtonThreeName)
{
RDMessageFormInit (Type, Message, ButtonOneName, ButtonTwoName, ButtonThreeName,
SupportedLanguages.en_us, 0);
SupportedLanguages.en_us, 0, false);
}

// Основная инициализация формы
private void RDMessageFormInit (RDMessageTypes Type, string Message, string ButtonOneName, string ButtonTwoName,
string ButtonThreeName, SupportedLanguages CurrentInterfaceLanguage, uint Timeout)
string ButtonThreeName, SupportedLanguages CurrentInterfaceLanguage, uint Timeout, bool CenterText)
{
// Инициализация
InitializeComponent ();
Expand All @@ -204,10 +207,13 @@ private void RDMessageFormInit (RDMessageTypes Type, string Message, string Butt

this.Text = ProgramDescription.AssemblyTitle;

// Обработка текста
if (!string.IsNullOrWhiteSpace (Message))
{
Label01.Text = Message.Replace ("\n", "\r\n").Replace ("\r\r", "\r");
Label01.SelectionLength = 0;
if (CenterText)
Label01.TextAlign = HorizontalAlignment.Center;

if (windowType != RDMessageTypes.LanguageSelector)
{
Expand Down Expand Up @@ -236,6 +242,7 @@ private void RDMessageFormInit (RDMessageTypes Type, string Message, string Butt
}
}

// Настройка кнопок
if (!string.IsNullOrWhiteSpace (ButtonOneName))
{
Button01.Text = ButtonOneName;
Expand Down Expand Up @@ -270,6 +277,7 @@ private void RDMessageFormInit (RDMessageTypes Type, string Message, string Butt
}
}

// Системный звук
switch (windowType)
{
case RDMessageTypes.Information:
Expand Down Expand Up @@ -303,6 +311,7 @@ private void RDMessageFormInit (RDMessageTypes Type, string Message, string Butt
break;
}

// Окончательное выравнивание элементов, применение цветовой схемы
AlignButtons ();
Label01.ForeColor = RDGenerics.GetInterfaceColor (RDInterfaceColors.DefaultText);
Label01.BackColor = this.BackColor;
Expand All @@ -313,23 +322,26 @@ private void RDMessageFormInit (RDMessageTypes Type, string Message, string Butt
LanguagesCombo.BackColor = this.BackColor;
}

// Запуск
if (Timeout > 0)
MainTimer.Interval = (int)Timeout;

// Запуск
this.StartPosition = FormStartPosition.CenterParent;
this.ShowDialog ();
}

private void RDMessageForm_Load (object sender, EventArgs e)
{
// Запуск отрисовки
CreateBackground (this);
}

private void RDMessageForm_Shown (object sender, EventArgs e)
{
// Отмена центрирования на родительское окно, если это невозможно
if (this.Left == 0)
this.CenterToScreen ();

// Запуск отрисовки
CreateBackground (this);

// Запуск таймера, если предусмотрен
if (MainTimer.Interval > 75)
MainTimer.Enabled = true;
Expand Down
File renamed without changes.

0 comments on commit edb2706

Please sign in to comment.