Add sizing of applauncher elements

This commit is contained in:
Michael 2017-04-22 09:25:17 -04:00
parent 114141b56e
commit e05fc88500
6 changed files with 289 additions and 0 deletions

View file

@ -0,0 +1,75 @@
namespace ShiftOS.WinForms.DesktopWidgets
{
partial class UpgradePercentage
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.pgupgrades = new ShiftOS.WinForms.Controls.ShiftedProgressBar();
this.lbstatus = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// pgupgrades
//
this.pgupgrades.BlockSize = 5;
this.pgupgrades.Dock = System.Windows.Forms.DockStyle.Bottom;
this.pgupgrades.Location = new System.Drawing.Point(0, 99);
this.pgupgrades.Maximum = 100;
this.pgupgrades.Name = "pgupgrades";
this.pgupgrades.Size = new System.Drawing.Size(227, 23);
this.pgupgrades.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
this.pgupgrades.TabIndex = 0;
this.pgupgrades.Text = "shiftedProgressBar1";
this.pgupgrades.Value = 0;
//
// lbstatus
//
this.lbstatus.Dock = System.Windows.Forms.DockStyle.Fill;
this.lbstatus.Location = new System.Drawing.Point(0, 0);
this.lbstatus.Name = "lbstatus";
this.lbstatus.Size = new System.Drawing.Size(227, 99);
this.lbstatus.TabIndex = 1;
this.lbstatus.Text = "label1";
this.lbstatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// UpgradePercentage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lbstatus);
this.Controls.Add(this.pgupgrades);
this.Name = "UpgradePercentage";
this.Size = new System.Drawing.Size(227, 122);
this.ResumeLayout(false);
}
#endregion
private Controls.ShiftedProgressBar pgupgrades;
private System.Windows.Forms.Label lbstatus;
}
}

View file

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using ShiftOS.Engine;
using ShiftOS.WinForms.Tools;
namespace ShiftOS.WinForms.DesktopWidgets
{
[DesktopWidget("Shiftorium Status", "Show how much upgrades you have and how much are available.")]
public partial class UpgradePercentage : UserControl, IDesktopWidget
{
public UpgradePercentage()
{
InitializeComponent();
}
public void OnSkinLoad()
{
ControlManager.SetupControl(lbstatus);
pgupgrades.Refresh();
}
public void OnUpgrade()
{
pgupgrades.Maximum = Shiftorium.GetDefaults().Count;
pgupgrades.Value = SaveSystem.CurrentSave.CountUpgrades();
lbstatus.Text = $"You have unlocked {pgupgrades.Value} upgrades out of the {pgupgrades.Maximum} available.";
}
public void Setup()
{
}
}
}

View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View file

@ -264,6 +264,12 @@
<Compile Include="DesktopWidgets\Clock.Designer.cs">
<DependentUpon>Clock.cs</DependentUpon>
</Compile>
<Compile Include="DesktopWidgets\UpgradePercentage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="DesktopWidgets\UpgradePercentage.Designer.cs">
<DependentUpon>UpgradePercentage.cs</DependentUpon>
</Compile>
<Compile Include="DownloadControl.cs">
<SubType>UserControl</SubType>
</Compile>
@ -413,6 +419,9 @@
<EmbeddedResource Include="DesktopWidgets\Clock.resx">
<DependentUpon>Clock.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DesktopWidgets\UpgradePercentage.resx">
<DependentUpon>UpgradePercentage.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DownloadControl.resx">
<DependentUpon>DownloadControl.cs</DependentUpon>
</EmbeddedResource>

View file

@ -604,6 +604,14 @@ namespace ShiftOS.WinForms
btnshutdown.Font = LoadedSkin.ShutdownFont;
btnshutdown.ForeColor = LoadedSkin.ShutdownForeColor;
pnladvancedal.Size = LoadedSkin.AALSize;
pnlalsystemactions.Height = LoadedSkin.ALSystemActionHeight;
pnlstatus.Height = LoadedSkin.ALSystemStatusHeight;
flcategories.Width = LoadedSkin.AALCategoryViewWidth;
this.flapps.Width = LoadedSkin.AALItemViewWidth;
}

View file

@ -1115,6 +1115,42 @@ namespace ShiftOS.Engine
[ShifterDescription("What part of the panel should the status text stick to?")]
public ContentAlignment ALStatusPanelAlignment = ContentAlignment.MiddleCenter;
[ShifterMeta("Desktop")]
[ShifterCategory("App Launcher")]
[RequiresUpgrade("shift_advanced_app_launcher")]
[ShifterName("AL System Status Height")]
[ShifterDescription("Set the height of the top system status bar in the App Launcher.")]
public int ALSystemStatusHeight = 50;
[ShifterMeta("Desktop")]
[ShifterCategory("App Launcher")]
[RequiresUpgrade("shift_advanced_app_launcher")]
[ShifterName("AL Size")]
[ShifterDescription("Set the size of the App Launcher's container")]
public Size AALSize = new Size(425, 500);
[ShifterMeta("Desktop")]
[ShifterCategory("App Launcher")]
[RequiresUpgrade("shift_advanced_app_launcher")]
[ShifterName("AL Category View Width")]
[ShifterDescription("Set the width of the left Category Listing on the app launcher.")]
public int AALCategoryViewWidth = 237;
[ShifterMeta("Desktop")]
[ShifterCategory("App Launcher")]
[RequiresUpgrade("shift_advanced_app_launcher")]
[ShifterName("AL Item List Width")]
[ShifterDescription("Set the width of the item list in the app launcher.")]
public int AALItemViewWidth = 237;
[ShifterMeta("Desktop")]
[ShifterCategory("App Launcher")]
[RequiresUpgrade("shift_advanced_app_launcher")]
[ShifterName("AL System Actions Height")]
[ShifterDescription("Set the height of the bottom system actions bar in the App Launcher.")]
public int ALSystemActionHeight = 30;
[ShifterMeta("Desktop")]
[ShifterCategory("App Launcher")]
[RequiresUpgrade("skinning;shift_advanced_app_launcher")]