[longomatch/newui: 71/157] Tweak font size and scale the team shield to style configured values.
- From: Andoni Morales Alastruey <amorales src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [longomatch/newui: 71/157] Tweak font size and scale the team shield to style configured values.
- Date: Mon, 1 Sep 2014 09:47:20 +0000 (UTC)
commit c84604c0c4be18103fa544edeb8221ff98bdbef0
Author: Julien Moutte <julien fluendo com>
Date: Fri Aug 22 17:10:33 2014 +0200
Tweak font size and scale the team shield to style configured values.
LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs | 20 ++++++++++----------
.../LongoMatch.Gui.Panel.TeamsTemplatesPanel.cs | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs b/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
index 06d692e..157283a 100644
--- a/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
+++ b/LongoMatch.GUI/Gui/Panel/TeamsTemplatesPanel.cs
@@ -125,10 +125,10 @@ namespace LongoMatch.Gui.Panel
TreeIter iter;
if (template.Shield != null) {
- img = template.Shield.Value;
+ img = template.Shield.Scale (StyleConf.TeamsShieldIconSize,
StyleConf.TeamsShieldIconSize).Value;
} else {
img = IconTheme.Default.LoadIcon (Constants.LOGO_ICON,
- Constants.MAX_SHIELD_ICON_SIZE,
+ StyleConf.TeamsShieldIconSize,
IconLookupFlags.ForceSvg);
}
iter = teams.AppendValues (img, template.Name, template.TeamName);
@@ -147,31 +147,31 @@ namespace LongoMatch.Gui.Panel
void HandleEnterTeamButton (object sender, EventArgs e)
{
if (sender == newteambutton) {
- editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">New
team</span>");
+ editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">New
team</span>");
} else if (sender == deleteteambutton) {
- editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">Delete
team</span>");
+ editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">Delete
team</span>");
} else if (sender == saveteambutton) {
- editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">Save
team</span>");
+ editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">Save
team</span>");
}
}
void HandleLeftTeamButton (object sender, EventArgs e)
{
- editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">Manage
teams</span>");
+ editteamslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">Manage
teams</span>");
}
void HandleEnterPlayerButton (object sender, EventArgs e)
{
if (sender == newplayerbutton1) {
- editplayerslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">New
player</span>");
+ editplayerslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">New
player</span>");
} else if (sender == deleteplayerbutton) {
- editplayerslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">Delete
player</span>");
+ editplayerslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">Delete
player</span>");
}
}
void HandleLeftPlayerButton (object sender, EventArgs e)
{
- editplayerslabel.Markup = Catalog.GetString ("<span font_desc=\"10\">Manage
players</span>");
+ editplayerslabel.Markup = Catalog.GetString ("<span font_desc=\"8\">Manage
players</span>");
}
void SaveLoadedTeam () {
@@ -182,7 +182,7 @@ namespace LongoMatch.Gui.Panel
/* The shield might have changed, update it just in case */
if (loadedTeam.Shield != null) {
teamseditortreeview.Model.SetValue (itersDict[loadedTeam.Name], 0,
- loadedTeam.Shield.Value);
+ loadedTeam.Shield.Scale
(StyleConf.TeamsShieldIconSize, StyleConf.TeamsShieldIconSize).Value);
}
}
diff --git a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.TeamsTemplatesPanel.cs
b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.TeamsTemplatesPanel.cs
index 141093d..9fdad4b 100644
--- a/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.TeamsTemplatesPanel.cs
+++ b/LongoMatch.GUI/gtk-gui/LongoMatch.Gui.Panel.TeamsTemplatesPanel.cs
@@ -70,7 +70,7 @@ namespace LongoMatch.Gui.Panel
this.titlelabel = new global::Gtk.Label ();
this.titlelabel.Name = "titlelabel";
this.titlelabel.Xalign = 0F;
- this.titlelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"27\"><b>TEAM EDITOR</b></span>");
+ this.titlelabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"22\"><b>TEAM EDITOR</b></span>");
this.titlelabel.UseMarkup = true;
this.titlelabel.Justify = ((global::Gtk.Justification)(2));
this.headerhbox.Add (this.titlelabel);
@@ -132,7 +132,7 @@ namespace LongoMatch.Gui.Panel
// Container child templateimagealignment.Gtk.Container+ContainerChild
this.teamimage = new global::Gtk.Image ();
this.teamimage.Name = "teamimage";
- this.teamimage.Ypad = 5;
+ this.teamimage.Ypad = 10;
this.teamimage.Yalign = 1F;
this.templateimagealignment.Add (this.teamimage);
this.teameditorbuttonbar.Add (this.templateimagealignment);
@@ -148,7 +148,7 @@ namespace LongoMatch.Gui.Panel
this.editteamslabel = new global::Gtk.Label ();
this.editteamslabel.Name = "editteamslabel";
this.editteamslabel.Xalign = 0F;
- this.editteamslabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Manage teams</span>");
+ this.editteamslabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"8\">Manage teams</span>");
this.editteamslabel.UseMarkup = true;
this.editteamsvbox.Add (this.editteamslabel);
global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.editteamsvbox
[this.editteamslabel]));
@@ -233,7 +233,7 @@ namespace LongoMatch.Gui.Panel
this.editplayerslabel = new global::Gtk.Label ();
this.editplayerslabel.Name = "editplayerslabel";
this.editplayerslabel.Xalign = 0F;
- this.editplayerslabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"10\">Manage players</span>");
+ this.editplayerslabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<span
font_desc=\"8\">Manage players</span>");
this.editplayerslabel.UseMarkup = true;
this.editplayersvbox.Add (this.editplayerslabel);
global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.editplayersvbox
[this.editplayerslabel]));
@@ -292,7 +292,7 @@ namespace LongoMatch.Gui.Panel
// Container child playerheaderalignment.Gtk.Container+ContainerChild
this.playerheaderimage = new global::Gtk.Image ();
this.playerheaderimage.Name = "playerheaderimage";
- this.playerheaderimage.Ypad = 5;
+ this.playerheaderimage.Ypad = 10;
this.playerheaderalignment.Add (this.playerheaderimage);
this.teameditorbuttonbar.Add (this.playerheaderalignment);
global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(this.teameditorbuttonbar
[this.playerheaderalignment]));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]