Connector/NET commit: r1674 - in trunk/MySql.VisualStudio: . Resources

[rburnett]

Added:
   trunk/MySql.VisualStudio/Resources/icon.bmp
Modified:
   trunk/MySql.VisualStudio/MySql.VisualStudio.csproj
   trunk/MySql.VisualStudio/PkgCmd.vsct
   trunk/MySql.VisualStudio/VsPkg.cs
Log:
checking in new button for website config wizard 

Modified: trunk/MySql.VisualStudio/MySql.VisualStudio.csproj
===================================================================
--- trunk/MySql.VisualStudio/MySql.VisualStudio.csproj	2009-07-08 16:26:06 UTC (rev 1673)
+++ trunk/MySql.VisualStudio/MySql.VisualStudio.csproj	2009-07-08 19:41:55 UTC (rev 1674)
@@ -308,6 +308,7 @@
     <None Include="Resources\ArrowKey.bmp" />
     <None Include="Resources\Key.bmp" />
     <None Include="Resources\bannrbmp.bmp" />
+    <Content Include="Resources\icon.bmp" />
     <Content Include="Resources\Package.ico" />
   </ItemGroup>
   <ItemGroup>

Modified: trunk/MySql.VisualStudio/PkgCmd.vsct
===================================================================
--- trunk/MySql.VisualStudio/PkgCmd.vsct	2009-07-08 16:26:06 UTC (rev 1673)
+++ trunk/MySql.VisualStudio/PkgCmd.vsct	2009-07-08 19:41:55 UTC (rev 1674)
@@ -204,14 +204,23 @@
       <Button guid="guidMySqlProviderCmdSet" id="cmdidConfig" priority="0x0100" type="Button">
         <Parent guid="guidMySqlProviderCmdSet" id="groupConfig"/>
         <CommandFlag>DynamicVisibility</CommandFlag>
-        <!--<CommandFlag>DefaultInvisible</CommandFlag>-->
-        <Icon guid="guidOfficeIcon" id="msotcidGears" />
+        <CommandFlag>DefaultInvisible</CommandFlag>
+        <Icon guid="guidImages" id="bmpConfig" />
         <Strings>
           <CommandName>cmdidConfig</CommandName>
           <ButtonText>MySQL Website Configuration</ButtonText>
         </Strings>
       </Button>
     </Buttons>
+    <!--The bitmaps section is used to define the bitmaps that are used for the commands.-->
+    <Bitmaps>
+      <!--  The bitmap id is defined in a way that is a little bit different from the others: 
+            the declaration starts with a guid for the bitmap strip, then there is the resource id of the 
+            bitmap strip containing the bitmaps and then there are the numeric ids of the elements used 
+            inside a button definition. An important aspect of this declaration is that the element id 
+            must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
+      <Bitmap guid="guidImages" href="Resources\icon.bmp" usedList="bmpConfig"/>
+    </Bitmaps>
   </Commands>
 
 
@@ -298,6 +307,9 @@
     <GuidSymbol name="WhoKnows" value="{501822e1-b5af-11d0-b4dc-00a0c91506ef}">
       <IDSymbol name="WhoKnowsId" value="0x3528"/>
     </GuidSymbol>
+    <GuidSymbol name="guidImages" value="{db91e508-7dbc-49d4-a0b3-5e4920e43655}" >
+      <IDSymbol name="bmpConfig" value="1" />
+    </GuidSymbol>
   </Symbols>
 
 </CommandTable>
\ No newline at end of file

Added: trunk/MySql.VisualStudio/Resources/icon.bmp
===================================================================
(Binary files differ)


Property changes on: trunk/MySql.VisualStudio/Resources/icon.bmp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/MySql.VisualStudio/VsPkg.cs
===================================================================
--- trunk/MySql.VisualStudio/VsPkg.cs	2009-07-08 16:26:06 UTC (rev 1673)
+++ trunk/MySql.VisualStudio/VsPkg.cs	2009-07-08 19:41:55 UTC (rev 1674)
@@ -99,7 +99,7 @@
                 // Create the command for the menu item.
                 CommandID menuCommandID = new CommandID(GuidList.guidMySqlDataPackageCmdSet,
                     (int)PkgCmdIDList.cmdidConfig);
-                OleMenuCommand menuItem = new OleMenuCommand(MenuItemCallback, menuCommandID);
+                OleMenuCommand menuItem = new OleMenuCommand(ConfigCallback, menuCommandID);
                 menuItem.BeforeQueryStatus += new EventHandler(menuItem_BeforeQueryStatus);
                 mcs.AddCommand(menuItem);
             }
@@ -111,6 +111,8 @@
             serviceContainer.AddService(typeof(MySqlLanguageService), languageService, true);
         }
 
+        #endregion
+
         void menuItem_BeforeQueryStatus(object sender, EventArgs e)
         {
             OleMenuCommand configButton = sender as OleMenuCommand;
@@ -124,14 +126,7 @@
             configButton.Visible = p.Kind == "{E24C65DC-7377-472b-9ABA-BC803B73C61A}";
         }
 
-        #endregion
-
-        /// <summary>
-        /// This function is the callback used to execute a command when the a menu item is clicked.
-        /// See the Initialize method to see how the menu item is associated to this function using
-        /// the OleMenuCommandService service and the MenuCommand class.
-        /// </summary>
-        private void MenuItemCallback(object sender, EventArgs e)
+        private void ConfigCallback(object sender, EventArgs e)
         {
             WebConfig.WebConfigDlg w = new WebConfig.WebConfigDlg();
             w.ShowDialog();