6 files changed, 15 insertions, 7 deletions

diff --git a/src/gui/gui_button.pas b/src/gui/gui_button.pas
index 17392714..6c7a3971 100644
--- a/src/gui/gui_button.pas
+++ b/src/gui/gui_button.pas
@@ -124,11 +124,13 @@ type
     property    Flat;
     property    FontDesc;
     property    GroupIndex;
+    property    Hint;
     property    ImageLayout;
     property    ImageMargin;
     property    ImageName;
     property    ImageSpacing;
     property    ModalResult;
+    property    ShowHint;
     property    ShowImage;
     property    Text;
     property    TextColor;
diff --git a/src/gui/gui_label.pas b/src/gui/gui_label.pas
index 20f5cfb3..58808020 100644
--- a/src/gui/gui_label.pas
+++ b/src/gui/gui_label.pas
@@ -26,7 +26,6 @@ uses
   SysUtils,
   gfxbase,
   fpgfx,
-  gfx_UTF8utils,
   gfx_widget;
 
 type
@@ -73,8 +72,10 @@ type
     property    AutoSize;
     property    BackgroundColor;
     property    FontDesc;
+    property    Hint;
     property    Layout;
     property    LineSpace;
+    property    ShowHint;
     property    Text;
     property    TextColor;
     property    Width;
@@ -211,7 +212,6 @@ end;
 
 procedure TfpgCustomLabel.HandlePaint;
 var
-  i: integer;
   r: TfpgRect;
   lTxtFlags: TFTextFlags;
 begin
diff --git a/uidesigner/newformdesigner.pas b/uidesigner/newformdesigner.pas
index 0f6af0f8..b5bd9cad 100644
--- a/uidesigner/newformdesigner.pas
+++ b/uidesigner/newformdesigner.pas
@@ -279,6 +279,7 @@ begin
   SetPosition(84, 123, 728, 87);
   WindowTitle := 'frmMain';
   WindowPosition := wpUser;
+  ShowHint := True;
   gINI.ReadFormState(self);
 
   MainMenu := TfpgMenuBar.Create(self);
@@ -299,6 +300,7 @@ begin
     ImageMargin := -1;
     ImageName := 'vfd.newform';
     Focusable := False;
+    Hint := 'Create a new form';
     OnClick   := @(maindsgn.OnNewForm);
   end;
 
@@ -312,6 +314,7 @@ begin
     ImageMargin := -1;
     ImageName := 'stdimg.open';
     Focusable := False;
+    Hint := 'Open a file';
     OnClick   := @(maindsgn.OnLoadFile);
   end;
 
@@ -325,6 +328,7 @@ begin
     ImageMargin := -1;
     ImageName := 'stdimg.save';
     Focusable := False;
+    Hint := 'Save the current form design';
     OnClick   := @(maindsgn.OnSaveFile);
   end;
 
@@ -422,6 +426,7 @@ begin
     btn.ImageName := wgc.WidgetIconName;
     btn.ImageMargin := -1;
     btn.Text      := '';
+    btn.Hint      := wgc.WidgetClass.ClassName;
     btn.Focusable := False;
     btn.OnClick   := @OnPaletteClick;
     btn.AllowDown := True;
diff --git a/uidesigner/uidesigner.lpi b/uidesigner/uidesigner.lpi
index 5090138f..50fde60d 100644
--- a/uidesigner/uidesigner.lpi
+++ b/uidesigner/uidesigner.lpi
@@ -114,16 +114,13 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
         <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/uidesigner/vfdmain.pas b/uidesigner/vfdmain.pas
index b11a5f02..cfa11b31 100644
--- a/uidesigner/vfdmain.pas
+++ b/uidesigner/vfdmain.pas
@@ -84,7 +84,8 @@ implementation
 uses
   vfdformparser,
   gui_iniutils,
-  gfx_utils;
+  gfx_utils,
+  fpgfx;
 
 Var
   DefaultPasExt : String = '.pas';
@@ -439,6 +440,7 @@ begin
   end;
   DefaultPasExt   := gINI.ReadString('Options', 'DefaultFileExt', '.pas');
   UndoOnPropExit  := gINI.ReadBool('Options', 'UndoOnExit', DefUndoOnPropExit);
+  fpgApplication.HintPause := 1000;
 end;
 
 end.
diff --git a/uidesigner/vfdwidgets.pas b/uidesigner/vfdwidgets.pas
index 099cf4c5..c002b6b9 100644
--- a/uidesigner/vfdwidgets.pas
+++ b/uidesigner/vfdwidgets.pas
@@ -234,6 +234,7 @@ begin
   wc.NameBase := 'lblName';
   wc.AddProperty('Alignment', TPropertyEnum, 'Horizontal text alignment');
   wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the label text');
+  wc.AddProperty('Hint', TPropertyString, '');
   wc.AddProperty('Layout', TPropertyEnum, 'Vertical text layout');
   wc.AddProperty('Text', TPropertyString, 'Label text');
   wc.AddProperty('WrapText', TPropertyBoolean, 'If True text will wrap when it doesn''t fit the width');
@@ -268,6 +269,7 @@ begin
   wc.AddProperty('Flat', TPropertyBoolean, 'Only draw button borders when mouse hovers over button');
   wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text');
   wc.AddProperty('GroupIndex', TPropertyInteger, '');
+  wc.AddProperty('Hint', TPropertyString, '');
   wc.AddProperty('ImageLayout', TPropertyEnum, 'Which side of the button contains the image');
   wc.AddProperty('ImageMargin', TPropertyInteger, 'Space between image and border, -1 centers image/text');
   wc.AddProperty('ImageName', TPropertyString, '');