UI tweaks, light theme

Core/Contents/Source/PolyLabel.cpp

@@ -419,14 +419,14 @@ void Label::setText(const String& text) {
 	
 	unsigned int textWidth = (bbox.xMax -  bbox.xMin)+1;
 	unsigned int textHeight = (bbox.yMax -  bbox.yMin)+1;
-	
+/*	
 	if(textWidth % 2 ){
 		textWidth++;
 	}
 	if(textHeight % 2 ){
 		textHeight++;
 	}
-	
+*/	
 	baseLineOffset = bbox.yMin;
 	xAdjustOffset = bbox.xMin;
 	baseLineAdjust = bbox.yMax;

IDE/Contents/Include/PolycodeConsole.h

@@ -62,7 +62,7 @@ class BackTraceEntry : public UIElement {
 		unsigned int lineNumber;
 		
 		UIRect *labelBg;	
-		SceneLabel *label;
+		UILabel *label;
 };
 
 class BackTraceWindow : public UIElement {

IDE/Contents/Include/PolycodeFontEditor.h

@@ -37,17 +37,13 @@ public:
 	void Resize(int x, int y);
 	
 protected:
-	
-	UIImage *grid;
-	
-	UIBox *bg;
-	
+		
 	Entity *anchor;
-	SceneLabel *editorLabel;
-	SceneLabel *editorLabel2;
-	SceneLabel *editorLabel3;
-	SceneLabel *editorLabel4;
-	SceneLabel *editorLabel5;	
+	UILabel *editorLabel;
+	UILabel *editorLabel2;
+	UILabel *editorLabel3;
+	UILabel *editorLabel4;
+	UILabel *editorLabel5;	
 };
 
 class PolycodeFontEditorFactory : public PolycodeEditorFactory {

IDE/Contents/Include/PolycodeFrame.h

@@ -241,10 +241,10 @@ private:
 
 	OSFileEntry draggedFile;
 	Entity *dragEntity;
-	SceneLabel *dragLabel;
+	UILabel *dragLabel;
 	bool isDragging;
 	
-	SceneLabel *currentProjectTitle;
+	UILabel *currentProjectTitle;
 	UIComboBox *currentFileSelector;
 	
 	UIImage *welcomeImage;	

IDE/Contents/Include/PolycodeImageEditor.h

@@ -37,7 +37,6 @@ class PolycodeImageEditor : public PolycodeEditor {
 	void Resize(int x, int y);
 	
 	protected:
-		UIImage *grid;
 	
 		UIRect *editorImage;
 		

IDE/Contents/Include/PolycodeProjectEditor.h

@@ -39,7 +39,7 @@ class ProjectFontEntry : public UIElement {
 		void handleEvent(Event *event);
 		
 		UITextInput *fontNameInput;
-		SceneLabel *fontFileLabel;
+		UILabel *fontFileLabel;
 		
 		UIImageButton *removeButton;
 		

IDE/Contents/Include/PolycodeProps.h

@@ -44,7 +44,7 @@ class PropProp : public UIElement {
 		virtual void setPropWidth(Number width) {}
 		
 		String propType;
-		SceneLabel *label;
+		UILabel *label;
 		Entity *propContents;				
 		
 		bool suppressChangeEvent;		
@@ -69,8 +69,8 @@ class Vector2Prop : public PropProp {
 		Vector2 lastData;
 		Vector2 currentData;	
 		
-		SceneLabel *labelX;
-		SceneLabel *labelY;		
+		UILabel *labelX;
+		UILabel *labelY;		
 };
 
 class SliderProp : public PropProp {
@@ -85,7 +85,7 @@ class SliderProp : public PropProp {
 		void setPropData(PolycodeEditorPropActionData* data);		
 				
 		UIHSlider *slider;
-		SceneLabel *valueLabel;
+		UILabel *valueLabel;
 		
 		Number lastValue;
 		Number currentValue;
@@ -266,7 +266,7 @@ class SoundProp : public PropProp {
 		void setPropData(PolycodeEditorPropActionData* data);
 		
 		Sound *previewSound;
-		SceneLabel *soundFile;		
+		UILabel *soundFile;		
 		UIButton *changeButton;
 		UIButton *playButton;	
 		
@@ -314,7 +314,7 @@ class TextureProp : public PropProp {
 				
 		UIRect *previewShape;
 		UIButton *changeButton;
-		SceneLabel *textureLabel;
+		UILabel *textureLabel;
 		
 		String lastData;
 		String currentData;
@@ -527,18 +527,18 @@ class EntityPropSheet : public PropSheet {
 		
 };
 
-class SceneLabelSheet : public PropSheet {
+class UILabelSheet : public PropSheet {
 	public:
-		SceneLabelSheet();
-		~SceneLabelSheet();
+		UILabelSheet();
+		~UILabelSheet();
 		
 		void refreshFonts();
 		
 		void handleEvent(Event *event);
 		void Update();
 				
-		SceneLabel *label;
-		SceneLabel *lastLabel;	
+		UILabel *label;
+		UILabel *lastLabel;	
 		
 		int lastSize;
 		String lastFont;

IDE/Contents/Include/TextureBrowser.h

@@ -42,7 +42,7 @@ class AssetEntry : public UIElement {
 		~AssetEntry();
 		
 		UIRect *imageShape;
-		SceneLabel *nameLabel;
+		UILabel *nameLabel;
 		
 		String assetPath;
 		

IDE/Contents/Include/ToolWindows.h

@@ -59,7 +59,7 @@ class YesNoPopup : public UIWindow {
 		
 		String action;
 	
-		SceneLabel *captionLabel;
+		UILabel *captionLabel;
 	
 		Entity *buttonAnchor;
 		UIButton *cancelButton;
@@ -76,7 +76,7 @@ class YesNoCancelPopup : public UIWindow {
 		
 		String action;
 	
-		SceneLabel *captionLabel;
+		UILabel *captionLabel;
 	
 		Entity *buttonAnchor;
 		UIButton *cancelButton;

IDE/Contents/Resources/UIThemes/dark/theme.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<PolyConfig>
+	<uiDefaultFontName>sans</uiDefaultFontName>
+	<uiDefaultFontColor>0xe4e0e3ab</uiDefaultFontColor>
+
+	<uiBgColor>0x322d2bff</uiBgColor>
+	<uiHeaderBgColor>0x262120ff</uiHeaderBgColor>
+	<uiSmallHeaderBgColor>0x2b2624ff</uiSmallHeaderBgColor>
+	<uiHeaderFontColor>0xe4e3e0ad</uiHeaderFontColor>
+
+	<uiTextInputFontName>sans</uiTextInputFontName>
+	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
+	<uiDefaultFontSize>12</uiDefaultFontSize>
+	<uiTextInputFontSize>12</uiTextInputFontSize>
+	<uiTextInputFontSizeMultiline>13</uiTextInputFontSizeMultiline>	
+	<uiTreeArrowIconImage>arrowIcon.png</uiTreeArrowIconImage>
+	<uiTreeCellHeight>20</uiTreeCellHeight>
+	<uiTreeCellPadding>4</uiTreeCellPadding>
+	
+	<textBgSkin>textfield.png</textBgSkin>
+	<textBgSkinMultiline>textfield_multi.png</textBgSkinMultiline>
+	<textBgSkinT>9</textBgSkinT>
+	<textBgSkinR>9</textBgSkinR>
+	<textBgSkinB>9</textBgSkinB>
+	<textBgSkinL>9</textBgSkinL>
+	<textBgSkinPadding>5</textBgSkinPadding>
+	<textEditLineSpacing>14</textEditLineSpacing>
+	
+	<uiTreeCellSkin>treeCellBg.png</uiTreeCellSkin>
+	<uiTreeCellSkinPadding>0</uiTreeCellSkinPadding>
+	<uiTreeCellSkinT>3</uiTreeCellSkinT>
+	<uiTreeCellSkinR>3</uiTreeCellSkinR>
+	<uiTreeCellSkinB>3</uiTreeCellSkinB>
+	<uiTreeCellSkinL>3</uiTreeCellSkinL>
+	<uiTreeFontColor>0xe4e0e3c8</uiTreeFontColor>
+	<uiTreeCellSelectorSkin>selector.png</uiTreeCellSelectorSkin>
+	<uiTreeCellSelectorSkinPadding>4</uiTreeCellSelectorSkinPadding>
+	<uiTreeCellSelectorSkinT>4</uiTreeCellSelectorSkinT>
+	<uiTreeCellSelectorSkinR>3</uiTreeCellSelectorSkinR>
+	<uiTreeCellSelectorSkinB>4</uiTreeCellSelectorSkinB>
+	<uiTreeCellSelectorSkinL>0</uiTreeCellSelectorSkinL>
+	
+	<uiTreeContainerSkin>treeBg.png</uiTreeContainerSkin>
+	<uiTreeContainerSkinPadding>0</uiTreeContainerSkinPadding>
+	<uiTreeContainerSkinT>2</uiTreeContainerSkinT>
+	<uiTreeContainerSkinR>2</uiTreeContainerSkinR>
+	<uiTreeContainerSkinB>2</uiTreeContainerSkinB>
+	<uiTreeContainerSkinL>2</uiTreeContainerSkinL>
+	
+	<uiScrollDefaultSize>19</uiScrollDefaultSize>	
+	<uiScrollPanePadding>0</uiScrollPanePadding>
+
+	<uiButtonSkin>button.png</uiButtonSkin>
+	<uiButtonFocusedSkin>buttonFocused.png</uiButtonFocusedSkin>
+	<uiButtonFontSize>12</uiButtonFontSize>	
+	<uiButtonFontColor>0xe4e0e3c8</uiButtonFontColor>
+	<uiButtonLabelOffsetX>0</uiButtonLabelOffsetX>
+	<uiButtonLabelOffsetY>4</uiButtonLabelOffsetY>	
+	<uiButtonSkinT>12</uiButtonSkinT>
+	<uiButtonSkinR>12</uiButtonSkinR>
+	<uiButtonSkinB>12</uiButtonSkinB>
+	<uiButtonSkinL>12</uiButtonSkinL>
+
+	<uiWindowSkin>windowBg.png</uiWindowSkin>
+	<uiWindowSkinT>24</uiWindowSkinT>
+	<uiWindowSkinR>17</uiWindowSkinR>
+	<uiWindowSkinB>17</uiWindowSkinB>
+	<uiWindowSkinL>17</uiWindowSkinL>
+	<uiWindowSkinPadding>15</uiWindowSkinPadding>		
+	<uiWindowTitleFont>sans</uiWindowTitleFont>
+	<uiWindowFontColor>0xe4e0e3c8</uiWindowFontColor>	
+	<uiWindowTitleFontSize>14</uiWindowTitleFontSize>
+	<uiWindowTitleX>15</uiWindowTitleX>	
+	<uiWindowTitleY>10</uiWindowTitleY>
+	<uiWindowTitleBarHeight>25</uiWindowTitleBarHeight>
+	<uiWindowTitleBarOffset>5</uiWindowTitleBarOffset>
+	<uiWindowCloseIcon>closeIcon.png</uiWindowCloseIcon>
+	<uiCloseIconX>11</uiCloseIconX>	
+	<uiCloseIconY>11</uiCloseIconY>		
+
+	<uiScrollBgSkin>scrollBg.png</uiScrollBgSkin>
+	<uiScrollBgSkinPadding>1</uiScrollBgSkinPadding>
+	<uiScrollBgSkinT>8</uiScrollBgSkinT>
+	<uiScrollBgSkinR>8</uiScrollBgSkinR>
+	<uiScrollBgSkinB>8</uiScrollBgSkinB>
+	<uiScrollBgSkinL>8</uiScrollBgSkinL>
+	
+	<uiScrollHandleSkin>scrollHandle.png</uiScrollHandleSkin>
+	<uiScrollHandleSkinT>6</uiScrollHandleSkinT>
+	<uiScrollHandleSkinR>6</uiScrollHandleSkinR>
+	<uiScrollHandleSkinB>6</uiScrollHandleSkinB>
+	<uiScrollHandleSkinL>6</uiScrollHandleSkinL>
+		
+	<uiScrollHandleMinSize>30</uiScrollHandleMinSize>	
+	<uiTreeContainerScrollBarOffset>27</uiTreeContainerScrollBarOffset>
+	
+	<uiCheckBoxFont>sans</uiCheckBoxFont>
+	<uiCheckBoxFontSize>12</uiCheckBoxFontSize>	
+	<uiCheckBoxCheckedImage>checkbox_checked.png</uiCheckBoxCheckedImage>
+	<uiCheckBoxUncheckedImage>checkbox_unchecked.png</uiCheckBoxUncheckedImage>
+	<uiCheckBoxLabelOffsetX>4</uiCheckBoxLabelOffsetX>
+	<uiCheckBoxLabelOffsetY>3</uiCheckBoxLabelOffsetY>
+		
+	<uiComboBoxFont>sans</uiComboBoxFont>
+	<uiComboBoxFontSize>12</uiComboBoxFontSize>
+	<uiComboBoxDropdownImage>combobox_drop.png</uiComboBoxDropdownImage>
+	<uiComboBoxBgImage>combobox_bg.png</uiComboBoxBgImage>
+	<uiComboBoxHeight>24</uiComboBoxHeight>
+	<uiComboBoxBgT>6</uiComboBoxBgT>
+	<uiComboBoxBgR>6</uiComboBoxBgR>
+	<uiComboBoxBgB>6</uiComboBoxBgB>
+	<uiComboBoxBgL>6</uiComboBoxBgL>
+	<uiComboBoxDropX>6</uiComboBoxDropX>
+	<uiComboBoxDropY>5</uiComboBoxDropY>
+	<uiComboBoxTextOffsetX>7</uiComboBoxTextOffsetX>
+	<uiComboBoxTextOffsetY>4</uiComboBoxTextOffsetY>		
+
+
+	<uiMenuFont>sans</uiMenuFont>
+	<uiMenuFontSize>12</uiMenuFontSize>
+	<uiMenuTextOffsetX>10</uiMenuTextOffsetX>
+	<uiMenuTextOffsetY>-1</uiMenuTextOffsetY>		
+	<uiMenuPaddingX>3</uiMenuPaddingX>
+	<uiMenuPaddingY>10</uiMenuPaddingY>
+	<uiMenuItemHeight>22</uiMenuItemHeight>
+	<uiMenuBgImage>menu_bg.png</uiMenuBgImage>	
+	<uiMenuBgT>4</uiMenuBgT>
+	<uiMenuBgR>6</uiMenuBgR>
+	<uiMenuBgB>9</uiMenuBgB>
+	<uiMenuBgL>6</uiMenuBgL>			
+	<uiMenuSelectorBgImage>menu_selector.png</uiMenuSelectorBgImage>	
+	<uiMenuSelectorBgT>0</uiMenuSelectorBgT>
+	<uiMenuSelectorBgR>0</uiMenuSelectorBgR>
+	<uiMenuSelectorBgB>0</uiMenuSelectorBgB>
+	<uiMenuSelectorBgL>0</uiMenuSelectorBgL>
+	<uiMenuSelectorPadding>3</uiMenuSelectorPadding>
+
+	<uiColorBoxFrameImage>colorboxFrame.png</uiColorBoxFrameImage>
+	<uiColorBoxFrameImageT>7</uiColorBoxFrameImageT>
+	<uiColorBoxFrameImageR>7</uiColorBoxFrameImageR>
+	<uiColorBoxFrameImageB>7</uiColorBoxFrameImageB>
+	<uiColorBoxFrameImageL>7</uiColorBoxFrameImageL>					
+	<uiColorBoxBgImage>colorboxBg.png</uiColorBoxBgImage>
+	<uiColorBoxFrameInset>4</uiColorBoxFrameInset>
+
+	<uiColorPickerMainBg>colorPickerMainBg.png</uiColorPickerMainBg>
+	<uiColorPickerMainFrame>colorPickerMainFrame.png</uiColorPickerMainFrame>
+	<uiColorPickerHueFrame>colorPickerHue.png</uiColorPickerHueFrame>
+	<uiColorPickerHueSelector>colorPickerHueSelector.png</uiColorPickerHueSelector>
+	<uiColorPickerMainSelector>colorPickerTarget.png</uiColorPickerMainSelector>
+
+	<uiHSliderGrip>hsliderHandle.png</uiHSliderGrip>
+	<uiHSliderBg>hsliderBg.png</uiHSliderBg>
+	<uiHSliderBgHeight>10</uiHSliderBgHeight>
+	<uiHSliderBgT>5</uiHSliderBgT>
+	<uiHSliderBgR>6</uiHSliderBgR>
+	<uiHSliderBgB>5</uiHSliderBgB>
+	<uiHSliderBgL>6</uiHSliderBgL>
+
+	<uiFileBrowserFileIcon>file.png</uiFileBrowserFileIcon>
+	<uiFileBrowserFolderIcon>folder.png</uiFileBrowserFolderIcon>
+	<uiFileBrowserPlaceIcon>boxIcon.png</uiFileBrowserPlaceIcon>
+</PolyConfig>

IDE/Contents/Resources/UIThemes/default/theme.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
 <PolyConfig>
 	<uiDefaultFontName>sans</uiDefaultFontName>
-	<uiDefaultFontColor>0xe4e0e3ab</uiDefaultFontColor>
+	<uiDefaultFontColor>0x000000c8</uiDefaultFontColor>
 
-	<uiBgColor>0x322d2bff</uiBgColor>
-	<uiHeaderBgColor>0x262120ff</uiHeaderBgColor>
-	<uiSmallHeaderBgColor>0x2b2624ff</uiSmallHeaderBgColor>
-	<uiHeaderFontColor>0xe4e3e0ad</uiHeaderFontColor>
+	<uiBgColor>0xc8c8c8ff</uiBgColor>
+	<uiHeaderBgColor>0x616161ff</uiHeaderBgColor>
+	<uiSmallHeaderBgColor>0x868686ff</uiSmallHeaderBgColor>
+	<uiHeaderFontColor>0x000000c8</uiHeaderFontColor>
+	<uiSectionFontColor>0x00000080</uiSectionFontColor>
 
 	<uiTextInputFontName>sans</uiTextInputFontName>
 	<uiTextInputFontNameMultiLine>mono</uiTextInputFontNameMultiLine>
@@ -32,7 +33,7 @@
 	<uiTreeCellSkinR>3</uiTreeCellSkinR>
 	<uiTreeCellSkinB>3</uiTreeCellSkinB>
 	<uiTreeCellSkinL>3</uiTreeCellSkinL>
-	<uiTreeFontColor>0xe4e0e3c8</uiTreeFontColor>
+	<uiTreeFontColor>0x000000c8</uiTreeFontColor>
 	<uiTreeCellSelectorSkin>selector.png</uiTreeCellSelectorSkin>
 	<uiTreeCellSelectorSkinPadding>4</uiTreeCellSelectorSkinPadding>
 	<uiTreeCellSelectorSkinT>4</uiTreeCellSelectorSkinT>
@@ -53,7 +54,7 @@
 	<uiButtonSkin>button.png</uiButtonSkin>
 	<uiButtonFocusedSkin>buttonFocused.png</uiButtonFocusedSkin>
 	<uiButtonFontSize>12</uiButtonFontSize>	
-	<uiButtonFontColor>0xe4e0e3c8</uiButtonFontColor>
+	<uiButtonFontColor>0xffffffff</uiButtonFontColor>
 	<uiButtonLabelOffsetX>0</uiButtonLabelOffsetX>
 	<uiButtonLabelOffsetY>4</uiButtonLabelOffsetY>	
 	<uiButtonSkinT>12</uiButtonSkinT>
@@ -68,7 +69,7 @@
 	<uiWindowSkinL>17</uiWindowSkinL>
 	<uiWindowSkinPadding>15</uiWindowSkinPadding>		
 	<uiWindowTitleFont>sans</uiWindowTitleFont>
-	<uiWindowFontColor>0xe4e0e3c8</uiWindowFontColor>	
+	<uiWindowFontColor>0x000000c8</uiWindowFontColor>	
 	<uiWindowTitleFontSize>14</uiWindowTitleFontSize>
 	<uiWindowTitleX>15</uiWindowTitleX>	
 	<uiWindowTitleY>10</uiWindowTitleY>
@@ -107,13 +108,13 @@
 	<uiComboBoxBgImage>combobox_bg.png</uiComboBoxBgImage>
 	<uiComboBoxHeight>24</uiComboBoxHeight>
 	<uiComboBoxBgT>6</uiComboBoxBgT>
-	<uiComboBoxBgR>6</uiComboBoxBgR>
+	<uiComboBoxBgR>10</uiComboBoxBgR>
 	<uiComboBoxBgB>6</uiComboBoxBgB>
-	<uiComboBoxBgL>6</uiComboBoxBgL>
+	<uiComboBoxBgL>10</uiComboBoxBgL>
 	<uiComboBoxDropX>6</uiComboBoxDropX>
 	<uiComboBoxDropY>5</uiComboBoxDropY>
 	<uiComboBoxTextOffsetX>7</uiComboBoxTextOffsetX>
-	<uiComboBoxTextOffsetY>4</uiComboBoxTextOffsetY>		
+	<uiComboBoxTextOffsetY>5</uiComboBoxTextOffsetY>		
 
 
 	<uiMenuFont>sans</uiMenuFont>
@@ -136,10 +137,10 @@
 	<uiMenuSelectorPadding>3</uiMenuSelectorPadding>
 
 	<uiColorBoxFrameImage>colorboxFrame.png</uiColorBoxFrameImage>
-	<uiColorBoxFrameImageT>7</uiColorBoxFrameImageT>
-	<uiColorBoxFrameImageR>7</uiColorBoxFrameImageR>
-	<uiColorBoxFrameImageB>7</uiColorBoxFrameImageB>
-	<uiColorBoxFrameImageL>7</uiColorBoxFrameImageL>					
+	<uiColorBoxFrameImageT>10</uiColorBoxFrameImageT>
+	<uiColorBoxFrameImageR>10</uiColorBoxFrameImageR>
+	<uiColorBoxFrameImageB>10</uiColorBoxFrameImageB>
+	<uiColorBoxFrameImageL>10</uiColorBoxFrameImageL>					
 	<uiColorBoxBgImage>colorboxBg.png</uiColorBoxBgImage>
 	<uiColorBoxFrameInset>4</uiColorBoxFrameInset>
 

IDE/Contents/Source/ExportProjectWindow.cpp

@@ -29,9 +29,9 @@ ExportProjectWindow::ExportProjectWindow() : UIWindow(L"Publish Project", 400, 3
 
 	closeOnEscape = true;
 
-	SceneLabel *label = new SceneLabel("LOCATION", 22, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel("LOCATION", 22, "section", Label::ANTIALIAS_FULL);
 	addChild(label);
-	label->color.a = 0.4;	
+	label->color.a = 1.0;	
 	label->setPosition(padding, 50);
 
 	projectLocationInput = new UITextInput(false, 420-(padding*2.0), 12);	
@@ -45,9 +45,9 @@ ExportProjectWindow::ExportProjectWindow() : UIWindow(L"Publish Project", 400, 3
 	locationSelectButton->setPosition(padding, projectLocationInput->getPosition().y+projectLocationInput->getHeight()+5);
 
 
-	label = new SceneLabel("PLATFORMS", 22, "section", Label::ANTIALIAS_FULL);
+	label = new UILabel("PLATFORMS", 22, "section", Label::ANTIALIAS_FULL);
 	addChild(label);
-	label->color.a = 0.4;	
+	label->color.a = 1.0;	
 	label->setPosition(padding, 150);
 
 	macCheckBox = new UICheckBox("MacOS X (Intel 64-bit)", false);
@@ -62,9 +62,9 @@ ExportProjectWindow::ExportProjectWindow() : UIWindow(L"Publish Project", 400, 3
 	addChild(linCheckBox);
 	linCheckBox->setPosition(padding, 225);
 
-	label = new SceneLabel("OPTIONS", 22, "section", Label::ANTIALIAS_FULL);
+	label = new UILabel("OPTIONS", 22, "section", Label::ANTIALIAS_FULL);
 	addChild(label);
-	label->color.a = 0.4;	
+	label->color.a = 1.0;	
 	label->setPosition(padding, 260);
 
 	compileCheckBox = new UICheckBox("Compile Scripts (experimental)", false);

IDE/Contents/Source/NewFileWindow.cpp

@@ -56,8 +56,8 @@ NewFileWindow::NewFileWindow() : UIWindow(L"Create New File", 580, 280) {
 		}
 	}	
 	
-	SceneLabel *label2 = new SceneLabel(L"NEW FILE NAME (NO EXTENSION)", 18, "section", Label::ANTIALIAS_FULL);
-	label2->color.a = 0.4;
+	UILabel *label2 = new UILabel(L"NEW FILE NAME (NO EXTENSION)", 18, "section", Label::ANTIALIAS_FULL);
+	label2->color.a = 1.0;
 	label2->getLabel()->setColorForRange(Color(),0, 12);
 	label2->getLabel()->setColorForRange(Color(0.6, 0.6, 0.6, 1.0),12, 40);
 	label2->setText("NEW FILE NAME (NO EXTENSION)");

IDE/Contents/Source/NewProjectWindow.cpp

@@ -64,8 +64,8 @@ NewProjectWindow::NewProjectWindow() : UIWindow(L"Create New Project", 480, 280)
 		}
 	}
 	
-	SceneLabel *label2 = new SceneLabel(L"PROJECT NAME", 18, "section", Label::ANTIALIAS_FULL);
-	label2->color.a = 0.4;
+	UILabel *label2 = new UILabel(L"PROJECT NAME", 18, "section", Label::ANTIALIAS_FULL);
+	label2->color.a = 1.0;
 	addChild(label2);
 	label2->setPosition(padding+220, templateContainer->getPosition().y-2);		
 
@@ -73,8 +73,8 @@ NewProjectWindow::NewProjectWindow() : UIWindow(L"Create New Project", 480, 280)
 	addChild(projectNameInput);
 	projectNameInput->setPosition(label2->getPosition().x-6, label2->getPosition().y + 25);
 	
-	SceneLabel *label3 = new SceneLabel(L"PROJECT LOCATION", 18, "section", Label::ANTIALIAS_FULL);
-	label3->color.a = 0.4;
+	UILabel *label3 = new UILabel(L"PROJECT LOCATION", 18, "section", Label::ANTIALIAS_FULL);
+	label3->color.a = 1.0;
 	addChild(label3);
 	label3->setPosition(padding+220, templateContainer->getPosition().y+65);		
 	

IDE/Contents/Source/PolycodeConsole.cpp

@@ -48,7 +48,7 @@ BackTraceEntry::BackTraceEntry(String fileName, int lineNumber, PolycodeProject
 	
 	labelBg->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
 	
-	label = new SceneLabel(fileName+" on line "+String::IntToString(lineNumber), fontSize, fontName);
+	label = new UILabel(fileName+" on line "+String::IntToString(lineNumber), fontSize, fontName);
 	addChild(label);
 	label->setPosition(5,2);
 	
@@ -98,7 +98,7 @@ BackTraceWindow::BackTraceWindow() : UIElement() {
 	labelBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	addChild(labelBg);
 	
-	SceneLabel *label = new SceneLabel("CRASH STACK", 18, "section");
+	UILabel *label = new UILabel("CRASH STACK", 18, "section");
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(5,3);
@@ -172,7 +172,7 @@ ConsoleWindow::ConsoleWindow() : UIElement() {
 	labelBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	addChild(labelBg);
 	
-	SceneLabel *label = new SceneLabel("CONSOLE", 18, "section");
+	UILabel *label = new UILabel("CONSOLE", 18, "section");
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(35,3);

IDE/Contents/Source/PolycodeFontEditor.cpp

@@ -27,8 +27,6 @@ PolycodeFontEditor::PolycodeFontEditor() : PolycodeEditor(true){
 }
 
 PolycodeFontEditor::~PolycodeFontEditor() {
-	delete grid;
-	delete bg;
 	delete anchor;
 	delete editorLabel;
 	delete editorLabel2;
@@ -40,50 +38,33 @@ PolycodeFontEditor::~PolycodeFontEditor() {
 bool PolycodeFontEditor::openFile(OSFileEntry filePath) {
 	
 	CoreServices::getInstance()->getFontManager()->registerFont(filePath.fullPath, filePath.fullPath);
-	
-	grid = new UIImage("Images/editorGrid.png");
-	
-	addChild(grid);
-	grid->snapToPixels = true;
-	
-	grid->getImage()->getTexture()->clamp = false;
-	grid->getImage()->getTexture()->recreateFromImageData();	
-	
-//	bg = new UIRect(10,10);
-	bg = new UIBox("Images/fontBox.png", 29,9,9,9, 10,10);	
-	bg->setAnchorPoint(-1.0, -1.0, 0.0);
-	bg->setPosition(-50,-50);
-	
-	
+		
 	anchor = new Entity();
 	addChild(anchor);
-	anchor->addChild(bg);
 	anchor->snapToPixels = true;
 	
-	editorLabel = new SceneLabel(L"ABCDEFGHIJKLM", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
+	editorLabel = new UILabel(L"ABCDEFGHIJKLM", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
 	anchor->addChild(editorLabel);
-	editorLabel2 = new SceneLabel(L"NOPQRSTUVWXYZ", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
+	editorLabel2 = new UILabel(L"NOPQRSTUVWXYZ", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
 	editorLabel2->setPosition(0, 48);
 	editorLabel->setPosition((editorLabel2->getWidth()-editorLabel->getWidth())/2, 0);
 	anchor->addChild(editorLabel2);
-	editorLabel3 = new SceneLabel(L"abcdefghijklm", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
+	editorLabel3 = new UILabel(L"abcdefghijklm", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
 	editorLabel3->setPosition((editorLabel2->getWidth()-editorLabel3->getWidth())/2, 96);	
 	anchor->addChild(editorLabel3);
-	editorLabel4 = new SceneLabel(L"nopqrstuvwxyz", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
+	editorLabel4 = new UILabel(L"nopqrstuvwxyz", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
 	editorLabel4->setPosition((editorLabel2->getWidth()-editorLabel4->getWidth())/2, 144);		
 	anchor->addChild(editorLabel4);
-	editorLabel5 = new SceneLabel(L"1234567890", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
+	editorLabel5 = new UILabel(L"1234567890", 48, filePath.fullPath, Label::ANTIALIAS_FULL);
 	editorLabel5->setPosition((editorLabel2->getWidth()-editorLabel5->getWidth())/2, 192);			
 	anchor->addChild(editorLabel5);
-
-	editorLabel->setColor(0,0,0,1);
-	editorLabel2->setColor(0,0,0,1);
-	editorLabel3->setColor(0,0,0,1);
-	editorLabel4->setColor(0,0,0,1);
-	editorLabel5->setColor(0,0,0,1);
-	
-	bg->resizeBox(editorLabel2->getWidth()+100, 192+48+100);
 	
+	Config *conf = CoreServices::getInstance()->getConfig();
+	editorLabel->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));
+	editorLabel2->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));
+	editorLabel3->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));
+	editorLabel4->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));
+	editorLabel5->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));					
 	anchor->setHeight(192+48);
 	anchor->setWidth(editorLabel2->getWidth());
 	
@@ -98,7 +79,6 @@ bool PolycodeFontEditor::openFile(OSFileEntry filePath) {
 
 void PolycodeFontEditor::Resize(int x, int y) {
 	anchor->setPosition((x-anchor->getWidth()) /2, (y-anchor->getHeight()) /2);
-	grid->getImage()->setImageCoordinates(0,0,x,y);
 	PolycodeEditor::Resize(x,y);	
 }
 

IDE/Contents/Source/PolycodeFrame.cpp

@@ -277,13 +277,13 @@ void EditCurve::setMode(unsigned int mode) {
 void EditCurve::Activate() {
 	pointsBase->visible = true;
 	pointsBase->enabled = true;
-	visMesh->color.a = 0.7;	
+	visMesh->color.a = 1.0;	
 }
 
 void EditCurve::Deactivate() {
 	pointsBase->visible = false;
 	pointsBase->enabled = false;
-	visMesh->color.a = 0.4;	
+	visMesh->color.a = 1.0;	
 }
 
 void EditCurve::Update() {
@@ -560,9 +560,9 @@ PolycodeFrame::PolycodeFrame() : UIElement() {
 	addChild(stopButton);
 	stopButton->setPosition(10,4);
 
-	currentProjectTitle = new SceneLabel("", 32, "section");
+	currentProjectTitle = new UILabel("", 32, "section");
 	addChild(currentProjectTitle);
-	currentProjectTitle->color.a = 0.4;
+	currentProjectTitle->color.a = 1.0;
 	currentProjectTitle->setPosition(70, 0);
 
 	currentFileSelector = new UIComboBox(globalMenu, 350);
@@ -623,13 +623,13 @@ PolycodeFrame::PolycodeFrame() : UIElement() {
 	aboutOKButton->setPosition(700, 420);
 	aboutOKButton->addEventListener(this, UIEvent::CLICK_EVENT);
 	
-	SceneLabel *versionLabel = new SceneLabel("version 0.8.2", 12, "mono");
+	UILabel *versionLabel = new UILabel("version 0.8.2", 12, "mono");
 	aboutWindow->addChild(versionLabel);
 	versionLabel->setPosition(20, 430);
-	versionLabel->color.a = 0.4;
+	versionLabel->color.a = 1.0;
 	
 	isDragging  = false;
-	dragLabel = new SceneLabel("NONE", 11, "sans");
+	dragLabel = new UILabel("NONE", 11, "sans");
 	dragLabel->setPosition(0,-15);
 	
 	dragEntity = new Entity();

IDE/Contents/Source/PolycodeIDEApp.cpp

@@ -62,7 +62,7 @@ PolycodeIDEApp::PolycodeIDEApp(PolycodeView *view) : EventDispatcher() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("UIThemes/default/");
 	CoreServices::getInstance()->getResourceManager()->addArchive("Images/");	
 
-	CoreServices::getInstance()->getFontManager()->registerFont("section", "Fonts/Roboto-Thin.ttf");
+	CoreServices::getInstance()->getFontManager()->registerFont("section", "Fonts/RobotoCondensed-Bold.ttf");
 
 	CoreServices::getInstance()->getRenderer()->clearColor.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiBgColor"));
 

IDE/Contents/Source/PolycodeImageEditor.cpp

@@ -27,7 +27,6 @@ PolycodeImageEditor::PolycodeImageEditor() : PolycodeEditor(true){
 }
 
 PolycodeImageEditor::~PolycodeImageEditor() {
-	delete grid;
 	delete editorImage;
 	delete leftShape;
 	delete rightShape;
@@ -37,14 +36,6 @@ PolycodeImageEditor::~PolycodeImageEditor() {
 
 bool PolycodeImageEditor::openFile(OSFileEntry filePath) {
 	
-	grid = new UIImage("Images/editorGrid.png");
-	
-	addChild(grid);
-	grid->snapToPixels = true;
-	
-	grid->getImage()->getTexture()->clamp = false;
-	grid->getImage()->getTexture()->recreateFromImageData();	
-		
 	
 	leftShape = new UIRect(10,10);
 	leftShape->setColor(0.0, 0.0, 0.0, 0.3);
@@ -79,7 +70,6 @@ bool PolycodeImageEditor::openFile(OSFileEntry filePath) {
 void PolycodeImageEditor::Resize(int x, int y) {
 
 	editorImage->setPosition(x/2, y/2);
-	grid->getImage()->setImageCoordinates(0,0,x,y);	
 
 	if((y * 0.8) * aspectRatio > x * 0.8) {
 		editorImage->Resize((x * 0.8), (x * 0.8) / aspectRatio);	

IDE/Contents/Source/PolycodeMaterialEditor.cpp

@@ -521,7 +521,7 @@ PostPreviewBox::PostPreviewBox() : UIElement() {
 	headerBg->setAnchorPoint(-1.0, -1.0, 0.0);
 	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));	
 
-	SceneLabel *label = new SceneLabel("POST PREVIEW", 18, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel("POST PREVIEW", 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(10, 3);
@@ -597,7 +597,7 @@ PostPreviewBox::PostPreviewBox() : UIElement() {
 	addChild(rotateCheckBox);
 	rotateCheckBox->setPosition(150, 2);
 
-	label = new SceneLabel("EXPOSURE", 18, "section", Label::ANTIALIAS_FULL);
+	label = new UILabel("EXPOSURE", 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(270, 3);
@@ -608,7 +608,7 @@ PostPreviewBox::PostPreviewBox() : UIElement() {
 	cameraExposureInput->setText(String::NumberToString(previewScene->getDefaultCamera()->getExposureLevel()));	
 	cameraExposureInput->addEventListener(this, UIEvent::CHANGE_EVENT);
 
-	label = new SceneLabel("LIGHT INT.", 18, "section", Label::ANTIALIAS_FULL);
+	label = new UILabel("LIGHT INT.", 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(430, 3);
@@ -692,7 +692,7 @@ MaterialPreviewBox::MaterialPreviewBox() : UIElement() {
 	if(previewBg->getLocalShaderOptions()) {
 	previewBg->getLocalShaderOptions()->addTexture("diffuse", tex);
 	}
-	previewScene->addChild(previewBg);
+//	previewScene->addChild(previewBg);
 	
 	previewScene->clearColor.setColor(0.1, 0.1, 0.1, 0.0);	
 	previewScene->ambientColor.setColor(0.2, 0.2, 0.2, 1.0);
@@ -746,7 +746,7 @@ MaterialPreviewBox::MaterialPreviewBox() : UIElement() {
 	
 	shapeSelector = new UIImage("Images/small_selector.png");
 	previewBase->addChild(shapeSelector);
-	shapeSelector->color.a = 0.4;
+	shapeSelector->color.a = 1.0;
 	
 	shapeSwitches.push_back(new UIImageButton("Images/torus_icon.png"));
 	shapeSwitches.push_back(new UIImageButton("Images/sphere_icon.png"));

IDE/Contents/Source/PolycodeProjectBrowser.cpp

@@ -31,7 +31,7 @@ PolycodeProjectBrowser::PolycodeProjectBrowser() : UIElement() {
 	headerBg->setAnchorPoint(-1.0, -1.0, 0.0);
 	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	
-	SceneLabel *label = new SceneLabel("PROJECT BROWSER", 18, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel("PROJECT BROWSER", 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	
 	addChild(label);

IDE/Contents/Source/PolycodeProjectEditor.cpp

@@ -56,8 +56,8 @@ ProjectFontEntry::ProjectFontEntry(String fontPath, String fontName) : UIElement
 	
 	OSFileEntry entry = OSFileEntry(fontPath, OSFileEntry::TYPE_FILE);
 	
-	fontFileLabel = new SceneLabel(entry.name, 12);
-	fontFileLabel->color.a = 0.6;
+	fontFileLabel = new UILabel(entry.name, 12);
+	fontFileLabel->color.a = 1.0;
 	addChild(fontFileLabel);
 	fontFileLabel->setPosition(140, 3);
 	
@@ -101,7 +101,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	headerBg->setAnchorPoint(-1.0, -1.0, 0.0);
 	headerBg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderBgColor"));
 	
-	SceneLabel *label = new SceneLabel("PROJECT SETTINGS", 18, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel("PROJECT SETTINGS", 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	
 	addChild(label);
@@ -114,8 +114,8 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	
 	Number lastYPos = 40;
 
-	label = new SceneLabel("PROJECT MODULES", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;
+	label = new UILabel("PROJECT MODULES", 18, "section", Label::ANTIALIAS_FULL);
+	label->color.setColorHexFromString(conf->getStringValue("Polycode", "uiSectionFontColor"));
 	moduleSettingsWindow->addChild(label);
 	label->setPosition(0, lastYPos);
 
@@ -137,8 +137,8 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	
 	lastYPos += 20;
 
-	label = new SceneLabel("PROJECT FONTS", 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.4;
+	label = new UILabel("PROJECT FONTS", 18, "section", Label::ANTIALIAS_FULL);
+	label->color.setColorHexFromString(conf->getStringValue("Polycode", "uiSectionFontColor"));
 	moduleSettingsWindow->addChild(label);
 	label->setPosition(0, lastYPos);
 	
@@ -156,14 +156,13 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	mainSettingsWindow->setPosition(0,10);
 	addChild(mainSettingsWindow);
 	
-	SceneLabel *label2 = new SceneLabel(L"DEFAULT VIDEO OPTIONS", 18, "section", Label::ANTIALIAS_FULL);	
-	label2->setColor(1.0, 1.0, 1.0, 0.4);
+	UILabel *label2 = new UILabel(L"DEFAULT VIDEO OPTIONS", 18, "section", Label::ANTIALIAS_FULL);	
+	label2->color.setColorHexFromString(conf->getStringValue("Polycode", "uiSectionFontColor"));
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding, 40);		
 
 		
-	label2 = new SceneLabel(L"Width", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);
+	label2 = new UILabel(L"Width", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 6, 80);		
 	
@@ -172,8 +171,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	defaultWidthInput->setPosition(label2->getPosition().x-6, label2->getPosition().y+18);
 	defaultWidthInput->setNumberOnly(true);
 
-	label2 = new SceneLabel(L"Height", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);
+	label2 = new UILabel(L"Height", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 80 + 6, 80);		
 	
@@ -182,8 +180,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	defaultHeightInput->setPosition(label2->getPosition().x-6, label2->getPosition().y+18);
 	defaultHeightInput->setNumberOnly(true);
 	
-	label2 = new SceneLabel(L"Anti-aliasing", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);
+	label2 = new UILabel(L"Anti-aliasing", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 160 + 6, 80);		
 	
@@ -194,8 +191,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	aaLevelComboBox->addComboItem("6x MSAA");			
 	aaLevelComboBox->setPosition(label2->getPosition().x-6, label2->getPosition().y+18);
 
-	label2 = new SceneLabel(L"Texture filtering mode:", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);
+	label2 = new UILabel(L"Texture filtering mode:", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 6, defaultHeightInput->getPosition().y+30);		
 	
@@ -205,8 +201,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	texFilteringComboBox->setPosition(label2->getPosition().x - 6, label2->getPosition().y+18);
 	
 
-	label2 = new SceneLabel(L"Anisotropic filtering:", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);	
+	label2 = new UILabel(L"Anisotropic filtering:", fontSize, fontName, Label::ANTIALIAS_FULL);	
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 6, texFilteringComboBox->getPosition().y+30);		
 	
@@ -219,8 +214,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	afLevelComboBox->addComboItem("16x Anisotropic Filtering");			
 	afLevelComboBox->setPosition(label2->getPosition().x-6, label2->getPosition().y+18);
 
-	label2 = new SceneLabel(L"Framerate", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);
+	label2 = new UILabel(L"Framerate", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 6, afLevelComboBox->getPosition().y+30);		
 	
@@ -233,14 +227,13 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	vSyncCheckBox->setPosition(label2->getPosition().x + 80, label2->getPosition().y+18);
 	mainSettingsWindow->addChild(vSyncCheckBox);
 	
-	label2 = new SceneLabel(L"STARTUP OPTIONS", 18, "section", Label::ANTIALIAS_FULL);	
-	label2->setColor(1.0, 1.0, 1.0, 0.4);
+	label2 = new UILabel(L"STARTUP OPTIONS", 18, "section", Label::ANTIALIAS_FULL);	
+	label2->color.setColorHexFromString(conf->getStringValue("Polycode", "uiSectionFontColor"));
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding, vSyncCheckBox->getPosition().y+vSyncCheckBox->getHeight()+20);		
 	
 	
-	label2 = new SceneLabel(L"Entry point file", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);	
+	label2 = new UILabel(L"Entry point file", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding + 6, vSyncCheckBox->getPosition().y+80);		
 	
@@ -253,8 +246,7 @@ PolycodeProjectEditor::PolycodeProjectEditor(PolycodeProjectManager *projectMana
 	mainSettingsWindow->addChild(aaLevelComboBox);		
 	mainSettingsWindow->addChild(texFilteringComboBox);	
 
-	label2 = new SceneLabel(L"Background color:", fontSize, fontName, Label::ANTIALIAS_FULL);
-	label2->setColor(1.0, 1.0, 1.0, 0.5);
+	label2 = new UILabel(L"Background color:", fontSize, fontName, Label::ANTIALIAS_FULL);
 	mainSettingsWindow->addChild(label2);
 	label2->setPosition(padding, entryPointInput->getPosition().y+entryPointInput->getHeight()+10);		
 

IDE/Contents/Source/PolycodeProps.cpp

@@ -133,7 +133,7 @@ PropList::PropList(String caption) : UIElement() {
 	
 	addChild(bg2);
 
-	SceneLabel *label = new SceneLabel(caption, 18, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel(caption, 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(10, 3);
@@ -216,8 +216,8 @@ PropSheet::PropSheet(String caption, String type) : UIElement() {
 	bg->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiSmallHeaderBgColor"));
 	bg->setAnchorPoint(-1.0, -1.0, 0.0);
 	
-	SceneLabel *label = new SceneLabel(caption, 18, "section", Label::ANTIALIAS_FULL);
-	label->color.a = 0.5;
+	UILabel *label = new UILabel(caption, 18, "section", Label::ANTIALIAS_FULL);
+	label->color.a = 1.0;
 	addChild(label);
 	label->setPosition(25, 3);	
 	
@@ -318,8 +318,8 @@ PropProp::PropProp(String caption, String type) : UIElement() {
 
 	suppressChangeEvent = false;
 	propType = type;
-	label = new SceneLabel(caption, 12);
-	label->color.a = 0.4;
+	label = new UILabel(caption, 12);
+	label->color.a = 1.0;
 	label->setPosition(0, 5);
 	addChild(label);
 	
@@ -337,13 +337,13 @@ PropProp::~PropProp() {
 
 Vector2Prop::Vector2Prop(String caption) : PropProp(caption, "Vector2") {
 
-	labelX = new SceneLabel("X:", 11);
-	labelX->color.a = 0.4;
+	labelX = new UILabel("X:", 11);
+	labelX->color.a = 1.0;
 	propContents->addChild(labelX);
 	labelX->setPosition(-20, 6);	
 
-	labelY = new SceneLabel("Y:", 11);
-	labelY->color.a = 0.4;
+	labelY = new UILabel("Y:", 11);
+	labelY->color.a = 1.0;
 	propContents->addChild(labelY);
 	labelY->setPosition(60, 6);	
 	
@@ -530,10 +530,10 @@ SliderProp::SliderProp(String caption, Number min, Number max) : PropProp(captio
 	slider->setPosition(5, 8);
 	propContents->addChild(slider);
 	
-	valueLabel = new SceneLabel("0.0", 10);
+	valueLabel = new UILabel("0.0", 10);
 	propContents->addChild(valueLabel);
 	valueLabel->setPosition(120, 5);
-	valueLabel->color.a = 0.6;
+	valueLabel->color.a = 1.0;
 	setHeight(30);
 }
 
@@ -769,10 +769,10 @@ BoolProp::~BoolProp() {
 
 SoundProp::SoundProp(String caption) : PropProp(caption, "Sound"){
 
-	soundFile = new SceneLabel("", 11);
+	soundFile = new UILabel("", 11);
 	soundFile->setPosition(0, 5);
 	propContents->addChild(soundFile);	
-	soundFile->color.a = 0.6;
+	soundFile->color.a = 1.0;
 
 	playButton = new UIButton("Play", 50);
 	propContents->addChild(playButton);
@@ -922,10 +922,10 @@ TextureProp::TextureProp(String caption) : PropProp(caption, "Texture"){
 	changeButton->setPosition(60, 5);
 	changeButton->addEventListener(this, UIEvent::CLICK_EVENT);
 	
-	textureLabel = new SceneLabel("", 12, "sans");
+	textureLabel = new UILabel("", 12, "sans");
 	propContents->addChild(textureLabel);
 	textureLabel->setPosition(-100, 32);
-	textureLabel->color.a = 0.3;
+	textureLabel->color.a = 1.0;
 		
 	setHeight(60);	
 }
@@ -2233,7 +2233,7 @@ void SceneEntityInstanceSheet::Update() {
 	}
 }
 
-SceneLabelSheet::SceneLabelSheet() : PropSheet("SCREEN LABEL", "SceneLabel") {
+UILabelSheet::UILabelSheet() : PropSheet("SCREEN LABEL", "UILabel") {
 	label = NULL;
 	
 	caption = new StringProp("Contents");
@@ -2260,7 +2260,7 @@ SceneLabelSheet::SceneLabelSheet() : PropSheet("SCREEN LABEL", "SceneLabel") {
 	refreshFonts();
 }
 
-void SceneLabelSheet::refreshFonts() {
+void UILabelSheet::refreshFonts() {
 	
 	FontManager *fontManager = CoreServices::getInstance()->getFontManager();
 	
@@ -2275,11 +2275,11 @@ void SceneLabelSheet::refreshFonts() {
 
 }
 
-SceneLabelSheet::~SceneLabelSheet() {
+UILabelSheet::~UILabelSheet() {
 
 }
 
-void SceneLabelSheet::handleEvent(Event *event) {
+void UILabelSheet::handleEvent(Event *event) {
 	if(!label)
 		return;
 
@@ -2324,7 +2324,7 @@ void SceneLabelSheet::handleEvent(Event *event) {
 	PropSheet::handleEvent(event);
 }
 
-void SceneLabelSheet::Update() {
+void UILabelSheet::Update() {
 	if(label) {
 		enabled = true;		
 		if(label != lastLabel) {

IDE/Contents/Source/PolycodeSpriteEditor.cpp

@@ -131,7 +131,7 @@ PolycodeSpriteEditor::PolycodeSpriteEditor() : PolycodeEditor(true){
 			
 	baseProps->propHeight = 180;
 	
-	SceneLabel *label = new SceneLabel("PREVIEW", 18, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel("PREVIEW", 18, "section", Label::ANTIALIAS_FULL);
 	label->color.setColorHexFromString(CoreServices::getInstance()->getConfig()->getStringValue("Polycode", "uiHeaderFontColor"));
 	addChild(label);
 	label->setPosition(390, 36);
@@ -140,8 +140,8 @@ PolycodeSpriteEditor::PolycodeSpriteEditor() : PolycodeEditor(true){
 	PropSheet *animationProps = new PropSheet("ANIMATIONS", "");
 	propList->addPropSheet(animationProps);
 
-	SceneLabel *animHelpLabel = new SceneLabel("Comma separated frames, ranges or repeats (e.g. 1,2,3-7,8x5)", 11);
-	animHelpLabel->color.a = 0.4;
+	UILabel *animHelpLabel = new UILabel("Comma separated frames, ranges or repeats (e.g. 1,2,3-7,8x5)", 11);
+	animHelpLabel->color.a = 1.0;
 	animationProps->addChild(animHelpLabel);
 	animHelpLabel->setPosition(5, 40);
 

IDE/Contents/Source/PolycodeTextEditor.cpp

@@ -646,12 +646,12 @@ FindBar::FindBar() : UIElement() {
 	addChild(barBg);
 	setHeight(30);
 	
-	SceneLabel *findLabel = new SceneLabel("FIND", 18, "section");
+	UILabel *findLabel = new UILabel("FIND", 18, "section");
 	addChild(findLabel);
 	findLabel->setColor(1.0, 1.0, 1.0, 0.6);
 	findLabel->setPosition(10,3);
 
-	SceneLabel *replaceLabel = new SceneLabel("REPLACE", 18, "section");
+	UILabel *replaceLabel = new UILabel("REPLACE", 18, "section");
 	addChild(replaceLabel);
 	replaceLabel->setColor(1.0, 1.0, 1.0, 0.6);
 	replaceLabel->setPosition(200,3);

IDE/Contents/Source/SettingsWindow.cpp

@@ -28,9 +28,9 @@ SettingsWindow::SettingsWindow() : UIWindow(L"Settings", SETTINGS_WINDOW_WIDTH,
 
 	closeOnEscape = true;
 
-	SceneLabel *label = new SceneLabel("TEXT EDITING", 22, "section", Label::ANTIALIAS_FULL);
+	UILabel *label = new UILabel("TEXT EDITING", 22, "section", Label::ANTIALIAS_FULL);
 	addChild(label);
-	label->color.a = 0.4;
+	label->color.a = 1.0;
 	label->setPosition(padding, 50);
 
 	useExternalTextEditorBox = new UICheckBox("Use external text editor", false);
@@ -47,9 +47,9 @@ SettingsWindow::SettingsWindow() : UIWindow(L"Settings", SETTINGS_WINDOW_WIDTH,
 	externalTextEditorCommand->setPosition(padding, EDITOR_BROWSE_POS);
 	
 	
-	label = new SceneLabel("Syntax highlighting theme", 12);
+	label = new UILabel("Syntax highlighting theme", 12);
 	addChild(label);
-	label->color.a = 0.6;
+	label->color.a = 1.0;
 	label->setPosition(padding, EDITOR_BROWSE_POS + 35);
 	
 	syntaxThemeBox = new UIComboBox(globalMenu, 300);

IDE/Contents/Source/TextureBrowser.cpp

@@ -61,9 +61,9 @@ AssetEntry::AssetEntry(String assetPath, String assetName, String extension) : U
 	
 	imageShape->setPosition(28, 10);
 	
-	nameLabel = new SceneLabel(assetName, 10);
+	nameLabel = new UILabel(assetName, 10);
 	addChild(nameLabel);
-	nameLabel->color.a = 0.5;
+	nameLabel->color.a = 1.0;
 	nameLabel->setAnchorPoint(0.0, 0.0, 0.0);
 	nameLabel->setPosition(60, 90);
 }

IDE/Contents/Source/ToolWindows.cpp

@@ -77,7 +77,7 @@ TextInputPopup::~TextInputPopup() {
 
 YesNoPopup::YesNoPopup() : UIWindow(L"", 300, 80) {
 	
-	captionLabel = new SceneLabel("This is a caption", 12);	
+	captionLabel = new UILabel("This is a caption", 12);	
 	addChild(captionLabel);
 	captionLabel->setPosition(padding, 35);
 		
@@ -133,7 +133,7 @@ YesNoPopup::~YesNoPopup() {
 
 YesNoCancelPopup::YesNoCancelPopup() : UIWindow(L"", 300, 80) {
 	
-	captionLabel = new SceneLabel("This is a caption", 12);	
+	captionLabel = new UILabel("This is a caption", 12);	
 	addChild(captionLabel);
 	captionLabel->setPosition(padding, 35);
 		

Modules/Contents/UI/Include/PolyUIElement.h

@@ -24,6 +24,7 @@
 #include "PolyGlobals.h"
 #include "PolyEntity.h"
 #include "PolySceneImage.h"
+#include "PolySceneLabel.h"
 
 namespace Polycode {
 	/*
@@ -104,6 +105,18 @@ namespace Polycode {
 			Texture *texture;
 			
 	};
+	
+	class _PolyExport UILabel : public UIElement {
+		public:
+			UILabel(const String& text, int size, const String& fontName = "sans", int amode = 0);			
+			void setText(const String& text);
+			Label *getLabel();
+			String getText();
+			
+			~UILabel();			
+		protected:
+			SceneLabel *label;
+	};
 
 	
 	class _PolyExport UIImage : public UIElement {

Modules/Contents/UI/Source/PolyUIElement.cpp

@@ -24,11 +24,38 @@
 #include "PolyRenderer.h"
 #include "PolyCoreServices.h"
 #include "PolyTexture.h"
+#include "PolyConfig.h"
 
 using namespace Polycode;
 
 UIElement *UIElement::globalFocusedChild = NULL;
 
+UILabel::UILabel(const String& text, int size, const String& fontName, int amode) : UIElement() {
+
+	Config *conf = CoreServices::getInstance()->getConfig();	
+	label = new SceneLabel(text, size, fontName, amode);
+	label->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));
+	addChild(label);
+	bBox = label->bBox;
+}
+
+void UILabel::setText(const String& text) {
+	label->setText(text);
+	bBox = label->bBox;	
+}
+
+String UILabel::getText() {
+	return label->getText();
+}
+
+UILabel::~UILabel() {
+	delete label;
+}
+
+Label *UILabel::getLabel() {
+	return label->getLabel();
+}
+
 UIRect::UIRect(String fileName) : UIElement() {
 	texture = NULL;
 	loadTexture(fileName);

Modules/Contents/UI/Source/PolyUIMenu.cpp

@@ -45,7 +45,7 @@ UIMenuItem::UIMenuItem(String label, String _id, void *data, Number comboWidth,
 	itemLabel = new SceneLabel(label, fontSize, fontName);
 	itemLabel->setPosition(paddingX, floor(((comboHeight/2.0) - itemLabel->getHeight()/2.0) + paddingY));
 	addChild(itemLabel);
-	
+	itemLabel->color.setColorHexFromString(conf->getStringValue("Polycode", "uiDefaultFontColor"));
 	this->_id = _id;
 	this->data = data;
 }