mirror of
https://github.com/jwetzell/qController.git
synced 2026-08-10 18:03:55 +00:00
* qfont.ttf:
* qfont.ttf: Add Dollar and Mail Icon * QButton.cs: Increase Default Font Size * QControlsBlock.cs: * QSelectedCueCell.cs: Cleanup * QInstanceCell.cs: Cleanup Properties * QLevelsCell.cs: Rename QSelectedCueOptionsCell * QIcon.cs: Add Dollar and Mail Icons * ControlPage.xaml: * qConnectionPage.xaml: Move some properties to XAML * ControlPage.xaml.cs: Audio level adjustments in popup "window" * MenuPage.xaml.cs: * qConnectionPage.xaml.cs: Add Support and Feedback menu items
This commit is contained in:
@@ -15,7 +15,7 @@ namespace qController
|
||||
qCommand = command;
|
||||
Text = qCommand.text;
|
||||
TextColor = Color.Black;
|
||||
|
||||
FontSize = App.HeightUnit * 2.5;
|
||||
if (qCommand.osc.Contains("go"))
|
||||
{
|
||||
BackgroundColor = Color.SeaGreen;
|
||||
|
||||
@@ -23,7 +23,7 @@ namespace qController
|
||||
|
||||
BackgroundColor = Color.Transparent;
|
||||
//highlight Button Grid
|
||||
BackgroundColor = Color.FromHex("FF0000");
|
||||
//BackgroundColor = Color.FromHex("FF0000");
|
||||
|
||||
List<QCommand> commands = new List<QCommand>();
|
||||
commands.Add(QCommands.PREVIOUS);
|
||||
|
||||
@@ -57,14 +57,14 @@ namespace qController
|
||||
Frame f = new Frame
|
||||
{
|
||||
Content = mainG,
|
||||
OutlineColor = Color.Black,
|
||||
BorderColor = Color.Black,
|
||||
VerticalOptions = LayoutOptions.CenterAndExpand,
|
||||
HorizontalOptions = LayoutOptions.FillAndExpand,
|
||||
Padding = 30,
|
||||
Margin = new Thickness(10,10,10,10),
|
||||
CornerRadius=20,
|
||||
BackgroundColor = Color.FromHex("D8D8D8")
|
||||
};
|
||||
f.BackgroundColor = Color.FromHex("D8D8D8");
|
||||
View = f;
|
||||
|
||||
void InitItems()
|
||||
@@ -106,9 +106,7 @@ namespace qController
|
||||
void Connect(object sender, EventArgs e)
|
||||
{
|
||||
App.NavigationPage.Navigation.PushAsync(new ControlPage(nameLabel.Text,addressLabel.Text));
|
||||
|
||||
Console.WriteLine("Connect To " + nameLabel.Text + " Pressed");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+20
-16
@@ -1,11 +1,10 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace qController
|
||||
{
|
||||
public class QSelectedCueOptionsCell : Frame
|
||||
public class QLevelsCell : Frame
|
||||
{
|
||||
|
||||
public List<double> levels;
|
||||
@@ -16,14 +15,16 @@ namespace qController
|
||||
public Label mainLabel;
|
||||
public Label rightLabel;
|
||||
public Label leftLabel;
|
||||
public QSelectedCueOptionsCell()
|
||||
public QLevelsCell()
|
||||
{
|
||||
Padding = new Thickness(5);
|
||||
CornerRadius = 20;
|
||||
BackgroundColor = Color.Transparent;
|
||||
|
||||
BorderColor = Color.Black;
|
||||
HasShadow = true;
|
||||
BackgroundColor = Color.FromHex("D8D8D8");
|
||||
IsVisible = false;
|
||||
//highlight for testing
|
||||
BackgroundColor = Color.Red;
|
||||
//BackgroundColor = Color.Red;
|
||||
|
||||
|
||||
Grid mainG = new Grid
|
||||
@@ -63,14 +64,9 @@ namespace qController
|
||||
Maximum = 12
|
||||
};
|
||||
|
||||
mainG.Children.Add(mainSlider, 1, 0);
|
||||
mainG.Children.Add(leftSlider, 1, 1);
|
||||
mainG.Children.Add(rightSlider, 1, 2);
|
||||
|
||||
Grid.SetColumnSpan(mainSlider, 4);
|
||||
Grid.SetColumnSpan(leftSlider, 4);
|
||||
Grid.SetColumnSpan(rightSlider, 4);
|
||||
mainLabel = new Label {
|
||||
|
||||
mainLabel = new Label
|
||||
{
|
||||
Text = "MAIN:",
|
||||
VerticalTextAlignment = TextAlignment.Center,
|
||||
HorizontalTextAlignment = TextAlignment.Center
|
||||
@@ -78,18 +74,26 @@ namespace qController
|
||||
|
||||
leftLabel = new Label
|
||||
{
|
||||
Text = "LEFT:",
|
||||
Text = "0:",
|
||||
VerticalTextAlignment = TextAlignment.Center,
|
||||
HorizontalTextAlignment = TextAlignment.Center
|
||||
};
|
||||
|
||||
rightLabel = new Label
|
||||
{
|
||||
Text = "RIGHT:",
|
||||
Text = "1:",
|
||||
VerticalTextAlignment = TextAlignment.Center,
|
||||
HorizontalTextAlignment = TextAlignment.Center
|
||||
};
|
||||
|
||||
mainG.Children.Add(mainSlider, 1, 0);
|
||||
mainG.Children.Add(leftSlider, 1, 1);
|
||||
mainG.Children.Add(rightSlider, 1, 2);
|
||||
|
||||
Grid.SetColumnSpan(mainSlider, 4);
|
||||
Grid.SetColumnSpan(leftSlider, 4);
|
||||
Grid.SetColumnSpan(rightSlider, 4);
|
||||
|
||||
mainG.Children.Add(mainLabel, 0, 0);
|
||||
mainG.Children.Add(leftLabel, 0, 1);
|
||||
mainG.Children.Add(rightLabel, 0, 2);
|
||||
@@ -116,7 +116,6 @@ namespace qController
|
||||
VerticalOptions = LayoutOptions.FillAndExpand,
|
||||
HorizontalOptions = LayoutOptions.FillAndExpand
|
||||
};
|
||||
|
||||
|
||||
//BACKGROUND COLORS FOR TESTING ONLY
|
||||
//notes.BackgroundColor = Color.Red;
|
||||
|
||||
@@ -47,6 +47,9 @@ namespace qController
|
||||
|
||||
public const string COMMENTING_O = "\uF27B";
|
||||
|
||||
public const string DOLLAR = "\uF155";
|
||||
public const string MAIL = "\uE812";
|
||||
|
||||
|
||||
public static string GetIconFromType(string type)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user