[Supertux-Commit] r5788 - in trunk/supertux-editor: . LispReader libeditor supertux-editor supertux-editor/Editors supertux-editor/LevelObjects supertux-editor/PropertyEditors supertux-editor/Tiles
anmaster at millhouse.dreamhost.com
anmaster at millhouse.dreamhost.com
Tue Sep 30 05:50:19 PDT 2008
Author: anmaster
Date: 2008-09-30 05:50:18 -0700 (Tue, 30 Sep 2008)
New Revision: 5788
Modified:
trunk/supertux-editor/LispReader/FieldOrProperty.cs
trunk/supertux-editor/Makefile
trunk/supertux-editor/libeditor/RenderView.cs
trunk/supertux-editor/supertux-editor/Application.cs
trunk/supertux-editor/supertux-editor/EditorStock.cs
trunk/supertux-editor/supertux-editor/Editors/Brush.cs
trunk/supertux-editor/supertux-editor/Editors/ObjectsEditor.cs
trunk/supertux-editor/supertux-editor/LayerListWidget.cs
trunk/supertux-editor/supertux-editor/LevelObjects/Background.cs
trunk/supertux-editor/supertux-editor/LevelObjects/Decal.cs
trunk/supertux-editor/supertux-editor/LevelObjects/ILayer.cs
trunk/supertux-editor/supertux-editor/LevelObjects/Objects.cs
trunk/supertux-editor/supertux-editor/LevelObjects/Path.cs
trunk/supertux-editor/supertux-editor/LevelObjects/Sector.cs
trunk/supertux-editor/supertux-editor/ObjectListWidget.cs
trunk/supertux-editor/supertux-editor/PropertiesView.cs
trunk/supertux-editor/supertux-editor/PropertyEditors/ChooseLicenseWidget.cs
trunk/supertux-editor/supertux-editor/SectorRenderer.cs
trunk/supertux-editor/supertux-editor/SectorSwitchNotebook.cs
trunk/supertux-editor/supertux-editor/SpriteViewWidget.cs
trunk/supertux-editor/supertux-editor/StringListSerializer.cs
trunk/supertux-editor/supertux-editor/TileListWidget.cs
trunk/supertux-editor/supertux-editor/Tiles/Tile.cs
trunk/supertux-editor/supertux-editor/Tiles/TilemapBorder.cs
trunk/supertux-editor/supertux-editor/Tiles/Tileset.cs
Log:
Strip trailing whitespaces from level editor source, since my editor will do that automatically on every file I edit the diffs would get messy. So better do it separately.
Modified: trunk/supertux-editor/LispReader/FieldOrProperty.cs
===================================================================
--- trunk/supertux-editor/LispReader/FieldOrProperty.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/LispReader/FieldOrProperty.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -11,7 +11,7 @@
/// <summary>
/// Oreginal base class (MemberInfo) can't Get/SetValue and this class allows it.
/// One code can work with FieldInfo or PropertyInfo as if there was no difference between them. + can raise event when Changed
- /// It's a kind of hack, however, because we can't "rebase" a class.
+ /// It's a kind of hack, however, because we can't "rebase" a class.
///</summary>
public abstract class FieldOrProperty
{
Modified: trunk/supertux-editor/Makefile
===================================================================
--- trunk/supertux-editor/Makefile 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/Makefile 2008-09-30 12:50:18 UTC (rev 5788)
@@ -28,7 +28,7 @@
.phony: all clean
-all: supertux-editor.exe
+all: supertux-editor.exe
clean:
rm -f *.dll *.pkg.dummy supertux-editor.exe
@@ -36,13 +36,13 @@
gtkgl-sharp.dll: \
$(wildcard gtkgl-sharp/*.cs) \
gtk-sharp-2.0.pkg.dummy \
-
+
Lisp.dll: \
$(wildcard Lisp/*.cs) \
-
+
Resources.dll: \
$(wildcard Resources/*.cs) \
-
+
libeditor.dll: \
$(wildcard libeditor/DataStructures/*.cs) $(wildcard libeditor/Libs/*.cs) $(wildcard libeditor/SceneGraph/*.cs) $(wildcard libeditor/Drawing/*.cs) $(wildcard libeditor/*.cs) \
$(wildcard libeditor/resources/*.png) $(wildcard libeditor/resources/*.glade) \
@@ -52,7 +52,7 @@
LispReader.dll: \
$(wildcard LispReader/*.cs) \
Lisp.dll libeditor.dll \
-
+
supertux-editor.exe: \
$(wildcard supertux-editor/*.cs) $(wildcard supertux-editor/Sprites/*.cs) $(wildcard supertux-editor/Tiles/*.cs) $(wildcard supertux-editor/PropertyEditors/*.cs) $(wildcard supertux-editor/LevelObjects/*.cs) $(wildcard supertux-editor/Undo/*.cs) $(wildcard supertux-editor/Editors/*.cs) \
$(wildcard supertux-editor/resources/*.png) $(wildcard supertux-editor/resources/*.glade) \
@@ -68,5 +68,4 @@
%.dll:
@echo MonoCSharp $@
- $(Q)$(GMCS) $(GMCSFLAGS) $(patsubst %.pkg.dummy,-pkg:%,$(filter %.pkg.dummy, $^)) -out:$@ -doc:$(patsubst %.dll,%.dll.xml,$@) -target:library $(patsubst %,-r:%,$(filter %.dll, $^)) $(patsubst %,-resource:%,$(filter %.png %.glade, $^)) $(filter %.cs, $^)
-
+ $(Q)$(GMCS) $(GMCSFLAGS) $(patsubst %.pkg.dummy,-pkg:%,$(filter %.pkg.dummy, $^)) -out:$@ -doc:$(patsubst %.dll,%.dll.xml,$@) -target:library $(patsubst %,-r:%,$(filter %.dll, $^)) $(patsubst %,-resource:%,$(filter %.png %.glade, $^)) $(filter %.cs, $^)
Modified: trunk/supertux-editor/libeditor/RenderView.cs
===================================================================
--- trunk/supertux-editor/libeditor/RenderView.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/libeditor/RenderView.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -94,7 +94,7 @@
Gtk.Drag.Finish (args.Context, true, false, args.Time);
} else {
LogManager.Log(LogLevel.Warning, "DragDataRecieved OK, but there is no editor that can handle it");
- Gtk.Drag.Finish (args.Context, false, false, args.Time);
+ Gtk.Drag.Finish (args.Context, false, false, args.Time);
}
}
Modified: trunk/supertux-editor/supertux-editor/Application.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/Application.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/Application.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -244,17 +244,17 @@
box.Homogeneous = false;
Adjustment vadjustment = new Adjustment(0, 0, 100, 1, 10, 10);
-
+
tileList = new TileListWidget(this, selection, vadjustment);
TilegroupSelector selector = new TilegroupSelector(this, tileList);
HBox hbox = new HBox(false, 0);
-
+
VScrollbar scrollbar = new VScrollbar(vadjustment);
-
+
hbox.PackStart(tileList, true, true, 0);
hbox.PackEnd(scrollbar, false, true, 0);
-
+
box.PackStart(selector, false, true, 0);
box.PackStart(hbox, true, true, 0);
@@ -267,12 +267,12 @@
Adjustment vadjustment = new Adjustment(0, 0, 100, 1, 10, 10);
VScrollbar scrollbar = new VScrollbar(vadjustment);
-
+
hbox.PackStart(new ObjectListWidget(this, vadjustment), true, true, 0);
hbox.PackEnd(scrollbar, false, true, 0);
return hbox;
- }
-
+ }
+
protected Widget GladeCustomWidgetHandler(Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2)
{
if(func_name == "TileList") {
@@ -886,7 +886,7 @@
// FIXME: Inserting new items at run-time doesn't seem to have an effect. For now we simply don't remove any some there's at least something to click on
/*
- // remove all old MenuItems
+ // remove all old MenuItems
MenuItemMruEntries.ForEach(delegate(MruEntry o){ MenuItemLevel_menu.Remove(o.MenuItem); });
MenuItemMruEntries.Clear();
*/
@@ -897,11 +897,11 @@
insertAt++;
if (w == MenuItemMruBegin) break;
}
-
+
// add all new MenuItems
Settings.Instance.RecentDocuments.ForEach(delegate(string fileName){
string shortLabel = System.IO.Path.GetFileName(fileName);
-
+
MruEntry e = new MruEntry();
e.MenuItem = new Gtk.MenuItem(shortLabel);
e.MenuItem.Activated += OnMruEntry;
@@ -979,7 +979,7 @@
Load(mruEntry.FileName);
break;
}
-
+
}
public static void Main(string[] args)
Modified: trunk/supertux-editor/supertux-editor/EditorStock.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/EditorStock.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/EditorStock.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -29,7 +29,7 @@
// HACK: This is needed to make tool icons show up on Windows, no idea why.
// TODO: test if this is still needed with additional SizeWildcarded.
- // SizeWildcarded only gives fuzzy images, at least for stock-eye-12.png
+ // SizeWildcarded only gives fuzzy images, at least for stock-eye-12.png
// It looks like windows are confusing large and small toolbar size ("SmallToolbar" causes 2x bigger buttons that "LargeToolbar"), bug in GTK for windows? bug in windows themselves?
#if WINDOWS
Gtk.IconSize ToolBarIconSize = Gtk.IconSize.SmallToolbar;
@@ -65,7 +65,7 @@
source.SizeWildcarded = true;
source.Pixbuf = img;
iconset.AddSource (source);
-
+
stock.Add (stockid, iconset);
}
}
Modified: trunk/supertux-editor/supertux-editor/Editors/Brush.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/Editors/Brush.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/Editors/Brush.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -190,7 +190,7 @@
int py = pos.Y - (int)(height/2);
TileBlock bestPattern = null;
-
+
// if we find any usable pattern, we apply it
if (FindBestPattern(px, py, tilemap, ref bestPattern)) {
bestPattern.ApplyToTilemap(new FieldPos(px,py),tilemap);
Modified: trunk/supertux-editor/supertux-editor/Editors/ObjectsEditor.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/Editors/ObjectsEditor.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/Editors/ObjectsEditor.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -236,7 +236,7 @@
application.PathToEdit = ((IPathObject) activeObject).Path;
else
application.PathToEdit = null;
-
+
if(activeObject != null && activeObject.Resizable) {
controlPoints.Add(new ControlPoint(activeObject,
ControlPoint.AttachPoint.TOP | ControlPoint.AttachPoint.LEFT));
Modified: trunk/supertux-editor/supertux-editor/LayerListWidget.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LayerListWidget.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LayerListWidget.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -71,7 +71,7 @@
{
if (! (Object is ILayer)) //ignore changes on other objects
return;
- if (! (field.Name=="Layer" || field.Name=="Name")) //ignore changes on other fields
+ if (! (field.Name=="Layer" || field.Name=="Name")) //ignore changes on other fields
return;
//TODO: Is that sorting execute-once or what? (found no other working way)
@@ -117,7 +117,7 @@
if(o is ILayer) {
ILayer ILayer = (ILayer) o;
return ILayer.Layer;
- }
+ }
return int.MaxValue;
}
@@ -125,11 +125,11 @@
public int compareLayer(TreeModel model, TreeIter tia, TreeIter tib){
object objA = model.GetValue (tia, 0);
object objB = model.GetValue (tib, 0);
- int a = getZPos(objA);
+ int a = getZPos(objA);
int b = getZPos(objB);
- return a.CompareTo(b);
- }
-
+ return a.CompareTo(b);
+ }
+
private void UpdateList()
{
visibility.Clear();
@@ -318,7 +318,7 @@
new ResizeDialog(sector, application.CurrentTilemap);
} catch(Exception e) {
ErrorDialog.Exception(e);
- }
+ }
}
private void OnEditPath(object o, EventArgs args)
Modified: trunk/supertux-editor/supertux-editor/LevelObjects/Background.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LevelObjects/Background.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LevelObjects/Background.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -156,7 +156,7 @@
set {
layer = value;
}
- }
+ }
[ChooseColorSetting]
[LispChild("top_color")]
Modified: trunk/supertux-editor/supertux-editor/LevelObjects/Decal.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LevelObjects/Decal.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LevelObjects/Decal.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -76,7 +76,7 @@
{
if (surface == null) return;
surface.Draw(new Vector(X, Y));
-
+
}
public Node GetSceneGraphNode() {
Modified: trunk/supertux-editor/supertux-editor/LevelObjects/ILayer.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LevelObjects/ILayer.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LevelObjects/ILayer.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -35,4 +35,3 @@
{
SceneGraph.Node GetSceneGraphNode();
}
-
Modified: trunk/supertux-editor/supertux-editor/LevelObjects/Objects.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LevelObjects/Objects.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LevelObjects/Objects.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -125,7 +125,7 @@
{
[LispChild("radius", Optional = true, Default = 100f)]
public float Radius = 100f;
-
+
public Crystallo() {
Sprite = SpriteManager.Create("images/creatures/crystallo/crystallo.sprite");
Sprite.Action = "left";
@@ -1182,7 +1182,7 @@
public string Name {get {return "";}} //= it can't have a name
private int layer = 0;
[LispChild("z-pos", Optional = true, Default = 0)]
- public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
+ public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
}
[SupertuxObject("particles-ghosts", "images/engine/editor/ghostparticles.png",
@@ -1192,7 +1192,7 @@
public string Name {get {return "";}} //= it can't have a name
private int layer = -200;
[LispChild("z-pos", Optional = true, Default = -200)]
- public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
+ public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
}
[SupertuxObject("particles-snow", "images/engine/editor/snow.png",
@@ -1202,7 +1202,7 @@
public string Name {get {return "";}} //= it can't have a name
private int layer = -200;
[LispChild("z-pos", Optional = true, Default = -200)]
- public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
+ public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
}
[SupertuxObject("particles-clouds", "images/engine/editor/clouds.png",
@@ -1212,7 +1212,7 @@
public string Name {get {return "";}} //= it can't have a name
private int layer = -200;
[LispChild("z-pos", Optional = true, Default = -200)]
- public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
+ public int Layer { get { return layer; } set { layer = value; }} //property around field layer needed to implement ILayer
}
#endregion Particles
Modified: trunk/supertux-editor/supertux-editor/LevelObjects/Path.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LevelObjects/Path.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LevelObjects/Path.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -56,7 +56,7 @@
Y = value.Y;
}
}
-
+
public object Clone() {
return MemberwiseClone();
}
Modified: trunk/supertux-editor/supertux-editor/LevelObjects/Sector.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/LevelObjects/Sector.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/LevelObjects/Sector.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -240,6 +240,6 @@
if(tmap.Height > height)
height = tmap.Height;
tmap.UpdatePos();
- }
+ }
}
}
Modified: trunk/supertux-editor/supertux-editor/ObjectListWidget.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/ObjectListWidget.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/ObjectListWidget.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -52,12 +52,12 @@
DragBegin += OnDragBegin;
DragEnd += OnDragEnd;
ScrollEvent += OnScroll;
- DragDataGet += OnDragDataGet;
+ DragDataGet += OnDragDataGet;
application.LevelChanged += OnLevelChanged;
vadjustment = adjv;
vadjustment.ValueChanged += OnVAdjustmentChangedValue;
}
-
+
/// <summary>Redraw Widget</summary>
protected override void DrawGl()
{
@@ -273,10 +273,10 @@
Atom[] Targets = args.Context.Targets;
foreach (Atom target in Targets){
- if (target.Name == "BadguyName")
+ if (target.Name == "BadguyName")
//TODO: Send only badguys into dispensers, no Doors, no Tilemaps..
args.SelectionData.Set (target, 8, System.Text.Encoding.UTF8.GetBytes (gameObjectTypes[SelectedObjectNr].Name.ToLower()));
- //if (target.Name == "GameObject")
+ //if (target.Name == "GameObject")
//no data transmitted
}
}
@@ -303,8 +303,8 @@
{
FirstRow = (int) vadjustment.Value;
QueueDraw();
- }
-
+ }
+
/// <summary>Calculate TILES_PER_ROW, when we know how wide we are</summary>
private void OnSizeAllocated (object o, SizeAllocatedArgs args)
{
@@ -312,7 +312,7 @@
ROWS_PER_PAGE = args.Allocation.Height / ROW_HEIGHT;
updateScrollbar();
}
-
+
/// <summary>adjust the scrollbar</summary>
private void updateScrollbar()
{
Modified: trunk/supertux-editor/supertux-editor/PropertiesView.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/PropertiesView.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/PropertiesView.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -61,7 +61,7 @@
wg.ChangeObject (NewObject);
this.Object = NewObject;
foreach (FieldOrProperty field in fieldTable) //and also all self-managed widgets
- OnFieldChanged(NewObject, field, null);
+ OnFieldChanged(NewObject, field, null);
titleLabel.Markup = "<b>" + title + "</b>";
} else {
CreatePropertyWidgets(title, NewObject);
Modified: trunk/supertux-editor/supertux-editor/PropertyEditors/ChooseLicenseWidget.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/PropertyEditors/ChooseLicenseWidget.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/PropertyEditors/ChooseLicenseWidget.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -75,7 +75,7 @@
protected override void OnFieldChanged(FieldOrProperty field) {
// set current value
string val = (string)Field.GetValue(Object);
- comboBox.Entry.Text = val;
+ comboBox.Entry.Text = val;
}
}
Modified: trunk/supertux-editor/supertux-editor/SectorRenderer.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/SectorRenderer.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/SectorRenderer.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -77,7 +77,7 @@
sector.ObjectAdded -= OnObjectAdded;
sector.ObjectRemoved -= OnObjectRemoved;
sector.SizeChanged -= OnSizeChanged;
- application.TilemapChanged -= OnTilemapChanged;
+ application.TilemapChanged -= OnTilemapChanged;
//TODO: It should be possible to iterate over all (currently present?) types that implements ILayer.. How?
FieldOrProperty.AnyFieldChanged += OnFieldChanged;
}
Modified: trunk/supertux-editor/supertux-editor/SectorSwitchNotebook.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/SectorSwitchNotebook.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/SectorSwitchNotebook.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -65,7 +65,7 @@
private void OnSectorRenamed(object Object, FieldOrProperty field, object oldValue)
{
if (widgets.ContainsKey(Object))
- SetTabLabelText (widgets[Object], (string) field.GetValue(Object));
+ SetTabLabelText (widgets[Object], (string) field.GetValue(Object));
}
private void ClearTabList()
Modified: trunk/supertux-editor/supertux-editor/SpriteViewWidget.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/SpriteViewWidget.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/SpriteViewWidget.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -16,7 +16,7 @@
window.SetSizeRequest( (int)sprite.Width, (int)sprite.Height);
window.Add(widget);
window.ShowAll();
- return window;
+ return window;
}
public SpriteViewWidget(Sprite sprite)
@@ -24,7 +24,7 @@
this.sprite = sprite;
SetSizeRequest( (int)sprite.Width, (int)sprite.Height);
}
-
+
/// <summary>Redraw Widget</summary>
protected override void DrawGl()
{
Modified: trunk/supertux-editor/supertux-editor/StringListSerializer.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/StringListSerializer.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/StringListSerializer.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -38,7 +38,7 @@
for (int i = 1; i < list.Length; i++) {
obj.Add((string)list[i]);
}
-
+
return obj;
}
/// <summary>
Modified: trunk/supertux-editor/supertux-editor/TileListWidget.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/TileListWidget.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/TileListWidget.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -25,9 +25,9 @@
private int hovertile = -1;
private Vector StartPos;
private bool multiselectInProgress = false;
-
+
private Adjustment vadjustment;
-
+
private IEditorApplication application;
public TileListWidget(IEditorApplication application, Selection selection, Adjustment adjv)
@@ -51,7 +51,7 @@
SizeAllocated += OnSizeAllocated;
application.LevelChanged += OnLevelChanged;
-
+
vadjustment = adjv;
vadjustment.ValueChanged += OnVAdjustmentChangedValue;
}
@@ -87,7 +87,7 @@
tilegroup = tileset.Tilegroups["All"];
updateScrollbar();
-
+
QueueDraw();
}
@@ -96,13 +96,13 @@
QueueDraw();
if( selection.Width == 1 && selection.Height == 1 ){
- int selectedTileID = selection[0, 0];
+ int selectedTileID = selection[0, 0];
string attributes;
if( level.isWorldmap ){
attributes = tileset.Get( selectedTileID ).ParseWorldmapAttributes();
} else {
attributes = tileset.Get( selectedTileID ).ParseLevelAttributes();
- }
+ }
application.PrintStatus( "TileListWidget: Selected tile: " + selectedTileID + " Attributes: " + attributes);
} else if( selection.Width <= 0 || selection.Height <= 0 ){
application.PrintStatus( "TileListWidget: No tile selected tile." );
@@ -311,14 +311,14 @@
args.RetVal = true;
}
}
-
+
/// <summary>Vertical Scroll Bar was scrolled</summary>
private void OnVAdjustmentChangedValue(object sender, EventArgs e)
{
Translation = new Vector(0, (float) -vadjustment.Value);
QueueDraw();
- }
-
+ }
+
/// <summary>adjust the scrollbar</summary>
private void updateScrollbar()
{
Modified: trunk/supertux-editor/supertux-editor/Tiles/Tile.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/Tiles/Tile.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/Tiles/Tile.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -110,7 +110,7 @@
}
if( HasAttribute(Attribute.WATER) ){
result += "Water ";
- }
+ }
if( HasAttribute(Attribute.HURTS) ){
result += "Hurts ";
}
@@ -120,13 +120,13 @@
if( result == "" ){
result = "(none) ";
- }
+ }
return result;
}
-
+
/// <summary>Returns a string describing the worldmap-tile's attributes in human readable form.</summary>
public string ParseWorldmapAttributes(){
- string result = "";
+ string result = "";
if( HasAttribute(Attribute.WORLDMAP_NORTH) ){
result += "North ";
}
@@ -145,10 +145,10 @@
if( result == "" ){
result = "(none) ";
- }
+ }
return result;
- }
-
+ }
+
public List<ImageResource> Images;
private List<Surface> Surfaces;
public List<ImageResource> EditorImages;
Modified: trunk/supertux-editor/supertux-editor/Tiles/TilemapBorder.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/Tiles/TilemapBorder.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/Tiles/TilemapBorder.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -19,7 +19,7 @@
if (application.CurrentTilemap == null)
return; //Stop, if we have no tilemap
if (application.CurrentTilemap.Width == application.CurrentSector.Width &&
- application.CurrentTilemap.Width == application.CurrentSector.Width &&
+ application.CurrentTilemap.Width == application.CurrentSector.Width &&
application.CurrentTilemap.X == 0 &&
application.CurrentTilemap.Y == 0)
return; //Stop, if we have full-sized tilemap starting at [0,0]
Modified: trunk/supertux-editor/supertux-editor/Tiles/Tileset.cs
===================================================================
--- trunk/supertux-editor/supertux-editor/Tiles/Tileset.cs 2008-09-30 12:36:48 UTC (rev 5787)
+++ trunk/supertux-editor/supertux-editor/Tiles/Tileset.cs 2008-09-30 12:50:18 UTC (rev 5788)
@@ -31,7 +31,7 @@
List TilesL = Util.Load(Resourcepath, "supertux-tiles");
Properties TilesP = new Properties(TilesL);
-
+
// add blank tile with ID 0
Tile blank = new Tile();
blank.Id = 0;
@@ -39,7 +39,7 @@
tiles.Add(null);
}
tiles[blank.Id] = blank;
-
+
foreach(List list in TilesP.GetList("tile")) {
try {
Tile tile = new Tile();
More information about the Supertux-Commit
mailing list