Mercurial > repos > IBBoard.WarFoundry.GUI.GTK

changeset 12:685532d43a96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re #88: Complete initial GTK# UI * Make use of new GTK# util code to add close button to tab
author IBBoard <dev@ibboard.co.uk>
date Thu, 25 Jun 2009 18:12:43 +0000
parents 4e5e382fbd2e
children 6b2c8e55564a
files FrmMainWindow.cs IBBoard.WarFoundry.GUI.GTK.csproj gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs gtk-gui/gui.stetic
diffstat 4 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/FrmMainWindow.cs	Wed May 27 19:44:40 2009 +0000
+++ b/FrmMainWindow.cs	Thu Jun 25 18:12:43 2009 +0000
@@ -9,6 +9,7 @@
 using Gtk;
 using IBBoard;
 using IBBoard.Commands;
+using IBBoard.GtkSharp;
 using IBBoard.IO;
 using IBBoard.Lang;
 using IBBoard.Logging;
@@ -915,10 +916,9 @@
 				else
 				{
 					widget = new UnitDisplayWidget(unit, CommandStack);
-					Label label = new Label(unit.Name);
 					logger.Debug("Adding page for "+unit.Name);
 					unitToWidgetMap[unit] = widget;
-					int pageNum = unitsNotebook.AppendPage(widget, label);
+					int pageNum = NotebookUtil.AddPageToNotebookWithCloseButton(unitsNotebook, widget, unit.Name);
 					logger.Debug("Page added at index "+pageNum);
 					unitsNotebook.ShowAll();
 					unitsNotebook.Page = pageNum;
--- a/IBBoard.WarFoundry.GUI.GTK.csproj	Wed May 27 19:44:40 2009 +0000
+++ b/IBBoard.WarFoundry.GUI.GTK.csproj	Thu Jun 25 18:12:43 2009 +0000
@@ -99,6 +99,10 @@
       <Project>{DCBA3FB1-267A-4D89-955B-5C05785EE1CD}</Project>
       <Name>IBBoard.Log4Net</Name>
     </ProjectReference>
+    <ProjectReference Include="..\IBBoard.GtkSharp\IBBoard.GtkSharp.csproj">
+      <Project>{06605A63-E433-42FE-93CF-0DA6630A7DF5}</Project>
+      <Name>IBBoard.GtkSharp</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="App.ico">
--- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs	Wed May 27 19:44:40 2009 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs	Thu Jun 25 18:12:43 2009 +0000
@@ -174,7 +174,6 @@
             this.toolbar.Name = "toolbar";
             this.toolbar.ShowArrow = false;
             this.toolbar.ToolbarStyle = ((Gtk.ToolbarStyle)(0));
-            this.toolbar.IconSize = ((Gtk.IconSize)(3));
             this.vbox1.Add(this.toolbar);
             Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.toolbar]));
             w3.Position = 1;
--- a/gtk-gui/gui.stetic	Wed May 27 19:44:40 2009 +0000
+++ b/gtk-gui/gui.stetic	Thu Jun 25 18:12:43 2009 +0000
@@ -5,6 +5,7 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
+    <widget-library name="../../IBBoard.GtkSharp/bin/Debug/IBBoard.GtkSharp.dll" />
     <widget-library name="../bin/Debug/WarFoundryGTK.exe" internal="true" />
   </import>
   <widget class="Gtk.Window" id="IBBoard.WarFoundry.GTK.FrmMainWindow" design-size="832 659">
@@ -191,7 +192,6 @@
             <property name="HeightRequest">36</property>
             <property name="ShowArrow">False</property>
             <property name="ButtonStyle">Icons</property>
-            <property name="IconSize">LargeToolbar</property>
             <node name="toolbar" type="Toolbar">
               <node type="Toolitem" action="newArmyButton" />
               <node type="Toolitem" action="openArmyButton" />