Removed the extra tabs

3 files changed, 79 insertions, 65 deletions

diff --git a/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj b/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
index 30bd864..c02b683 100644
--- a/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
+++ b/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
@@ -86,32 +86,72 @@
     <EmbeddedResource Include="icons\installed-overlay.png">
       <LogicalName>installed-overlay.png</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="icons\package-x-generic.png" />
-    <EmbeddedResource Include="icons\package-x-generic_16.png" />
-    <EmbeddedResource Include="icons\package-x-generic_22.png" />
-    <EmbeddedResource Include="icons\plugin-16.png" />
-    <EmbeddedResource Include="icons\plugin-22.png" />
-    <EmbeddedResource Include="icons\plugin-32.png" />
-    <EmbeddedResource Include="icons\plugin-avail-16.png" />
-    <EmbeddedResource Include="icons\plugin-avail-32.png" />
-    <EmbeddedResource Include="icons\plugin-disabled-32.png" />
-    <EmbeddedResource Include="icons\plugin-update-16.png" />
-    <EmbeddedResource Include="icons\plugin-update-22.png" />
-    <EmbeddedResource Include="icons\plugin-update-32.png" />
-    <EmbeddedResource Include="icons\software-update-available.png" />
-    <EmbeddedResource Include="icons\software-update-available-overlay.png" />
-    <EmbeddedResource Include="icons\system-software-update.png" />
-    <EmbeddedResource Include="icons\system-software-update_22.png" />
-    <EmbeddedResource Include="icons\user-package.png" />
-    <EmbeddedResource Include="icons\web.png" />
-    <EmbeddedResource Include="interfaces\AddinInfoView.ui" />
+    <EmbeddedResource Include="icons\package-x-generic.png">
+      <LogicalName>package-x-generic.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-x-generic_16.png">
+      <LogicalName>package-x-generic_16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-x-generic_22.png">
+      <LogicalName>package-x-generic_22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16.png">
+      <LogicalName>plugin-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22.png">
+      <LogicalName>plugin-22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32.png">
+      <LogicalName>plugin-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16.png">
+      <LogicalName>plugin-avail-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-32.png">
+      <LogicalName>plugin-avail-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32.png">
+      <LogicalName>plugin-disabled-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16.png">
+      <LogicalName>plugin-update-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22.png">
+      <LogicalName>plugin-update-22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32.png">
+      <LogicalName>plugin-update-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\software-update-available.png">
+      <LogicalName>software-update-available.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\software-update-available-overlay.png">
+      <LogicalName>software-update-available-overlay.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\system-software-update.png">
+      <LogicalName>system-software-update.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\system-software-update_22.png">
+      <LogicalName>system-software-update_22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\user-package.png">
+      <LogicalName>user-package.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web.png">
+      <LogicalName>icons.web.png</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="interfaces\AddinInstallerDialog.ui" />
-    <EmbeddedResource Include="interfaces\AddinManagerDialog.ui" />
     <EmbeddedResource Include="interfaces\ErrorDialog.ui" />
     <EmbeddedResource Include="interfaces\InstallDialog.ui" />
     <EmbeddedResource Include="interfaces\ManageSitesDialog.ui" />
     <EmbeddedResource Include="interfaces\NewSiteDialog.ui" />
     <EmbeddedResource Include="interfaces\ProgressDialog.ui" />
+    <EmbeddedResource Include="interfaces\AddinManagerDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.AddinManagerDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\AddinInfoView.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.AddinInfoView.ui</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui b/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml
index 07f5ab8..6880216 100644
--- a/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui
+++ b/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml
@@ -3,6 +3,8 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkBox" id="AddinInfoView">
     <property name="can_focus">False</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
     <child>
       <object class="GtkEventBox" id="ebox">
         <property name="can_focus">False</property>
@@ -221,7 +223,7 @@
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
@@ -234,7 +236,7 @@
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
@@ -247,7 +249,7 @@
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">False</property>
                         <property name="position">2</property>
                       </packing>
@@ -260,7 +262,7 @@
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
+                        <property name="expand">True</property>
                         <property name="fill">False</property>
                         <property name="position">3</property>
                       </packing>
@@ -278,8 +280,8 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
         <property name="position">0</property>
       </packing>
     </child>
diff --git a/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui b/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml
index e59197a..f2e0236 100644
--- a/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui
+++ b/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml
@@ -82,9 +82,7 @@
                                                       <signal name="UninstallClicked" handler="OnUninstallClicked" swapped="no"/>
                                                       <signal name="UpdateClicked" handler="OnUpdateClicked" swapped="no"/>
                                                       <signal name="EnableDisableClicked" handler="OnEnableDisableClicked" swapped="no"/>
-                                                   </object>-->
-				  <placeholder />
-                                </child>
+                                                   </object>-->                                </child>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
                               </object>
@@ -96,15 +94,7 @@
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="label7">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Installed</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+
                         <child>
                           <object class="GtkHBox" id="boxUpdates">
                             <property name="can_focus">False</property>
@@ -205,7 +195,6 @@
                                                       <signal name="UpdateClicked" handler="OnUpdateClicked" swapped="no"/>
                                                       <signal name="EnableDisableClicked" handler="OnEnableDisableClicked" swapped="no"/>
                                                    </object>-->
-				  <placeholder />
                                 </child>
                               </object>
                               <packing>
@@ -219,15 +208,7 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="label4">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Updates</property>
-                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
-                        </child>
+
                         <child>
                           <object class="GtkHBox" id="hbox6">
                             <property name="can_focus">False</property>
@@ -250,7 +231,7 @@
                                             <property name="label" translatable="yes">Repository:</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
+                                            <property name="expand">True</property>
                                             <property name="fill">False</property>
                                             <property name="position">0</property>
                                           </packing>
@@ -272,7 +253,7 @@
                                             <property name="use_underline">True</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
+                                            <property name="expand">True</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
@@ -299,7 +280,7 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
@@ -324,12 +305,11 @@
                                                       <signal name="UpdateClicked" handler="OnUpdateClicked" swapped="no"/>
                                                       <signal name="EnableDisableClicked" handler="OnEnableDisableClicked" swapped="no"/>
                                                    </object>-->
-				  <placeholder />
                                 </child>
                               </object>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -338,15 +318,7 @@
                             <property name="position">2</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Gallery</property>
-                          </object>
-                          <packing>
-                            <property name="position">5</property>
-                          </packing>
-                        </child>
+
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -363,14 +335,14 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">0</property>
           </packing>