[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1002
Date       : Thu May 11 13:51:47 BST 2006

Changed paths:
   M /Trunk/XaraLX/Scripts/barconverter
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc

Remove tooltips from main gallery area
Do not depend upon tooltips for bar names etc.


Diff:
Index: Trunk/XaraLX/Scripts/barconverter
===================================================================
--- Trunk/XaraLX/Scripts/barconverter	(revision 1001)
+++ Trunk/XaraLX/Scripts/barconverter	(revision 1002)
@@ -214,7 +214,7 @@
     print STDOUT $ddindent. "    <object class=\"wxPanel\" name=\"$name\">
";
     print STDOUT $ddindent. "        <label>$title</label>
";
     print STDOUT $ddindent. "        <title>$title</title>
";
-    print STDOUT $ddindent. "        <tooltip>$title</tooltip>
";
+#    print STDOUT $ddindent. "        <tooltip>$title</tooltip>
";
     print STDOUT $ddindent. "        <help>$title</help>
";
 
 # The following for wxDialog only
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1001)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralx-bars.xrc	(revision 1002)
@@ -1348,7 +1348,6 @@
     <object class="wxPanel" name="IDD_COLOURSGALLERY">
         <label>Colour gallery</label>
         <title>Colour gallery</title>
-        <tooltip>Colour gallery</tooltip>
         <help>Colour gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -1562,7 +1561,6 @@
     <object class="wxPanel" name="IDD_LAYERSGALLERY">
         <label>Layer gallery</label>
         <title>Layer gallery</title>
-        <tooltip>Layer gallery</tooltip>
         <help>Layer gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -1734,7 +1732,6 @@
     <object class="wxPanel" name="IDD_FRAMESGALLERY">
         <label>Frame gallery</label>
         <title>Frame gallery</title>
-        <tooltip>Frame gallery</tooltip>
         <help>Frame gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -1903,7 +1900,6 @@
     <object class="wxPanel" name="IDD_BITMAPSGALLERY">
         <label>Bitmap gallery</label>
         <title>Bitmap gallery</title>
-        <tooltip>Bitmap gallery</tooltip>
         <help>Bitmap gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -2175,7 +2171,6 @@
     <object class="wxPanel" name="IDD_LINESGALLERY">
         <label>Line gallery</label>
         <title>Line gallery</title>
-        <tooltip>Line gallery</tooltip>
         <help>Line gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -2285,7 +2280,6 @@
     <object class="wxPanel" name="IDD_NAMESGALLERY">
         <label>Name gallery</label>
         <title>Name gallery</title>
-        <tooltip>Name gallery</tooltip>
         <help>Name gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -2524,7 +2518,6 @@
     <object class="wxPanel" name="FontsSGallery">
         <label>This bar should not be called FontsSGallery</label>
         <title>This bar should not be called FontsSGallery</title>
-        <tooltip>This bar should not be called FontsSGallery</tooltip>
         <help>This bar should not be called FontsSGallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -2738,7 +2731,6 @@
     <object class="wxPanel" name="IDD_LIBCLIPARTSGALLERY">
         <label>Clipart gallery</label>
         <title>Clipart gallery</title>
-        <tooltip>Clipart gallery</tooltip>
         <help>Clipart gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
@@ -2977,7 +2969,6 @@
     <object class="wxPanel" name="IDD_LIBFILLSSGALLERY">
         <label>Fills gallery</label>
         <title>Fills gallery</title>
-        <tooltip>Fills gallery</tooltip>
         <help>Fills gallery</help>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1001)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1002)
@@ -374,6 +374,12 @@
 		if (Title.IsEmpty()) Title = pDialogWnd->GetLabel(); // because wxPanel doesn't seem to support a title
 		if (Title.IsEmpty())
 		{
+			const TCHAR * ResString=CamResource::GetTextFail(pDialogWnd->GetId());
+			if (ResString)
+				Title=wxString(ResString);
+		}
+		if (Title.IsEmpty())
+		{
 			// Finally, in desperation, we (mis-)use the tooltip string because now the wx folks have removed
 			// the label, even though it's needed for accessibility. Aarrghh
 			wxToolTip* pTip = pDialogWnd->GetToolTip();


Xara